update version reliance

2003-12-07  JP Rosevear  <jpr@ximian.com>

	* configure.in: update version reliance

svn path=/trunk/; revision=23667

45 files changed, 156119 insertions, 105344 deletions

diff --git a/ChangeLog b/ChangeLog
index 2086a1dff8..48617b5247 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-12-07  JP Rosevear  <jpr@ximian.com>
+
+	* configure.in: update version reliance
+
 2003-12-06  JP Rosevear <jpr@ximian.com>
 
 	* tools/Makefile.am: Remove hard coded disable deprecated flags
diff --git a/configure.in b/configure.in
index 7d1683d041..605b1c73ef 100644
--- a/configure.in
+++ b/configure.in
@@ -968,8 +968,9 @@ AC_DEFUN(EVO_SET_COMPILE_FLAGS, [
 
 dnl --- Required version numbers
 
-GAL_REQUIRED=2.1.0
-GTKHTML_REQUIRED=3.1.3
+GAL_REQUIRED=2.1.1
+GTKHTML_REQUIRED=3.1.4
+EDS_REQUIRED=0.0.3
 
 AC_SUBST(GAL_REQUIRED)
 AC_SUBST(GTKHTML_REQUIRED)
@@ -1049,7 +1050,7 @@ AC_SUBST(SHELL_LIBS)
 
 dnl --- evolution-addressbook flags
 
-EVOLUTION_ADDRESSBOOK_DEPS="gconf-2.0 libbonoboui-2.0 libglade-2.0 gal-2.2 >= $GAL_REQUIRED libgnomeui-2.0 libgnome-2.0 libgnomecanvas-2.0 gnome-vfs-2.0 libgnomeprintui-2.2 libgtkhtml-3.1 >= $GTKHTML_REQUIRED libebook-1.0"
+EVOLUTION_ADDRESSBOOK_DEPS="gconf-2.0 libbonoboui-2.0 libglade-2.0 gal-2.2 >= $GAL_REQUIRED libgnomeui-2.0 libgnome-2.0 libgnomecanvas-2.0 gnome-vfs-2.0 libgnomeprintui-2.2 libgtkhtml-3.1 >= $GTKHTML_REQUIRED libebook-1.0 >= $EDS_REQUIRED"
 
 EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
 AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
@@ -1063,7 +1064,7 @@ fi
 
 dnl --- evolution-calendar flags
 
-EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.2 >= $GAL_REQUIRED libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.1 >= $GTKHTML_REQUIRED libebook-1.0 libecal-1.0)
+EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.2 >= $GAL_REQUIRED libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.1 >= $GTKHTML_REQUIRED libebook-1.0 >= $EDS_REQUIRED libecal-1.0 >= $EDS_REQUIRED)
 AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
 AC_SUBST(EVOLUTION_CALENDAR_LIBS)
 
diff --git a/po/am.po b/po/am.po
index 9caa0916e5..0ea07139bc 100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-02-07 17:46+EDT\n"
 "Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
 "Language-Team: Amharic <locales@geez.org>\n"
@@ -29,64 +29,196 @@ msgstr ""
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:205
-msgid "Failed to connect to LDAP server"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "አውቶማቲክ"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Certificates"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:230
-msgid "Failed to authenticate with LDAP server"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Configure autocomple here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:258
-msgid "Could not perform query on Root DSE"
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:681
-msgid "The server responded with no supported search bases"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1192
-msgid "This server does not support LDAPv3 schema information"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address pop-up"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1214
-msgid "Error retrieving schema information"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address viewer"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1222
-msgid "Server did not respond with valid schema information"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook card viewer"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook component"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "የሰርቨር ስም"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook folder viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "አድራሻ"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "ምርጫዎች..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "አጥፉ"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "እንደገና ሰይም"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "ወር"
+
+#: addressbook/gui/component/addressbook-component.c:218
+#, fuzzy
+msgid "_Contact"
+msgstr "ወር"
+
+#: addressbook/gui/component/addressbook-component.c:219
+#, fuzzy
+msgid "Create a new contact"
+msgstr "አዲስ ዶሴ ፍጠር"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "አልተገኘም"
+
+#: addressbook/gui/component/addressbook-component.c:226
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "አዲስ ዶሴ ፍጠር"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "የግል"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "መሥራት"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+msgid "On LDAP Servers"
+msgstr ""
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "አዲስ ዶሴ ፍጠር"
+
+#: addressbook/gui/component/addressbook-config.c:416
+msgid "Failed to connect to LDAP server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:440
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:468
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:792
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1203
+msgid "This server does not support LDAPv3 schema information"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
+#: addressbook/gui/component/addressbook-config.c:1225
+msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
+#: addressbook/gui/component/addressbook-config.c:1233
+msgid "Server did not respond with valid schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is unreachable."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -94,7 +226,7 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -105,44 +237,43 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "ጠለቅ"
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -150,7 +281,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -158,85 +289,40 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1102
-msgid "URI of the contacts that the control will display"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Certificates"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr ""
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
+#: addressbook/gui/component/addressbook.c:1063
+msgid "UID of the contacts source that the view will display"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook folder viewer"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -259,6 +345,7 @@ msgstr ""
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -292,7 +379,7 @@ msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
+msgid "Addressbook Creation Assistant"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:12
@@ -310,55 +397,55 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address:"
 msgstr "ኢሜያል አድራሻ"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "ጨርሷል"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "አጠቃላይ"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "የውይይት መድረክ"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "በፍጹም"
 
@@ -381,8 +468,8 @@ msgid "S_earch scope: "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr ""
 
@@ -426,24 +513,25 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:47
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
+msgid "Step 1: Folder Characteristics"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr ""
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "የኩነቶች መረጃ"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
+msgid "Step 3: Connecting to Server"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
+msgid "Step 4: Searching the Directory"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:52
@@ -456,14 +544,6 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -471,7 +551,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -479,7 +559,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -489,43 +569,48 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 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:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 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:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 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:74
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -551,21 +636,29 @@ msgid "Using email address"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -573,54 +666,52 @@ msgstr ""
 msgid "_Edit"
 msgstr "አስተካክል"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "የ_ፖርት ቍጥር፦"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "_የሰርቨር ስም፦"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "ስም"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "ሁሉንም አስወግድ"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "አስወግድ"
@@ -647,23 +738,21 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "ስም"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "ምንጭ"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr ""
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr ""
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "ፈልግ"
@@ -739,7 +828,8 @@ msgid "D_epartment:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "ዝርዝሮች"
 
@@ -805,12 +895,12 @@ msgid "_Categories..."
 msgstr "ምድብ... (_T)"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "አጥፉ"
@@ -1936,7 +2026,7 @@ msgid "Esq."
 msgstr ""
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "ሙሉ ስም"
 
@@ -2030,11 +2120,25 @@ msgstr ""
 msgid "Save List as VCard"
 msgstr ""
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr ""
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr ""
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr ""
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr ""
@@ -2049,20 +2153,6 @@ msgid ""
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr ""
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr ""
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2160,9 +2250,9 @@ msgstr ""
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "አትም"
@@ -2184,9 +2274,12 @@ msgstr ""
 msgid "Cut"
 msgstr "ቁረጥ"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "ቅጂ"
 
@@ -2195,16 +2288,8 @@ msgstr "ቅጂ"
 msgid "Paste"
 msgstr "ለጥፍ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "አጥፉ"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "የአሁኑ ዕይታ"
 
@@ -2217,166 +2302,170 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "* Click here to add a contact *"
+msgid "Assistant"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant"
+msgid "Assistant Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Assistant Phone"
+msgid "Business Fax"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Address"
+msgid "Business Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Business Fax"
+msgid "Business Phone 2"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-msgid "Business Phone"
+msgid "Callback Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
-msgid "Business Phone 2"
+msgid "Car Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-msgid "Callback Phone"
-msgstr ""
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+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:11
-msgid "Department"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "ኢሜይል"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "ኢሜይል"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "ኢሜይል"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "የቤተሰብ ስም"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr ""
+#, fuzzy
+msgid "Given Name"
+msgstr "የሰርቨር ስም"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "የቤት ፋክስ"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "የቤት ስልክ"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "የቤት ስልክ"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "የቤት ስልክ"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "ጆርዳን"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "መቆጣጠሪያ"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "ቅጽል ስም"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "ማስታወሻ"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "ቢሮ"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr ""
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
+msgid "Other Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
-msgid "Other Fax"
+msgid "Pager"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
-msgid "Other Phone"
+msgid "Primary Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
-msgid "Pager"
-msgstr ""
+msgid "Radio"
+msgstr "ሬዲዮ"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-msgid "Primary Phone"
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
+msgid "Spouse"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
-msgid "Radio"
-msgstr "ሬዲዮ"
+#, fuzzy
+msgid "TTYTDD"
+msgstr "tty"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
+msgid "Telex"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "tty"
+msgid "Title"
+msgstr "አርእስት"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-msgid "Telex"
-msgstr ""
+#, fuzzy
+msgid "Unit"
+msgstr "ያልተሰየመ"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr "አርእስት"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr ""
 
@@ -2460,11 +2549,19 @@ msgstr "የፋይል ስም"
 msgid "Job Title"
 msgstr "አርእስት"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr ""
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "አድራሻ"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr ""
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2476,160 +2573,157 @@ msgstr "የቤት ፋክስ"
 msgid "Blog"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "ያልታወቀ ስህተት"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "አልተገኘም"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Contact ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Error adding contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 msgid "Error removing contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "በላዩ ላይ ይጻፍ"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "ዝርዝር"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 msgid "Move contact to"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 msgid "Copy contact to"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 msgid "Move contacts to"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 msgid "Copy contacts to"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -2819,7 +2913,7 @@ msgstr "ህዳጎች"
 msgid "Number of columns:"
 msgstr "የዐምድ ብዛት"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "&ምርጫዎች"
 
@@ -3001,18 +3095,18 @@ msgstr ""
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -3020,24 +3114,81 @@ msgstr ""
 msgid "Default Priority:"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "ቀን መቁጠሪያ"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "እየጀመረ ነው"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr ""
@@ -3102,123 +3253,272 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr ""
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "bonobo ማስጀመር አልቻልኩም!"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+msgid "Calendars to run alarms for"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+msgid "Color of tasks that are due today"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+msgid "Color of tasks that are overdue"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+msgid "Show where events end in week and month views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+msgid "The view showing when the calendar starts"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+msgid "Whether to hide completed tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+msgid "Whether to show week numbers in date navigator"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
 "events."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 msgid "Purge events older than"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "ቀን"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+msgid "Rename this calendar to"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "ኒው ካሌዶኒያ"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:639
 #, fuzzy
-msgid "Rename"
-msgstr "እንደገና ሰይም"
+msgid "New meeting"
+msgstr "ስብሰባ"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
+#: calendar/gui/calendar-component.c:640
+#, fuzzy
+msgid "M_eeting"
+msgstr "ስብሰባ"
+
+#: calendar/gui/calendar-component.c:641
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "አዲስ ዶሴ ፍጠር"
+
+#: calendar/gui/calendar-component.c:646
+msgid "New all day appointment"
 msgstr ""
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "የግል"
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr ""
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "መሥራት"
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "አዲስ ዶሴ ፍጠር"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3338,7 +3638,7 @@ msgstr "ላክ"
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr ""
 
@@ -3354,6 +3654,10 @@ msgstr "ሰዓትን"
 msgid "minutes"
 msgstr "ደቂቃዎች"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3386,8 +3690,8 @@ msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "ማጠቃለያ፦"
 
@@ -3416,7 +3720,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr "ሰዓት(ኦች)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "ደቂቃ(ዎች)"
 
@@ -3470,7 +3774,7 @@ msgstr "ቀን"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "ዓርብ"
 
@@ -3484,7 +3788,7 @@ msgstr "ደቂቃዎች"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "ሰኞ"
 
@@ -3494,7 +3798,7 @@ msgstr "_እሑድ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "ቅዳሜ"
 
@@ -3508,7 +3812,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "እሑድ"
 
@@ -3526,7 +3830,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "ሐሙስ"
 
@@ -3544,7 +3848,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "ማክሰኞ"
 
@@ -3554,12 +3858,12 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "ረቡዕ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr ""
 
@@ -3596,7 +3900,7 @@ msgid "_Fri"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "አጠቃላይ"
 
@@ -3636,76 +3940,76 @@ msgstr ""
 msgid "before every appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
@@ -3715,161 +4019,165 @@ msgstr ""
 msgid "Validation error: %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr "ወደ"
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "በሌላ ስም አስቀምጥ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+msgid "Select destination source"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 msgid "The journal entry could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr ""
 
@@ -3885,43 +4193,43 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "ስብሰባ"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr ""
 
@@ -3991,31 +4299,31 @@ msgid "_Start time:"
 msgstr ""
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "ምንም"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr ""
 
@@ -4056,21 +4364,15 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr ""
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "ሁኔታ"
@@ -4090,6 +4392,7 @@ msgid "_Invite Others..."
 msgstr ""
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4121,6 +4424,7 @@ msgid "Could not create directory for new calendar"
 msgstr ""
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 msgid "A group must be selected"
 msgstr ""
 
@@ -4148,34 +4452,59 @@ msgstr "ቀን መቁጠሪያ"
 msgid "Calendar Name"
 msgstr "ቀን መቁጠሪያ"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+msgid "<b>Task List Options</b>"
+msgstr ""
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "አድራሻ"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+msgid "Task List Group"
+msgstr ""
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "የፋይል ስም"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "ዋሊስ እና ፉቱና ደሴቶች"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 #, fuzzy
 msgid "This and Future Instances"
 msgstr "ዋሊስ እና ፉቱና ደሴቶች"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr ""
 
@@ -4223,10 +4552,15 @@ msgstr "ቀን ኦች"
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr ""
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "ቀን/ሰዓት፦"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "ጨምር"
@@ -4291,39 +4625,39 @@ msgstr "ሳመንት"
 msgid "year(s)"
 msgstr "ዓመት"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 #, fuzzy
 msgid "Save Event"
 msgstr "የቀን መቁጠሪያ ኩነቶች"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr ""
 
@@ -4333,43 +4667,43 @@ msgid "% _Complete"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "ከፍ ያለ"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "ዝቅ ያለ"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "የተለመደ"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr ""
 
@@ -4378,7 +4712,7 @@ msgid "Progress"
 msgstr "ይሻሻል"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr ""
 
@@ -4399,21 +4733,21 @@ msgstr "ሁኔታ"
 msgid "_Web Page:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "ቀላል"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4421,9 +4755,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "ሚስጢራዊ"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "መግለጫ"
 
@@ -4528,26 +4862,21 @@ msgstr "%s በ %s"
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "ሚስጢራዊ"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "ምድቦች"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4560,27 +4889,25 @@ msgid "Start Date"
 msgstr ""
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "ማጠቃለያ"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "ቀለም"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 msgid "component"
 msgstr ""
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "ነፃ"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr ""
 
@@ -4592,7 +4919,7 @@ msgstr "n"
 msgid "S"
 msgstr "s"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "ምሥራቅ"
 
@@ -4600,14 +4927,14 @@ msgstr "ምሥራቅ"
 msgid "W"
 msgstr "ምዕራብ"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4615,7 +4942,7 @@ msgstr ""
 msgid "Yes"
 msgstr "አዎ"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4623,17 +4950,17 @@ msgstr "አይ"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "ያልታወቀ"
 
@@ -4645,180 +4972,178 @@ msgstr ""
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
+msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
-msgid "Deleting selected objects"
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "አትም"
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "ለጥፍ"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "ምርጫዎች"
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "ክፈት"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "በሌላ ስም አስቀምጥ"
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "ቅጂ"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "ምርጫዎች"
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "+0"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 msgid "Open _Web Page"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
@@ -4832,8 +5157,8 @@ msgstr ""
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr ""
 
@@ -4862,18 +5187,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4889,7 +5214,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -4902,442 +5227,441 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "ጠዋት"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "ከሳዓት"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "በየቀን"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "በየ%d ቀን"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "በየሳመንት"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "በየ%d ሳመንት"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " እና "
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "በየወር"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr "በየ%d ወር"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "በየ ዓመት"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "በየ%d ዓመታት"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>ምንም</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "ቦታ፦"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "ሁኔታ፦"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "አሻሽል"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "እሺ"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "ተወው"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -5497,7 +5821,7 @@ msgstr "%a %m/%d/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -5561,97 +5885,83 @@ msgstr ""
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "ቀን፦"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "ቀን፦"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "ቅድሚያ"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "ገጽ"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "ቀን መቁጠሪያ"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5659,7 +5969,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5667,56 +5977,11 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "አትም"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "ቀን መቁጠሪያ"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr ""
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "ኤፕረል"
@@ -5773,296 +6038,332 @@ msgstr "ኦክተውበር"
 msgid "September"
 msgstr "ሴፕቴምበር"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "የኩነቶች መረጃ"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "በድጋሚ ጀምር"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1ኛ"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2ኛ"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3ኛ"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4ኛ"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5ኛ"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6ኛ"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7ኛ"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8ኛ"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9ኛ"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10ኛ"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11ኛ"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12ኛ"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13ኛ"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14ኛ"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15ኛ"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16ኛ"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17ኛ"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18ኛ"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19ኛ"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20ኛ"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21ኛ"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22ኛ"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23ኛ"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24ኛ"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25ኛ"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26ኛ"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27ኛ"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28ኛ"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29ኛ"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30ኛ"
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31ኛ"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "እ"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "ሳ"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "ማ"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "ረ"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "ሐ"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "ዓ"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "ቅ"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr ""
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "ሁኔታ፦ %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "ቅድሚያ፦ %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr ""
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL፦ %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "ምድቦች፦ %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr ""
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "የቅድመ ህትመት ዕይታ"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "የህትመት ቅንጅት"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "ይህንን ሚስጢራዊ ቃል አስታውሱ"
+
+#: calendar/gui/tasks-component.c:398
+msgid "New Task List"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:591
+#, fuzzy
+msgid "_Task"
+msgstr "የማይፈለግ"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6070,11 +6371,11 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr ""
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr ""
 
@@ -6102,21 +6403,21 @@ msgstr ""
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "የቀን መቁጠሪያ ኩነቶች"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr ""
 
@@ -7649,27 +7950,27 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr ""
 
@@ -7715,86 +8016,86 @@ msgstr ""
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr ""
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -7822,34 +8123,34 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr ""
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr ""
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 msgid "Filtering new message(s)"
 msgstr ""
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -7857,45 +8158,45 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr ""
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -7903,52 +8204,62 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr ""
+
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+msgid "Encrypted content"
+msgstr ""
+
+#: camel/camel-gpg-context.c:1632
 msgid "Unable to parse message content"
 msgstr ""
 
@@ -8046,15 +8357,15 @@ msgstr ""
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr ""
 
@@ -8350,76 +8661,87 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr ""
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 msgid "Unverified"
 msgstr ""
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 msgid "Good signature"
 msgstr ""
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 msgid "Bad signature"
 msgstr ""
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 msgid "Signing certificate not found"
 msgstr ""
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 msgid "Signing certificate not trusted"
 msgstr ""
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 msgid "Malformed signature"
 msgstr ""
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 msgid "Processing error"
 msgstr ""
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr ""
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "የማይፈለግ"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "ጁን"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr ""
@@ -8604,7 +8926,7 @@ msgid ""
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
@@ -8623,22 +8945,22 @@ msgstr ""
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
@@ -8716,7 +9038,7 @@ msgstr ""
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -8728,7 +9050,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr ""
@@ -8766,53 +9088,66 @@ msgid "Failed to cache %s: %s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:43
-msgid "Checking for new mail"
+msgid "Connection to Server"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:45
+msgid "Use custom command to connect to server"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "የሼሉን ትእዛዝ"
+
+#: camel/providers/imap/camel-imap-provider.c:50
+msgid "Checking for new mail"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "ዶሴዎች"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 msgid "Automatically synchronize remote mail locally"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "ሚስጢራዊ ቃል"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9053,7 +9388,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr ""
@@ -9167,40 +9502,40 @@ msgstr ""
 msgid "Storing folder"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -9267,14 +9602,18 @@ msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+msgid "Folder already exists"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 msgid "The new folder name is illegal."
 msgstr ""
 
@@ -9317,7 +9656,7 @@ msgstr ""
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
@@ -9595,7 +9934,7 @@ msgstr ""
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr ""
 
@@ -9675,7 +10014,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr ""
 
@@ -9727,7 +10066,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9890,7 +10229,7 @@ msgstr ""
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr ""
 
@@ -10011,7 +10350,7 @@ msgstr ""
 msgid "%.0fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr ""
 
@@ -10056,11 +10395,11 @@ msgstr "የmime ዓይነት"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr ""
 
@@ -10071,45 +10410,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "ከ፦"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "ጉዳዩ፦"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "ወደ፦"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc፦"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc፦"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10118,14 +10457,18 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr ""
 
+#: composer/e-msg-composer-hdrs.c:548
+msgid "Choose a folder to post the message to."
+msgstr ""
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr ""
@@ -10157,55 +10500,55 @@ msgstr ""
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10213,34 +10556,34 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "ፋይል ክፈት"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr ""
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10248,24 +10591,24 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+msgid "The Ximian Evolution Groupware Suite"
 msgstr ""
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+msgid "Ximian Evolution (Unstable)"
 msgstr ""
 
 #: data/evolution.keys.in.h:1
@@ -10505,13 +10848,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "i p,"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "h"
 
@@ -10636,7 +10979,7 @@ msgstr ""
 msgid "You must specify a folder."
 msgstr ""
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "ዶሴ ምረጡ"
@@ -10648,24 +10991,24 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "አስፈላጊ"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr ""
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "ፈተና"
 
@@ -10759,7 +11102,7 @@ msgstr ""
 msgid "months"
 msgstr "ወር"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "ሴኮንዶች"
 
@@ -10856,7 +11199,7 @@ msgstr ""
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "መለያ"
 
@@ -10926,112 +11269,118 @@ msgid "Source Account"
 msgstr ""
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "ቅ"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "ጉዳዩ"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "does not return"
 msgstr ""
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "is before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "አይደለም"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "ነው"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr ""
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr ""
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
@@ -11056,18 +11405,77 @@ msgstr ""
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr ""
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 msgid "VFolder source"
 msgstr ""
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail folder viewer"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "ፖስታ"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr ""
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr ""
@@ -11109,7 +11517,7 @@ msgid "Protocol"
 msgstr ""
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr ""
 
@@ -11133,45 +11541,42 @@ msgstr ""
 msgid "Signature(s)"
 msgstr ""
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr ""
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11181,185 +11586,396 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "ፖስታ"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "አዲስ ዶሴ ፍጠር"
+
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
 msgstr ""
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
-msgid "Folder _name"
+msgid "Folder _name:"
 msgstr "የዶሴ ስም፦"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#: mail/em-folder-tree-model.c:592
+#, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "በመጫን ላይ..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "ዶሴ ምረጡ"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "አዲስ ዶሴ ፍጠር"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#: mail/em-folder-tree.c:1200
+#, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr ""
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "\"%s\"ን አጥፉ"
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr ""
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+#, fuzzy
+msgid "Rename Folder"
+msgstr "ዶሴን እንደገና ሰይም"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "ምርጫዎች"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "ምርጫዎች"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "የዶሴ ስም፦ (_F)"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "ተመልከት (_V)"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "በአዲስ መስኮት ውስጥ ክፈት"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "መንቀሳቅስ"
+
+#: mail/em-folder-tree.c:1500
+#, fuzzy
+msgid "_New Folder..."
+msgstr "_አዲስ ዶሴ (_N)"
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "እንደገና ሰይም"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "ምርጫዎች"
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "አትም"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "ወደፊት፦"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+msgid "Mark as _Junk"
+msgstr ""
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+msgid "Mark as _Not Junk"
+msgstr ""
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "አታጥፋ"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "የዶሴ ስም፦"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 msgid "Filter on Thread"
 msgstr ""
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "የነበረው"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr ""
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "አያያዝ ቦታ ቅጂ"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, c-format
 msgid "Matches: %d"
 msgstr ""
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "ያልተሰየመ"
+
+#: mail/em-format-html-display.c:597
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr ""
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+msgid "Valid signature"
+msgstr ""
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+msgid "Invalid signature"
+msgstr ""
+
+#: mail/em-format-html-display.c:599
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+msgid "Unencrypted"
+msgstr ""
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+msgid "Encrypted"
+msgstr ""
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr ""
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+msgid "Unsupported signature format"
+msgstr ""
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "ያልታወቀ ስህተት፦ %s"
+
+#: mail/em-format-html-display.c:917
 msgid "_View Inline"
 msgstr ""
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "ደብቅ"
@@ -11369,324 +11985,623 @@ msgstr "ደብቅ"
 msgid "Page %d of %d"
 msgstr ""
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, c-format
 msgid "Retrieving `%s'"
 msgstr ""
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-
-#: mail/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-msgid "No signature present"
-msgstr ""
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "bonobo ማስጀመር አልቻልኩም!"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-msgid "Unsupported signature format"
-msgstr ""
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 msgid "Formatting message"
 msgstr ""
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "ከ"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr ""
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "ወደ"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "ቀን"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/em-format.c:1259
-msgid "Could not parse S/MIME message: Unknown error"
+#: mail/em-format.c:1185
+#, fuzzy
+msgid "Session not initialised"
+msgstr "bonobo ማስጀመር አልቻልኩም!"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/em-popup.c:593
+#: mail/em-format.c:1212
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "በመጫን ላይ..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, c-format
+msgid "Migrating `%s':"
+msgstr ""
+
+#: mail/em-migrate.c:627
+#, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "በሌላ ስም አስቀምጥ..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 msgid "_Reply to sender"
 msgstr ""
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "በአዲስ መስኮት ውስጥ ክፈት"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "ምስሉን በሌላ ስም አስቀምጥ"
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 msgid "_Add to Addressbook"
 msgstr ""
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 msgid "Subscribed"
 msgstr ""
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "ዶሴ"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr ""
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "አጣራዎች"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr ""
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr ""
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
 " %s"
 msgstr ""
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "መልዕክት"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "በሌላ ስም አስቀምጥ..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "አድራሻ"
+
+#: mail/em-utils.c:2262
 #, c-format
-msgid "Could not create temporary directory: %s"
+msgid ""
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
 msgstr ""
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2288
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
+#: mail/evolution-mail.schemas.in.in.h:1
+msgid "Automatic link recognition"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/evolution-mail.schemas.in.in.h:2
+msgid "Automatic smiley recognition"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:6
+msgid "Default charset in which to compose messages"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:7
+msgid "Default charset in which to compose messages."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
+msgid "Default charset in which to display messages"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:9
+msgid "Default charset in which to display messages."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:10
+msgid "Default forward style"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:11
+msgid "Default reply style"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+msgid "Empty Trash folders on exit"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:14
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid ""
-"Configure mail preferences, including security and message display, here"
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
+#: mail/evolution-mail.schemas.in.in.h:21
+msgid "List of accounts"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
+#: mail/evolution-mail.schemas.in.in.h:27
+msgid "Log filter actions"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/importers/elm-importer.c:105
-msgid "Evolution is importing your old Elm mail"
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
-msgid "Importing..."
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
-msgid "Please wait"
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/importers/elm-importer.c:547
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "New Mail Notify sound file"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
+msgid "New Mail Notify type"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/importers/elm-importer.c:568
-msgid "Elm"
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:44
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+msgid "Send HTML mail by default"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:52
+msgid "Send HTML mail by default."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:53
+msgid "Show Animations"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:54
+msgid "Show animated images as animations."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+msgid "Show deleted messages in the message-list"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:57
+msgid "Show the \"Preview\" pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+msgid "Sound file to play when new mail arrives."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+msgid "Spell check inline"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:62
+msgid "Terminal font"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+msgid "The variable width font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "ምስሉን በሌላ ስም አስቀምጥ"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+msgid "Thread the message-list"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+msgid "UID string of the default account."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+msgid "Variable width font"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
 msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
@@ -11717,6 +12632,42 @@ msgstr ""
 msgid "Evolution Pine importer"
 msgstr ""
 
+#: mail/importers/elm-importer.c:105
+msgid "Evolution is importing your old Elm mail"
+msgstr ""
+
+#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
+#: mail/importers/pine-importer.c:115
+msgid "Importing..."
+msgstr ""
+
+#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
+#: mail/importers/pine-importer.c:117
+msgid "Please wait"
+msgstr ""
+
+#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
+#: mail/importers/pine-importer.c:288
+#, c-format
+msgid "Importing %s as %s"
+msgstr ""
+
+#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
+#: mail/importers/pine-importer.c:425
+#, c-format
+msgid "Scanning %s"
+msgstr ""
+
+#: mail/importers/elm-importer.c:547
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: mail/importers/elm-importer.c:568
+msgid "Elm"
+msgstr ""
+
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -11758,12 +12709,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "የማይፈለግ"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr ""
@@ -11772,7 +12717,7 @@ msgstr ""
 msgid "Scanning directory"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr ""
 
@@ -11840,23 +12785,23 @@ msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "እንግዳ ተቀባይ"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "የተጠቃሚ ስም"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "መተላለፊያ"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -11865,35 +12810,35 @@ msgstr ""
 msgid "Mail to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, c-format
 msgid "Replies to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11901,149 +12846,32 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr ""
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr ""
-
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
-
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
+#: mail/mail-component.c:379
+#, fuzzy
+msgid "New Mail Message"
+msgstr "%s - መልዕክት"
 
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
+#: mail/mail-component.c:380
+#, fuzzy
+msgid "_Mail Message"
+msgstr "መልዕክቶች"
 
-#: mail/mail-component.c:553
-#, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-msgid "Select destination to copy folder into"
-msgstr ""
-
-#: mail/mail-component.c:1643
-msgid "Select destination to move folder into"
-msgstr ""
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "አዲስ ዶሴ ፍጠር"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr ""
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
-
-#: mail/mail-component.c:1812
-#, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr ""
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "\"%s\"ን አጥፉ"
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr ""
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-#, fuzzy
-msgid "Rename Folder"
-msgstr "ዶሴን እንደገና ሰይም"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr ""
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "ምርጫዎች"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "ምርጫዎች"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "የዶሴ ስም፦ (_F)"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "ተመልከት (_V)"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "በአዲስ መስኮት ውስጥ ክፈት"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "መንቀሳቅስ"
-
-#: mail/mail-component.c:2087
-#, fuzzy
-msgid "_New Folder..."
-msgstr "_አዲስ ዶሴ (_N)"
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "እንደገና ሰይም"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "ምርጫዎች"
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr ""
 
@@ -12092,11 +12920,11 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr ""
 
@@ -12177,26 +13005,35 @@ msgid "C_olors"
 msgstr "ቀለሞች (_O)"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "ሴኔጋል"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "ምርጫዎች"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12206,477 +13043,495 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "የነበረው (_F)"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "ጨርሷል"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "አስቻለ"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "ኢሜያል አድራሻ"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Encry_ption certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "አጣራዎች"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Fonts"
 msgstr "መልዕክቶች"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr ""
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "ቀለም ምረጡ"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "ይህንን ሚስጢራዊ ቃል አስታውሱ"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "ይህንን ሚስጢራዊ ቃል አስታውሱ"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "_ደህነት"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Si_gning certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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:121
+#: mail/mail-config.glade.h:124
 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:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "ነባሮች"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "አስቻለ"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "ሙሉ ስም"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "ጁን"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "ስም"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "ጽሑፍ"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "አጥፉ..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr ""
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "መግለጫ"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr ""
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr ""
 
@@ -12688,157 +13543,161 @@ msgstr ""
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr ""
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr ""
@@ -12855,60 +13714,74 @@ msgstr "ፈልግ"
 msgid "Search"
 msgstr "&ፈልግ"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+msgid "Digital Signature"
+msgstr ""
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "መግለጫ"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "መረጃ"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "ዓይነት፦ %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 #, fuzzy
 msgid "Cancel _All"
 msgstr "ተወው"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "ሚስጢራዊ ቃል አስገቡ"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "ይህንን ሚስጢራዊ ቃል አስታውሱ (_R)"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -12944,26 +13817,31 @@ msgstr ""
 msgid "Name:"
 msgstr "ስም"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, c-format
+msgid "Invalid folder: `%s'"
+msgstr ""
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12972,88 +13850,88 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "ዝቅተኛ"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "ዛሬ %l:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "ትናንት %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr ""
 
@@ -13109,11 +13987,11 @@ msgstr "ወደፊት"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr ""
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr ""
 
@@ -13166,39 +14044,127 @@ msgstr ""
 msgid "_Unsubscribe"
 msgstr ""
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "80"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "አዲስ ዶሴ ፍጠር"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+msgid "Default width of the folder bar pane"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+msgid "Default width of the shortcut bar pane"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+msgid "Default window height"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+msgid "Default window width"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+msgid "Evolution configuration version"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
 msgstr ""
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
 msgstr ""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Path to the default contacts folder"
 msgstr ""
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+msgid "Path to the default mail folder"
 msgstr ""
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "ተልኳል"
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+msgid "Path to the default tasks folder"
+msgstr ""
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+msgid "Physical URI to the default tasks folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+msgid "Whether to show the folder bar"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+msgid "Whether to show the shortcut bar"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "ኢሜይል"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13206,14 +14172,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13221,7 +14187,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13314,9 +14280,10 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
+msgid "The specified folder name is not valid: %s"
 msgstr ""
 
 #: shell/e-shell-folder-commands.c:584
@@ -13337,19 +14304,15 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "አዲስ ዶሴ ፍጠር"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(ያልተሰየመ)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr ""
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13358,11 +14321,11 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13370,133 +14333,116 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr ""
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "አውቶማቲክ"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "የፋይል ስም፦"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "ፋይል ምረጡ"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "የፋይሉ ዓይነት፦"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 msgid "Import a _single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "ከ %s፦"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "ከውጭ አስገባ"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr ""
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr ""
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr ""
@@ -13531,7 +14477,7 @@ msgstr ""
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -13540,16 +14486,10 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 msgid "Quit Assistant"
 msgstr ""
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "አዲስ"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr ""
@@ -13607,60 +14547,47 @@ msgstr ""
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr ""
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(ምንም)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "አጠቃላይ ስህተት"
 
@@ -13776,73 +14703,17 @@ msgstr "አስወግድ"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:1096
-msgid "Shortcuts"
-msgstr "አቋራጮች"
-
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "ስህተት የለም"
-
-#: shell/e-storage.c:573
-msgid "A folder with the same name already exists"
-msgstr ""
-
-#: shell/e-storage.c:575
-msgid "The specified folder type is not valid"
-msgstr ""
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "I/O ስህተት"
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr ""
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr ""
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr ""
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr ""
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr ""
-
-#: shell/e-storage.c:591
-msgid "The specified type is not supported in this storage"
-msgstr ""
-
-#: shell/e-storage.c:593
-msgid "The specified folder cannot be modified or removed"
-msgstr ""
-
-#: shell/e-storage.c:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr ""
-
-#: shell/e-storage.c:597
-msgid "Cannot create a folder with that name"
-msgstr ""
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
 msgstr ""
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr ""
+#: shell/e-shortcuts.c:1097
+msgid "Shortcuts"
+msgstr "አቋራጮች"
 
 #: shell/e-task-widget.c:211
 #, c-format
@@ -13854,6 +14725,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr ""
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "አዲስ"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr ""
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -13883,74 +14765,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "የCORBA ብልሽት"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "ባለቤት የለም"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "አልተገኘም"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "የውስጥ ብልሽት"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "የማይሰራ URI"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr ""
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr ""
-
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr ""
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr ""
@@ -13979,11 +14793,6 @@ msgstr "ፖስታ፦ (_M)"
 msgid "_Tasks:"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-#, fuzzy
-msgid "Folder _name:"
-msgstr "የዶሴ ስም፦"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 #, fuzzy
 msgid "Folder _type:"
@@ -14038,22 +14847,6 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr ""
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -14089,7 +14882,7 @@ msgstr ""
 msgid "Importers"
 msgstr ""
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "ከውጭ አስገባ"
 
@@ -14105,16 +14898,16 @@ msgstr ""
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr ""
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14134,71 +14927,109 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr ""
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+msgid "Select a cert to import..."
+msgstr ""
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 msgid "Certificate Name"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "ይሻሻል"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 msgid "Expires"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "ኢሜያል አድራሻ"
 
+#: smime/gui/certificate-viewer.c:281
+#, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14250,84 +15081,342 @@ msgid "Backup All"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+msgid "Certificate"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:15
+msgid "Certificate Authority Trust"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:16
+msgid "Certificate details"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:17
 msgid "Common Name (CN)"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 msgid "Contact Certificates"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "አስተካክል"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 msgid "Email Signer Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 msgid "Expires On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 msgid "Organization (O)"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 msgid "Organizational Unit (OU)"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "ተመልከት (_V)"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+msgid "View Certificate"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:42
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
+msgid "Certificate already exists"
+msgstr ""
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
 #, fuzzy
-msgid "import"
-msgstr "ከውጭ አስገባ"
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "ጥያቄ"
+
+#: smime/lib/e-cert.c:488
+msgid "Version 1"
+msgstr ""
+
+#: smime/lib/e-cert.c:491
+msgid "Version 2"
+msgstr ""
+
+#: smime/lib/e-cert.c:494
+msgid "Version 3"
+msgstr ""
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "n"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "እሺ"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "n"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+msgid "Certificate Key Usage"
+msgstr ""
+
+#: smime/lib/e-cert.c:615
+msgid "Netscape Certificate Type"
+msgstr ""
+
+#: smime/lib/e-cert.c:618
+msgid "Certificate Authority Key Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "ID"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+msgid "Subject's Public Key"
+msgstr ""
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+msgid "Error: Unable to process extension"
+msgstr ""
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+msgid "SSL Certificate Authority"
+msgstr ""
+
+#: smime/lib/e-cert.c:781
+msgid "Email Certificate Authority"
+msgstr ""
+
+#: smime/lib/e-cert.c:809
+msgid "Signing"
+msgstr ""
+
+#: smime/lib/e-cert.c:813
+msgid "Non-repudiation"
+msgstr ""
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+msgid "Data Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+msgid "Certificate Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "ክሮኤሽያ"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+msgid "Not Critical"
+msgstr ""
+
+#: smime/lib/e-cert.c:907
+msgid "Extensions"
+msgstr ""
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s በ %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+msgid "Certificate Signature Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "አስገባ (_I)"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+msgid "Subject Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1159
+msgid "Certificate Signature Value"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+msgid "Enter password for PKCS12 file:"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:379
+msgid "Imported Certificate"
+msgstr ""
 
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
@@ -14378,7 +15467,7 @@ msgstr "የተመረጠውን ቅዳ"
 msgid "Copy to Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "የተመረጠውን ቁረጥ"
 
@@ -14394,7 +15483,7 @@ msgstr ""
 msgid "Move to Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "ክሊፕቦርዱን ለጥፍ"
 
@@ -14402,8 +15491,8 @@ msgstr "ክሊፕቦርዱን ለጥፍ"
 msgid "Previews the contacts to be printed"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "የቅድመ ህትመት ዕይታ"
@@ -14448,13 +15537,13 @@ msgstr ""
 msgid "View the current contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "ትግባሮች (_A)"
 
@@ -14484,139 +15573,108 @@ msgstr ""
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "አዲስ ዶሴ ፍጠር"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "አዲስ ዶሴ ፍጠር"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "ቀን ኦች"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "ሂድ ወደ"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "ሂድ ወደ ኋላ"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "ሂድ ውደ ፊት"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "ዝርዝር"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "ወር"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "ኒው ካሌዶኒያ"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "ስብሰባ"
-
-#: ui/evolution-calendar.xml.h:27
-msgid "New _Task"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "ገጽ"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 msgid "Purge old appointments and meetings"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 msgid "Show as list"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "ሳመንት"
 
@@ -14680,7 +15738,7 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "ፋይል (_F)"
 
@@ -14899,7 +15957,7 @@ msgstr ""
 msgid "Mark all visible messages as read"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr ""
 
@@ -14955,16 +16013,6 @@ msgstr ""
 msgid "_Threaded Message List"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "ይሄንን መስኮት ዝጋ"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "ዝጋ (_C)"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr ""
@@ -15121,254 +16169,277 @@ msgstr ""
 msgid "Increase the text size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+msgid "Mark the selected message(s) as junk"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:57
+msgid "Mark the selected message(s) as not being junk"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "መንቀሳቅስ"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "የሚቀጥለው"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "አልተገኘም"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "የመጀመሪያው መጠን (_Z)"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 msgid "Post a Repl_y"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "የቀድሞው"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 msgid "S_earch in Message..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "አነስተኛ (_M)"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "ሂድ ወደ (_G)"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "መሣሪያዎች (_T)"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "አታጥፋ (_U)"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "ይሄንን መስኮት ዝጋ"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "ዝጋ (_C)"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr ""
@@ -15646,12 +16717,13 @@ msgid "Change Evolution's settings"
 msgstr ""
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "ውጣ (_X)"
+#, fuzzy
+msgid "Create a new window"
+msgstr "አዲስ ዶሴ ፍጠር"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr ""
+msgid "E_xit"
+msgstr "ውጣ (_X)"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -15663,7 +16735,7 @@ msgstr ""
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
+msgid "Open a new window"
 msgstr "በአዲስ መስኮት ውስጥ ክፈት"
 
 #: ui/evolution.xml.h:11
@@ -15671,53 +16743,66 @@ msgid "Pi_lot Settings..."
 msgstr ""
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "ላክ / ተቀበል"
+
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr ""
+
+#: ui/evolution.xml.h:14
 msgid "Set up Pilot configuration"
 msgstr ""
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "የስሕተቱን ጉዳይ አቅርብ"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "የስሕተቱን ጉዳይ አቅርብ"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "ቀያያር"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr ""
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "መረጃ (_H)"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "ከውጭ አስገባ... (_I)"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "አዲስ (_N)"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "ላክ / ተቀበል (_S)"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "አሁኑኑ"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr ""
@@ -15843,12 +16928,12 @@ msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "ሳማረሐዓቅእ"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -15981,7 +17066,7 @@ msgstr "ፈልግ"
 msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "ሰርዝ"
 
@@ -15997,24 +17082,58 @@ msgstr ""
 msgid "Text"
 msgstr "ጽሑፍ"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "ሰርዝ"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
-msgstr ""
-
 #, fuzzy
-#~ msgid "Given Name"
+msgid "Find _Now"
+msgstr "ፈልግ"
+
+#~ msgid "Server Name"
 #~ msgstr "የሰርቨር ስም"
 
-#~ msgid "Family Name"
-#~ msgstr "የቤተሰብ ስም"
+#, fuzzy
+#~ msgid "Folder _name"
+#~ msgstr "የዶሴ ስም፦"
+
+#~ msgid "Sent"
+#~ msgstr "ተልኳል"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(ምንም)"
+
+#~ msgid "No error"
+#~ msgstr "ስህተት የለም"
+
+#~ msgid "I/O error"
+#~ msgstr "I/O ስህተት"
+
+#~ msgid "CORBA error"
+#~ msgstr "የCORBA ብልሽት"
+
+#~ msgid "No owner"
+#~ msgstr "ባለቤት የለም"
+
+#~ msgid "Internal error"
+#~ msgstr "የውስጥ ብልሽት"
+
+#~ msgid "Invalid URI"
+#~ msgstr "የማይሰራ URI"
 
 #, fuzzy
-#~ msgid "Address List"
-#~ msgstr "አድራሻ"
+#~ msgid "import"
+#~ msgstr "ከውጭ አስገባ"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "በአዲስ መስኮት ውስጥ ክፈት"
+
+#~ msgid "Toggle"
+#~ msgstr "ቀያያር"
+
+#~ msgid "Clear"
+#~ msgstr "ሰርዝ"
 
 #, fuzzy
 #~ msgid "Email List"
@@ -16039,9 +17158,6 @@ msgstr ""
 #~ msgid "ICS Calendar"
 #~ msgstr "ቀን መቁጠሪያ"
 
-#~ msgid "Loading..."
-#~ msgstr "በመጫን ላይ..."
-
 #, fuzzy
 #~ msgid "Object not found"
 #~ msgstr "አልተገኘም"
@@ -16072,13 +17188,6 @@ msgstr ""
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#, fuzzy
-#~ msgid "M_eeting"
-#~ msgstr "ስብሰባ"
-
 #~ msgid "URL:"
 #~ msgstr "url"
 
@@ -16088,9 +17197,6 @@ msgstr ""
 #~ msgid "Print..."
 #~ msgstr "አትም"
 
-#~ msgid "Properties..."
-#~ msgstr "ምርጫዎች..."
-
 #~ msgid "Properties for \"%s\""
 #~ msgstr "ለ \"%s\"ን ምርጫዎች"
 
@@ -16165,9 +17271,6 @@ msgstr ""
 #~ msgid " F"
 #~ msgstr " F"
 
-#~ msgid " C"
-#~ msgstr " C"
-
 #~ msgid "kph"
 #~ msgstr "kph"
 
@@ -16207,9 +17310,6 @@ msgstr ""
 #~ msgid "_New Feed"
 #~ msgstr "_አዲስ ዶሴ (_N)"
 
-#~ msgid "Send / Receive"
-#~ msgstr "ላክ / ተቀበል"
-
 #~ msgid "_Copy..."
 #~ msgstr "ቅጂ... (_C)"
 
@@ -16228,21 +17328,12 @@ msgstr ""
 #~ msgid "_Rename..."
 #~ msgstr "እንደገና ሰይም... (_R)"
 
-#~ msgid "_Send / Receive"
-#~ msgstr "ላክ / ተቀበል (_S)"
-
 #~ msgid "_Shortcut..."
 #~ msgstr "አቋራጭ... (_S)"
 
-#~ msgid "Information"
-#~ msgstr "መረጃ"
-
 #~ msgid "Error"
 #~ msgstr "ስህተት"
 
-#~ msgid "Question"
-#~ msgstr "ጥያቄ"
-
 #~ msgid "De_lete"
 #~ msgstr "አጥፉ"
 
diff --git a/po/az.po b/po/az.po
index 4aad7e71b2..32ee446d44 100644
--- a/po/az.po
+++ b/po/az.po
@@ -6,654 +6,207 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.evolution-1-4-branch\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-23 03:52+0200\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-11-27 19:18+0200\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azərbaycan dili <gnome@azitt.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-msgid "Evolution LDIF importer"
-msgstr "Evolution LDIF idxalçısı"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "LDAP Data Interchange Format (.ldif)"
-msgstr "LDAP Mə'lumat Dəyişdirmə Formatı (.ldif)"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-msgid "Evolution VCard Importer"
-msgstr "Evolution VCard İdxalçısı"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Evolution VCard importer"
-msgstr "Evolution VCard idxalçısı"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
-msgstr "VCard (.vcf, .gcrd)"
-
-#: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/backend/ebook/e-card.c:1306
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
-msgid "File As"
-msgstr "Fərqli Faylla"
-
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/backend/ebook/e-card.c:1320
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-#: my-evolution/e-summary-table.c:59
-msgid "Name"
-msgstr "Ad"
-
-#: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/backend/ebook/e-card.c:1347
-#: 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:1752
-msgid "Primary"
-msgstr "İlk"
-
-#: addressbook/backend/ebook/e-card-simple.c:63
-msgid "Prim"
-msgstr "İlk"
-
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/backend/ebook/e-card.c:1409
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant"
-msgstr "Yardımçı"
-
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
-#: addressbook/gui/contact-editor/e-contact-editor.c:1809
-msgid "Business"
-msgstr "İş"
-
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/backend/ebook/e-card-simple.c:70
-msgid "Bus"
-msgstr "İş"
-
-#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Callback"
-msgstr "Qayıdış"
-
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-msgid "Company"
-msgstr "Şirkət"
-
-#: addressbook/backend/ebook/e-card-simple.c:67
-msgid "Comp"
-msgstr "Şir"
-
-#: addressbook/backend/ebook/e-card-simple.c:68
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
-#: addressbook/gui/contact-editor/e-contact-editor.c:1810
-msgid "Home"
-msgstr "Ev"
-
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/backend/ebook/e-card.c:1367
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Quruluş"
-
-#: addressbook/backend/ebook/e-card-simple.c:69
-msgid "Org"
-msgstr "Qur"
-
-#: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-msgid "Mobile"
-msgstr "Mobil Telefonu"
-
-#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
-msgid "Car"
-msgstr "Maşın"
-
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Business Fax"
-msgstr "İş Faksı"
-
-#: addressbook/backend/ebook/e-card-simple.c:74
-msgid "Bus Fax"
-msgstr "İş Faksı"
-
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1746
-#: 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:1739
-msgid "Business 2"
-msgstr "İş 2"
-
-#: addressbook/backend/ebook/e-card-simple.c:76
-msgid "Bus 2"
-msgstr "İş 2"
-
-#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
-msgid "Home 2"
-msgstr "Ev 2"
-
-#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/backend/ebook/e-card-simple.c:79
-#: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
-#: addressbook/gui/contact-editor/e-contact-editor.c:1811
-msgid "Other"
-msgstr "Başqa"
-
-#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: 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:1751
-#: 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:1753
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
-#: addressbook/gui/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.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
-
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:488
-#: addressbook/gui/contact-editor/e-contact-editor.c:1782
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
-msgid "Email 2"
-msgstr "Epoçt 2"
-
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/component/e-address-popup.c:498
-#: addressbook/gui/contact-editor/e-contact-editor.c:1783
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
-msgid "Email 3"
-msgstr "Epoçt 3"
-
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-msgid "Web Site"
-msgstr "Veb Saytı"
-
-#: addressbook/backend/ebook/e-card-simple.c:88
-msgid "Url"
-msgstr "Url"
-
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Bölmə"
-
-#: addressbook/backend/ebook/e-card-simple.c:89
-msgid "Dep"
-msgstr "Böl"
-
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/backend/ebook/e-card.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "İdarə"
-
-#: addressbook/backend/ebook/e-card-simple.c:90
-msgid "Off"
-msgstr "İda"
-
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/backend/ebook/e-card.c:1388
-#: 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.etspec.h:34
-msgid "Profession"
-msgstr "Məslək"
-
-#: addressbook/backend/ebook/e-card-simple.c:92
-msgid "Prof"
-msgstr "Məs"
-
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/backend/ebook/e-card.c:1402
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
-msgstr "İdarəçi"
-
-#: addressbook/backend/ebook/e-card-simple.c:93
-msgid "Man"
-msgstr "İda"
-
-#: addressbook/backend/ebook/e-card-simple.c:94
-msgid "Ass"
-msgstr "Yar"
-
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/backend/ebook/e-card.c:1416
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr "Ləqəb"
-
-#: addressbook/backend/ebook/e-card-simple.c:95
-msgid "Nick"
-msgstr "Ləqəb"
-
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/backend/ebook/e-card.c:1423
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr "Yoldaş"
-
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/backend/ebook/e-card.c:1464
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr "Qeyd"
-
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/backend/ebook/e-card.c:1443
-msgid "Calendar URI"
-msgstr "Təqvim URI"
-
-#: addressbook/backend/ebook/e-card-simple.c:98
-msgid "CALUri"
-msgstr "TƏQUri"
-
-#: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "Sərbəst-məşğul URL"
-
-#: addressbook/backend/ebook/e-card-simple.c:99
-msgid "FBUrl"
-msgstr "SMUrl"
-
-#: addressbook/backend/ebook/e-card-simple.c:100
-msgid "Default server calendar"
-msgstr "Ön qurğulu verici təqvimi"
-
-#: addressbook/backend/ebook/e-card-simple.c:100
-msgid "icsCalendar"
-msgstr "icsTəqvim"
-
-#: addressbook/backend/ebook/e-card-simple.c:101
-#: addressbook/backend/ebook/e-card.c:1430
-msgid "Anniversary"
-msgstr "İldönümü"
-
-#: addressbook/backend/ebook/e-card-simple.c:101
-msgid "Anniv"
-msgstr "İldö"
-
-#: addressbook/backend/ebook/e-card-simple.c:102
-msgid "Birth Date"
-msgstr "Ad Günü"
-
-#: addressbook/backend/ebook/e-card-simple.c:105
-#: addressbook/backend/ebook/e-card.c:1478
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kateqoriyalar"
-
-#: addressbook/backend/ebook/e-card-simple.c:106
-msgid "Family Name"
-msgstr "Soyad"
-
-#: addressbook/backend/ebook/e-card-simple.c:335
-msgid "ECard"
-msgstr "ECard"
-
-#: addressbook/backend/ebook/e-card-simple.c:842
-#, c-format
-msgid "%x"
-msgstr "%x"
-
-#: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:709
-msgid "Unnamed List"
-msgstr "Adsız Siyahı"
-
-#: addressbook/backend/ebook/e-card.c:1313
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Tam Ad"
-
-#: addressbook/backend/ebook/e-card.c:1326
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-msgid "Address"
-msgstr "Ünvan"
-
-#: addressbook/backend/ebook/e-card.c:1333
-msgid "Address Label"
-msgstr "Ünvan Etiketi"
-
-#: addressbook/backend/ebook/e-card.c:1340
-msgid "Phone"
-msgstr "Telefon"
-
-#: addressbook/backend/ebook/e-card.c:1354
-msgid "Birth date"
-msgstr "Doğum tarixi"
-
-#: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:19
-msgid "URL"
-msgstr "URL"
-
-#: addressbook/backend/ebook/e-card.c:1374
-msgid "Organizational Unit"
-msgstr "Quruluş Bölümü"
-
-#: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Rolu"
-
-#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:963
-msgid "Mailer"
-msgstr "Göndərici"
-
-#: addressbook/backend/ebook/e-card.c:1450
-msgid "Free/Busy URL"
-msgstr "Sərbəst/Məşğul URL"
-
-#: addressbook/backend/ebook/e-card.c:1457
-msgid "ICS Calendar"
-msgstr "ICS Təqvimi"
-
-#: addressbook/backend/ebook/e-card.c:1471
-msgid "Related Contacts"
-msgstr "Bağlı Əlaqələr"
-
-#: addressbook/backend/ebook/e-card.c:1485
-msgid "Category List"
-msgstr "Kateqoriya Siyahısı"
-
-#: addressbook/backend/ebook/e-card.c:1492
-msgid "Wants HTML"
-msgstr "HTML İstəyir"
-
-#: addressbook/backend/ebook/e-card.c:1499
-msgid "Wants HTML set"
-msgstr "HTML dəstəsini istəyir"
-
-#: addressbook/backend/ebook/e-card.c:1506
-msgid "List"
-msgstr "Siyahı"
-
-#: addressbook/backend/ebook/e-card.c:1513
-msgid "List Show Addresses"
-msgstr "Siyahı Ünvanları Göstərsin"
-
-#: addressbook/backend/ebook/e-card.c:1520
-msgid "Arbitrary"
-msgstr "Sərbəst"
-
-#: addressbook/backend/ebook/e-card.c:1527
-msgid "ID"
-msgstr "ID"
-
-#: addressbook/backend/ebook/e-card.c:1534
-msgid "Last Use"
-msgstr "Son İstifadə"
-
-#: addressbook/backend/ebook/e-card.c:1545
-msgid "Use Score"
-msgstr "İstifadə Xalı"
-
-#: addressbook/backend/ebook/test-client-list.c:15
-#: addressbook/backend/ebook/test-client.c:33
-#: calendar/gui/alarm-notify/notify-main.c:173
-msgid "Could not initialize Bonobo"
-msgstr "Bonobo hazırlana bilmədi"
-
-#: addressbook/backend/pas/pas-backend-file.c:464
-#: addressbook/backend/pas/pas-backend-ldap.c:3050
-msgid "Searching..."
-msgstr "Axtarılır..."
-
-#: addressbook/backend/pas/pas-backend-file.c:466
-msgid "Loading..."
-msgstr "Yüklənir..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:598
-msgid "Using Distinguished Name (DN)"
-msgstr "Fərqlənən Ad (DN) İşlədilir"
-
-#: addressbook/backend/pas/pas-backend-ldap.c:602
-msgid "Using Email Address"
-msgstr "Epoçt Ünvanı İşlədilir"
-
-#: addressbook/backend/pas/pas-backend-ldap.c:748
-msgid "Reconnecting to LDAP server..."
-msgstr "LDAP vericisinə yenidən bağlanır..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:1291
-msgid "Adding card to LDAP server..."
-msgstr "Kart LDAP vericisinə əlavə edilir..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:1402
-msgid "Removing card from LDAP server..."
-msgstr "Kart LDAP vericisindən çıxardılır..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:1638
-#: addressbook/backend/pas/pas-backend-ldap.c:1641
-msgid "Modifying card from LDAP server..."
-msgstr "LDAP vericisindəki kart təkmilləşdirilir..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:2961
-msgid "Receiving LDAP search results..."
-msgstr "LDAP axtarış nəticələri alınır..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:3070
-msgid "Error performing search"
-msgstr "Axtarma xətası"
-
-#: addressbook/conduit/address-conduit.c:294
+#: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Ön Qurğulu Sync Ünvanı:"
 
-#: addressbook/conduit/address-conduit.c:537
-msgid "Cursor could not be loaded\n"
-msgstr "Kursir yüklənə bilmədi\n"
-
-#: addressbook/conduit/address-conduit.c:550
-msgid "EBook not loaded\n"
-msgstr "EKitab yüklü deyil\n"
-
-#: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1342
-#: calendar/conduits/todo/todo-conduit.c:884
-msgid "Could not start wombat server"
-msgstr "Wombat vericisi başladıla bilmədi"
-
-#: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1343
-#: calendar/conduits/todo/todo-conduit.c:885
-msgid "Could not start wombat"
-msgstr "Wombat başladıla bilmədi"
+#: addressbook/conduit/address-conduit.c:1150
+#: addressbook/conduit/address-conduit.c:1151
+#, fuzzy
+msgid "Could not load addressbook"
+msgstr "%s yüklənə bilmədi: %s"
 
-#: addressbook/conduit/address-conduit.c:1407
-#: addressbook/conduit/address-conduit.c:1410
+#: addressbook/conduit/address-conduit.c:1214
+#: addressbook/conduit/address-conduit.c:1217
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot-un Ünvan tə'minatı bloku oxuna bilmədi"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Configure access to LDAP directory servers here"
-msgstr "LDAP qovluq vericilərinizə yetişməni buradan quraşdırın"
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Avtomatik Tamamlama Qovluqları"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Directory Servers"
-msgstr "Qovluq Vericiləri"
+#, fuzzy
+msgid "Certificates"
+msgstr "_Sertifikat ID-si:"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Evolution Addressbook"
-msgstr "Evolution Ünvan Kitabçası"
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Elektronik məktub hesablarnızı buradan quraşdırın"
 
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Evolution Ünvan Kitabçası LDAP Quraşdırma İdarəsi"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Əlaqələr"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
+msgstr "Evolution Ünvan Kitabçası"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Evolution Addressbook address pop-up"
 msgstr "Evolution Ünvan Kitabçası ünvan pop-up-ı"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook address viewer"
 msgstr "Evolution Ünvan Kitabçası ünvan nümayişçisi"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook card viewer"
 msgstr "Evolution Ünvan Kitabçası kart nümayişçisi"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Addressbook component"
 msgstr "Evolution Ünvan Kitabçası tərkib hissəsi"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Addressbook folder viewer"
 msgstr "Evolution Ünvan Kitabçası qovluq nümayişçisi"
 
-#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:625
-#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Əlaqələr"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution Poçt xassələri idarəsi"
 
-#: addressbook/gui/component/addressbook-component.c:76
-msgid "Folder containing contact information"
-msgstr "Əlaqələr haqqında mə'lumatı daxil edən qovluq"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Evolutionun qovluq qurğularını quraşdırma idarəsi"
 
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP Server"
-msgstr "LDAP Vericisi"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP server containing contact information"
-msgstr "Əlaqələr haqqında mə'lumatı daxil edən LDAP vericisi"
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Ünvan Dəftəri"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Xassələr..."
 
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public Contacts"
-msgstr "İctimai Əlaqələr"
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Sil"
 
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public folder containing contact information"
-msgstr "Əlaqələr haqqında mə'lumatı daxil edən ictimai qovluq"
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "_Yenidən Adlandır"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:217
 msgid "New Contact"
 msgstr "Yeni Əlaqə"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:218
 msgid "_Contact"
 msgstr "Ə_laqə"
 
-#: addressbook/gui/component/addressbook-component.c:580
+#: addressbook/gui/component/addressbook-component.c:219
 msgid "Create a new contact"
 msgstr "Yeni əlaqə yarat"
 
-#: addressbook/gui/component/addressbook-component.c:583
+#: addressbook/gui/component/addressbook-component.c:224
 msgid "New Contact List"
 msgstr "Yeni Əlaqə Siyahısı"
 
-#: addressbook/gui/component/addressbook-component.c:583
+#: addressbook/gui/component/addressbook-component.c:225
 msgid "Contact _List"
 msgstr "Əlaqə _Siyahısı"
 
-#: addressbook/gui/component/addressbook-component.c:584
+#: addressbook/gui/component/addressbook-component.c:226
 msgid "Create a new contact list"
 msgstr "Yeni əlaqə siyahısı yarat"
 
-#: addressbook/gui/component/addressbook-config.c:206
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Şəxsi"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "İş"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "LDAP Vericisi"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "%s qovluğu yaradıla bilmədi: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "LDAP vericisinə bağlanma xətası"
 
-#: addressbook/gui/component/addressbook-config.c:231
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "IMAP vericisinə tanıdılma xətası"
 
-#: addressbook/gui/component/addressbook-config.c:259
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "Kök DSE üstündə sorğu həyata keçirilə bilmədi"
 
-#: addressbook/gui/component/addressbook-config.c:682
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "Bu verici dəstəklənməyən axtarış bazaları ilə cavab verdi"
 
-#: addressbook/gui/component/addressbook-config.c:1193
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Bu verici LDAPv3 sxem mə'lumatını dəstəkləmir"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "Sxem mə'lumatını alma xətası"
 
-#: addressbook/gui/component/addressbook-config.c:1223
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr "Verici hökmlü sxem mə'lumatı ilə cavab vermədi"
 
-#: addressbook/gui/component/addressbook-config.c:1637
-msgid "Account Name"
-msgstr "Hesab Adı"
-
-#: addressbook/gui/component/addressbook-config.c:1639
-msgid "Server Name"
-msgstr "Verici Adı"
-
-#: addressbook/gui/component/addressbook-config.c:1676
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "Evolution proqramının bu inşasında LDAP dəstəyi fəallaşdırılmayıb"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Başqa Əlaqələr"
-
-#: addressbook/gui/component/addressbook.c:502
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -661,7 +214,7 @@ msgstr ""
 "Bu ünvan kitabçasını aça bilmədik.  Xahiş edirik, cığırın\n"
 "mövcud olduğunu və üstündəki səlahiyyətlərinizi yoxlayın."
 
-#: addressbook/gui/component/addressbook.c:512
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -670,7 +223,7 @@ msgstr ""
 "Bu ünvan kitabçasını aça bilmədik. Ya səhv URI bildirdiniz,\n"
 "ya da LDAP vericisinə yetişilə bilmir."
 
-#: addressbook/gui/component/addressbook.c:517
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -682,7 +235,7 @@ msgstr ""
 "üçün aşağıdakı körpüdən OpenLDAP-ı aldıqdan sonra CVS mənbələrini\n"
 "endirib yenidən dərləməlisiniz.\n"
 
-#: addressbook/gui/component/addressbook.c:527
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -691,48 +244,47 @@ msgstr ""
 "Bu ünvan kitabçasını aça bilmədik.  Ya səhv URL bildirdiniz,\n"
 "ya da vericiyə yetişilə bilmir."
 
-#: addressbook/gui/component/addressbook.c:547
+#: addressbook/gui/component/addressbook.c:539
 msgid "Unable to open addressbook"
 msgstr "Ünvan kitabçası açıla bilmədi"
 
-#: addressbook/gui/component/addressbook.c:607
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP vericisinə anonim olaraq yetişmə"
 
-#: addressbook/gui/component/addressbook.c:652
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "Tanıdılma bacarılmadı.\n"
 
-#: addressbook/gui/component/addressbook.c:660
-#: addressbook/gui/component/addressbook.c:663
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s %s üçün şifrə daxil edin (istifadəçi %s)"
 
-#: addressbook/gui/component/addressbook.c:794
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "Ad bununla başlayır:"
 
-#: addressbook/gui/component/addressbook.c:795
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "Epoçt bununla başlayır:"
 
-#: addressbook/gui/component/addressbook.c:796
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Kateqoriya budur:"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:797
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Hər hansı bir sahə bunu daxil edir:"
 
-#: addressbook/gui/component/addressbook.c:798
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Ətraflı..."
 
-#: addressbook/gui/component/addressbook.c:955
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -740,7 +292,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:961
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -748,82 +300,41 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:967
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Bu ünvan kitabçasının mühərriki bu sorğunu oxuya bilmədi."
 
-#: addressbook/gui/component/addressbook.c:970
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Bu ünvan kitabçasının mühərriki bu sorğunu tədbiq etməyi rədd etdi."
 
-#: addressbook/gui/component/addressbook.c:974
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "Bu sorğu müvəffəqiyyətlə nəticələnmədi."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1059
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Hər Hansı Kateqoriya"
 
-#: addressbook/gui/component/addressbook.c:1145
-msgid "The URI that the Folder Browser will display"
-msgstr "Qovluq Səyyahının göstərəcəyi URI"
-
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * card.
-#.
-#: addressbook/gui/component/e-address-popup.c:184
-msgid "(none)"
-msgstr "(heç biri)"
-
-#: addressbook/gui/component/e-address-popup.c:478
-#: addressbook/gui/contact-editor/e-contact-editor.c:1781
-msgid "Primary Email"
-msgstr "İlk Epoçt"
-
-#: addressbook/gui/component/e-address-popup.c:614
-msgid "Select an Action"
-msgstr "Gedişat Seç"
-
-#: addressbook/gui/component/e-address-popup.c:622
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Yeni \"%s\" əlaqəsi yarat"
-
-#: addressbook/gui/component/e-address-popup.c:638
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Mövcud \"%s\" əlaqəsinə ünvan əlavə et"
-
-#: addressbook/gui/component/e-address-popup.c:917
-msgid "Querying Addressbook..."
-msgstr "Ünvan Kitabçası Sorğulanır..."
-
-#: addressbook/gui/component/e-address-popup.c:1001
-#: addressbook/gui/component/e-address-widget.c:401
-msgid "Edit Contact Info"
-msgstr "Əlaqə Mə'lumatını Dəyişdir"
-
-#: addressbook/gui/component/e-address-popup.c:1031
-#: addressbook/gui/component/e-address-widget.c:437
-#: addressbook/gui/component/select-names/e-select-names-popup.c:324
-msgid "Add to Contacts"
-msgstr "Əlaqələrə Əlavə Et"
+#: addressbook/gui/component/addressbook.c:1063
+msgid "UID of the contacts source that the view will display"
+msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1056
-msgid "Merge E-Mail Address"
-msgstr "E-Poçt Ünvanını Birləşdir"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:378
-msgid "Disable Queries"
-msgstr "Sorğuları Qeyri-fəallaşdır"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:378
-msgid "Enable Queries (Dangerous!)"
-msgstr "Sorğuları Fəallaşdır (Təhlükəlidir!)"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
@@ -844,9 +355,11 @@ msgstr "  Dəstəklənən Bazaları _Göstər "
 #: calendar/gui/dialogs/alarm-options.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
-#: mail/message-tags.glade.h:1
+#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
@@ -877,15 +390,16 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "LDAP Vericisi Əlavə Et"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "LDAP Quraşdırma Yardımçısı"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
 msgstr "Ünvan Kitabçası Mənbələri"
 
-#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:62
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:15
 msgid "Always"
 msgstr "Həmişə"
 
@@ -895,52 +409,55 @@ msgstr "Anonim olaraq"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "Bağlanır"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "Ayırılan _adı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr "LDAP Vericisini Təkmilləşdir"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
 msgstr "Epoçt ünvanı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution sizi vericiyə tanıtmaq üçün DN istifadə edəcək"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
-msgid "Evolution will use this email address to authenticate you with the server"
-msgstr "Evolution sizi vericiyə tanıtmaq üçün bu epoçt ünvanını istifadə edəcək"
+#: addressbook/gui/component/ldap-config.glade.h:23
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr ""
+"Evolution sizi vericiyə tanıtmaq üçün bu epoçt ünvanını istifadə edəcək"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "Qurtardı"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Ümumi"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "LDAP Quraşdırma Yardımçısı"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "Qrup"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:64
-#: mail/mail-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Qətiyyən"
 
@@ -962,10 +479,9 @@ msgstr "Bir"
 msgid "S_earch scope: "
 msgstr "Axtarışın əhatə _sahəsi: "
 
-#. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/calendar-model.c:1983 calendar/gui/e-day-view.c:1714
-#: calendar/gui/e-week-view.c:1345
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Axtarılır"
 
@@ -1009,25 +525,28 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:47
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "Addım 1: Verici Mə'lumatı"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "Addım 2: Vericiyə Bağlanır"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "Addım 1: Verici Mə'lumatı"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "Addım 3: Qovluq Axtarılır"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Addım 2: Vericiyə Bağlanır"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "Addım 4: Ad Göstərilir"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Addım 3: Qovluq Axtarılır"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -1039,14 +558,6 @@ msgstr "Dəstəklənən Axtarış Bazaları"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -1054,7 +565,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1062,7 +573,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1072,43 +583,48 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 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:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 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:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 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:74
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -1133,62 +649,70 @@ msgstr "Ayırılan ad (DN) işlədilir"
 msgid "Using email address"
 msgstr "Epoçt ünvanı işlədilir"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:63
-#: mail/mail-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Mümkünsə Həmişə"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "_Göstərilən ad:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "_Endirmə məhdudiyyəti:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:18
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:19
 msgid "_Edit"
 msgstr "_Düzəlt"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "_Giriş yöntəmi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "_Qapı nömrəsi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "_Axtarış bazası:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "_Verici adı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "_Vaxt Dolması (dəqiqə):"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "kartlar"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr "bağlanma-səkməsi"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr "ümumi-səkməsi"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr "axtarış-səkməsi"
 
@@ -1196,46 +720,53 @@ msgstr "axtarış-səkməsi"
 msgid "Evolution Addressbook name selection interface"
 msgstr "Evolution Ünvan Kitabçası siçim ara üzü"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+#: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Hamısını Sil"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: addressbook/gui/component/select-names/e-select-names-popup.c:212
 #: addressbook/gui/component/select-names/e-select-names.c:694
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Sil"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#: addressbook/gui/component/select-names/e-select-names-popup.c:219
 msgid "View Contact List"
 msgstr "Əlaqə Siyahısını Göstər"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#: addressbook/gui/component/select-names/e-select-names-popup.c:219
 msgid "View Contact Info"
 msgstr "Əlaqə Mə'lumatını Göstər"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:225
-#: addressbook/gui/component/select-names/e-select-names-popup.c:332
+#: addressbook/gui/component/select-names/e-select-names-popup.c:226
+#: addressbook/gui/component/select-names/e-select-names-popup.c:336
 msgid "Send HTML Mail?"
 msgstr "HTML Məktubu Göndərilsin?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:350
+#: addressbook/gui/component/select-names/e-select-names-popup.c:328
+#: addressbook/gui/widgets/eab-popup-control.c:1002
+msgid "Add to Contacts"
+msgstr "Əlaqələrə Əlavə Et"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:354
 msgid "Unnamed Contact"
 msgstr "Adsız Əlaqə"
 
-#: addressbook/gui/component/select-names/e-select-names-table-model.c:354
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Ad"
+
+#: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Mənbə"
 
-#: addressbook/gui/component/select-names/e-select-names.c:509
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Əlaqələri Ünvan Kitabçasından Seç"
 
-#: addressbook/gui/component/select-names/e-select-names.c:650
-msgid "Find contact in"
-msgstr "Əlaqəni burada tap"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Tap"
@@ -1289,41 +820,47 @@ msgid "Birthda_y:"
 msgstr "_Ad günü:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#, fuzzy
+msgid "Blog address:"
+msgstr "Epoçt ünvanı:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "Business fa_x:"
 msgstr "İş fa_ksı:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "Collaboration"
 msgstr "İş birliyi"
 
 #. Construct the app
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
-#: addressbook/gui/contact-editor/e-contact-editor.c:1334
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/e-contact-editor.c:1343
 msgid "Contact Editor"
 msgstr "Əlaqə Editoru"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
 msgid "D_epartment:"
 msgstr "_Bölmə:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:199
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Təfərruatlar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "F_ree/Busy URL:"
 msgstr "Sə_rbəst/Məşğul URL:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "File a_s:"
 msgstr "Fərqli fa_ylla:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Full _Name..."
 msgstr "_Tam Ad..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
 "Internet, enter the address\n"
@@ -1333,107 +870,111 @@ msgstr ""
 "nəşr edirsə, bu mə'lumatın yer aldığı ünvanı\n"
 "buraya daxil edin."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "New phone type"
 msgstr "Yeni telefon növü"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "No_tes:"
 msgstr "_Qeydlər:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Organi_zation:"
 msgstr "_Quruluş:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "P_rofession:"
 msgstr "_Məslək:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Primary _email:"
 msgstr "İlk _epoçt:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "S_pouse:"
 msgstr "_Yoldaş:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "Wants to receive _HTML mail"
 msgstr "_HTML poçt almaq istəyir"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Add"
 msgstr "Ə_lavə Et"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Business:"
 msgstr "_İş:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Categories..."
 msgstr "_Kateqoriyalar..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:717 calendar/gui/e-calendar-table.c:977
-#: calendar/gui/e-day-view.c:3755 calendar/gui/e-week-view.c:3741
-#: mail/folder-browser.c:1812 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:30 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-mail-message.xml.h:97 ui/evolution-tasks.xml.h:17
-#: ui/evolution.xml.h:45
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
+#: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Sil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Home:"
 msgstr "_Ev:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Job title:"
 msgstr "Məslək _izahı:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Manager's name:"
 msgstr "_İdarəçinin adı:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Mobile:"
 msgstr "_Mobil:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Nickname:"
 msgstr "_Ləqəb:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Office:"
 msgstr "_İdarə:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Public Calendar URL:"
 msgstr "_İctimai Təqvim URL-si:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_This is the mailing address"
 msgstr "_Bu məktublaşma ünvanıdır"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Web page address:"
 msgstr "_Veb səhifəsi ünvanı:"
 
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+msgid "Address"
+msgstr "Ünvan"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
-#: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:396
+#: addressbook/gui/contact-editor/e-contact-editor.c:212
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
+#: addressbook/gui/widgets/e-addressbook-model.c:312
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view-widget.c:120
-#: addressbook/gui/widgets/e-minicard-view.c:478
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:474
+#: addressbook/gui/widgets/e-minicard.c:182
 msgid "Editable"
 msgstr "Dəyişdirilə bilən"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:135
-#: my-evolution/Locations.h:2340
 msgid "United States"
 msgstr "Birləşmiş Ştatlar"
 
@@ -1442,12 +983,10 @@ msgid "Afghanistan"
 msgstr "Əfqanıstan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:137
-#: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr "Albaniya"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:138
-#: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr "Əlcəzair"
 
@@ -1476,7 +1015,6 @@ msgid "Antigua And Barbuda"
 msgstr "Antiqua Və Barbuda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:145
-#: my-evolution/Locations.h:120
 msgid "Argentina"
 msgstr "Argentina"
 
@@ -1489,12 +1027,10 @@ msgid "Aruba"
 msgstr "Aruba"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:148
-#: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr "Avstraliya"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:149
-#: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr "Avstriya"
 
@@ -1503,12 +1039,10 @@ msgid "Azerbaijan"
 msgstr "Azərbaycan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:151
-#: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr "Bahamalar"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:152
-#: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr "Bahreyn"
 
@@ -1525,12 +1059,10 @@ msgid "Belarus"
 msgstr "Belarusiya"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:156
-#: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr "Belçika"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:157
-#: my-evolution/Locations.h:218
 msgid "Belize"
 msgstr "Beliz"
 
@@ -1547,7 +1079,6 @@ msgid "Bhutan"
 msgstr "Butan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:161
-#: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr "Boliviya"
 
@@ -1564,7 +1095,6 @@ msgid "Bouvet Island"
 msgstr "Buvet Adası"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:165
-#: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr "Braziliya"
 
@@ -1577,7 +1107,6 @@ msgid "Brunei Darussalam"
 msgstr "Bruney Darüssəlam"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:168
-#: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr "Bolqarıstan"
 
@@ -1598,7 +1127,6 @@ msgid "Cameroon"
 msgstr "Kamerun"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:173
-#: my-evolution/Locations.h:354
 msgid "Canada"
 msgstr "Kanada"
 
@@ -1607,7 +1135,6 @@ msgid "Cape Verde"
 msgstr "Keyp Verde"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:175
-#: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr "Kayman Adaları"
 
@@ -1620,7 +1147,6 @@ msgid "Chad"
 msgstr "Çad"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:178
-#: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "Çili"
 
@@ -1629,7 +1155,6 @@ msgid "China"
 msgstr "Çin"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:180
-#: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr "Kristmas Adası"
 
@@ -1638,7 +1163,6 @@ msgid "Cocos (Keeling) Islands"
 msgstr "Kokos Adaları"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:182
-#: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr "Kolumbiya"
 
@@ -1656,7 +1180,6 @@ msgid "Cook Islands"
 msgstr "Kuku Adaları"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:187
-#: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr "Kosta Rika"
 
@@ -1665,27 +1188,22 @@ msgid "Cote d'Ivoire"
 msgstr "Kot Divuar"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:189
-#: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr "Xorvatıstan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:190
-#: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr "Kuba"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:191
-#: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr "Kipr"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:192
-#: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr "Çex Respublikası"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:193
-#: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr "Danimarka"
 
@@ -1698,7 +1216,6 @@ msgid "Dominica"
 msgstr "Dominik"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:196
-#: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr "Dominikan Respublikası"
 
@@ -1707,17 +1224,14 @@ msgid "East Timor"
 msgstr "Şərqi Timor"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:198
-#: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr "Ekvador"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:199
-#: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "Misir"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:200
-#: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr "El Salvador"
 
@@ -1730,7 +1244,6 @@ msgid "Eritrea"
 msgstr "Eritre"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:203
-#: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr "Estoniya"
 
@@ -1751,12 +1264,10 @@ msgid "Fiji"
 msgstr "Fici"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:208
-#: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "Finlandiya"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:209
-#: my-evolution/Locations.h:766
 msgid "France"
 msgstr "Fransa"
 
@@ -1781,12 +1292,10 @@ msgid "Gambia"
 msgstr "Qambiya"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:215
-#: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr "Gürcüstan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:216
-#: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "Almanya"
 
@@ -1795,12 +1304,10 @@ msgid "Ghana"
 msgstr "Qana"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:218
-#: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:219
-#: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "Yunanıstan"
 
@@ -1821,7 +1328,6 @@ msgid "Guam"
 msgstr "Quam"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:224
-#: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "Quatemala"
 
@@ -1838,7 +1344,6 @@ msgid "Guyana"
 msgstr "Quyana"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:228
-#: my-evolution/Locations.h:888
 msgid "Haiti"
 msgstr "Haiti"
 
@@ -1851,27 +1356,22 @@ msgid "Holy See"
 msgstr "Müqəddəs Dəniz"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:231
-#: my-evolution/Locations.h:945
 msgid "Honduras"
 msgstr "Honduras"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:232
-#: my-evolution/Locations.h:946
 msgid "Hong Kong"
 msgstr "Honq Konq"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:233
-#: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr "Macarıstan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:234
-#: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr "İslandiya"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:235
-#: my-evolution/Locations.h:991
 msgid "India"
 msgstr "Hindistan"
 
@@ -1880,7 +1380,6 @@ msgid "Indonesia"
 msgstr "İndoneziya"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:237
-#: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "İrlandiya"
 
@@ -1889,22 +1388,18 @@ msgid "Israel"
 msgstr "İsrail"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:239
-#: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr "İtaliya"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:240
-#: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr "Yamayka"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:241
-#: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr "Yaponiya"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:242
-#: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr "İordaniya"
 
@@ -1925,7 +1420,6 @@ msgid "Korea, Republic Of"
 msgstr "Koreya Respublikası"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:247
-#: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Kuveyt"
 
@@ -1942,7 +1436,6 @@ msgid "Latvia"
 msgstr "Latviya"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:251
-#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Livan"
 
@@ -1951,7 +1444,6 @@ msgid "Lesotho"
 msgstr "Lesoto"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:253
-#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberiya"
 
@@ -1960,12 +1452,10 @@ msgid "Liechtenstein"
 msgstr "Lixtenşteyn"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:255
-#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Litva"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:256
-#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Lyuksemburq"
 
@@ -1998,7 +1488,6 @@ msgid "Mali"
 msgstr "Mali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:264
-#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
@@ -2023,7 +1512,6 @@ msgid "Mayotte"
 msgstr "Mayot"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:270
-#: my-evolution/Locations.h:1385
 msgid "Mexico"
 msgstr "Mexiko"
 
@@ -2048,7 +1536,6 @@ msgid "Montserrat"
 msgstr "Montserrat"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:276
-#: my-evolution/Locations.h:1468
 msgid "Morocco"
 msgstr "Mərakeş"
 
@@ -2073,7 +1560,6 @@ msgid "Nepal"
 msgstr "Nepal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:282
-#: my-evolution/Locations.h:1529
 msgid "Netherlands"
 msgstr "Hollandiya"
 
@@ -2086,12 +1572,10 @@ msgid "New Caledonia"
 msgstr "Yeni Kaledoniya"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1558
 msgid "New Zealand"
 msgstr "Yeni Zellandiya"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1560
 msgid "Nicaragua"
 msgstr "Nikaraqua"
 
@@ -2108,7 +1592,6 @@ msgid "Niue"
 msgstr "Niu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1572
 msgid "Norfolk Island"
 msgstr "Norfolk Adaları"
 
@@ -2117,17 +1600,14 @@ msgid "Northern Mariana Islands"
 msgstr "Şimali Marian Adaları"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1585
 msgid "Norway"
 msgstr "Norveç"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1630
 msgid "Oman"
 msgstr "Oman"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:294
-#: my-evolution/Locations.h:1671
 msgid "Pakistan"
 msgstr "Pakistan"
 
@@ -2140,7 +1620,6 @@ msgid "Palestinian Territory"
 msgstr "Fələstin Bölgəsi"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1681
 msgid "Panama"
 msgstr "Panama"
 
@@ -2149,12 +1628,10 @@ msgid "Papua New Guinea"
 msgstr "Papua Yeni Qvineya"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1686
 msgid "Paraguay"
 msgstr "Paraqvay"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:300
-#: my-evolution/Locations.h:1721
 msgid "Peru"
 msgstr "Peru"
 
@@ -2167,22 +1644,18 @@ msgid "Pitcairn"
 msgstr "Pitkairn"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:303
-#: my-evolution/Locations.h:1762
 msgid "Poland"
 msgstr "Polşa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:304
-#: my-evolution/Locations.h:1789
 msgid "Portugal"
 msgstr "Portuqaliya"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:305
-#: my-evolution/Locations.h:1822
 msgid "Puerto Rico"
 msgstr "Porto Riko"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:306
-#: my-evolution/Locations.h:1834
 msgid "Qatar"
 msgstr "Katar"
 
@@ -2191,7 +1664,6 @@ msgid "Reunion"
 msgstr "Reyunion"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:308
-#: my-evolution/Locations.h:1909
 msgid "Romania"
 msgstr "Ruminıya"
 
@@ -2228,7 +1700,6 @@ msgid "Sao Tome And Principe"
 msgstr "Sao Tome Və Prinsip"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:317
-#: my-evolution/Locations.h:2032
 msgid "Saudi Arabia"
 msgstr "Səudiyyə Ərəbistan"
 
@@ -2245,17 +1716,14 @@ msgid "Sierra Leone"
 msgstr "Siera Lione"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2087
 msgid "Singapore"
 msgstr "Sinqapur"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:322
-#: my-evolution/Locations.h:2100
 msgid "Slovakia"
 msgstr "Slovakiya"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:323
-#: my-evolution/Locations.h:2101
 msgid "Slovenia"
 msgstr "Sloveniya"
 
@@ -2268,7 +1736,6 @@ msgid "Somalia"
 msgstr "Somali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2116
 msgid "South Africa"
 msgstr "Cənubi Afrika"
 
@@ -2277,7 +1744,6 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr "Cənub Georgiya Və Cənub Sandviç Adaları"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:328
-#: my-evolution/Locations.h:2124
 msgid "Spain"
 msgstr "İspaniya"
 
@@ -2298,7 +1764,6 @@ msgid "Sudan"
 msgstr "Sudan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:333
-#: my-evolution/Locations.h:2173
 msgid "Suriname"
 msgstr "Surinam"
 
@@ -2311,17 +1776,14 @@ msgid "Swaziland"
 msgstr "Svaziland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:336
-#: my-evolution/Locations.h:2178
 msgid "Sweden"
 msgstr "İsveç"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:337
-#: my-evolution/Locations.h:2180
 msgid "Switzerland"
 msgstr "İsveçrə"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:338
-#: my-evolution/Locations.h:2202
 msgid "Taiwan"
 msgstr "Tayvan"
 
@@ -2358,7 +1820,6 @@ msgid "Tunisia"
 msgstr "Tunis"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2318
 msgid "Turkey"
 msgstr "Türkiyə"
 
@@ -2379,7 +1840,6 @@ msgid "Uganda"
 msgstr "Uqanda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2331
 msgid "Ukraine"
 msgstr "Ukrayna"
 
@@ -2388,7 +1848,6 @@ msgid "United Arab Emirates"
 msgstr "Birləşmiş Ərəb Əmirlikləri"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:354
-#: my-evolution/Locations.h:2339
 msgid "United Kingdom"
 msgstr "Birləşmiş Krallıq"
 
@@ -2397,7 +1856,6 @@ msgid "United States Minor Outlying Islands"
 msgstr "Birləşmiş Ştatlar yanı Kiçik Adalar"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:356
-#: my-evolution/Locations.h:2345
 msgid "Uruguay"
 msgstr "Uruqvay"
 
@@ -2410,12 +1868,10 @@ msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2377
 msgid "Venezuela"
 msgstr "Venezuela"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:360
-#: my-evolution/Locations.h:2389
 msgid "Viet Nam"
 msgstr "Vyetnam"
 
@@ -2436,12 +1892,10 @@ msgid "Western Sahara"
 msgstr "Qərbi Saxara"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:365
-#: my-evolution/Locations.h:2509
 msgid "Yemen"
 msgstr "Yəmən"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:366
-#: my-evolution/Locations.h:2521
 msgid "Yugoslavia"
 msgstr "Yuqoslaviya"
 
@@ -2453,48 +1907,49 @@ msgstr "Zambiya"
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:156
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
-#: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:382
-#: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view-widget.c:106
-#: addressbook/gui/widgets/e-minicard-view.c:464
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
+#: addressbook/gui/widgets/e-addressbook-model.c:298
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
+#: addressbook/gui/widgets/e-addressbook-view.c:177
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:460
 msgid "Book"
 msgstr "Kitab"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:163
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard-widget.c:93
-#: addressbook/gui/widgets/e-minicard.c:190
-msgid "Card"
-msgstr "Kart"
+#: addressbook/gui/contact-editor/e-contact-editor.c:191
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#: addressbook/gui/widgets/e-minicard.c:189
+msgid "Contact"
+msgstr "Əlaqə"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:170
-msgid "Is New Card"
-msgstr "Yeni Kart Mı"
+#: addressbook/gui/contact-editor/e-contact-editor.c:198
+#, fuzzy
+msgid "Is New Contact"
+msgstr "Yeni Əlaqə"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:177
+#: addressbook/gui/contact-editor/e-contact-editor.c:205
 msgid "Writable Fields"
 msgstr "Yazıla Bilən Sahələr"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:191
+#: addressbook/gui/contact-editor/e-contact-editor.c:219
 msgid "Changed"
 msgstr "Dəyişdirilib"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:827
+#: addressbook/gui/contact-editor/e-contact-editor.c:855
 msgid "Category editor not available."
 msgstr "Kateqoriya editoru mövcud deyildir."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:835
+#: addressbook/gui/contact-editor/e-contact-editor.c:863
 msgid "This contact belongs to these categories:"
 msgstr "Bu üzv bu kateqoriyalara aitdir:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1009
+#: addressbook/gui/contact-editor/e-contact-editor.c:1034
 msgid "Save Contact as VCard"
 msgstr "Əlaqəni VCard Olaraq Qeyd Et"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1055
+#: addressbook/gui/contact-editor/e-contact-editor.c:1074
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2502,7 +1957,7 @@ msgstr ""
 "Bu əlaqələri həqiqətən\n"
 "də silmək istəyirsiniz?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1058
+#: addressbook/gui/contact-editor/e-contact-editor.c:1077
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2510,58 +1965,39 @@ msgstr ""
 "Bu əlaqəni həqiqətən\n"
 "də silmək istəyirsiniz?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1755
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1780
+msgid "Business"
+msgstr "İş"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2376
+#: addressbook/gui/contact-editor/e-contact-editor.c:1781
+msgid "Home"
+msgstr "Ev"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1782
+msgid "Other"
+msgstr "Başqa"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2284
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Sahənin pəncərəciyi tapıla bilmir: `%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:290
 msgid "Contact Quick-Add"
 msgstr "Cəld Əlaqə Əlavəsi"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
 msgid "_Edit Full"
 msgstr "_Hamısını Düzəlt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:319
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
 msgid "_Full Name:"
 msgstr "_Tam Ad:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:325
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
 msgid "E-_mail:"
 msgstr "E-_poçt:"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:66
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "%s qeyd edilirkən xəta yarandı: %s"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:103
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/contact-editor/e-contact-save-as.c:175
-msgid "list"
-msgstr "siyahı"
-
-#: addressbook/gui/contact-editor/e-contact-save-as.c:208
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s onsuz da mövcuddur.\n"
-"Üstünə yazmaq istəyirsiniz?"
-
-#: addressbook/gui/contact-editor/e-contact-save-as.c:212
-msgid "Overwrite"
-msgstr "Üstünə yaz"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Ünvan _2:"
@@ -2602,6 +2038,11 @@ msgstr "Dr."
 msgid "Esq."
 msgstr "Esq."
 
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+msgid "Full Name"
+msgstr "Tam Ad"
+
 #: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "I"
@@ -2678,37 +2119,49 @@ msgstr "Epoçt ünvanını _yazın ya da əlaqəni aşağıdakı siyahıya daş�
 msgid "contact-list-editor"
 msgstr "əlaqə-siyahısı-editoru"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "Yeni Siyahı Mı"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:242
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:272
 msgid "Contact List Editor"
 msgstr "Əlaqə Siyahısı Editoru"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:457
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:502
 msgid "Save List as VCard"
 msgstr "Siyahını VCard Olaraq Qeyd Et"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-msgid "Contact"
-msgstr "Əlaqə"
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Dəyişdirilmiş Əlaqə:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Toqquşan Əlaqə:"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Cüt Əlaqə Tapıldı"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Dəyişdirilmiş bu əlaqənin ad və ya poçt ünvanı qovluqda onsuz da\n"
+"mövcuddur. Bunu yenə də əlavə etmək istəyirsiniz?."
+
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Yeni Əlaqə:"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
 msgid "Original Contact:"
 msgstr "Əsl Əlaqə:"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -2716,314 +2169,148 @@ msgstr ""
 "Bu əlaqənin adı və ya epoçt ünvanı bu qovluqda onsuz da\n"
 "mövcuddur.  Bunu yenə də əlavə etmək istəyirsiniz?"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Dəyişdirilmiş Əlaqə:"
-
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Toqquşan Əlaqə:"
-
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"Dəyişdirilmiş bu əlaqənin ad və ya poçt ünvanı qovluqda onsuz da\n"
-"mövcuddur. Bunu yenə də əlavə etmək istəyirsiniz?."
-
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:117
+#: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Ətraflı Axtarış"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:156
-msgid "No cards"
-msgstr "Kart yoxdur"
+#: addressbook/gui/widgets/e-addressbook-model.c:148
+#, fuzzy
+msgid "No contacts"
+msgstr "Əlaqələri Göstər"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:159
-msgid "1 card"
-msgstr "1 kart"
+#: addressbook/gui/widgets/e-addressbook-model.c:151
+#, fuzzy
+msgid "1 contact"
+msgstr "Əlaqə"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:162
-#, c-format
-msgid "%d cards"
-msgstr "%d kart"
+#: addressbook/gui/widgets/e-addressbook-model.c:154
+#, fuzzy, c-format
+msgid "%d contacts"
+msgstr "Əlaqələr"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:389
-#: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view-widget.c:113
-#: addressbook/gui/widgets/e-minicard-view.c:471
+#: addressbook/gui/widgets/e-addressbook-model.c:305
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
+#: addressbook/gui/widgets/e-addressbook-view.c:184
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:467
 msgid "Query"
 msgstr "Sorğu"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:457
+#: addressbook/gui/widgets/e-addressbook-model.c:448
 msgid "Error getting book view"
 msgstr "Kitab görünüşü alınırkən xəta yarandı"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:403
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
 msgid "Model"
 msgstr "Model"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:148
-#: addressbook/gui/widgets/e-addressbook-util.c:105
-#: addressbook/gui/widgets/e-minicard.c:531
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:114
 msgid "Error modifying card"
 msgstr "Kard təkmilləşdirmə xətası"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
-#: shell/evolution-shell-component.c:1183
-msgid "Success"
-msgstr "Müvəffəqiyyət"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:37
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
-#: camel/providers/pop3/camel-pop3-store.c:526
-#: camel/providers/pop3/camel-pop3-store.c:533 shell/e-shell.c:2077
-#: shell/e-storage.c:598 shell/evolution-shell-component.c:1222
-msgid "Unknown error"
-msgstr "Naməlum xəta"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:38
-msgid "Repository offline"
-msgstr "Nüsxə xətdə deyil"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:584
-#: shell/evolution-shell-component.c:1213
-msgid "Permission denied"
-msgstr "Qadağandır"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:40
-msgid "Card not found"
-msgstr "Kart tapıla bilmədi"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-msgid "Card ID already exists"
-msgstr "Kard ID onsuz da mövcuddur"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:42
-msgid "Protocol not supported"
-msgstr "Protokol dəstəklənmir"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:43
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1184
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:477 calendar/gui/print.c:2307
-#: camel/camel-service.c:745 camel/camel-service.c:786
-#: camel/camel-service.c:876 camel/camel-service.c:919
-#: camel/providers/pop3/camel-pop3-store.c:443
-#: camel/providers/pop3/camel-pop3-store.c:520
-msgid "Cancelled"
-msgstr "Ləğv Edildi"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:44
-msgid "Authentication Failed"
-msgstr "Tanıtma Bacarılmadı"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:45
-msgid "Authentication Required"
-msgstr "Tanıtma Məcburidir"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:46
-msgid "TLS not Available"
-msgstr "TLS Mövcud Deyil"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:47
-msgid "Addressbook does not exist"
-msgstr "Ünvan kitabçası mövcud deyil"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:48
-msgid "Other error"
-msgstr "Başqa xəta"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:75
-msgid "Do you want to save changes?"
-msgstr "Dəyişiklikləri qeyd etmək istəyirsiniz?"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:77
-msgid "_Discard"
-msgstr "_Unut"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:96
-msgid "Error adding list"
-msgstr "Siyahıya əlavə etmə xətası"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:96
-#: addressbook/gui/widgets/e-addressbook-util.c:272
-msgid "Error adding card"
-msgstr "Kart əlavə etmə xətası"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:105
-msgid "Error modifying list"
-msgstr "Siyahı təkmilləşdirmə xətası"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:115
-msgid "Error removing list"
-msgstr "Siyahı çıxartma xətası"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:115
-#: addressbook/gui/widgets/e-addressbook-util.c:230
-msgid "Error removing card"
-msgstr "Kart çıxartma xətası"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:197
-#, c-format
-msgid ""
-"Opening %d cards will open %d new windows as well.\n"
-"Do you really want to display all of these cards?"
-msgstr ""
-"%d kart açmaq %d dənə yeni pəncərə də açacaq.\n"
-"Həqiqətən də bütün bu kartları görmək istəyirsiniz?"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:328
-msgid "Move card to"
-msgstr "Kartı daşı"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:330
-msgid "Copy card to"
-msgstr "Kartı köçür"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:333
-msgid "Move cards to"
-msgstr "Kartları daşı"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:335
-msgid "Copy cards to"
-msgstr "Kartları köçür"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:517
-msgid "Multiple VCards"
-msgstr "Çoxlu VCard"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:525
-#, c-format
-msgid "VCard for %s"
-msgstr "%s üçün VCard"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:194
+#: addressbook/gui/widgets/e-addressbook-view.c:191
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-meeting-list-view.c:249
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Növ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:398
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:399
 #: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Ünvan Dəftəri"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
-#: addressbook/gui/widgets/e-addressbook-view.c:899
-#: addressbook/gui/widgets/e-addressbook-view.c:1883
+#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:894
+#: addressbook/gui/widgets/e-addressbook-view.c:1653
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "VCard olaraq qeyd et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "New Contact..."
 msgstr "Yeni Əlaqə..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "New Contact List..."
 msgstr "Yeni Əlaqə Siyahısı..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Go to Folder..."
 msgstr "Qovluğa _Get..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Import..."
 msgstr "_İdxal Et..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:888
 msgid "Search for Contacts..."
 msgstr "Əlaqələri Axtar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:894
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Addressbook Sources..."
 msgstr "Ü_nvan Kitabçası Mənbələri..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 msgid "Pilot Settings..."
 msgstr "Pilot Qurğuları..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Əlaqəni Ötür"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:896
 msgid "Send Message to Contact"
 msgstr "Əlaqəyə İsmarış Göndər"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2439
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: 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/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Çap Et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 msgid "Print Envelope"
 msgstr "Zərfi Çap Et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 msgid "Copy to folder..."
 msgstr "Qovluğa köçür..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Move to folder..."
 msgstr "Qovluğa daşı..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:907
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Kəs"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
-#: ui/evolution-tasks.xml.h:2
+#. create the dialog
+#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Köçür"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Yapışdır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
-msgid "Delete"
-msgstr "Sil"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:919
-#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3706
+#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "Hazırkı Görünüş"
 
-#. Minicard view stuff
-#. Translators: put here a list of labels you want to see on buttons in
-#. addressbook. You may use any character to separate labels but it must
-#. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:953
-msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-msgstr ",123,a,b,c,ç,d,e,ə,f,g,ğ,h,i,j,k,,l,m,n,o,ö,p,q,r,s,ş,t,u,ü,v,w,x,y,z"
-
-#. Translators: put here a list of characters that correspond to buttons
-#. in addressbook. You may use any character to separate labels but it
-#. must also be placed at the begining ot the string.
-#. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:958
-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:1356
+#: addressbook/gui/widgets/e-addressbook-view.c:1099
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3032,90 +2319,185 @@ msgid ""
 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 *"
+msgid "Assistant"
+msgstr "Yardımçı"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant Phone"
 msgstr "Yardımçı Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Address"
-msgstr "İş Ünvanı"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Business Fax"
+msgstr "İş Faksı"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "İş Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "2-ci İş Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Geri axtarma Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Maşın Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kateqoriyalar"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 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:10
+#: addressbook/gui/widgets/eab-contact-display.c:216
+#: addressbook/gui/widgets/eab-contact-display.c:217
+#: addressbook/gui/widgets/eab-contact-display.c:218
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
+msgid "Email"
+msgstr "Epoçt"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:460
+msgid "Email 2"
+msgstr "Epoçt 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:470
+msgid "Email 3"
+msgstr "Epoçt 3"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Soyad"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+msgid "File As"
+msgstr "Fərqli Faylla"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#, fuzzy
+msgid "Given Name"
+msgstr "Sahə Adı"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Fax"
+msgstr "Ev Faksı"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Ev Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "2-ci Ev Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "İordaniya"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Manager"
+msgstr "İdarəçi"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 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:24
+msgid "Nickname"
+msgstr "Ləqəb"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Qeyd"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Office"
+msgstr "İdarə"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Quruluş"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr "Başqa Faks"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Digər Telefonlar"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr "Peycer"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Əsas Telefon"
 
-#: addressbook/gui/widgets/e-minicard-control.c:204
-#, c-format
-msgid "and %d other cards."
-msgstr "və %d başqa kart."
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+msgid "Radio"
+msgstr "Radio"
 
-#: addressbook/gui/widgets/e-minicard-control.c:206
-msgid "and one other card."
-msgstr "və bir başqa kart."
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Rolu"
 
-#: addressbook/gui/widgets/e-minicard-control.c:318
-msgid "Save in addressbook"
-msgstr "Ünvan dəftərinə qeyd et"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Spouse"
+msgstr "Yoldaş"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Telex"
+msgstr "Teleks"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
+msgid "Title"
+msgstr "Başlıq"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Unst"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Web Site"
+msgstr "Veb Saytı"
 
 #: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:146
+#: addressbook/gui/widgets/e-minicard.c:145
 msgid "Width"
 msgstr "En"
 
 #: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:153
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Height"
 msgstr "Hündürlük"
 
 #: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:161
+#: addressbook/gui/widgets/e-minicard.c:160
 msgid "Has Focus"
 msgstr "Fokusa Malikdir"
 
@@ -3135,11 +2517,11 @@ msgstr "Mətn Modeli"
 msgid "Max field name length"
 msgstr "Maksimal sahə adı uzunluğu"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:127
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
 msgid "Column Width"
 msgstr "Sütun Eni"
 
-#: addressbook/gui/widgets/e-minicard-view.c:141
+#: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
 "\n"
@@ -3153,7 +2535,7 @@ msgstr ""
 "\n"
 "Yeni Əlaqə yaratmaq üçün buraya cüt-tıqlayayın."
 
-#: addressbook/gui/widgets/e-minicard-view.c:144
+#: addressbook/gui/widgets/e-minicard-view.c:145
 msgid ""
 "\n"
 "\n"
@@ -3163,18 +2545,292 @@ msgstr ""
 "\n"
 "Bu görünüşdə göstəriləcək üzv yoxdur."
 
-#: addressbook/gui/widgets/e-minicard-view.c:457
+#: addressbook/gui/widgets/e-minicard-view.c:453
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard.c:169
+#: addressbook/gui/widgets/e-minicard.c:168
 msgid "Selected"
 msgstr "Seçili"
 
-#: addressbook/gui/widgets/e-minicard.c:176
+#: addressbook/gui/widgets/e-minicard.c:175
 msgid "Has Cursor"
 msgstr "Kursora Malikdir"
 
+#: addressbook/gui/widgets/eab-contact-display.c:93
+#: addressbook/gui/widgets/eab-contact-display.c:114
+#, fuzzy
+msgid "Map It"
+msgstr "Mayport"
+
+#: addressbook/gui/widgets/eab-contact-display.c:198
+#: addressbook/gui/widgets/eab-contact-display.c:324
+#, fuzzy
+msgid "List Members"
+msgstr "Üzvlər"
+
+#: addressbook/gui/widgets/eab-contact-display.c:214
+#: addressbook/gui/widgets/eab-contact-display.c:344
+#, fuzzy
+msgid "Job Title"
+msgstr "Məslək _izahı:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Ev Ünvanı"
+
+#: addressbook/gui/widgets/eab-contact-display.c:222
+#, fuzzy
+msgid "Work Address"
+msgstr "Ev Ünvanı"
+
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "BaşqaÜnvanlar"
+
+#: addressbook/gui/widgets/eab-contact-display.c:227
+#: addressbook/gui/widgets/eab-contact-display.c:375
+#, fuzzy
+msgid "Home page"
+msgstr "Ev Faksı"
+
+#: addressbook/gui/widgets/eab-contact-display.c:228
+#: addressbook/gui/widgets/eab-contact-display.c:383
+#, fuzzy
+msgid "Blog"
+msgstr "Bologna"
+
+#: addressbook/gui/widgets/eab-gui-util.c:43
+msgid "Success"
+msgstr "Müvəffəqiyyət"
+
+#: addressbook/gui/widgets/eab-gui-util.c:44
+#: camel/providers/imap/camel-imap-command.c:306
+#: camel/providers/imap/camel-imap-command.c:403
+#: camel/providers/pop3/camel-pop3-store.c:536
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
+msgid "Unknown error"
+msgstr "Naməlum xəta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:45
+msgid "Repository offline"
+msgstr "Nüsxə xətdə deyil"
+
+#: addressbook/gui/widgets/eab-gui-util.c:46
+msgid "Permission denied"
+msgstr "Qadağandır"
+
+#: addressbook/gui/widgets/eab-gui-util.c:47
+#, fuzzy
+msgid "Contact not found"
+msgstr "Kart tapıla bilmədi"
+
+#: addressbook/gui/widgets/eab-gui-util.c:48
+#, fuzzy
+msgid "Contact ID already exists"
+msgstr "Kard ID onsuz da mövcuddur"
+
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Protocol not supported"
+msgstr "Protokol dəstəklənmir"
+
+#: addressbook/gui/widgets/eab-gui-util.c:50
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
+#: camel/camel-service.c:772 camel/camel-service.c:856
+#: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
+#: camel/providers/pop3/camel-pop3-store.c:530
+msgid "Cancelled"
+msgstr "Ləğv Edildi"
+
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Authentication Failed"
+msgstr "Tanıtma Bacarılmadı"
+
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Authentication Required"
+msgstr "Tanıtma Məcburidir"
+
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "TLS not Available"
+msgstr "TLS Mövcud Deyil"
+
+#: addressbook/gui/widgets/eab-gui-util.c:54
+msgid "Addressbook does not exist"
+msgstr "Ünvan kitabçası mövcud deyil"
+
+#: addressbook/gui/widgets/eab-gui-util.c:55
+msgid "Other error"
+msgstr "Başqa xəta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:82
+msgid "Do you want to save changes?"
+msgstr "Dəyişiklikləri qeyd etmək istəyirsiniz?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:84
+msgid "_Discard"
+msgstr "_Unut"
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+msgid "Error adding list"
+msgstr "Siyahıya əlavə etmə xətası"
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
+#, fuzzy
+msgid "Error adding contact"
+msgstr "Kart əlavə etmə xətası"
+
+#: addressbook/gui/widgets/eab-gui-util.c:112
+msgid "Error modifying list"
+msgstr "Siyahı təkmilləşdirmə xətası"
+
+#: addressbook/gui/widgets/eab-gui-util.c:112
+#, fuzzy
+msgid "Error modifying contact"
+msgstr "Kard təkmilləşdirmə xətası"
+
+#: addressbook/gui/widgets/eab-gui-util.c:122
+msgid "Error removing list"
+msgstr "Siyahı çıxartma xətası"
+
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
+#, fuzzy
+msgid "Error removing contact"
+msgstr "Kart çıxartma xətası"
+
+#: addressbook/gui/widgets/eab-gui-util.c:204
+#, fuzzy, c-format
+msgid ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr ""
+"%d kart açmaq %d dənə yeni pəncərə də açacaq.\n"
+"Həqiqətən də bütün bu kartları görmək istəyirsiniz?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:230
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s onsuz da mövcuddur.\n"
+"Üstünə yazmaq istəyirsiniz?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:234
+msgid "Overwrite"
+msgstr "Üstünə yaz"
+
+#: addressbook/gui/widgets/eab-gui-util.c:270
+#, c-format
+msgid "Error saving %s: %s"
+msgstr "%s qeyd edilirkən xəta yarandı: %s"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:307
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:376
+msgid "list"
+msgstr "siyahı"
+
+#: addressbook/gui/widgets/eab-gui-util.c:513
+#, fuzzy
+msgid "Move contact to"
+msgstr "Kartı daşı"
+
+#: addressbook/gui/widgets/eab-gui-util.c:515
+#, fuzzy
+msgid "Copy contact to"
+msgstr "Kartı köçür"
+
+#: addressbook/gui/widgets/eab-gui-util.c:518
+#, fuzzy
+msgid "Move contacts to"
+msgstr "Kartları daşı"
+
+#: addressbook/gui/widgets/eab-gui-util.c:520
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "Kartları köçür"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+msgid "Multiple VCards"
+msgstr "Çoxlu VCard"
+
+#: addressbook/gui/widgets/eab-gui-util.c:714
+#, c-format
+msgid "VCard for %s"
+msgstr "%s üçün VCard"
+
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * contact.
+#.
+#: addressbook/gui/widgets/eab-popup-control.c:188
+msgid "(none)"
+msgstr "(heç biri)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:450
+msgid "Primary Email"
+msgstr "İlk Epoçt"
+
+#: addressbook/gui/widgets/eab-popup-control.c:586
+msgid "Select an Action"
+msgstr "Gedişat Seç"
+
+#: addressbook/gui/widgets/eab-popup-control.c:594
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Yeni \"%s\" əlaqəsi yarat"
+
+#: addressbook/gui/widgets/eab-popup-control.c:610
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Mövcud \"%s\" əlaqəsinə ünvan əlavə et"
+
+#: addressbook/gui/widgets/eab-popup-control.c:888
+msgid "Querying Addressbook..."
+msgstr "Ünvan Kitabçası Sorğulanır..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:972
+msgid "Edit Contact Info"
+msgstr "Əlaqə Mə'lumatını Dəyişdir"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1027
+msgid "Merge E-Mail Address"
+msgstr "E-Poçt Ünvanını Birləşdir"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:140
+#, fuzzy, c-format
+msgid "and %d other contacts."
+msgstr "və %d başqa kart."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:142
+#, fuzzy
+msgid "and one other contact."
+msgstr "və bir başqa kart."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:225
+#: addressbook/gui/widgets/eab-vcard-control.c:275
+#, fuzzy
+msgid "Show Full VCard"
+msgstr "_Bütün Başlıqları Göstər"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:229
+#, fuzzy
+msgid "Show Compact VCard"
+msgstr "Əlaqəni VCard Olaraq Qeyd Et"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:280
+msgid "Save in addressbook"
+msgstr "Ünvan dəftərinə qeyd et"
+
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Kart Görünüşü"
@@ -3183,19 +2839,35 @@ msgstr "Kart Görünüşü"
 msgid "GTK Tree View"
 msgstr "GTK Ağac Görünüşü"
 
-#: addressbook/printing/e-contact-print-envelope.c:217
-#: addressbook/printing/e-contact-print-envelope.c:238
+#: addressbook/gui/widgets/test-reflow.c:106
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/widgets/test-reflow.c:107
+#: addressbook/printing/test-contact-print-style-editor.c:54
+#: addressbook/printing/test-print.c:53
+msgid "Copyright (C) 2000, Ximian, Inc."
+msgstr ""
+
+#: addressbook/gui/widgets/test-reflow.c:109
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
 msgid "Print envelope"
 msgstr "Zərfi çap et"
 
-#: addressbook/printing/e-contact-print.c:1158
-msgid "Print cards"
-msgstr "Kartları çap et"
+#: addressbook/printing/e-contact-print.c:1003
+#, fuzzy
+msgid "Print contacts"
+msgstr "Seçili əlaqələri çap et"
 
-#: addressbook/printing/e-contact-print.c:1224
-#: addressbook/printing/e-contact-print.c:1250
-msgid "Print card"
-msgstr "Kartı çap et"
+#: addressbook/printing/e-contact-print.c:1069
+#: addressbook/printing/e-contact-print.c:1096
+#, fuzzy
+msgid "Print contact"
+msgstr "Seçili əlaqələri çap et"
 
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
@@ -3285,7 +2957,7 @@ msgstr "Kənarlar"
 msgid "Number of columns:"
 msgstr "Sütunların miqdarı :"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:79
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Seçənəklər"
 
@@ -3294,7 +2966,6 @@ msgid "Orientation"
 msgstr "İstiqamət"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1670
 msgid "Page"
 msgstr "Səhifə"
 
@@ -3366,171 +3037,125 @@ msgstr "En:"
 msgid "_Font..."
 msgstr "_Yazı növü..."
 
-#: calendar/cal-util/cal-component.c:1218
-msgid "Untitled appointment"
-msgstr "Adsız görüş"
-
-#: calendar/cal-util/cal-recur.c:3985 calendar/gui/print.c:477
-msgid "1st"
-msgstr "1-ci"
-
-#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:477
-msgid "2nd"
-msgstr "2-ci"
-
-#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:477
-msgid "3rd"
-msgstr "3-cü"
-
-#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:477
-msgid "4th"
-msgstr "4-cü"
-
-#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:477
-msgid "5th"
-msgstr "5-ci"
-
-#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:478
-msgid "6th"
-msgstr "6-cı"
-
-#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:478
-msgid "7th"
-msgstr "7-ci"
-
-#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:478
-msgid "8th"
-msgstr "8-ci"
-
-#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:478
-msgid "9th"
-msgstr "9-cu"
-
-#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:478
-msgid "10th"
-msgstr "10-cu"
-
-#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:479
-msgid "11th"
-msgstr "11-ci"
-
-#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:479
-msgid "12th"
-msgstr "12-ci"
-
-#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:479
-msgid "13th"
-msgstr "13-cü"
+#: addressbook/printing/test-contact-print-style-editor.c:53
+#, fuzzy
+msgid "Contact Print Style Editor Test"
+msgstr "Əlaqə Siyahısı Editoru"
 
-#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:479
-msgid "14th"
-msgstr "14-cü"
+#: addressbook/printing/test-contact-print-style-editor.c:56
+msgid "This should test the contact print style editor widget"
+msgstr ""
 
-#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:479
-msgid "15th"
-msgstr "15-ci"
+#: addressbook/printing/test-print.c:52
+#, fuzzy
+msgid "Contact Print Test"
+msgstr "Əlaqə _Siyahısı"
 
-#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:480
-msgid "16th"
-msgstr "16-cı"
+#: addressbook/printing/test-print.c:55
+msgid "This should test the contact print code"
+msgstr ""
 
-#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:480
-msgid "17th"
-msgstr "17-ci"
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#, fuzzy
+msgid "Can not open file"
+msgstr "İsmarış açıla bilmir"
 
-#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:480
-msgid "18th"
-msgstr "18-ci"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#, fuzzy
+msgid "Can not load URI"
+msgstr "Kart tapıla bilmədi"
 
-#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:480
-msgid "19th"
-msgstr "19-cu"
+#: addressbook/tools/evolution-addressbook-export.c:56
+msgid "Specify the output file instead of standard output"
+msgstr ""
 
-#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:480
-msgid "20th"
-msgstr "20-ci"
+#: addressbook/tools/evolution-addressbook-export.c:57
+msgid "OUTPUTFILE"
+msgstr ""
 
-#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:481
-msgid "21st"
-msgstr "21-ci"
+#: addressbook/tools/evolution-addressbook-export.c:58
+#, fuzzy
+msgid "List local addressbook folders"
+msgstr "bütün yerli və fəal uzaq qovluqlarla"
 
-#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:481
-msgid "22nd"
-msgstr "22-ci"
+#: addressbook/tools/evolution-addressbook-export.c:60
+msgid "Show cards as vcard or csv file"
+msgstr ""
 
-#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:481
-msgid "23rd"
-msgstr "23-cü"
+#: addressbook/tools/evolution-addressbook-export.c:60
+#, fuzzy
+msgid "[vcard|csv]"
+msgstr "kartlar"
 
-#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:481
-msgid "24th"
-msgstr "24-cü"
+#: addressbook/tools/evolution-addressbook-export.c:61
+msgid "Export in asynchronous mode "
+msgstr ""
 
-#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:481
-msgid "25th"
-msgstr "25-ci"
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
+msgstr ""
 
-#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:482
-msgid "26th"
-msgstr "26-cı"
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid "NUMBER"
+msgstr ""
 
-#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:482
-msgid "27th"
-msgstr "27-ci"
+#: addressbook/tools/evolution-addressbook-export.c:91
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
 
-#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:482
-msgid "28th"
-msgstr "28-ci"
+#: addressbook/tools/evolution-addressbook-export.c:105
+msgid "Only support csv or vcard format."
+msgstr ""
 
-#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:482
-msgid "29th"
-msgstr "29-cu"
+#: addressbook/tools/evolution-addressbook-export.c:114
+msgid "In async mode, output must be file."
+msgstr ""
 
-#: calendar/cal-util/cal-recur.c:4014 calendar/gui/print.c:482
-msgid "30th"
-msgstr "30-cu"
+#: addressbook/tools/evolution-addressbook-export.c:122
+msgid "In normal mode, there should not need size option."
+msgstr ""
 
-#: calendar/cal-util/cal-recur.c:4015 calendar/gui/print.c:483
-msgid "31st"
-msgstr "31-ci"
+#: addressbook/tools/evolution-addressbook-export.c:153
+#, fuzzy
+msgid "Impossible internal error."
+msgstr "Daxili xəta"
 
-#: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:401 mail/message-list.c:753
-msgid "High"
-msgstr "Yüksək"
+#: addressbook/tools/evolution-addressbook-import.c:46
+msgid "Error loading default addressbook."
+msgstr "Əsas ünvan kitabçasını yükləmə xətası."
 
-#: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/calendar-model.c:1709
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:402 mail/message-list.c:752
-msgid "Normal"
-msgstr "Normal"
+#: addressbook/tools/evolution-addressbook-import.c:67
+msgid "Input File"
+msgstr "Giriş Faylı"
 
-#: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:403 mail/message-list.c:751
-msgid "Low"
-msgstr "Alçaq"
+#: addressbook/tools/evolution-addressbook-import.c:82
+msgid "No filename provided."
+msgstr "Fayl adı bildirilməyib."
 
-#. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:570
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:404
-msgid "Undefined"
-msgstr "Təsvirsiz"
+#: addressbook/util/eab-destination.c:675
+msgid "Unnamed List"
+msgstr "Adsız Siyahı"
 
 #: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr "Çox Günlü Hadisələri Böl:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1289
-#: calendar/conduits/todo/todo-conduit.c:830
-msgid "Error while communicating with calendar server"
-msgstr "Təqvim vericisi ilə bağlantı qurulurkən xəta oldu"
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
+msgid "Could not start wombat server"
+msgstr "Wombat vericisi başladıla bilmədi"
+
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
+msgid "Could not start wombat"
+msgstr "Wombat başladıla bilmədi"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1440
-#: calendar/conduits/calendar/calendar-conduit.c:1443
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Pilot Təqvim əlavələri bloku oxuna bilmədi"
 
@@ -3538,8 +3163,8 @@ msgstr "Pilot Təqvim əlavələri bloku oxuna bilmədi"
 msgid "Default Priority:"
 msgstr "Ö_n Qurğulu Üstünlük:"
 
-#: calendar/conduits/todo/todo-conduit.c:954
-#: calendar/conduits/todo/todo-conduit.c:957
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilot Ediləcəklər əlavələri bloku oxuna bilmədi"
 
@@ -3548,17 +3173,18 @@ msgid "Calendar and Tasks"
 msgstr "Təqvim və Vəzifələr"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Təqvim"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr "Vaxt zolağınızı, Təqvimi və Vəzifə Siyahısını buradan quraşdırın "
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Evolution Calendar and Tasks"
 msgstr "Evolution Təqvimi və Vəzifələr"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks component"
-msgstr "Evolution Təqvim və Vəzifələr tərkib hissəsi"
-
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Evolution Calendar configuration control"
 msgstr "Evolution Təqvim quraşdırma idarəsi"
@@ -3579,6 +3205,24 @@ msgstr "Evolution Təqvim/Vəzifə editoru"
 msgid "Evolution Tasks viewer"
 msgstr "Evolution Vəzifələr nümayişçisi"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolution Təqvim və Vəzifələr tərkib hissəsi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolution Sınaq Tərkib Hissəsi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Vəzifələr"
+
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution Təqvim alarm ilə bildriş xidməti"
@@ -3591,21 +3235,19 @@ msgstr "Başlanğıc:"
 msgid "Ending:"
 msgstr "Son:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
-msgid "invalid time"
-msgstr "səhv vaxt"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Evolution Alarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:366
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "%s vaxtı alarm ver"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
 msgstr "_Bağla"
 
@@ -3621,16 +3263,25 @@ msgstr "Mürgüləmə vaxtı (dəqiqə)"
 msgid "_Edit appointment"
 msgstr "Görüşü _düzəlt"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:770
+#: calendar/gui/alarm-notify/alarm-queue.c:875
 msgid "No description available."
 msgstr "İzahat yoxdur."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:843
-#: calendar/gui/alarm-notify/alarm-queue.c:867 widgets/misc/e-messagebox.c:161
+#: calendar/gui/alarm-notify/alarm-queue.c:893
+#, c-format
+msgid ""
+"Alarm on %s\n"
+"%s\n"
+"Starting at %s\n"
+"Ending at %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:980
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
 msgid "Warning"
 msgstr "Xəbərdarlıq"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:847
+#: calendar/gui/alarm-notify/alarm-queue.c:984
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3642,7 +3293,7 @@ msgstr ""
 "üçün qurulubdur.  Evolution bunun yerinə normal\n"
 "xatırlatma ekranını göstərəcəkdir."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-queue.c:1010
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3659,257 +3310,301 @@ msgstr ""
 "\n"
 "Həqiqətən də bu proqramı icra etmək istəyirsiniz?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:887
+#: calendar/gui/alarm-notify/alarm-queue.c:1024
 msgid "Do not ask me about this program again."
 msgstr "Mənə bu proqram ilə əlaqəli bir də soruşma."
 
-#: calendar/gui/alarm-notify/notify-main.c:176
+#: calendar/gui/alarm-notify/notify-main.c:157
+msgid "Could not initialize Bonobo"
+msgstr "Bonobo hazırlana bilmədi"
+
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs-ni başlada bilmədim"
 
-#: calendar/gui/alarm-notify/notify-main.c:185
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Alarm vermə xidməti emalatxanası yaradıla bilmir"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
+msgid "invalid time"
+msgstr "səhv vaxt"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "iCalendar Xətası"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Bugünkü vəzifə rəngi"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Bugünkü vəzifə rəngi"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "Həftəlik və aylıq nümayişlərdə görüşlərin _sonlanma vaxtlarını göstər"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Çap ediləcək təqvimi nümayiş etdirər"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "Üzvləri silərkən təsdiq _istə"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "Üzvləri silərkən təsdiq _istə"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Başa çatmış vəzifələri sil"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Vaxt səyyahında həftə _sayını göstər"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "İcmal bunu daxil edir:"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "İzahat bunu daxil edir:"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Şərh bunu daxil edir:"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1130
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Oxşar Olmayan"
 
-#: calendar/gui/calendar-commands.c:419
+#: calendar/gui/calendar-commands.c:370
+#, fuzzy
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
+"Bu əməliyyat bitmiş olaraq işarələnmiş bütün vəzifələri həmişəlik "
+"siləcəkdir. Davam etsəniz, bu vəzifələri geri gətirə bilməyəcəksiniz.\n"
+"\n"
+"Vəzifələr həqiqətən də silinsin?"
+
+#: calendar/gui/calendar-commands.c:376
+#, fuzzy
+msgid "Purge events older than"
+msgstr "bundan kiçik cavab göndərirsə"
+
+#: calendar/gui/calendar-commands.c:381
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+msgid "days"
+msgstr "gün"
+
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:422 calendar/gui/e-day-view-top-item.c:265
-#: calendar/gui/e-day-view.c:1440 calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %b %d"
 
-#: calendar/gui/calendar-commands.c:424 calendar/gui/calendar-commands.c:429
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:442 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:457
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:447
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1509
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:834
-msgid "Could not create the calendar view.  Please check your ORBit and OAF setup."
+#: calendar/gui/calendar-component.c:368
+#, c-format
+msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 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-component.c:70 calendar/gui/gnome-cal.c:1543
-#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
-#: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
-#: shell/e-shortcuts.c:1085
-msgid "Calendar"
-msgstr "Təqvim"
-
-#: calendar/gui/calendar-component.c:71
-msgid "Folder containing appointments and events"
-msgstr "Görüş və hadisələri daxil edən qovluq"
-
-#: calendar/gui/calendar-component.c:75
-msgid "Public Calendar"
-msgstr "İctimai Təqvim"
-
-#: calendar/gui/calendar-component.c:76
-msgid "Public folder containing appointments and events"
-msgstr "Görüş və hadisələri daxil edən ictimai qovluq"
-
-#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:738
-#: calendar/gui/print.c:1789 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:644
-#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
-#: my-evolution/e-summary-tasks.c:329 my-evolution/e-summary-tasks.c:338
-#: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Vəzifələr"
 
-#: calendar/gui/calendar-component.c:81
-msgid "Folder containing to-do items"
-msgstr "Ediləcək işləri daxil edən qovluq"
-
-#: calendar/gui/calendar-component.c:85
-msgid "Public Tasks"
-msgstr "İctimai Vəzifələr"
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Bu təqvimi çap et"
 
-#: calendar/gui/calendar-component.c:86
-msgid "Public folder containing to-do items"
-msgstr "Ediləcək işləri daxil edən ictimai qovluq"
+#: calendar/gui/calendar-component.c:428
+#, fuzzy
+msgid "New Calendar"
+msgstr "Yeni Kaledoniya"
 
-#: calendar/gui/calendar-component.c:732
+#: calendar/gui/calendar-component.c:632
 msgid "New appointment"
 msgstr "Yeni görüş"
 
-#: calendar/gui/calendar-component.c:732
+#: calendar/gui/calendar-component.c:633
 msgid "_Appointment"
 msgstr "_Görüş"
 
-#: calendar/gui/calendar-component.c:733
+#: calendar/gui/calendar-component.c:634
 msgid "Create a new appointment"
 msgstr "Yeni görüş yarat"
 
-#: calendar/gui/calendar-component.c:737
+#: calendar/gui/calendar-component.c:639
 msgid "New meeting"
 msgstr "Yeni görüş"
 
-#: calendar/gui/calendar-component.c:737
+#: calendar/gui/calendar-component.c:640
 msgid "M_eeting"
 msgstr "_Görüş"
 
-#: calendar/gui/calendar-component.c:738
+#: calendar/gui/calendar-component.c:641
 msgid "Create a new meeting request"
 msgstr "Yeni görüş istəyi yarat"
 
-#: calendar/gui/calendar-component.c:742
-msgid "New task"
-msgstr "Yeni vəzifə"
-
-#: calendar/gui/calendar-component.c:742
-msgid "_Task"
-msgstr "_Vəzifə"
-
-#: calendar/gui/calendar-component.c:743
-msgid "Create a new task"
-msgstr "Yeni vəzifə yarat"
-
-#: calendar/gui/calendar-component.c:747
-msgid "New All Day Appointment"
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
 msgstr "Yeni Tam Günlük Görüş"
 
-#: calendar/gui/calendar-component.c:747
+#: calendar/gui/calendar-component.c:647
 msgid "All _Day Appointment"
 msgstr "_Tam Günlük Görüş"
 
-#: calendar/gui/calendar-component.c:748
+#: calendar/gui/calendar-component.c:648
 msgid "Create a new all-day appointment"
 msgstr "Yeni tam günlük görüş yarat"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/calendar-model.c:964
-#: calendar/gui/e-calendar-table.c:380
-msgid "Private"
-msgstr "Şəxsi"
-
-#: calendar/gui/calendar-model.c:408 calendar/gui/calendar-model.c:966
-#: calendar/gui/e-calendar-table.c:381
-msgid "Confidential"
-msgstr "Gizli"
-
-#: calendar/gui/calendar-model.c:411 calendar/gui/e-calendar-table.c:379
-msgid "Public"
-msgstr "Ümumi"
-
-#: calendar/gui/calendar-model.c:523
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/calendar-model.c:523
-msgid "S"
-msgstr "Baz."
-
-#: calendar/gui/calendar-model.c:525
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/calendar-model.c:525
-msgid "W"
-msgstr "Çərş."
-
-#: calendar/gui/calendar-model.c:590 calendar/gui/calendar-model.c:1134
-#: calendar/gui/e-calendar-table.c:453
-msgid "Free"
-msgstr "Boş"
-
-#: calendar/gui/calendar-model.c:592 calendar/gui/e-calendar-table.c:454
-#: calendar/gui/e-meeting-time-sel.c:406
-#: shell/evolution-shell-component.c:1207
-msgid "Busy"
-msgstr "Məşğul"
-
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:474 calendar/gui/print.c:2298
-msgid "Not Started"
-msgstr "Başlamayıb"
-
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:475 calendar/gui/print.c:2301
-msgid "In Progress"
-msgstr "Fəaliyyətdə"
-
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-meeting-model.c:294
-#: calendar/gui/e-meeting-model.c:317 calendar/gui/print.c:2304
-msgid "Completed"
-msgstr "Bitirilib"
-
-#: calendar/gui/calendar-model.c:1036
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
-"Coğrafi mövqe bu şəkildə bildirilməlidir: \n"
-"\n"
-"45.436845,125.862501"
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1176 calendar/gui/dialogs/meeting-page.c:330
-#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2067
-#: mail/folder-browser.c:1774 mail/mail-account-gui.c:1260
-#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
-#: mail/mail-config.glade.h:76
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:442
-#: widgets/misc/e-dateedit.c:1458 widgets/misc/e-dateedit.c:1573
-msgid "None"
-msgstr "Yoxdur"
 
-#: calendar/gui/calendar-model.c:1711
-msgid "Recurring"
-msgstr "Təkrarlayan"
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
-#: calendar/gui/calendar-model.c:1713
-msgid "Assigned"
-msgstr "Vəzifələndirilmiş"
+#. create the remote source group
+#: calendar/gui/calendar-component.c:858
+msgid "On The Web"
+msgstr ""
 
-#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:266
-#: calendar/gui/e-meeting-model.c:276 calendar/gui/e-meeting-model.c:534
-#: calendar/gui/e-meeting-model.c:787
-msgid "Yes"
-msgstr "Bəli"
+#: calendar/gui/calendar-offline-handler.c:190
+#, c-format
+msgid "backend_go_offline(): %s"
+msgstr ""
 
-#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:278
-#: calendar/gui/e-meeting-model.c:788
-msgid "No"
-msgstr "Xeyir"
+#: calendar/gui/calendar-offline-handler.c:212
+#, c-format
+msgid "backend_go_online(): %s"
+msgstr ""
 
 #: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
@@ -3927,28 +3622,38 @@ msgstr "Həftəlik Nümayiş"
 msgid "Month View"
 msgstr "Aylıq Nümayiş"
 
-#: calendar/gui/comp-editor-factory.c:456
+#: calendar/gui/calendar-view-factory.c:130
+#, fuzzy
+msgid "List View"
+msgstr "Xüsusi Görünüş"
+
+#: calendar/gui/comp-editor-factory.c:451
 msgid "Error while opening the calendar"
 msgstr "Təqvim açılırkən xəta oldu"
 
-#: calendar/gui/comp-editor-factory.c:467
+#: calendar/gui/comp-editor-factory.c:462
 msgid "Method not supported when opening the calendar"
 msgstr "Yöntəm təqvim açılırkən dəstəklənmir"
 
-#: calendar/gui/comp-editor-factory.c:473
+#: calendar/gui/comp-editor-factory.c:468
 msgid "Permission denied to open the calendar"
 msgstr "Təqvimi açmaq üçün səlahiyyət verilmədi"
 
-#: calendar/gui/control-factory.c:119
+#: calendar/gui/comp-editor-factory.c:516
+#, c-format
+msgid "open_client(): %s"
+msgstr ""
+
+#: calendar/gui/control-factory.c:133
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "'%s' içindəki qovluq açıla bilədi"
 
-#: calendar/gui/control-factory.c:165
+#: calendar/gui/control-factory.c:179
 msgid "The URI that the calendar will display"
 msgstr "Təqvimin göstərəcəyi URI"
 
-#: calendar/gui/control-factory.c:172
+#: calendar/gui/control-factory.c:186
 msgid "The type of view to show"
 msgstr "Göstəriləcək nümayiş növü"
 
@@ -4004,11 +3709,7 @@ msgstr "Alıcı:"
 msgid "With these arguments:"
 msgstr "Bu arqumentlərlə:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
-msgid "days"
-msgstr "gün"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:11
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr "dialoq1"
 
@@ -4024,6 +3725,10 @@ msgstr "saat"
 msgid "minutes"
 msgstr "dəqiqə"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -4056,7 +3761,8 @@ msgstr "Epoçt Göndər"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Mündəricat:"
 
@@ -4085,7 +3791,7 @@ msgstr "görüşün sonu"
 msgid "hour(s)"
 msgstr "saat"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:173
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "dəqiqə"
 
@@ -4138,8 +3844,8 @@ msgid "Days"
 msgstr "Gün"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:647
+#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Cümə"
 
@@ -4152,8 +3858,8 @@ msgid "Minutes"
 msgstr "Dəqiqə"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Bazar ertəsi"
 
@@ -4162,8 +3868,8 @@ msgid "S_un"
 msgstr "Ba_z"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Şənbə"
 
@@ -4176,8 +3882,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Vaxt səyyahında həftə _sayını göstər"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:642
+#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Bazar"
 
@@ -4194,8 +3900,8 @@ msgid "Task List"
 msgstr "Vəzifə Siyahısı"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Cümə Axşamı"
 
@@ -4212,8 +3918,8 @@ msgid "Time format:"
 msgstr "Vaxt formatı:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:644
+#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Çərşənbə Axşamı"
 
@@ -4222,13 +3928,13 @@ msgid "W_eek starts:"
 msgstr "Həftənin _başlanğıcı:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Çərşənbə"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "İş Həftəsi"
 
@@ -4265,7 +3971,7 @@ msgid "_Fri"
 msgstr "_Cüm"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Ümumi"
 
@@ -4305,78 +4011,80 @@ msgstr "_Çər"
 msgid "before every appointment"
 msgstr "hər görüşdən əvvəl"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Bu görüşü həqiqətən də ləğv edib silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Bu vəzifəni həqiqətən də ləğv edib silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Bu jurnal girişini həqiqətən də ləğv edib silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Bu hadisə silindi."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Bu vəzifə silindi."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Bu jurnal girişi silindi."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
-"%s  Siz dəyişikliklər apardınız. Bu dəyişikliklər nəzərə alınmayaraq editor"
-"bağlansın?"
+"%s  Siz dəyişikliklər apardınız. Bu dəyişikliklər nəzərə alınmayaraq "
+"editorbağlansın?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Siz dəyişikliklər aparmadınız, editor bağlansın?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Bu hadisə dəyişdirilib."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Bu vəzifə dəyişdirilib."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Bu jurnal girişi dəyişdirilib."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr "%s  Siz dəyişikliklər apardınız. Bu dəyişikliklər unudularaq editor yenilənsin?"
+msgstr ""
+"%s  Siz dəyişikliklər apardınız. Bu dəyişikliklər unudularaq editor "
+"yenilənsin?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Siz dəyişikliklər aparmadınız, editor yenilənsin?"
@@ -4386,175 +4094,169 @@ msgstr "%s  Siz dəyişikliklər aparmadınız, editor yenilənsin?"
 msgid "Validation error: %s"
 msgstr "Yoxlama xətası: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2216
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " alıcı "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2220
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Qurtarılıb "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2222
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Qurtarılıb "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2227
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Qalan "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2229
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Qalan"
 
-#: calendar/gui/dialogs/comp-editor.c:334
-msgid "Could not update invalid object"
-msgstr "Hökmsüz cism yenilənə bilmədi"
-
-#: calendar/gui/dialogs/comp-editor.c:337
-msgid "Object not found, not updated"
-msgstr "Cism tapıla bilmədi, yenilənmədi"
-
-#: calendar/gui/dialogs/comp-editor.c:340
-msgid "You don't have permissions to update this object"
-msgstr "Bu cismi yeniləmə səlahiyyətlərinə malik deyilsiniz"
-
-#: calendar/gui/dialogs/comp-editor.c:343
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "Cism yenilənə bilmədi"
 
-#: calendar/gui/dialogs/comp-editor.c:793
-#: calendar/gui/dialogs/comp-editor.c:830
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Görüşü Dəyişdir"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Görüş - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:801
-#: calendar/gui/dialogs/comp-editor.c:838
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Vəzifə - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:804
-#: calendar/gui/dialogs/comp-editor.c:841
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Jurnal girişi - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:815
-#: calendar/gui/dialogs/comp-editor.c:851
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Mündəricat yoxdur"
 
-#: calendar/gui/dialogs/comp-editor.c:1281
-#: calendar/gui/e-calendar-table.c:1068 calendar/gui/e-day-view.c:3993
-#: calendar/gui/e-week-view.c:3950 composer/e-msg-composer.c:1171
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Fərqli qeyd et..."
 
-#: calendar/gui/dialogs/comp-editor.c:1383
-#: calendar/gui/dialogs/comp-editor.c:1407
-#: calendar/gui/dialogs/comp-editor.c:1433
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1460
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Hazırkı buraxılış öyrənilə bilmədi!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+msgid "Select destination source"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "`%s' görüşünü həqiqətən də silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Bu adsız görüşü həqiqətən də silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "`%s' vəzifəsini həqiqətən də silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Bu adsız vəzifəsini həqiqətən də silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "`%s' jurnal girişini həqiqətən də silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Bu adsız jurnal girişini həqiqətən də silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "%d görüşü həqiqətən də silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "%d vəzifəni həqiqətən də silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "%d jurnal girişini həqiqətən də silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/delete-error.c:50
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:66
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:82
-msgid "The event could not be deleted because it was invalid"
+#: calendar/gui/dialogs/delete-error.c:84
+msgid "The event could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:85
-msgid "The task could not be deleted because it was invalid"
+#: calendar/gui/dialogs/delete-error.c:87
+msgid "The task could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:88
-msgid "The journal entry could not be deleted because it was invalid"
-msgstr ""
+#: calendar/gui/dialogs/delete-error.c:90
+#, fuzzy
+msgid "The journal entry could not be deleted due to an error"
+msgstr "Bu jurnal girişi silindi."
 
-#: calendar/gui/dialogs/delete-error.c:91
-msgid "The item could not be deleted because it was invalid"
-msgstr ""
+#: calendar/gui/dialogs/delete-error.c:93
+#, fuzzy
+msgid "The item could not be deleted due to an error"
+msgstr "Üzv göndərilə bilmədi!\n"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Addressbook..."
@@ -4568,43 +4270,43 @@ msgstr "Nümayəndələşdir:"
 msgid "Enter Delegate"
 msgstr "Nümayəndəni Bildir"
 
-#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Görüş"
 
-#: calendar/gui/dialogs/event-editor.c:206
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Xatırladıcı"
 
-#: calendar/gui/dialogs/event-editor.c:213
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Təkrarlama"
 
-#: calendar/gui/dialogs/event-editor.c:220
-#: calendar/gui/dialogs/event-editor.c:292
-#: calendar/gui/dialogs/event-editor.c:436
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Vaxtlaşdırma"
 
-#: calendar/gui/dialogs/event-editor.c:227
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Görüş"
 
-#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:509
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "Başlama tarixi səhvdir"
 
-#: calendar/gui/dialogs/event-page.c:613
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "Bitiş tarixi səhvdir"
 
-#: calendar/gui/dialogs/event-page.c:636
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "Başlama vaxtı səhvdir"
 
-#: calendar/gui/dialogs/event-page.c:643
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "Bitiş vaxtı səhvdir"
 
@@ -4623,6 +4325,7 @@ msgstr "_Kateqoriyalar..."
 
 #: calendar/gui/dialogs/event-page.glade.h:5
 #: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/e-cal-list-view.etspec.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Sinifləndirmə"
@@ -4655,7 +4358,6 @@ msgid "Pu_blic"
 msgstr "İ_ctimai"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Vaxt Fərqli Göstər"
 
@@ -4672,27 +4374,37 @@ msgstr "_Bitiş vaxtı:"
 msgid "_Start time:"
 msgstr "_Başlama vaxt:"
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#. an empty string is the same as 'None'
+#: calendar/gui/dialogs/meeting-page.c:310
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
+msgid "None"
+msgstr "Yoxdur"
+
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:443
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "Təşkilatçı lazımdır."
 
-#: calendar/gui/dialogs/meeting-page.c:458
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "Ən az bir iştirakçı lazımdır."
 
 #: calendar/gui/dialogs/meeting-page.c:629
-msgid "That person is already attending the meeting!"
-msgstr "Bu şəxs onsuz da iclasın iştirakçısıdır!"
-
-#: calendar/gui/dialogs/meeting-page.c:713
 msgid "_Delegate To..."
 msgstr "_Təmsil Et..."
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/e-meeting-list-view.c:240
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "İştirakçı"
@@ -4728,14 +4440,15 @@ msgid "Member"
 msgstr "Üzv"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
+#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-meeting-list-view.c:270
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Vəziyyət"
@@ -4750,10 +4463,98 @@ msgid "_Change Organizer"
 msgstr "Təşkilatçını _Dəyişdir"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:424
+#: calendar/gui/e-meeting-time-sel.c:417
 msgid "_Invite Others..."
 msgstr "Başqalarını _Dəvət Et..."
 
+#: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/new-calendar.c:116
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/new-calendar.c:125
+#, fuzzy, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "`%s'-i yükləməyə yarayan yol dəstəklənmir"
+
+#: calendar/gui/dialogs/new-calendar.c:138
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/new-calendar.c:155
+#, fuzzy
+msgid "Could not create cache for new calendar"
+msgstr "%s üçün qıfıl faylı yaradıla bilmədi: %s"
+
+#: calendar/gui/dialogs/new-calendar.c:174
+#, fuzzy
+msgid "Could not create directory for new calendar"
+msgstr "%s qovluğu yaradıla bilmədi: %s"
+
+#: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
+#, fuzzy
+msgid "A group must be selected"
+msgstr "Təşkilatçı bildirlməlidir."
+
+#: calendar/gui/dialogs/new-calendar.glade.h:2
+#, fuzzy
+msgid "<b>Calendar options</b>"
+msgstr "Təqvim mə'lumatı"
+
+#: calendar/gui/dialogs/new-calendar.glade.h:3
+#, fuzzy
+msgid "Add New Calendar"
+msgstr "Yeni Kaledoniya"
+
+#: calendar/gui/dialogs/new-calendar.glade.h:4
+#, fuzzy
+msgid "Calendar Group"
+msgstr "iCalendar Xətası"
+
+#: calendar/gui/dialogs/new-calendar.glade.h:5
+#, fuzzy
+msgid "Calendar Location"
+msgstr "Təqvim mə'lumatı"
+
+#: calendar/gui/dialogs/new-calendar.glade.h:6
+#, fuzzy
+msgid "Calendar Name"
+msgstr "Təqvim"
+
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "%s qovluğu yaradıla bilmədi: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+msgid "<b>Task List Options</b>"
+msgstr ""
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Vəzifə Siyahısı"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Vəzifə Siyahısı"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Vəzifə Siyahısı"
+
 #: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
@@ -4763,69 +4564,80 @@ msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
 #: calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring journal entry, what would you like to modify?"
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
 #: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr "Ancaq Bu Nümunəni"
 
-#: calendar/gui/dialogs/recur-comp.c:75
+#: calendar/gui/dialogs/recur-comp.c:76
+#, fuzzy
+msgid "This and Prior Instances"
+msgstr "Bu və Növbəti Nümunələri"
+
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr "Bu və Növbəti Nümunələri"
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr "Bütün Nümunələri"
 
-#: calendar/gui/dialogs/recurrence-page.c:535
+#: calendar/gui/dialogs/recurrence-page.c:542
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Bu görüş Evolution-un düzəldə bilməyəcəyi təkrarlara malikdir."
 
-#: calendar/gui/dialogs/recurrence-page.c:809
+#: calendar/gui/dialogs/recurrence-page.c:816
 msgid "Recurrence date is invalid"
 msgstr "Təkrar tarixi hökmsüzdür"
 
-#: calendar/gui/dialogs/recurrence-page.c:919
+#: calendar/gui/dialogs/recurrence-page.c:927
 msgid "on"
 msgstr "tarixində"
 
-#: calendar/gui/dialogs/recurrence-page.c:980
+#: calendar/gui/dialogs/recurrence-page.c:988
 msgid "first"
 msgstr "ilk"
 
-#: calendar/gui/dialogs/recurrence-page.c:981
+#: calendar/gui/dialogs/recurrence-page.c:989
 msgid "second"
 msgstr "ikinci"
 
-#: calendar/gui/dialogs/recurrence-page.c:982
+#: calendar/gui/dialogs/recurrence-page.c:990
 msgid "third"
 msgstr "üçüncü"
 
-#: calendar/gui/dialogs/recurrence-page.c:983
+#: calendar/gui/dialogs/recurrence-page.c:991
 msgid "fourth"
 msgstr "dördüncü"
 
-#: calendar/gui/dialogs/recurrence-page.c:984
+#: calendar/gui/dialogs/recurrence-page.c:992
 msgid "last"
 msgstr "sonuncu"
 
-#: calendar/gui/dialogs/recurrence-page.c:1007
+#: calendar/gui/dialogs/recurrence-page.c:1015
 msgid "Other Date"
 msgstr "Başqa Tarix"
 
-#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/dialogs/recurrence-page.c:1043
 msgid "day"
 msgstr "gün"
 
-#: calendar/gui/dialogs/recurrence-page.c:1172
+#: calendar/gui/dialogs/recurrence-page.c:1180
 msgid "on the"
 msgstr "tarixində"
 
-#: calendar/gui/dialogs/recurrence-page.c:1357
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "hadisələr"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Tarix/Vaxt:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "Ə_lavə Et"
@@ -4890,7 +4702,7 @@ msgstr "həftə"
 msgid "year(s)"
 msgstr "il"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
@@ -4900,75 +4712,122 @@ msgstr ""
 "\n"
 "Dəyişiklikləriniz qeyd edilsin?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1568
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "Dəyişiklikləri _Unut"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 msgid "Save Event"
 msgstr "Hadisəni Qeyd Et"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Görüş mə'lumatı yaradıldı. Göndərilsin?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Görüş mə'lumatı dəyişdirildi. Yeni buraxılışı göndərilsin?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "Vəzifə tapşırma mə'lumatı yaradıldı. Göndərilsin?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "Vəzifə tapşırma mə'lumatı dəyişdirildi. Yeni buraxılışı göndərilsin?"
 
-#: calendar/gui/dialogs/task-details-page.c:401
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Bitiş tarixi səhvdir"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
+#, fuzzy, no-c-format
+msgid "% _Complete"
 msgstr "% Bitdi"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
+msgid "Completed"
+msgstr "Bitirilib"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-msgid "Date Completed:"
-msgstr "Bitirmə Tarixi:"
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
+msgid "High"
+msgstr "Yüksək"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
+msgid "In Progress"
+msgstr "Fəaliyyətdə"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
+msgid "Low"
+msgstr "Alçaq"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
+msgid "Normal"
+msgstr "Normal"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
+msgid "Not Started"
+msgstr "Başlamayıb"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:10
 msgid "Progress"
 msgstr "İrəliləmə"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:405
+msgid "Undefined"
+msgstr "Təsvirsiz"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Date Completed:"
+msgstr "Bitirmə Tarixi:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Priority:"
 msgstr "Ü_stünlük:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Status:"
 msgstr "_Vəziyyət:"
 
-#: calendar/gui/dialogs/task-editor.c:192
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+#, fuzzy
+msgid "_Web Page:"
+msgstr "_Veb səhifəsi ünvanı:"
+
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Əsas"
 
-#: calendar/gui/dialogs/task-editor.c:206
-#: calendar/gui/dialogs/task-editor.c:269
-#: calendar/gui/dialogs/task-editor.c:406
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Tapşırıq"
 
-#: calendar/gui/dialogs/task-page.c:482
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "Bitiş tarixi səhvdir"
 
-#: calendar/gui/dialogs/task-page.c:542
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr "Bitiş tarixi başlama tarixindən əvvəldir!"
 
@@ -4976,9 +4835,9 @@ msgstr "Bitiş tarixi başlama tarixindən əvvəldir!"
 msgid "Con_fidential"
 msgstr "Gi_zli"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1077
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "İzahat:"
 
@@ -5083,131 +4942,308 @@ msgstr "%s %s"
 msgid "%s for an unknown trigger type"
 msgstr "namə'lum işə salma növü üçün %s"
 
-#: calendar/gui/e-calendar-table.c:423
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
+msgid "Public"
+msgstr "Ümumi"
+
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
+msgid "Private"
+msgstr "Şəxsi"
+
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
+msgid "Confidential"
+msgstr "Gizli"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+#: calendar/gui/e-calendar-table.etspec.h:9
+#, fuzzy
+msgid "Description"
+msgstr "İzahat:"
+
+#: calendar/gui/e-cal-list-view.etspec.h:4
+#: calendar/gui/e-calendar-table.etspec.h:13
+msgid "Start Date"
+msgstr "Başlama Tarixi"
+
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
+msgid "Summary"
+msgstr "Mündəricat"
+
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
+msgid "color"
+msgstr "rəng"
+
+#: calendar/gui/e-cal-list-view.etspec.h:7
+#, fuzzy
+msgid "component"
+msgstr "Görüş"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
+msgid "Free"
+msgstr "Boş"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Məşğul"
+
+#: calendar/gui/e-cal-model-tasks.c:275
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:275
+msgid "S"
+msgstr "Baz."
+
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:277
+msgid "W"
+msgstr "Çərş."
+
+#: calendar/gui/e-cal-model-tasks.c:546
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Coğrafi mövqe bu şəkildə bildirilməlidir: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
+#: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Bəli"
+
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
+#: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Xeyir"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-meeting-list-view.c:144
+#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
+#: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
+#: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
+#: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
+msgstr "Namə'lum"
+
+#: calendar/gui/e-cal-model.c:837
+msgid "Recurring"
+msgstr "Təkrarlayan"
+
+#: calendar/gui/e-cal-model.c:839
+msgid "Assigned"
+msgstr "Vəzifələndirilmiş"
+
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
+msgid "Deleting selected objects"
+msgstr "Seçili üzv silinir"
+
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Cismlər yenilənir"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
+msgid "New _Appointment..."
+msgstr "Yeni _Görüş..."
+
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
+msgid "New All Day _Event"
+msgstr "Yeni Bütün Günlük _Hadisə"
+
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
+msgid "New Meeting"
+msgstr "Yeni Görüş"
+
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
+msgid "New Task"
+msgstr "Yeni Vəzifə"
+
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
+#: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
+msgid "_Print..."
+msgstr "Ç_ap et..."
+
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
+msgid "_Paste"
+msgstr "_Yapışdır"
+
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
+msgid "Go to _Today"
+msgstr "_Bugünə Get"
+
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
+msgid "_Go to Date..."
+msgstr "Tarixə _Get..."
+
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
+msgid "_Publish Free/Busy Information"
+msgstr "Sərbəst/Məşğul Mə'lumatını _Dərc Et"
+
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
+#: ui/evolution-addressbook.xml.h:36
+msgid "_Open"
+msgstr "_Aç"
+
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
+msgid "_Save As..."
+msgstr "Fərqli _Qeyd Et..."
+
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
+#: 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-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
+msgid "_Copy"
+msgstr "_Köçür"
+
+#: calendar/gui/e-cal-view.c:1218
+msgid "_Schedule Meeting..."
+msgstr "_Görüş Planlaşdır..."
+
+#: calendar/gui/e-cal-view.c:1219
+msgid "_Forward as iCalendar..."
+msgstr "iCalendar şəklində ö_tür..."
+
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
+msgid "Delete this _Occurrence"
+msgstr "Bu _Vaqiəni Sil"
+
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
+msgid "Delete _All Occurrences"
+msgstr "_Bütün Vaqiələri Sil"
+
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "_Qurğular..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:424
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:726 calendar/gui/e-day-view.c:2869
-#: calendar/gui/e-week-view.c:2022
-msgid "Deleting selected objects"
-msgstr "Seçili üzv silinir"
-
-#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3737
-#: calendar/gui/e-week-view.c:3723 mail/folder-browser.c:1785
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
-msgid "_Open"
-msgstr "_Aç"
-
-#: calendar/gui/e-calendar-table.c:959
-msgid "_Save as..."
-msgstr "_Fərqli qeyd et..."
-
-#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3739
-#: calendar/gui/e-week-view.c:3698 calendar/gui/e-week-view.c:3725
-#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:33
-#: ui/evolution-comp-editor.xml.h:19 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:108 ui/evolution-tasks.xml.h:21
-#: ui/my-evolution.xml.h:6
-msgid "_Print..."
-msgstr "Ç_ap et..."
-
-#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3744
-#: calendar/gui/e-week-view.c:3730 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:965 calendar/gui/e-day-view.c:3745
-#: calendar/gui/e-week-view.c:3731 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:29 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-tasks.xml.h:16
-msgid "_Copy"
-msgstr "_Köçür"
-
-#: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3710
-#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3702
-#: calendar/gui/e-week-view.c:3732 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:32 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-list.xml.h:29 ui/evolution-tasks.xml.h:20
-msgid "_Paste"
-msgstr "_Yapışdır"
+#: calendar/gui/e-calendar-table.c:990
+#, fuzzy
+msgid "Open _Web Page"
+msgstr "İsmarışı _Aç"
 
-#: calendar/gui/e-calendar-table.c:970
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "_Vəzifə Tə'yin Et"
 
-#: calendar/gui/e-calendar-table.c:971
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "iCalendar şəklində ö_tür"
 
-#: calendar/gui/e-calendar-table.c:972
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "Bitmiş Olaraq _İşarələ"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Seçili Vəzifələri Bitmiş Olaraq _İşarələ"
 
-#: calendar/gui/e-calendar-table.c:978
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "Seçili Vəzifələri _Sil"
 
-#: calendar/gui/e-calendar-table.c:1269 calendar/gui/e-day-view.c:8022
-#: calendar/gui/e-week-view.c:4447
-msgid "Updating objects"
-msgstr "Cismlər yenilənir"
-
-#: calendar/gui/e-calendar-table.c:1352
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Vəzifə əlavə etmək üçün tıqlayın"
 
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr "% Bitdi"
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmlar"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
-#: camel/camel-filter-driver.c:1251
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Bitdi"
 
@@ -5215,12 +5251,8 @@ msgstr "Bitdi"
 msgid "Completion Date"
 msgstr "Bitiş Tarixi"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Due Date"
-msgstr "Bitiş Tarixi"
-
 #: calendar/gui/e-calendar-table.etspec.h:10
-msgid "End Date"
+msgid "Due Date"
 msgstr "Bitiş Tarixi"
 
 #: calendar/gui/e-calendar-table.etspec.h:11
@@ -5231,33 +5263,27 @@ msgstr "Çoğrafi Mövqe"
 msgid "Priority"
 msgstr "Üstünlük"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
-msgid "Start Date"
-msgstr "Başlama Tarixi"
-
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:56 shell/e-shell.c:750
-#: shell/e-shortcuts.c:1082
-msgid "Summary"
-msgstr "Mündəricat"
-
-#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Vəzifə nizamlanması"
 
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5275,198 +5301,139 @@ msgstr "%02i dəqiqəlik bölmələr"
 
 #. 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:261 calendar/gui/e-day-view.c:1423
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1525
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1342
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 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:269 calendar/gui/e-day-view.c:1456
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1375
 #: calendar/gui/e-week-view-main-item.c:339
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:360
-#: calendar/gui/print.c:809
+#: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
+#: calendar/gui/print.c:818
 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:363
-#: calendar/gui/print.c:811
+#: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3694
-msgid "New _Appointment"
-msgstr "Yeni _Görüş"
-
-#: calendar/gui/e-day-view.c:3696 calendar/gui/e-week-view.c:3692
-msgid "New All Day _Event"
-msgstr "Yeni Bütün Günlük _Hadisə"
-
-#: calendar/gui/e-day-view.c:3698 calendar/gui/e-week-view.c:3693
-msgid "New Meeting"
-msgstr "Yeni Görüş"
-
-#: calendar/gui/e-day-view.c:3700 calendar/gui/e-week-view.c:3694
-msgid "New Task"
-msgstr "Yeni Vəzifə"
-
-#: calendar/gui/e-day-view.c:3705
-msgid "Print..."
-msgstr "Çap Et..."
-
-#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3708
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
-msgstr "_Bugünə Get"
-
-#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3709
-msgid "_Go to Date..."
-msgstr "Tarixə _Get..."
-
-#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3713
-#: ui/evolution-calendar.xml.h:34
-msgid "_Publish Free/Busy Information"
-msgstr "Sərbəst/Məşğul Mə'lumatını _Dərc Et"
-
-#: calendar/gui/e-day-view.c:3729 calendar/gui/e-week-view.c:3717
-#: ui/evolution.xml.h:60
-msgid "_Settings..."
-msgstr "_Qurğular..."
-
-#: calendar/gui/e-day-view.c:3738 calendar/gui/e-week-view.c:3724
-#: mail/folder-browser.c:1787 ui/evolution-mail-message.xml.h:112
-msgid "_Save As..."
-msgstr "Fərqli _Qeyd Et..."
-
-#: calendar/gui/e-day-view.c:3750 calendar/gui/e-week-view.c:3736
-msgid "_Schedule Meeting..."
-msgstr "_Görüş Planlaşdır..."
-
-#: calendar/gui/e-day-view.c:3751 calendar/gui/e-week-view.c:3737
-msgid "_Forward as iCalendar..."
-msgstr "iCalendar şəklində ö_tür..."
-
-#: calendar/gui/e-day-view.c:3756 calendar/gui/e-week-view.c:3742
-msgid "Make this Occurrence _Movable"
-msgstr "Bu Vaqiə _Daşına Bilsin"
-
-#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3743
-msgid "Delete this _Occurrence"
-msgstr "Bu _Vaqiəni Sil"
-
-#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3744
-msgid "Delete _All Occurrences"
-msgstr "_Bütün Vaqiələri Sil"
+#: calendar/gui/e-itip-control.c:139
+#, c-format
+msgid "start_calendar_server(): %s"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr "Bəli."
 
-#: calendar/gui/e-itip-control.c:688
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "Hər gün"
 
-#: calendar/gui/e-itip-control.c:690
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "Hər %d gün"
 
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "Hər həftə"
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "Hər %d həftə"
 
-#: calendar/gui/e-itip-control.c:701
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr "Həftənin hər müəyyən günündə"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Hər %d həftədən müəyyən gündə"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " və "
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "hər ay"
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr "hər %d ay"
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "Hər il"
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "Hər %d il"
 
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr " toplam %d dəfə"
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ", bitiş tarixi olaraq  "
 
-#: calendar/gui/e-itip-control.c:793
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>Başlayır:</b> "
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Bitir:</b> "
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>Başa Çatdı:</b> "
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>Qalıb:</b> "
 
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:923
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "iCalendar Mə'lumatı"
 
 #. Title
-#: calendar/gui/e-itip-control.c:885
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "iCalendar Xətası"
 
-#: calendar/gui/e-itip-control.c:954 calendar/gui/e-itip-control.c:970
-#: calendar/gui/e-itip-control.c:981 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Namə'lum şəxs"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1005
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5474,336 +5441,326 @@ msgstr ""
 "<br> Xahiş edirik, aşağıdakı mə'lumatı gözdən keçirin və aşağıdakı menyudan "
 "gedişatı seçin."
 
-#: calendar/gui/e-itip-control.c:1020
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Heç biri</i>"
 
-#: calendar/gui/e-itip-control.c:1031
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "Mövqe:"
 
-#: calendar/gui/e-itip-control.c:1045
+#. write status
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Vəziyyət:"
 
-#: calendar/gui/e-itip-control.c:1050 calendar/gui/e-meeting-model.c:286
-#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:801
-#: calendar/gui/itip-utils.c:419
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
+#: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Qəbul Edildi"
 
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Əvvəlcədən Qəbul Edildi"
 
-#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:802
-#: calendar/gui/itip-utils.c:425 calendar/gui/itip-utils.c:451
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
+#: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Rədd Edildi"
 
-#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1270
-#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:759
-#: calendar/gui/e-meeting-model.c:775 camel/camel-gpg-context.c:1574
-#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:634
-#: camel/providers/smtp/camel-smtp-transport.c:173
-#: camel/providers/smtp/camel-smtp-transport.c:228 mail/folder-browser.c:347
-#: mail/mail-display.c:932 widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr "Namə'lum"
-
-#: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
-#: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Gedişatı seçin:"
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Yenilə"
 
-#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
-#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
-#: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Oldu"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Qəbul Et"
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Əvvəlcədən qəbul et"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Rədd Et"
 
-#: calendar/gui/e-itip-control.c:1172
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Sərbəst/Məşğul Mə'lumatını Yolla"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Cavablayıcı vəziyyətini yenilə"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Ən Son Mə'lumatı Yolla"
 
-#: calendar/gui/e-itip-control.c:1211 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:387 mail/mail-send-recv.c:444
-#: shell/evolution-shell-component.c:1185 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Ləğv Et"
 
-#: calendar/gui/e-itip-control.c:1292
+#: calendar/gui/e-itip-control.c:1261
 #, 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:1293
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Görüş Mə'lumatı"
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> %s şəxsinin görüşdə olmasını xahiş edir."
 
-#: calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-itip-control.c:1269
 #, 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:1301
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Görüş Məqsədi"
 
-#: calendar/gui/e-itip-control.c:1305
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1306
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Görüş Yenilənməsi"
 
-#: calendar/gui/e-itip-control.c:1310
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1311
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Görüş Yenilənmə İstəyi"
 
-#: calendar/gui/e-itip-control.c:1318
+#: calendar/gui/e-itip-control.c:1287
 #, 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:1319
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Görüş Cavabı"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1295
 #, 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:1327
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Görüş Ləğvi"
 
-#: calendar/gui/e-itip-control.c:1334 calendar/gui/e-itip-control.c:1401
-#: calendar/gui/e-itip-control.c:1436
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, 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:1335
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Pis Görüş İsmarışı"
 
-#: calendar/gui/e-itip-control.c:1359
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1360
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Vəzifə Mə'lumatı"
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> %sdan vəzifəni görməsini istədi."
 
-#: calendar/gui/e-itip-control.c:1367
+#: calendar/gui/e-itip-control.c:1336
 #, 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:1368
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Vəzifə Təklifi"
 
-#: calendar/gui/e-itip-control.c:1372
+#: calendar/gui/e-itip-control.c:1341
 #, 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:1373
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Vəzifə Yenilənməsi"
 
-#: calendar/gui/e-itip-control.c:1377
+#: calendar/gui/e-itip-control.c:1346
 #, 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:1378
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Vəzifə Yeniləmə İstəyi"
 
-#: calendar/gui/e-itip-control.c:1385
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> vəzifə tapşırığına cavab verdi."
 
-#: calendar/gui/e-itip-control.c:1386
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Vəzifə Cavabı"
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1362
 #, 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:1394
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Vəzifə Ləğvi"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Pis Vəzifə İsmarışı"
 
-#: calendar/gui/e-itip-control.c:1421
+#: calendar/gui/e-itip-control.c:1390
 #, 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:1422
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Sərbəst/Məşğul Mə'lumatı"
 
-#: calendar/gui/e-itip-control.c:1426
+#: calendar/gui/e-itip-control.c:1395
 #, 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:1427
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Sərbəst/Məşğul İstəyi"
 
-#: calendar/gui/e-itip-control.c:1431
+#: calendar/gui/e-itip-control.c:1400
 #, 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:1432
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Sərbəst/Məşğul Cavabı"
 
-#: calendar/gui/e-itip-control.c:1437
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Pis Sərbəst/Məşğul İsmarışı"
 
-#: calendar/gui/e-itip-control.c:1513
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1576
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "İsmarış ancaq dəstəklənməyən istəkləri daxil edir."
 
-#: calendar/gui/e-itip-control.c:1607 calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Əlavə hökmlü təqvim ismarışını daxil etmir"
 
-#: calendar/gui/e-itip-control.c:1638
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr "Əlavə göstərilə bilən təqvim üzvlərini daxil etmir"
 
-#: calendar/gui/e-itip-control.c:1879 calendar/gui/e-itip-control.c:1971
-msgid "Object is invalid and cannot be updated\n"
-msgstr "Cism hökmsüzdür və yenilənə bilməz\n"
-
-#: calendar/gui/e-itip-control.c:1882 calendar/gui/e-itip-control.c:1974
-msgid "There was an error on the CORBA system\n"
-msgstr "CORBA sistemində bir xəta baş verdi\n"
-
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1977
-msgid "Object could not be found\n"
-msgstr "Cism tapıla bilmədi!\n"
-
-#: calendar/gui/e-itip-control.c:1888
-msgid "You do not have the right permissions to update the calendar\n"
-msgstr "Təqvimi yeniləmək üçün düzgün səlahiyyətləriniz yoxdur\n"
+#: calendar/gui/e-itip-control.c:1851
+msgid "Calendar file could not be updated!\n"
+msgstr "Təqvim faylı yenilənə bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1891
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Yeniləmə başa çatdı\n"
 
-#: calendar/gui/e-itip-control.c:1894
-msgid "Calendar file could not be updated!\n"
-msgstr "Təqvim faylı yenilənə bilmədi!\n"
-
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1989
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 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ü yenilənə bilməz"
+msgstr ""
+"İştirakçı vəziyyəti üzvün artıq mövcud olmadığından ötrü yenilənə bilməz"
+
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
+msgid "Object is invalid and cannot be updated\n"
+msgstr "Cism hökmsüzdür və yenilənə bilməz\n"
 
-#: calendar/gui/e-itip-control.c:1944
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Cavabı göndərən iştirakçı deyil.  İştirakçı olaraq əlavə edilsin?"
 
-#: calendar/gui/e-itip-control.c:1956
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "İştirakçı vəziyyəti səhv haldan ötrü yenilənə bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1980
+#: calendar/gui/e-itip-control.c:1940
+msgid "There was an error on the CORBA system\n"
+msgstr "CORBA sistemində bir xəta baş verdi\n"
+
+#: calendar/gui/e-itip-control.c:1943
+msgid "Object could not be found\n"
+msgstr "Cism tapıla bilmədi!\n"
+
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Təqvimi yeniləmək üçün düzgün səlahiyyətləriniz yoxdur\n"
 
-#: calendar/gui/e-itip-control.c:1983
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "İştirakçı vəziyyəti yeniləndi\n"
 
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "İştirakçı vəziyyəti yenilənə bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:2023
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Çıxartma Başa Çatdı"
 
-#: calendar/gui/e-itip-control.c:2055 calendar/gui/e-itip-control.c:2105
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Üzv göndərildi!\n"
 
-#: calendar/gui/e-itip-control.c:2057 calendar/gui/e-itip-control.c:2109
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Üzv göndərilə bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:2200
+#: calendar/gui/e-itip-control.c:2170
 msgid "Select Calendar Folder"
 msgstr "Təqvim Qovluğu Seçin"
 
-#: calendar/gui/e-itip-control.c:2206
+#: calendar/gui/e-itip-control.c:2176
 msgid "Select Tasks Folder"
 msgstr "Vəzifə Qovluğu Seçin"
 
@@ -5844,185 +5801,219 @@ msgstr "bitiş tarixi"
 msgid "date-start"
 msgstr "başlama-tarixi"
 
-#: calendar/gui/e-meeting-model.c:79
+#: calendar/gui/e-meeting-list-view.c:62 calendar/gui/e-meeting-model.c:77
 msgid "Chair Persons"
 msgstr "İdarəçilər"
 
-#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1639
+#: calendar/gui/e-meeting-list-view.c:63
+#: calendar/gui/e-meeting-list-view.c:456 calendar/gui/e-meeting-model.c:78
+#: calendar/gui/e-meeting-model.c:1635
 msgid "Required Participants"
 msgstr "Məcburi İştirakçılar"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-list-view.c:64 calendar/gui/e-meeting-model.c:79
 msgid "Optional Participants"
 msgstr "Ehtiyatdakı İştirakçılar"
 
-#: calendar/gui/e-meeting-model.c:82
+#: calendar/gui/e-meeting-list-view.c:65 calendar/gui/e-meeting-model.c:80
 msgid "Resources"
 msgstr "Mənbələr"
 
-#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
-#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:755
+#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-model.c:192
+#: calendar/gui/e-meeting-model.c:209 calendar/gui/e-meeting-model.c:525
+#: calendar/gui/e-meeting-model.c:750 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Şəxsi"
 
-#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
-#: calendar/gui/e-meeting-model.c:756
+#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-model.c:194
+#: calendar/gui/e-meeting-model.c:211 calendar/gui/e-meeting-model.c:751
+#: calendar/gui/e-meeting-store.c:92 calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Qrup"
 
-#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
-#: calendar/gui/e-meeting-model.c:757
+#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-model.c:196
+#: calendar/gui/e-meeting-model.c:213 calendar/gui/e-meeting-model.c:752
+#: calendar/gui/e-meeting-store.c:94 calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Mənbə"
 
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:758
+#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-model.c:198
+#: calendar/gui/e-meeting-model.c:215 calendar/gui/e-meeting-model.c:753
+#: calendar/gui/e-meeting-store.c:96 calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Otaq"
 
-#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
-#: calendar/gui/e-meeting-model.c:771
+#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-model.c:227
+#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:766
+#: calendar/gui/e-meeting-store.c:125 calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Stul"
 
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:772
+#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-model.c:229
+#: calendar/gui/e-meeting-model.c:246 calendar/gui/e-meeting-model.c:527
+#: calendar/gui/e-meeting-model.c:767 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Məcburi İştirakçı"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:773
+#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-model.c:231
+#: calendar/gui/e-meeting-model.c:248 calendar/gui/e-meeting-model.c:768
+#: calendar/gui/e-meeting-store.c:129 calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Ehtiyatdakı İştirakçı"
 
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:774
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-model.c:233
+#: calendar/gui/e-meeting-model.c:250 calendar/gui/e-meeting-model.c:769
+#: calendar/gui/e-meeting-store.c:131 calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Qeyri-İştirakçı"
 
-#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
-#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:800
+#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-model.c:279
+#: calendar/gui/e-meeting-model.c:302 calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:795 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Hərəkət Lazımdır"
 
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:803 calendar/gui/e-meeting-time-sel.c:405
+#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:798
+#: calendar/gui/e-meeting-store.c:183 calendar/gui/e-meeting-store.c:206
+#: calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Öncəlikli"
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:804
+#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:799
+#: calendar/gui/e-meeting-store.c:185 calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Temsilli"
 
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
+#: calendar/gui/e-meeting-model.c:291 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-store.c:189 calendar/gui/e-meeting-store.c:212
 msgid "In Process"
 msgstr "Gedişatda"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:458
-#: calendar/gui/e-meeting-time-sel.c:2098
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2060
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:462
-#: calendar/gui/e-meeting-time-sel.c:2131 e-util/e-time-utils.c:203
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2093 e-util/e-time-utils.c:203
 #: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:466 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1582
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:407 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "İş Yerində Deyil"
 
-#: calendar/gui/e-meeting-time-sel.c:408
+#: calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "Mə'lumat Yoxdur"
 
-#: calendar/gui/e-meeting-time-sel.c:447
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Seçimlər"
 
-#: calendar/gui/e-meeting-time-sel.c:464
+#: calendar/gui/e-meeting-time-sel.c:457
 msgid "Show _Only Working Hours"
 msgstr "Ancaq _İş Saatlarını Göstər"
 
-#: calendar/gui/e-meeting-time-sel.c:474
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Zoomed Out"
 msgstr "_Uzaqlaşdıraraq Göstər"
 
-#: calendar/gui/e-meeting-time-sel.c:489
+#: calendar/gui/e-meeting-time-sel.c:482
 msgid "_Update Free/Busy"
 msgstr "Sərbəst/Məşğul Mə'lumatını _Yenilə"
 
-#: calendar/gui/e-meeting-time-sel.c:504
+#: calendar/gui/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:522
+#: calendar/gui/e-meeting-time-sel.c:515
 msgid "_Autopick"
 msgstr "_Avtomarik Seç"
 
-#: calendar/gui/e-meeting-time-sel.c:537
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:554
+#: calendar/gui/e-meeting-time-sel.c:547
 msgid "_All People and Resources"
 msgstr "_Bütün Adamlar və Mənbələr"
 
-#: calendar/gui/e-meeting-time-sel.c:563
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "All _People and One Resource"
 msgstr "Bütün _Adamlar və Bir Mənbə"
 
-#: calendar/gui/e-meeting-time-sel.c:572
+#: calendar/gui/e-meeting-time-sel.c:565
 msgid "_Required People"
 msgstr "_Məcburi Adamlar"
 
-#: calendar/gui/e-meeting-time-sel.c:581
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "Required People and _One Resource"
 msgstr "Məcburi Adamlar və _Bir Mənbə"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "Meeting _start time:"
 msgstr "İclas _başlama saatı:"
 
-#: calendar/gui/e-meeting-time-sel.c:620
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "Meeting _end time:"
 msgstr "İclas _bitiş saatı:"
 
-#: calendar/gui/e-tasks.c:360 calendar/gui/gnome-cal.c:2196
-#: calendar/gui/gnome-cal.c:2207
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Vəzifələr %s vaxtı açılır"
+#: calendar/gui/e-tasks.c:181
+#, fuzzy
+msgid "Start Date:"
+msgstr "Başla_ma Tarixi:"
 
-#: calendar/gui/e-tasks.c:389 calendar/gui/tasks-control.c:201
+#: calendar/gui/e-tasks.c:197
+#, fuzzy
+msgid "Due Date:"
+msgstr "_Bitiş Tarixi:"
+
+#. write priority
+#: calendar/gui/e-tasks.c:225
+#, fuzzy
+msgid "Priority:"
+msgstr "Ü_stünlük:"
+
+#. URL
+#: calendar/gui/e-tasks.c:281
+#, fuzzy
+msgid "Web Page:"
+msgstr "Səhifə"
+
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "`%s'-dakı vəzifələr yüklənə bilmədi"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s'-i yükləməyə yarayan yol dəstəklənmir"
 
-#: calendar/gui/e-tasks.c:418 calendar/gui/gnome-cal.c:1699
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "`%s'-da qovluq açmaq üçün səlahiyyətləriniz yoxdur"
 
-#: calendar/gui/e-tasks.c:486 calendar/gui/gnome-cal.c:1918
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6031,61 +6022,58 @@ msgstr ""
 "%s-da xəta:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:557
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "Vəzifələr başa çatdırılır..."
 
-#: calendar/gui/e-tasks.c:580
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "Seçili cismlər silinir..."
 
-#: calendar/gui/e-tasks.c:675
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3691
-msgid "New _Appointment..."
-msgstr "Yeni _Görüş..."
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
+#: shell/e-shortcuts.c:1086
+msgid "Calendar"
+msgstr "Təqvim"
 
-#: calendar/gui/gnome-cal.c:1671
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s'-da qovluq açıla bilmədi"
 
-#: calendar/gui/gnome-cal.c:1685
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s'-i açmağa yarayan yol dəstəklənmir"
 
-#: calendar/gui/gnome-cal.c:1746
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "%s üçün alarmlar əlavə edilir"
 
-#: calendar/gui/gnome-cal.c:1938
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
-"The calendar backend for\n"
+"The task backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1947
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
-"The task backend for\n"
+"The calendar backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2178
-#, c-format
-msgid "Opening calendar at %s"
-msgstr "Təqvim %s vaxtı açılır"
-
-#: calendar/gui/gnome-cal.c:2218
-msgid "Opening default tasks folder"
-msgstr "Ön qurğulu vəzifələr qovluğu açılır"
+#: calendar/gui/gnome-cal.c:2848
+#, fuzzy
+msgid "Purging"
+msgstr "Turin"
 
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
@@ -6143,173 +6131,332 @@ msgstr "Oktyabr"
 msgid "September"
 msgstr "Sentyabr"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Təşkilatçı bildirlməlidir."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Ən az bir iştirakçı lazımdır"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Hadisə mə'lumatı"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Vəzifə mə'lumatı"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Jurnal mə'lumatı"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Sərbəst/Məşğul mə'lumatı"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Təqvim mə'lumatı"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Yeniləndi"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Təzələ"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Sərbəst/Məşğul Mə'lumatı (%s / %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "iCalendar mə'lumatı"
 
-#: calendar/gui/itip-utils.c:672
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Siz hadisənin istirakçısı olmalısınız."
 
-#: calendar/gui/print.c:547
+#: calendar/gui/print.c:476
+msgid "1st"
+msgstr "1-ci"
+
+#: calendar/gui/print.c:476
+msgid "2nd"
+msgstr "2-ci"
+
+#: calendar/gui/print.c:476
+msgid "3rd"
+msgstr "3-cü"
+
+#: calendar/gui/print.c:476
+msgid "4th"
+msgstr "4-cü"
+
+#: calendar/gui/print.c:476
+msgid "5th"
+msgstr "5-ci"
+
+#: calendar/gui/print.c:477
+msgid "6th"
+msgstr "6-cı"
+
+#: calendar/gui/print.c:477
+msgid "7th"
+msgstr "7-ci"
+
+#: calendar/gui/print.c:477
+msgid "8th"
+msgstr "8-ci"
+
+#: calendar/gui/print.c:477
+msgid "9th"
+msgstr "9-cu"
+
+#: calendar/gui/print.c:477
+msgid "10th"
+msgstr "10-cu"
+
+#: calendar/gui/print.c:478
+msgid "11th"
+msgstr "11-ci"
+
+#: calendar/gui/print.c:478
+msgid "12th"
+msgstr "12-ci"
+
+#: calendar/gui/print.c:478
+msgid "13th"
+msgstr "13-cü"
+
+#: calendar/gui/print.c:478
+msgid "14th"
+msgstr "14-cü"
+
+#: calendar/gui/print.c:478
+msgid "15th"
+msgstr "15-ci"
+
+#: calendar/gui/print.c:479
+msgid "16th"
+msgstr "16-cı"
+
+#: calendar/gui/print.c:479
+msgid "17th"
+msgstr "17-ci"
+
+#: calendar/gui/print.c:479
+msgid "18th"
+msgstr "18-ci"
+
+#: calendar/gui/print.c:479
+msgid "19th"
+msgstr "19-cu"
+
+#: calendar/gui/print.c:479
+msgid "20th"
+msgstr "20-ci"
+
+#: calendar/gui/print.c:480
+msgid "21st"
+msgstr "21-ci"
+
+#: calendar/gui/print.c:480
+msgid "22nd"
+msgstr "22-ci"
+
+#: calendar/gui/print.c:480
+msgid "23rd"
+msgstr "23-cü"
+
+#: calendar/gui/print.c:480
+msgid "24th"
+msgstr "24-cü"
+
+#: calendar/gui/print.c:480
+msgid "25th"
+msgstr "25-ci"
+
+#: calendar/gui/print.c:481
+msgid "26th"
+msgstr "26-cı"
+
+#: calendar/gui/print.c:481
+msgid "27th"
+msgstr "27-ci"
+
+#: calendar/gui/print.c:481
+msgid "28th"
+msgstr "28-ci"
+
+#: calendar/gui/print.c:481
+msgid "29th"
+msgstr "29-cu"
+
+#: calendar/gui/print.c:481
+msgid "30th"
+msgstr "30-cu"
+
+#: calendar/gui/print.c:482
+msgid "31st"
+msgstr "31-ci"
+
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Baz."
 
-#: calendar/gui/print.c:547
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "B.er"
 
-#: calendar/gui/print.c:547
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Ç.ax"
 
-#: calendar/gui/print.c:547
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Çə"
 
-#: calendar/gui/print.c:548
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "C.ax"
 
-#: calendar/gui/print.c:548
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Cümə"
 
-#: calendar/gui/print.c:548
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Şn"
 
 #. Day
-#: calendar/gui/print.c:1875
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Seçili gün ( %a %b %d %Y )"
 
-#: calendar/gui/print.c:1900 calendar/gui/print.c:1904
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1901
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1905 calendar/gui/print.c:1907
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1912
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Seçili həftə (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1920
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Seçili ay (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1927
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Seçili il (%Y)"
 
-#: calendar/gui/print.c:2255
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Vəzifə"
 
-#: calendar/gui/print.c:2314
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Vəziyyət: %s"
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Vaciblik: %s"
 
-#: calendar/gui/print.c:2343
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Başa Çatmış Nisbət: %i"
 
-#: calendar/gui/print.c:2355
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Kateqoriyalar: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Əlaqələr: "
 
-#: calendar/gui/print.c:2518 calendar/gui/print.c:2604
-#: calendar/gui/tasks-control.c:564 mail/mail-callbacks.c:2948
-#: my-evolution/e-summary.c:649
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Çap Nümayişi"
 
-#: calendar/gui/print.c:2552
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Üzvü Çap Et"
 
-#: calendar/gui/print.c:2625
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Çap Qurğuları"
 
-#: calendar/gui/tasks-control.c:152
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Bu qısa yolu yenidən adlandır"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Vəzifə Siyahısı"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Yeni vəzifə"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Vəzifə"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Yeni vəzifə yarat"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
+#: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "Göstəriləcək vəzifələr qovluğunun URI-si"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6321,11 +6468,11 @@ msgstr ""
 "\n"
 "Vəzifələr həqiqətən də silinsin?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Bir də soruşma."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "Çap Vəzifələri"
 
@@ -6353,15 +6500,15 @@ msgstr "iCalendar faylları (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar faylları (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:403
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "Xatırladıcı!!"
 
-#: calendar/importers/icalendar-importer.c:637
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "Təqvim Hadisələri"
 
-#: calendar/importers/icalendar-importer.c:662
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6369,124 +6516,10 @@ msgstr ""
 "Evolution Gnome Təqvim fayllarını tapdı.\n"
 "Onları Evolution-a idxal etmək istəyirsiniz?"
 
-#: calendar/importers/icalendar-importer.c:669
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Gnome Təqvim"
 
-#: calendar/pcs/cal-backend-file.c:316
-msgid "Can't save calendar data: Malformed URI."
-msgstr "Təqvim mə'lumatları qeyd edilə bilmir: Pozulmuş URI."
-
-#: calendar/pcs/query.c:289
-msgid "time-now expects 0 arguments"
-msgstr "indiki-vaxt 0 arqument gözləyir"
-
-#: calendar/pcs/query.c:313
-msgid "make-time expects 1 argument"
-msgstr "vaxt-düzəlt 1 arqument gözləyir"
-
-#: calendar/pcs/query.c:318
-msgid "make-time expects argument 1 to be a string"
-msgstr "vaxt-düzəlt 1 qatar arqument gözləyir"
-
-#: calendar/pcs/query.c:326
-msgid "make-time argument 1 must be an ISO 8601 date/time string"
-msgstr "vaxt-düzəlt arqumenti 1 ISO 8601 tarix/vaxt qatarı olmalıdır"
-
-#: calendar/pcs/query.c:355
-msgid "time-add-day expects 2 arguments"
-msgstr "vaxt-gün-əlavə-et 2 arqument gözləyir"
-
-#: calendar/pcs/query.c:360
-msgid "time-add-day expects argument 1 to be a time_t"
-msgstr "vaxt-gün-əlavə-et gözlədiyi 1 arqumentinin vaxt_t olmağını gözləyir"
-
-#: calendar/pcs/query.c:367
-msgid "time-add-day expects argument 2 to be an integer"
-msgstr "vaxt-gün-əlavə-et gözlədiyi 2 arqumentinin tam sayı olmağını gözləyir"
-
-#: calendar/pcs/query.c:394
-msgid "time-day-begin expects 1 argument"
-msgstr "vaxt-gün-başlanğıcı 1 arqumentini gözləyir"
-
-#: calendar/pcs/query.c:399
-msgid "time-day-begin expects argument 1 to be a time_t"
-msgstr "vaxt-gün-başlanğıcı gözlədiyi 1 arqumentinin vaxt_t olmağını gözləyir"
-
-#: calendar/pcs/query.c:426
-msgid "time-day-end expects 1 argument"
-msgstr "vaxt-gün-sonu 1 arqumentini gözləyir"
-
-#: calendar/pcs/query.c:431
-msgid "time-day-end expects argument 1 to be a time_t"
-msgstr "vaxt-gün-sonu gözlədiyi 1 arqumentinin vaxt_t olmağını gözləyir"
-
-#: calendar/pcs/query.c:467
-msgid "get-vtype expects 0 arguments"
-msgstr "get-vtype 0 arqument gözləyir"
-
-#: calendar/pcs/query.c:563
-msgid "occur-in-time-range? expects 2 arguments"
-msgstr "occur-in-time-range? 2 arqument gözləyir"
-
-#: calendar/pcs/query.c:568
-msgid "occur-in-time-range? expects argument 1 to be a time_t"
-msgstr "occur-in-time-range? time_t olan 1 arqument gözləyir"
-
-#: calendar/pcs/query.c:575
-msgid "occur-in-time-range? expects argument 2 to be a time_t"
-msgstr "occur-in-time-range? time_t olan 2 arqument gözləyir"
-
-#: calendar/pcs/query.c:705
-msgid "contains? expects 2 arguments"
-msgstr "contains? 2 arqument gözləyir"
-
-#: calendar/pcs/query.c:710
-msgid "contains? expects argument 1 to be a string"
-msgstr "contains? qatar olan arqument 1 gözləyir"
-
-#: calendar/pcs/query.c:717
-msgid "contains? expects argument 2 to be a string"
-msgstr "contains? qatar olan arqument 2 gözləyir"
-
-#: calendar/pcs/query.c:734
-msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
-"\""
-msgstr "contains? \"any\", \"summary\", \"description\" olan arqument 1 gözləyir"
-
-#: calendar/pcs/query.c:776
-msgid "has-categories? expects at least 1 argument"
-msgstr "has-categories? ən az 1 arqument gözləyir"
-
-#: calendar/pcs/query.c:788
-msgid ""
-"has-categories? expects all arguments to be strings or one and only one "
-"argument to be a boolean false (#f)"
-msgstr ""
-"has-categories? expects all arguments to be strings or one and only one "
-"argument to be a boolean false (#f)"
-
-#: calendar/pcs/query.c:876
-msgid "is-completed? expects 0 arguments"
-msgstr "is-completed? 0 argument gözləyir"
-
-#: calendar/pcs/query.c:921
-msgid "completed-before? expects 1 argument"
-msgstr "completed-before? 1 arqument gözləyir"
-
-#: calendar/pcs/query.c:926
-msgid "completed-before? expects argument 1 to be a time_t"
-msgstr "completed-before? time_t olan arqumnet 1 gözləyir"
-
-#: calendar/pcs/query.c:1229
-msgid "Evaluation of the search expression did not yield a boolean value"
-msgstr "Axtarış ifadəsi boolean qiymət qəbul etmir"
-
-#: calendar/pcs/query.c:1483
-msgid "Parse error"
-msgstr "Oxuma xətası"
-
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -8016,27 +8049,27 @@ msgstr "Sakit/Wallis"
 msgid "Pacific/Yap"
 msgstr "Sakit/Yap"
 
-#: camel/camel-cipher-context.c:178
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "Bu şifrləmə ilə imza dəstəklənmir"
 
-#: camel/camel-cipher-context.c:218
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "Bu şifrləmə ilə təsdiqləmə dəstəklənmir"
 
-#: camel/camel-cipher-context.c:262
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Bu şifrləmə ilə şifrləmə dəstəklənmir"
 
-#: camel/camel-cipher-context.c:304
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Bu şifrləmə ilə şifr açma dəstəklənmir"
 
-#: camel/camel-cipher-context.c:342
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr "Bu şifrləmə ilə açarları idxal edə bilməyəcəksiniz"
 
-#: camel/camel-cipher-context.c:374
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr "Bu şifrləmə ilə açarları ixrac edə bilməyəcəksiniz"
 
@@ -8075,7 +8108,11 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Verici ilə yenidən sinxronlaşdırılır"
 
-#: camel/camel-disco-folder.c:278
+#: camel/camel-disco-folder.c:90
+msgid "Downloading new messages for offline mode"
+msgstr ""
+
+#: camel/camel-disco-folder.c:351
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "%s qovluğu xətdən qoparılmaq üçün hazırlanır"
@@ -8084,86 +8121,86 @@ msgstr "%s qovluğu xətdən qoparılmaq üçün hazırlanır"
 msgid "You must be working online to complete this operation"
 msgstr "Bu əməliyyatı bitirmək üçün xətdə olmalısınız"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "'%s'-a boru yaradıla bilmədi:'%s'"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "'%s' törəmə gedişatı yaradıla bilmədi:'%s'"
 
-#: camel/camel-filter-driver.c:744
+#: camel/camel-filter-driver.c:754
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "'%s'-dan hökmsüz ismarış axımı alındı:'%s'"
 
-#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Qovluqlar sinxronlaşdırılır"
 
-#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Filtr oxuma xətası: %s: %s"
 
-#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Filtr işə salma xətası: %s: %s"
 
-#: camel/camel-filter-driver.c:1097
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Növbə qovluğu açıla bilmədi"
 
-#: camel/camel-filter-driver.c:1106
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Növbə qovluğu həll edilə bilmədi"
 
-#: camel/camel-filter-driver.c:1121
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d ismarışı alınır (%d%%)"
 
-#: camel/camel-filter-driver.c:1125
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "İsmarış açıla bilmir"
 
-#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "%d ismarışında xəta yarandı"
 
-#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Qovluq sinxronlaşdırılır"
 
-#: camel/camel-filter-driver.c:1213
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Alınan ismarış: %d / %d"
 
-#: camel/camel-filter-driver.c:1228
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d / %d ismarışında iflas etdi"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "İsmarış alına bilmədi"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr "Sistem bayrağına hökmsüz arqumentlər"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr "İstifadəçi bayrağına hökmsüz arqumentlər"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Filtr axtarışı işə salma xətası: %s: %s"
@@ -8186,39 +8223,44 @@ msgstr ""
 "Axtarış ifadəsi işə salma xətası:%s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:575 camel/camel-folder-search.c:603
+#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:655
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Namə'lum başlıqda sorğu aparılır: %s"
 
-#: camel/camel-folder.c:583
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "%s üçün dəstəklənməyən əməliyyat: ismarış əlavə et"
 
-#: camel/camel-folder.c:1161
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "%s üçün dəstəklənməyən əməliyyat: ifadəyə görə axtar"
 
-#: camel/camel-folder.c:1201
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "%s üçün dəstəklənməyən əməliyyat: uid-ə görə axtar"
 
-#: camel/camel-folder.c:1319
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "İsmarışlar daşınır"
 
-#: camel/camel-folder.c:1319
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr "İsmarışlar köçürülür"
 
-#: camel/camel-gpg-context.c:762
+#: camel/camel-folder.c:1572
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "%d ismarış alınır"
+
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8229,15 +8271,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:777
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg userid ehkamı oxuna bilmədi."
 
-#: camel/camel-gpg-context.c:802
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr "gpg şifrə istəyi oxuna bilmədi."
 
-#: camel/camel-gpg-context.c:810
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8246,30 +8288,30 @@ msgstr ""
 "Bu istifadəçi üçün açarın qıfılını aşmaq üçün\n"
 "şifrəyə ehtiyacınız var: \"%s\""
 
-#: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
-#: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:577
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Ləğv edildi."
 
-#: camel/camel-gpg-context.c:839
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Gizli açarın qıfılı açıla bilmədi: 3 səhv şifrə bildirildi."
 
-#: camel/camel-gpg-context.c:845
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG-dən gözlənilməyən cavab alındı: %s"
 
-#: camel/camel-gpg-context.c:857
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr "Heç bir mə'lumat bildirilməyib"
 
-#: camel/camel-gpg-context.c:895
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Şifrələnə bilmədi:Heç bir hökmlü alıcı bildirilməyib."
 
-#: camel/camel-gpg-context.c:1172
+#: camel/camel-gpg-context.c:1121
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8280,45 +8322,81 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1177
+#: camel/camel-gpg-context.c:1126
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "%s GPG ilə şifrələnə bilmədi: %s\n"
 
-#: camel/camel-gpg-context.c:1288 camel/camel-gpg-context.c:1573
-#: camel/camel-gpg-context.c:1624
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
+#, fuzzy, c-format
+msgid "Could not generate signing data: %s"
+msgstr "Mə'lumat yazıla bilmədi: %s"
+
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg icra edilə bilmədi: %s"
 
-#: camel/camel-gpg-context.c:1318 camel/camel-gpg-context.c:1395
-#: camel/camel-gpg-context.c:1464 camel/camel-gpg-context.c:1494
-#: camel/camel-gpg-context.c:1520 camel/camel-gpg-context.c:1550
-#: camel/camel-gpg-context.c:1595 camel/camel-gpg-context.c:1646
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr "gpg icra edilə bilmədi."
 
-#: camel/camel-gpg-context.c:1380
+#: camel/camel-gpg-context.c:1296
+msgid "This is a digitally signed message part"
+msgstr "Bu, dijital olaraq imzalanmış ismarış hissəsidir"
+
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr "İsmarış imzası təsdiqlənə bilmədi: müvəqqəti fayl yaradıla bilmir: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "İsmarış imzası təsdiqlənə bilmədi: müvəqqəti fayl yaradıla bilmir: %s"
 
-#: camel/camel-lock-client.c:111
+#: camel/camel-gpg-context.c:1473
+#, fuzzy, c-format
+msgid "Could not generate encrypting data: %s"
+msgstr "Mə'lumat yazıla bilmədi: %s"
+
+#: camel/camel-gpg-context.c:1531
+#, fuzzy
+msgid "This is a digitally encrypted message part"
+msgstr "Bu, dijital olaraq imzalanmış ismarış hissəsidir"
+
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Məktub məzmununu indekslə"
+
+#: camel/camel-gpg-context.c:1632
+#, fuzzy
+msgid "Unable to parse message content"
+msgstr "Editordan ismarış alına bilmir"
+
+#: camel/camel-lock-client.c:100
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Qıfıllayıcı yardımçı boru yaradıla bilmir: %s"
 
-#: camel/camel-lock-client.c:124
+#: camel/camel-lock-client.c:113
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Qıfıllayıcı yardımçı çəngəllənə bilmir: %s"
 
-#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "'%s' qıfıllana bilmir: lock-helper ilə protokol xətası"
 
-#: camel/camel-lock-client.c:215
+#: camel/camel-lock-client.c:204
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "'%s' qıfıllana bilmədi"
@@ -8331,7 +8409,9 @@ msgstr "%s üçün qıfıl faylı yaradıla bilmədi: %s"
 #: camel/camel-lock.c:154
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "%s üstündəki qıfıl faylının alınması müddəti doldu. Daha sonra yenidən sınayın."
+msgstr ""
+"%s üstündəki qıfıl faylının alınması müddəti doldu. Daha sonra yenidən "
+"sınayın."
 
 #: camel/camel-lock.c:209
 #, c-format
@@ -8397,23 +8477,15 @@ msgstr "Müvəqqəti məktub faylı yazma xətası: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Müvəqqəti məktub faylı köçürmə xətası: %s"
 
-#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME hissəsinin şifrəsi açıla bilmədi: protokol xətası"
 
-#: camel/camel-multipart-encrypted.c:287
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "MIME hissəsinin şifrəsi açıla bilmədi: hökmsüz qurğu"
 
-#: camel/camel-multipart-encrypted.c:327
-msgid "Failed to decrypt MIME part: parse error"
-msgstr "MIME hissəsinin şifrəsi açıla bilmədi: oxuma xətası"
-
-#: camel/camel-multipart-signed.c:644
-msgid "This is a digitally signed message part"
-msgstr "Bu, dijital olaraq imzalanmış ismarış hissəsidir"
-
-#: camel/camel-multipart-signed.c:698
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "oxuma xətası"
 
@@ -8432,19 +8504,19 @@ msgstr "%s yüklənə bilmədi: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s yüklənə bilmədi: Modulda başlatma kodu yoxdur."
 
-#: camel/camel-sasl-anonymous.c:33
+#: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonim"
 
-#: camel/camel-sasl-anonymous.c:35
+#: camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
 msgstr "Bu seçim vericiyə anonim giriş işlədərək bağlanacaqdır."
 
-#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
+#: camel/camel-sasl-anonymous.c:112 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
 msgstr "Tanıtma bacarılmadı."
 
-#: camel/camel-sasl-anonymous.c:119
+#: camel/camel-sasl-anonymous.c:121
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -8453,7 +8525,7 @@ msgstr ""
 "Səhv epoçt ünvanı iz mə'lumatı:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:131
+#: camel/camel-sasl-anonymous.c:133
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -8462,7 +8534,7 @@ msgstr ""
 "Səhv qeyri-şəffaf iz mə'lumatı:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:143
+#: camel/camel-sasl-anonymous.c:145
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -8480,8 +8552,8 @@ msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"Əgər verici dəstəkləyirsə, bu seçim vericiyə e'tibarlı CRAM-MD5 şifrəsi işlədərək "
-"bağlanacaqdır."
+"Əgər verici dəstəkləyirsə, bu seçim vericiyə e'tibarlı CRAM-MD5 şifrəsi "
+"işlədərək bağlanacaqdır."
 
 #: camel/camel-sasl-digest-md5.c:48
 msgid "DIGEST-MD5"
@@ -8492,8 +8564,8 @@ msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
-"Əgər verici dəstəkləyirsə, bu seçim vericiyə e'tibarlı DIGEST-MD5 şifrəsi işlədərək "
-"bağlanacaqdır."
+"Əgər verici dəstəkləyirsə, bu seçim vericiyə e'tibarlı DIGEST-MD5 şifrəsi "
+"işlədərək bağlanacaqdır."
 
 #: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
@@ -8580,7 +8652,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1052
+#: camel/providers/imap/camel-imap-store.c:1217
 msgid "Bad authentication response from server."
 msgstr "Vericidən xətalı tanıtmacavabı alındı."
 
@@ -8636,23 +8708,23 @@ msgstr ""
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: camel/camel-sasl-popb4smtp.c:34
+#: camel/camel-sasl-popb4smtp.c:36
 msgid "POP before SMTP"
 msgstr "SMTP-dən əvvəl POP"
 
-#: camel/camel-sasl-popb4smtp.c:36
+#: camel/camel-sasl-popb4smtp.c:38
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "Bu seçim SMTP-dən əvvəl POP bağlantısını sınayacaq"
 
-#: camel/camel-sasl-popb4smtp.c:107
+#: camel/camel-sasl-popb4smtp.c:103
 msgid "POP Source URI"
 msgstr "POP Mənbə URI-si"
 
-#: camel/camel-sasl-popb4smtp.c:111
+#: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "Namə'lum nəqliyyat işlədilərək SMTP-dən əvvəl POP"
 
-#: camel/camel-sasl-popb4smtp.c:116
+#: camel/camel-sasl-popb4smtp.c:112
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "Qeyri-POP mənbəyi işlədənrək SMTP-dən əvvəl POP"
 
@@ -8661,55 +8733,55 @@ msgstr "Qeyri-POP mənbəyi işlədənrək SMTP-dən əvvəl POP"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Qaydalı ifadə dərlənməsi bacarılmadı: %s: %s"
 
-#: camel/camel-service.c:282
+#: camel/camel-service.c:278
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "'%s' URL-si istifadəçi adı tərkib hissəsinə ehtiyac hiss edir"
 
-#: camel/camel-service.c:290
+#: camel/camel-service.c:286
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "'%s' URL-si qovşaq tərkib hissəsinə ehtiyac hiss edir"
 
-#: camel/camel-service.c:298
+#: camel/camel-service.c:294
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URL-si cığır tərkib hissəsinə ehtiyac hiss edir"
 
-#: camel/camel-service.c:750
+#: camel/camel-service.c:739
 #, c-format
 msgid "Resolving: %s"
 msgstr "%s tapılır"
 
-#: camel/camel-service.c:784 camel/camel-service.c:917
+#: camel/camel-service.c:770 camel/camel-service.c:894
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Ad axtarışında iflas: %s"
 
-#: camel/camel-service.c:805 camel/camel-service.c:938
+#: camel/camel-service.c:791 camel/camel-service.c:915
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Qovşaq axtarışı iflas etdi: ilgək yaradıla bilmir: %s"
 
-#: camel/camel-service.c:819
+#: camel/camel-service.c:804
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Qovşaq axtarışı iflas etdi: %s: qovşaq tapılmadı"
 
-#: camel/camel-service.c:822
+#: camel/camel-service.c:807
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Qovşaq axtarışı iflas etdi: %s: namə'lum səbəb"
 
-#: camel/camel-service.c:881
+#: camel/camel-service.c:861
 msgid "Resolving address"
 msgstr "Ünvan tapılır"
 
-#: camel/camel-service.c:954
+#: camel/camel-service.c:930
 msgid "Host lookup failed: host not found"
 msgstr "Qovşaq axtarışı iflas etdi: qovşaq tapılmadı"
 
-#: camel/camel-service.c:957
+#: camel/camel-service.c:933
 msgid "Host lookup failed: unknown reason"
 msgstr "Qovşaq axtarışı iflas etdi: namə'lum səbəb"
 
@@ -8721,12 +8793,12 @@ msgstr "Virtual qovluq epoçt xidmətçisi"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Başqa qovluq dəstələrinin istəyi olaraq məktubların oxunması üçün"
 
-#: camel/camel-session.c:355 camel/camel-session.c:405
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "`%s' protokolu üçün xidmətçi yoxdur"
 
-#: camel/camel-session.c:528
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8735,168 +8807,199 @@ msgstr ""
 "%s qovluğu yaradıla bilmədi:\n"
 "%s"
 
-#: camel/camel-smime-context.c:171
-#, c-format
-msgid "Please enter your password for %s"
-msgstr "Xahiş edirik, %s üçün şifrənizi bildirin"
+#: camel/camel-smime-context.c:96
+#, fuzzy, c-format
+msgid "Enter security pass-phrase for `%s'"
+msgstr "%s üçün şifrəni bildirin"
 
-#: camel/camel-smime-context.c:201
-msgid "Please indicate the nickname of a certificate to sign with."
-msgstr "Xahiş edirik, imzalamaq istədiyiniz sertifikatın ləqəbini bildirin."
+#: camel/camel-smime-context.c:501
+#, fuzzy
+msgid "Unverified"
+msgstr "Təsvirsiz"
 
-#: camel/camel-smime-context.c:207
-#, c-format
-msgid "The signature certificate for \"%s\" does not exist."
-msgstr "\"%s\" üçün imza sertifikatı mövcud deyil."
+#: camel/camel-smime-context.c:503
+#, fuzzy
+msgid "Good signature"
+msgstr "İmzanı dəyişdir"
 
-#: camel/camel-smime-context.c:247
-#, c-format
-msgid "The encryption certificate for \"%s\" does not exist."
-msgstr "\"%s\" üçün şifrələmə sertifikatı mövcud deyil."
+#: camel/camel-smime-context.c:505
+#, fuzzy
+msgid "Bad signature"
+msgstr "İmzanı dəyişdir"
 
-#: camel/camel-smime-context.c:417 camel/camel-smime-context.c:428
-#: camel/camel-smime-context.c:534 camel/camel-smime-context.c:544
-#, c-format
-msgid "Failed to find certificate for \"%s\"."
-msgstr "\"%s\" üçün sertifikat tapıla bilmədi."
+#: camel/camel-smime-context.c:507
+msgid "Content tampered with or altered in transit"
+msgstr ""
+
+#: camel/camel-smime-context.c:509
+#, fuzzy
+msgid "Signing certificate not found"
+msgstr "Zincirdə öz-özünə imzalı sertifikat"
 
-#: camel/camel-smime-context.c:554
-msgid "Failed to find a common bulk algorithm."
-msgstr "Ümumi bulk alqoritmi tapıla bilmədi."
+#: camel/camel-smime-context.c:511
+#, fuzzy
+msgid "Signing certificate not trusted"
+msgstr "Sertifikat e'tibarlı deyil"
 
-#: camel/camel-smime-context.c:808
-msgid "Failed to decode message."
-msgstr "İsmarış şifrəsi açıla bilmədi."
+#: camel/camel-smime-context.c:513
+msgid "Signature algorithm unknown"
+msgstr ""
 
-#: camel/camel-smime-context.c:853
-msgid "Failed to verify certificates."
-msgstr "Sertifikatlar təsdiqlənə bilmədi."
+#: camel/camel-smime-context.c:515
+msgid "Siganture algorithm unsupported"
+msgstr ""
+
+#: camel/camel-smime-context.c:517
+#, fuzzy
+msgid "Malformed signature"
+msgstr "İmzanı qeyd et"
+
+#: camel/camel-smime-context.c:519
+#, fuzzy
+msgid "Processing error"
+msgstr "Oxuma xətası"
+
+#: camel/camel-smime-context.c:634
+#, fuzzy, c-format
+msgid "Signer: %s <%s>: %s\n"
+msgstr "Verici: %s, Növ: %s"
 
-#: camel/camel-store.c:215
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Qovluq alına bilmir: Mənbədə hökmsüz əməliyyat"
 
-#: camel/camel-store.c:269
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Qovluq yaradıla bilmir: Mənbədə hökmsüz əməliyyat"
 
-#: camel/camel-tcp-stream-openssl.c:571
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Zibil"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "İyun"
+
+#: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "Nəşriyyatçının sertifikatı alına bilmədi"
 
-#: camel/camel-tcp-stream-openssl.c:573
+#: camel/camel-tcp-stream-openssl.c:570
 msgid "Unable to get Certificate Revocation List"
 msgstr "Sertifikat Ləğvi siyahısı alına bilmədi"
 
-#: camel/camel-tcp-stream-openssl.c:575
+#: camel/camel-tcp-stream-openssl.c:572
 msgid "Unable to decrypt certificate signature"
 msgstr "Sertifikat imzasının şifrəsi açıla bilmədi"
 
-#: camel/camel-tcp-stream-openssl.c:577
+#: camel/camel-tcp-stream-openssl.c:574
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr "Sertifikat Ləğvi siyahısının imzasının şifrəsi açıla bilmədi"
 
-#: camel/camel-tcp-stream-openssl.c:579
+#: camel/camel-tcp-stream-openssl.c:576
 msgid "Unable to decode issuer's public key"
 msgstr "Nəşriyyatçının ictimai açarının şifrəsi açıla bilmədi"
 
-#: camel/camel-tcp-stream-openssl.c:581
+#: camel/camel-tcp-stream-openssl.c:578
 msgid "Certificate signature failure"
 msgstr "Sertifikat imzası xətası"
 
-#: camel/camel-tcp-stream-openssl.c:583
+#: camel/camel-tcp-stream-openssl.c:580
 msgid "Certificate Revocation List signature failure"
 msgstr "Sertifikat Ləğvi siyahısı imzası xətası"
 
-#: camel/camel-tcp-stream-openssl.c:585
+#: camel/camel-tcp-stream-openssl.c:582
 msgid "Certificate not yet valid"
 msgstr "Sertifikat hələ hökmlü deyil"
 
-#: camel/camel-tcp-stream-openssl.c:587
+#: camel/camel-tcp-stream-openssl.c:584
 msgid "Certificate has expired"
 msgstr "Sertifikatın vaxtı başa çatıb"
 
-#: camel/camel-tcp-stream-openssl.c:589
+#: camel/camel-tcp-stream-openssl.c:586
 msgid "CRL not yet valid"
 msgstr "CRL hələ hökmlü deyil"
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:588
 msgid "CRL has expired"
 msgstr "CRL vaxtı başa çatıb"
 
-#: camel/camel-tcp-stream-openssl.c:596
+#: camel/camel-tcp-stream-openssl.c:593
 msgid "Error in CRL"
 msgstr "CRL-də xəta"
 
-#: camel/camel-tcp-stream-openssl.c:598
+#: camel/camel-tcp-stream-openssl.c:595
 msgid "Out of memory"
 msgstr "Yaddaş xaricində"
 
-#: camel/camel-tcp-stream-openssl.c:600
+#: camel/camel-tcp-stream-openssl.c:597
 msgid "Zero-depth self-signed certificate"
 msgstr "Sıfır-dərinlikli öz-özünə imzalı sertifikat"
 
-#: camel/camel-tcp-stream-openssl.c:602
+#: camel/camel-tcp-stream-openssl.c:599
 msgid "Self-signed certificate in chain"
 msgstr "Zincirdə öz-özünə imzalı sertifikat"
 
-#: camel/camel-tcp-stream-openssl.c:604
+#: camel/camel-tcp-stream-openssl.c:601
 msgid "Unable to get issuer's certificate locally"
 msgstr "Nəşriyyatçının sertifikatı yerli olaraq alına bilmədi"
 
-#: camel/camel-tcp-stream-openssl.c:606
+#: camel/camel-tcp-stream-openssl.c:603
 msgid "Unable to verify leaf signature"
 msgstr "Yarpaq sertifikatı təsdiqlənə bilmədi"
 
-#: camel/camel-tcp-stream-openssl.c:608
+#: camel/camel-tcp-stream-openssl.c:605
 msgid "Certificate chain too long"
 msgstr "Sertifikar zinciri çox uzundur"
 
-#: camel/camel-tcp-stream-openssl.c:610
+#: camel/camel-tcp-stream-openssl.c:607
 msgid "Certificate Revoked"
 msgstr "Sertifikat Ləğv Edildi"
 
-#: camel/camel-tcp-stream-openssl.c:612
+#: camel/camel-tcp-stream-openssl.c:609
 msgid "Invalid Certificate Authority (CA)"
 msgstr "Hökmsüz Sertifikat Təsdiqi (CA)"
 
-#: camel/camel-tcp-stream-openssl.c:614
+#: camel/camel-tcp-stream-openssl.c:611
 msgid "Path length exceeded"
 msgstr "Çığır uzunluği hüdudu keçdi"
 
-#: camel/camel-tcp-stream-openssl.c:616
+#: camel/camel-tcp-stream-openssl.c:613
 msgid "Invalid purpose"
 msgstr "Səhv məqsəd"
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:615
 msgid "Certificate untrusted"
 msgstr "Sertifikat e'tibarlı deyil"
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:617
 msgid "Certificate rejected"
 msgstr "Sertifikat rədd edildi"
 
-#: camel/camel-tcp-stream-openssl.c:623
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Subject/Issuer mismatch"
 msgstr "Mövzu/Nəşriyyatçı uyğunsuzluğu"
 
-#: camel/camel-tcp-stream-openssl.c:625
+#: camel/camel-tcp-stream-openssl.c:622
 msgid "AKID/SKID mismatch"
 msgstr "AKID/SKID uyğunsuzluğu"
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:624
 msgid "AKID/Issuer serial mismatch"
 msgstr "AKID/Nəşriyyatçı serial uyğunsuzluğu"
 
-#: camel/camel-tcp-stream-openssl.c:629
+#: camel/camel-tcp-stream-openssl.c:626
 msgid "Key usage does not support certificate signing"
 msgstr "Açar istifadəsi sertifikat imzalamasını dəstəkləmir"
 
-#: camel/camel-tcp-stream-openssl.c:632
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Error in application verification"
 msgstr "Tə'minat təsdiqləməsində xəta"
 
-#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8909,15 +9012,15 @@ msgstr ""
 "Barmaq izi:            %s\n"
 "İmza:                    %s"
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "GOOD"
 msgstr "HÖKMLÜ"
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "BAD"
 msgstr "HÖKMSÜZ"
 
-#: camel/camel-tcp-stream-openssl.c:707
+#: camel/camel-tcp-stream-openssl.c:704
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -8937,7 +9040,7 @@ msgstr ""
 "Yenə də qəbul etmək istəyirsiniz?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:833
+#: camel/camel-tcp-stream-ssl.c:841
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8952,7 +9055,7 @@ msgstr ""
 "\n"
 "Qəbul etmək istəyirsiniz?"
 
-#: camel/camel-tcp-stream-ssl.c:877
+#: camel/camel-tcp-stream-ssl.c:885
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -8961,7 +9064,7 @@ msgstr ""
 "Sertifikat problemi: %s\n"
 "Nəşriyyatçı: %s"
 
-#: camel/camel-tcp-stream-ssl.c:929
+#: camel/camel-tcp-stream-ssl.c:937
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -8970,7 +9073,7 @@ msgstr ""
 "Hökmsüz sertifikat domeni: %s\n"
 "Nəşriyyatçı: %s"
 
-#: camel/camel-tcp-stream-ssl.c:947
+#: camel/camel-tcp-stream-ssl.c:955
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -8979,7 +9082,7 @@ msgstr ""
 "Sertifikatın vaxtı başa çatıb: %s\n"
 "Nəşriyyatçı: %s"
 
-#: camel/camel-tcp-stream-ssl.c:964
+#: camel/camel-tcp-stream-ssl.c:972
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -8988,41 +9091,41 @@ msgstr ""
 "Sertifikat Ləğvi siyahısının vaxtı başa çatıb: %s\n"
 "Nəşriyyatçı: %s"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:143
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "`%s' URL-si oxuna bilmədi"
 
-#: camel/camel-vee-folder.c:618
+#: camel/camel-vee-folder.c:611
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "%s saxlanırkən xəta: %s"
 
-#: camel/camel-vee-folder.c:656
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s içində %s bənzəri ismarış yoxdur"
 
-#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
+#: camel/camel-vee-folder.c:812 camel/camel-vee-folder.c:818
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "İsmarışlar Virtual Qovluğa köçürülə ya da daşına bilmir"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Qovluq silinə bilmir: %s: Səhv əməliyyat"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Qovluq silinə bilmir: %s: Qovluq yoxdur"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Qovluq yenidən adlandırıla bilmir: %s: Səhv əməliyyat"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Qovluq yenidən adlandırıla bilmir: %s: Qovluq yoxdur"
@@ -9030,12 +9133,12 @@ msgstr "Qovluq yenidən adlandırıla bilmir: %s: Qovluq yoxdur"
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2816
 msgid "Operation cancelled"
 msgstr "Əməliyyat ləğv edildi"
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2647
+#: camel/providers/imap/camel-imap-store.c:2819
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Verici gözlənilməz şəkildə bağlantını kəsdi: %s"
@@ -9074,38 +9177,38 @@ msgstr "IMAP vericisinin cavabı %s mə'lumatını daxil etmədi"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP vericisindən gözlənilməz qəbul cavabı: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:222
+#: camel/providers/imap/camel-imap-folder.c:223
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "%s qovluğu yaradıla bilmədi: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:241
+#: camel/providers/imap/camel-imap-folder.c:242
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s üçün mündəricat yüklənə bilmədi"
 
-#: camel/providers/imap/camel-imap-folder.c:307
+#: camel/providers/imap/camel-imap-folder.c:308
 msgid "Folder was destroyed and recreated on server."
 msgstr "Qovluq dağıdılıb vericidə yenisi yaradıldı."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:549
+#: camel/providers/imap/camel-imap-folder.c:550
 msgid "Scanning for changed messages"
 msgstr "Dəyişdirilmiş ismarışlar axtarılır"
 
-#: camel/providers/imap/camel-imap-folder.c:1885
+#: camel/providers/imap/camel-imap-folder.c:1886
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "İsmarış alına bilmədi: %s."
 
-#: camel/providers/imap/camel-imap-folder.c:1922
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:225
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mbox-folder.c:351
-#: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:211
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/local/camel-maildir-folder.c:211
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -9114,24 +9217,24 @@ msgstr ""
 "İsmarıc alına bilmir: %s\n"
 "   %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1922
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:351
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/local/camel-maildir-folder.c:211
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Belə ismarış yoxdur"
 
-#: camel/providers/imap/camel-imap-folder.c:1945
-#: camel/providers/imap/camel-imap-folder.c:2541
+#: camel/providers/imap/camel-imap-folder.c:1946
+#: camel/providers/imap/camel-imap-folder.c:2542
 msgid "This message is not currently available"
 msgstr "Bu ismarış hazırda mövcud deyil"
 
-#: camel/providers/imap/camel-imap-folder.c:2205
-#: camel/providers/imap/camel-imap-folder.c:2275
+#: camel/providers/imap/camel-imap-folder.c:2206
+#: camel/providers/imap/camel-imap-folder.c:2276
 msgid "Fetching summary information for new messages"
 msgstr "Yeni ismarışların icmal mə'lumatı alınır"
 
-#: camel/providers/imap/camel-imap-folder.c:2579
+#: camel/providers/imap/camel-imap-folder.c:2580
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH cavabında ismarış gövdəsi tapıla bilmədi"
 
@@ -9154,112 +9257,153 @@ msgid "Failed to cache %s: %s"
 msgstr "%s ön yaddaşa alına bilmədi: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Vericiyə bağlanır..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "LDAP vericisinə bağlanma xətası"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "Qabığ Əmri"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Yeni poçt yoxlanır"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Check for new messages in all folders"
 msgstr "Bütün qovluqlarda yeni poçtu yoxla"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Qovluqlar"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Ancaq qeydiyyatdan keçmiş qovluqları göstər"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "Verici əlavəlı qovluq adı boşluqlarını nəzərə alma"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Ad boşluğu"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Bu vericidə GƏLƏNLƏR qutusundaki yeni ismarışlara filtrləri tədbiq et"
 
-#: camel/providers/imap/camel-imap-provider.c:63
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Automatically synchronize remote mail locally"
+msgstr "Yeni məktubları _avtomatik olaraq bu aralıqla yoxla:"
+
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP vericilərində məktubların saxlanması və oxuna bilməsi üçün."
 
-#: camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
+#: camel/providers/imap/camel-imap-provider.c:89
+#: camel/providers/imapp/camel-imapp-provider.c:65
+#: camel/providers/nntp/camel-nntp-store.c:265
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Şifrə"
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Bu seçim IMAP vericisinə xam mətn şifrəsi ilə bağlanma imkanı verir."
 
-#: camel/providers/imap/camel-imap-store.c:457
+#: camel/providers/imap/camel-imap-store.c:459
 #, c-format
 msgid "IMAP server %s"
 msgstr "%s IMAP vericisi"
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:461
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%2$s üstündə %1$s üçün IMAP xidmətləri"
 
-#: camel/providers/imap/camel-imap-store.c:587
-#: camel/providers/nntp/camel-nntp-store.c:130
-#: camel/providers/nntp/camel-nntp-store.c:148
-#: camel/providers/pop3/camel-pop3-store.c:184
-msgid "Connection cancelled"
-msgstr "Bağlantı ləğv edildi"
-
-#: camel/providers/imap/camel-imap-store.c:590
-#: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/imap/camel-imap-store.c:582
+#: camel/providers/imap/camel-imap-store.c:602
+#: camel/providers/imapp/camel-imapp-store.c:236
+#: camel/providers/nntp/camel-nntp-store.c:131
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:285
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s-a bağlana bilmədi (qapı %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/pop3/camel-pop3-store.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:271
+#, fuzzy
+msgid "SSL unavailable"
+msgstr "TLS Mövcud Deyil"
+
+#: camel/providers/imap/camel-imap-store.c:599
+#: camel/providers/imap/camel-imap-store.c:831
+#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/nntp/camel-nntp-store.c:128
+#: camel/providers/nntp/camel-nntp-store.c:146
+#: camel/providers/pop3/camel-pop3-store.c:194
+msgid "Connection cancelled"
+msgstr "Bağlantı ləğv edildi"
+
+#: camel/providers/imap/camel-imap-store.c:665
+#: camel/providers/imap/camel-imap-store.c:696
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "%2$s təhlükəsizlik modunda %1$s IMAP verisicinə bağlana bilmədi"
 
-#: camel/providers/imap/camel-imap-store.c:650
-#: camel/providers/pop3/camel-pop3-store.c:220
+#: camel/providers/imap/camel-imap-store.c:666
+#: camel/providers/pop3/camel-pop3-store.c:230
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS uzantısı dəstəklənmir."
 
-#: camel/providers/imap/camel-imap-store.c:681
-#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/imap/camel-imap-store.c:697
+#: camel/providers/pop3/camel-pop3-store.c:271
 msgid "SSL negotiations failed"
 msgstr "SSL danışıqları bacarılmadı"
 
-#: camel/providers/imap/camel-imap-store.c:1075
+#: camel/providers/imap/camel-imap-store.c:834
+#, fuzzy, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "%s-a bağlana bilmədi (qapı %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:1247
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "%s IMAP vericisi istənən %s tanıtma növünü dəstəkləmir"
 
-#: camel/providers/imap/camel-imap-store.c:1085
+#: camel/providers/imap/camel-imap-store.c:1257
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s tanıtma növü dəstəklənmir"
 
-#: camel/providers/imap/camel-imap-store.c:1108
+#: camel/providers/imap/camel-imap-store.c:1280
+#: camel/providers/imapp/camel-imapp-store.c:349
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sXahiş edirik, %s@%s üçün IMAP şifrəsini bildirin"
 
-#: camel/providers/imap/camel-imap-store.c:1122
+#: camel/providers/imap/camel-imap-store.c:1294
 msgid "You didn't enter a password."
 msgstr "Şifrənizi bildirmədiniz."
 
-#: camel/providers/imap/camel-imap-store.c:1151
+#: camel/providers/imap/camel-imap-store.c:1323
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9270,41 +9414,70 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1498
-#: camel/providers/imap/camel-imap-store.c:1640
+#: camel/providers/imap/camel-imap-store.c:1670
+#: camel/providers/imap/camel-imap-store.c:1812
 #, c-format
 msgid "No such folder %s"
 msgstr "%s adında qovluq yoxdur"
 
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:2013
 #, c-format
-msgid "The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "\"%s\" qovluq adı \"%c\" hərfini daxil etdiyi üçün hökmsüzdür"
 
-#: camel/providers/imap/camel-imap-store.c:1853
+#: camel/providers/imap/camel-imap-store.c:2025
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Namə'lum qonşu qovluq: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1889
+#: camel/providers/imap/camel-imap-store.c:2061
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Qonşu qovluq alt qovluqlara malik ola bilməzi"
 
+#: camel/providers/imapp/camel-imapp-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr "İsmarışın saxlanması"
+
+#: camel/providers/imapp/camel-imapp-provider.c:47
+#, fuzzy
+msgid "IMAP+"
+msgstr "IMAP"
+
+#: camel/providers/imapp/camel-imapp-provider.c:49
+msgid ""
+"Experimental IMAP 4(.1) client\n"
+"This is untested and unsupported code, you want to use plain imap instead.\n"
+"\n"
+" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+msgstr ""
+
+#: camel/providers/imapp/camel-imapp-store.c:333
+#, fuzzy, c-format
+msgid "Could not connect to POP server on %s"
+msgstr "%s POP vericisinə bağlana bilmədi"
+
+#: camel/providers/local/camel-local-folder.c:179
+#, fuzzy
+msgid "Index message body data"
+msgstr "Əlaqəyə ismarış göndər"
+
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:354
+#: camel/providers/local/camel-local-folder.c:382
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:358
-#: camel/providers/local/camel-local-folder.c:361
+#: camel/providers/local/camel-local-folder.c:386
+#: camel/providers/local/camel-local-folder.c:389
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "poçt qutusu:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:365
+#: camel/providers/local/camel-local-folder.c:393
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -9358,50 +9531,54 @@ msgid ""
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-mbox-store.c:305
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "%s qovluq kökü dəqiq mütləq cığır deyil"
 
-#: camel/providers/local/camel-local-store.c:146
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "%s qovluq kökü düzgün qovluq deyil"
 
-#: camel/providers/local/camel-local-store.c:155
-#: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:239
+#: camel/providers/local/camel-local-store.c:154
+#: camel/providers/local/camel-local-store.c:170
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Qovluq alına bilmir: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:187
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "Yerli qovluqların gələnlər qutusu yoxdur"
 
-#: camel/providers/local/camel-local-store.c:199
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "%s yeli məktub faylı"
 
-#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:909
+#: camel/providers/local/camel-local-store.c:307
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "%s qovluğu %s adi ilə yenidən adlandırıla bilmədi: %s"
 
-#: camel/providers/local/camel-local-store.c:365
+#: camel/providers/local/camel-local-store.c:364
+#: camel/providers/local/camel-mbox-store.c:475
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "'%s' yenidən adlandırıla bilmədi: %s"
 
-#: camel/providers/local/camel-local-store.c:388
+#: camel/providers/local/camel-local-store.c:387
+#: camel/providers/local/camel-mbox-store.c:258
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "`%s' qovluq mündəricat faylı silinə bilmədi: %s"
 
-#: camel/providers/local/camel-local-store.c:398
+#: camel/providers/local/camel-local-store.c:397
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "`%s' qovluq indeks faylı silinə bilmədi: %s"
@@ -9415,17 +9592,17 @@ msgstr "İcmal qeyd edilə bilmədi: %s :%s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Mündəricata ismarış əlavə edilə bilmədi: namə'lum səbəb"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:183
 msgid "Maildir append message cancelled"
 msgstr "Maildir imsarış əlavə edilməsi ləğv edildi"
 
-#: camel/providers/local/camel-maildir-folder.c:187
+#: camel/providers/local/camel-maildir-folder.c:186
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "İsmarış maildir qovluğuna əlavə edilə bilmir: %s: %s "
 
-#: camel/providers/local/camel-maildir-folder.c:235
-#: camel/providers/local/camel-mh-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:220
 msgid "Invalid message contents"
 msgstr "Hökmsüz ismarış məzmunu"
 
@@ -9441,7 +9618,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mbox-store.c:157
 #: camel/providers/local/camel-mh-store.c:209
 #: camel/providers/local/camel-spool-store.c:167
 #, c-format
@@ -9504,29 +9681,29 @@ msgstr "Yeni ismarışlar yoxlanır"
 msgid "Storing folder"
 msgstr "Qovluq saxlanır"
 
-#: camel/providers/local/camel-mbox-folder.c:159
-#: camel/providers/local/camel-spool-folder.c:149
+#: camel/providers/local/camel-mbox-folder.c:225
+#: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s üstündə qovluq qıfılı yaradıla bilməir: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:218
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Məktub qutusu açıla bilmir: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:278
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "Məktub əlavəsi ləğv edildi"
 
-#: camel/providers/local/camel-mbox-folder.c:281
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "İsmarış mbox fayllına əlava edilə bimir: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:369
-#: camel/providers/local/camel-mbox-folder.c:400
-#: camel/providers/local/camel-mbox-folder.c:408
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9535,15 +9712,15 @@ msgstr ""
 "İsmarış alına bilmir: %2$s qovluğundan %1$s\n"
 "   %3$s"
 
-#: camel/providers/local/camel-mbox-folder.c:401
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Qovluq geri dönülməz şəkildə xəsarət alıb."
 
-#: camel/providers/local/camel-mbox-folder.c:409
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "İsmarış quruluşu bacarılmadı: Məktub qutusu xəsərlidir?"
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:149
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9552,7 +9729,16 @@ msgstr ""
 "`%s' faylı açıla bilmədi:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:166
+#, fuzzy, c-format
+msgid ""
+"Could not create directory `%s':\n"
+"%s"
+msgstr ""
+"%s qovluğu yaradıla bilmədi:\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:178
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9561,14 +9747,15 @@ msgstr ""
 "`%s' faylı yaradıla bilmədi: \n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:188
+#: camel/providers/local/camel-mbox-store.c:229
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' normal fayl deyil."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:210
+#: camel/providers/local/camel-mbox-store.c:221
+#: camel/providers/local/camel-mbox-store.c:244
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9577,11 +9764,41 @@ msgstr ""
 "`%s' qovluğu silinə bilmədi:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:236
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' qovluğu boş deyil. Silinmədi."
 
+#: camel/providers/local/camel-mbox-store.c:311
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Bu adda qovluq yaradıla bilmir"
+
+#: camel/providers/local/camel-mbox-store.c:324
+#, fuzzy, c-format
+msgid "Cannot create directory `%s': %s."
+msgstr "%s qovluğu yaradıla bilmədi: %s"
+
+#: camel/providers/local/camel-mbox-store.c:338
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "Qovluq alına bilmir: %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "Kard ID onsuz da mövcuddur"
+
+#: camel/providers/local/camel-mbox-store.c:409
+#, fuzzy, c-format
+msgid "Could not rename %s to %s: %s"
+msgstr "%s qovluğu %s adi ilə yenidən adlandırıla bilmədi: %s"
+
+#: camel/providers/local/camel-mbox-store.c:428
+#, fuzzy
+msgid "The new folder name is illegal."
+msgstr "Bildirilən qovluq adı hökmlü deyildir: %s"
+
 #: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
@@ -9611,7 +9828,7 @@ msgid "Cannot open temporary mailbox: %s"
 msgstr "Müvəqqəti məktub qutusu açıla bilmir: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:702
+#: camel/providers/local/camel-mbox-summary.c:704
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Mənbə qovluğu bağlana bilmədi: %s: %s"
@@ -9621,45 +9838,45 @@ msgstr "Mənbə qovluğu bağlana bilmədi: %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Müvəqqəti qovluq bağlana bilmədi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Qovluq yenidən adlandırıla bilmədi: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:644
 #: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:843
-#: camel/providers/local/camel-mbox-summary.c:851
+#: camel/providers/local/camel-mbox-summary.c:845
+#: camel/providers/local/camel-mbox-summary.c:853
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "İcmal və qovluq bir birinə uyğun gəlmir, sinxronizasiyadan sonra belə"
 
-#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-mbox-summary.c:779
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Namə'lum xəta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:812
+#: camel/providers/local/camel-mbox-summary.c:814
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Qovluq saxlana bilmədi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:906
-#: camel/providers/local/camel-mbox-summary.c:932
+#: camel/providers/local/camel-mbox-summary.c:908
+#: camel/providers/local/camel-mbox-summary.c:934
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Müvəqqəti məktub qutusuna yazma xətası: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:923
+#: camel/providers/local/camel-mbox-summary.c:925
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Müvəqqəti məktub qutusuna yazma bacarılmadı: %s: %s"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:174
 msgid "MH append message cancelled"
 msgstr "MH ismarış əlavəsi ləğv edildi"
 
-#: camel/providers/local/camel-mh-folder.c:178
+#: camel/providers/local/camel-mh-folder.c:177
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "İsmarış mh qovluğuna əlavə edilə bilmir: %s: %s"
@@ -9739,68 +9956,130 @@ msgstr ""
 "%s hovuz qovluğu sinxronlaşdırıla bilmədi: %s\n"
 "Qovluq xəsarət görmüş ola bilər, nüsxəsi`%s' içində köçürüldü"
 
+#: camel/providers/nntp/camel-nntp-auth.c:44
+#, fuzzy, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr "%sXahiş edirik %s@%s üçün SMTP şifrənizi bildirin"
+
+#: camel/providers/nntp/camel-nntp-auth.c:64
+msgid "Server rejected username"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:70
+#, fuzzy
+msgid "Failed to send username to server"
+msgstr "LDAP vericisinə bağlanma xətası"
+
+#: camel/providers/nntp/camel-nntp-auth.c:79
+msgid "Server rejected username/password"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:114
+#, c-format
+msgid "Internal error: uid in invalid format: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:155
+#: camel/providers/nntp/camel-nntp-folder.c:161
+#: camel/providers/pop3/camel-pop3-folder.c:433
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:512
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "%s ismarışı alına bilmir: %s"
+
+#: camel/providers/nntp/camel-nntp-folder.c:159
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "İstifadəçi ləğv etdi"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#, fuzzy
+msgid "Could not get group list from server."
+msgstr "Qrup alına bilmədi: %s"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#, fuzzy, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr ""
+"Yekun faylı yaradıla bilmir: %s\n"
+" %s"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#, fuzzy, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr ""
+"Yekun faylı yaradıla bilmir: %s\n"
+" %s"
+
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET xəbərləri"
 
 #: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr "Bu, USENET xəbər qruplarına məktub göndərmək və xəbərləri oxumaq üçün bir vasitədir."
+msgstr ""
+"Bu, USENET xəbər qruplarına məktub göndərmək və xəbərləri oxumaq üçün bir "
+"vasitədir."
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:149
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "%s salamı oxuna bilmədi: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:163
+#: camel/providers/nntp/camel-nntp-store.c:161
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "%s NNTP vericisi %d xəta kodunu göndərdi: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:262
+#: camel/providers/nntp/camel-nntp-store.c:260
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s vasitəsilə USENET Xəbərləri"
 
-#: camel/providers/nntp/camel-nntp-store.c:269
+#: camel/providers/nntp/camel-nntp-store.c:267
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
-"Bu seçim NNTP verisici ilə xam mətn şəklindəki şifrə ilə ünsiyyət "
-"quracaqdır."
+"Bu seçim NNTP verisici ilə xam mətn şəklindəki şifrə ilə ünsiyyət quracaqdır."
 
-#: camel/providers/nntp/camel-nntp-summary.c:234
+#: camel/providers/nntp/camel-nntp-summary.c:237
 #, c-format
 msgid "No such folder: %s"
 msgstr "Belə qovluq yoxdur: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:238
+#: camel/providers/nntp/camel-nntp-summary.c:241
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Qrup alına bilmədi: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:344
+#: camel/providers/nntp/camel-nntp-summary.c:347
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP əmri iflas etdi: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:404
-#: camel/providers/nntp/camel-nntp-summary.c:505
+#: camel/providers/nntp/camel-nntp-summary.c:407
+#: camel/providers/nntp/camel-nntp-summary.c:508
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Yeni ismarışlaryoxlanır"
 
-#: camel/providers/nntp/camel-nntp-summary.c:520
+#: camel/providers/nntp/camel-nntp-summary.c:523
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Naməlum verici cavabı: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:566
+#: camel/providers/nntp/camel-nntp-summary.c:569
 msgid "Use cancel"
 msgstr "Ləğv etməni işlət"
 
-#: camel/providers/nntp/camel-nntp-summary.c:568
+#: camel/providers/nntp/camel-nntp-summary.c:571
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Əməliyyat bacarılmadı: %s"
@@ -9809,13 +10088,6 @@ msgstr "Əməliyyat bacarılmadı: %s"
 msgid "Retrieving POP summary"
 msgstr "POP icmalı alınır"
 
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:429
-#: camel/providers/pop3/camel-pop3-folder.c:490
-#: camel/providers/pop3/camel-pop3-folder.c:508
-msgid "User cancelled"
-msgstr "İstifadəçi ləğv etdi"
-
 #: camel/providers/pop3/camel-pop3-folder.c:265
 #, c-format
 msgid "Cannot get POP summary: %s"
@@ -9825,34 +10097,22 @@ msgstr "POP icmalı alına bilmir: %s"
 msgid "Expunging deleted messages"
 msgstr "Silinmiş ismarışlar cızılır"
 
-#: camel/providers/pop3/camel-pop3-folder.c:403
+#: camel/providers/pop3/camel-pop3-folder.c:404
 #, c-format
 msgid "No message with uid %s"
 msgstr "%s uid'li ismarış yoxdur"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:410
+#: camel/providers/pop3/camel-pop3-folder.c:411
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "%d POP ismarışı alınır"
 
-#: camel/providers/pop3/camel-pop3-folder.c:432
-#: camel/providers/pop3/camel-pop3-folder.c:493
-#: camel/providers/pop3/camel-pop3-folder.c:500
-#: camel/providers/pop3/camel-pop3-folder.c:511
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "%s ismarışı alına bilmir: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:501
 msgid "Unknown reason"
 msgstr "Namə'lum səbəb"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
-msgid "Message storage"
-msgstr "İsmarışın saxlanması"
-
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "İsmarışları vericidə burax"
@@ -9866,7 +10126,7 @@ msgstr "%s gün sonra sil"
 msgid "Disable support for all POP3 extensions"
 msgstr "Bütün POP3 uzantı dəstəklərini qeyri-fəallaşdır"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -9879,8 +10139,8 @@ msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
-"Bu seçim POP verisici ilə xam mətn şəklindəki şifrə ilə ünsiyyət "
-"quracaqdır. Bu POP vericiləri tərəfindən dəstəklənən yeganə yoldur."
+"Bu seçim POP verisici ilə xam mətn şəklindəki şifrə ilə ünsiyyət quracaqdır. "
+"Bu POP vericiləri tərəfindən dəstəklənən yeganə yoldur."
 
 #: camel/providers/pop3/camel-pop3-provider.c:83
 msgid ""
@@ -9892,53 +10152,55 @@ msgstr ""
 "quracaqdır. Bu seçim bütün vericilər tərəfindən bütün istifadəçilər üçün "
 "dəstəklənməz."
 
-#: camel/providers/pop3/camel-pop3-store.c:187
+#: camel/providers/pop3/camel-pop3-store.c:197
 #, c-format
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "%s POP vericisinə bağlana bilmədi (qapı %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:219
-#: camel/providers/pop3/camel-pop3-store.c:248
-#: camel/providers/pop3/camel-pop3-store.c:260
+#: camel/providers/pop3/camel-pop3-store.c:229
+#: camel/providers/pop3/camel-pop3-store.c:258
+#: camel/providers/pop3/camel-pop3-store.c:270
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "%s POP vericisinə %s təhlükəsizlik modunda bağlana bilmədi"
 
-#: camel/providers/pop3/camel-pop3-store.c:358
+#: camel/providers/pop3/camel-pop3-store.c:368
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "%s POP vericisinə bağlana bilmədi"
 
-#: camel/providers/pop3/camel-pop3-store.c:399
-#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:519
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
-msgstr "%s POP vericisinə bağlana bilmədi İstənən tanıtma protokoluna dəstək verilmir."
+msgstr ""
+"%s POP vericisinə bağlana bilmədi İstənən tanıtma protokoluna dəstək "
+"verilmir."
 
-#: camel/providers/pop3/camel-pop3-store.c:415
+#: camel/providers/pop3/camel-pop3-store.c:425
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' %s POP vericisi üçün giriş bacarılmadı: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:427
+#: camel/providers/pop3/camel-pop3-store.c:437
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "%s POP vericisinə girilə bilmədi: SASL Protokol xətası"
 
-#: camel/providers/pop3/camel-pop3-store.c:446
+#: camel/providers/pop3/camel-pop3-store.c:456
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "%s POP vericisinə tanıdıla bilmədi: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:468
+#: camel/providers/pop3/camel-pop3-store.c:478
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sXahiş edirik, %s@%s üçün POP şifrənizi bildirin"
 
-#: camel/providers/pop3/camel-pop3-store.c:523
-#: camel/providers/pop3/camel-pop3-store.c:530
+#: camel/providers/pop3/camel-pop3-store.c:533
+#: camel/providers/pop3/camel-pop3-store.c:540
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9947,13 +10209,13 @@ msgstr ""
 "%s POP vericisinə bağlana bilmədi.\n"
 "Şifrə göndərmə xətası : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:629
+#: camel/providers/pop3/camel-pop3-store.c:639
 #, 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:107
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10007,7 +10269,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Sendmail proqramı ilə məktub göndərilməsi"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:99
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10015,107 +10277,108 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Uzaq məktub yayıcısına SMTP ilə bağlanaraq məktub göndərmək üçün.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr "İmla xətası, əmr tanınmır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "Parametr və ya arqumentlərdə imla xətası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "Əmr yerinə yetirilməyib"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "Əmr parametri yerinə yetirilməyib"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "Sistem vəziyyəti ya da yardım cavabı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "Yardım ismarışı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Xidmət hazırdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "Xidmət nəqliyyat kanallarını bağlayır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "Xidmət uyğun deyildir, nəqliyyat kanalları bağlanır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "Sorğulanan məktub gedişatı müvəffəqiyyətlidir, qurtardı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "User not local; will forward to <forward-path>"
 msgstr "İstifadəçi yerli deyil; <ötürmə-cığırı>na ötürüləcək"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Sorğulanan məktub gedişatı yerinə yetirilmədi: poçt qutusu yoxdur"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Sorğulanan gedişat yerinə yetirilmədi: poçt qutusu yoxdur"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr "Sorğulanan gedişat ləğv edildi: oxumada xəta oldu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
 msgstr "İstifadəçi yerli deyil; xahiş edirik, <ötürmə-cığırı>nı sınayın"
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Sorğulanan gedişatı yerinə yetirilmədi: əksik sistem yeri"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Sorğulanan məktub gedişatı ləğv edildi; yer həddi keçilib"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
-msgstr "Sorğulanan gedişat yerinə yetirilmədi: poçt qutusu adına icazə verilmir"
+msgstr ""
+"Sorğulanan gedişat yerinə yetirilmədi: poçt qutusu adına icazə verilmir"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Məktub alımı başladı; <CRLF>.<CRLF> ilə sonlandırın"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "Nəqliyyat bacarılmadı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr "Şifrə nəqli lazımdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "Tanıtma mexanizması çox zəifdir"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Sorğulanan tanıtma mexanizması üçün kriptləmək lazımdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "Müvəqqəti tanıtma iflası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:225
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Tanıtma lazımdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:308
 msgid "Welcome response error"
 msgstr "Cavablama xətasını xoş qarşıla"
 
@@ -10173,7 +10436,7 @@ msgstr "%s vasitəsilə SMTP məktub göndərilməsi"
 msgid "Cannot send message: sender address not valid."
 msgstr "İsmarış göndrərilə bilmədi: göndərənin ünvanı hökmsüzdür."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:637
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "İsmarış göndərilir"
 
@@ -10189,57 +10452,57 @@ msgstr "İsmarış göndrərilə bilmədi: bir ya da daha çox hökmsüz alıcı
 msgid "SMTP Greeting"
 msgstr "SMTP Qarşılaması"
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:929
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr "HELO istəyi vaxt dolması: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:951
 msgid "HELO response error"
 msgstr "HELO cavablama xətası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "SMTP Tanıtması"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "SASL tanıtma cismini yaratma xətası."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1052
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH istəyi vaxt dolması: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1061
 msgid "AUTH request failed."
 msgstr "AUTH istəyi bacarılmadı."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1122
 msgid "Bad authentication response from server.\n"
 msgstr "Vericidən xətalı tanıtma istəyi alındı.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1147
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM istək vaxt dolması: %s: məktub göndərilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1167
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM cavablama xətası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1191
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCTP TO istəyi vaxt dolması: %s: məktub göndərilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1213
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> bacarılmadı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1250
+#: camel/providers/smtp/camel-smtp-transport.c:1252
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA istəyi vaxt dolması. %s: məktub göndərilmədi"
@@ -10247,35 +10510,35 @@ msgstr "DATA istəyi vaxt dolması. %s: məktub göndərilmədi"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1270
+#: camel/providers/smtp/camel-smtp-transport.c:1272
 msgid "DATA response error"
 msgstr "DATA cavablama xətası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1311
-#: camel/providers/smtp/camel-smtp-transport.c:1334
+#: camel/providers/smtp/camel-smtp-transport.c:1313
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "DATA göndərmə vaxt dolması: ismarış ləğvi: %s: məktub göndərilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1354
+#: camel/providers/smtp/camel-smtp-transport.c:1356
 msgid "DATA termination response error"
 msgstr "DATA ləğvi cavablama xətası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1377
+#: camel/providers/smtp/camel-smtp-transport.c:1379
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET istəyi vaxt dolması: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1397
+#: camel/providers/smtp/camel-smtp-transport.c:1399
 msgid "RSET response error"
 msgstr "RSET cavablama xətası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1420
+#: camel/providers/smtp/camel-smtp-transport.c:1422
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr "QUIT istəyi vaxt dolması: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1440
+#: camel/providers/smtp/camel-smtp-transport.c:1442
 msgid "QUIT response error"
 msgstr "QUIT cavablama xətası"
 
@@ -10294,20 +10557,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:313 mail/mail-display.c:226
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "ilişdirilmiş fayl"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:445
 msgid "Remove selected items from the attachment list"
 msgstr "Seçili üzvləri ilişdirilmiş fayllar siyahısından sil"
 
-#: composer/e-msg-composer-attachment-bar.c:481
+#: composer/e-msg-composer-attachment-bar.c:475
 msgid "Add attachment..."
 msgstr "İlişdirilmiş fayl əlavə et..."
 
-#: composer/e-msg-composer-attachment-bar.c:482
+#: composer/e-msg-composer-attachment-bar.c:476
 msgid "Attach a file to the message"
 msgstr "İsmarışa bir fayl ilişdir"
 
@@ -10339,11 +10601,11 @@ msgstr "MIME növü:"
 msgid "Suggest automatic display of attachment"
 msgstr "İlişdirilmiş faylın avtomatik göstərilməsini məsləhət et"
 
-#: composer/e-msg-composer-hdrs.c:290
+#: composer/e-msg-composer-hdrs.c:287
 msgid "You need to configure an account before you can compose mail."
 msgstr "Məktub yazmadan əvvəl bir hesab quraşdırmalısınız."
 
-#: composer/e-msg-composer-hdrs.c:483
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Ünvan kitabçası üçün buraya tıqlayın"
 
@@ -10354,73 +10616,85 @@ msgstr "Ünvan kitabçası üçün buraya tıqlayın"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:514
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Cavablama-Ünvanı:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:520
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Göndərən:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:526
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Mövzu:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Alıcı:"
 
-#: composer/e-msg-composer-hdrs.c:536
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "İsmarışın alıcılarını bildirin"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:540
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "İsmarışın nüsxəsinin göndəriləcəyi ünvanları bildirin"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:544
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
-"İsmarışın nüsxələrinin göndəriləcəyi ünvanları bildirin; bu alıcılar özlərini"
-"ismarışın göndərildiği adamlar arasında görməyəcəkdir."
+"İsmarışın nüsxələrinin göndəriləcəyi ünvanları bildirin; bu alıcılar "
+"özləriniismarışın göndərildiği adamlar arasında görməyəcəkdir."
 
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:551
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Yolla:"
 
-#: composer/e-msg-composer-hdrs.c:553
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr "Yollanacaq hədəf"
 
-#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "İsmarışa bir fayl ilişdir"
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Fayl(lar) ilişdir"
 
-#: composer/e-msg-composer.c:542
-msgid "Could not create a PGP signature context"
-msgstr "PGP imza məzmunu yaradıla bilmədi."
+#: composer/e-msg-composer.c:651
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for from account"
+msgstr "Bu hesab işlədildiyində bütün məktubları _həmişə imzala"
+
+#: composer/e-msg-composer.c:657
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for from "
+"account"
+msgstr ""
 
-#: composer/e-msg-composer.c:821
+#: composer/e-msg-composer.c:788
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10429,30 +10703,30 @@ msgstr ""
 "%s faylı oxunurkən xəta oldu:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1184
+#: composer/e-msg-composer.c:1153
 msgid "File exists, overwrite?"
 msgstr "Fayl mövcuddur, üstünə yazılsın?"
 
-#: composer/e-msg-composer.c:1202
+#: composer/e-msg-composer.c:1164 composer/e-msg-composer.c:1180
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Faylı qeyd edərkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Faylı yüklərkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fayla yetişilirkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Editordan ismarış alına bilmir"
 
-#: composer/e-msg-composer.c:1278
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10461,7 +10735,7 @@ msgstr ""
 "Faylda axtarış aparıla bilmir: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1285
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10470,7 +10744,7 @@ msgstr ""
 "Fayl parçalana bilmir: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1294
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10479,7 +10753,7 @@ msgstr ""
 "Fayl izahatçısı köçürülə bilmir: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1303
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10488,7 +10762,7 @@ msgstr ""
 "İsmarışın avtomatik qeyd edilmə xatası: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1400
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10496,7 +10770,7 @@ msgstr ""
 "Ximian Evolution əvvəlki iclasdan qalan qeyd edilməmiş fayllar tapdı.\n"
 "Onları indi bərpa etməyə cəhd etmək istəyirsiniz?"
 
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10507,28 +10781,28 @@ msgstr ""
 "\n"
 "Dəyişiklikləri qeyd etmək istəyirsiniz?"
 
-#: composer/e-msg-composer.c:1572
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Diqqət: Təkmilləşdirilmiş İsmarış"
 
-#: composer/e-msg-composer.c:1604
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Faylı aç"
 
-#: composer/e-msg-composer.c:2028
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "İmza:"
 
-#: composer/e-msg-composer.c:2068 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "Avtomatik yarat"
 
-#: composer/e-msg-composer.c:2244 composer/e-msg-composer.c:2911
-#: composer/e-msg-composer.c:2912
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "İsmarış yaz"
 
-#: composer/e-msg-composer.c:2943
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10536,7 +10810,7 @@ msgstr ""
 "Tərtib pəncərəsi yaradıla bilmir:\n"
 "Ünvan seçici idarə fəaliyyətə keçirilə bilmir."
 
-#: composer/e-msg-composer.c:2971
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10548,7 +10822,7 @@ msgstr ""
 "Xahiş edirik, gtkhtml və ləbgtkhtml tə'minatlarının\n"
 "düzgün buraxılışlarına malik olduğunuzdan əmin olun.\n"
 
-#: composer/e-msg-composer.c:3038
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10556,18 +10830,20 @@ msgstr ""
 "Tərtib pəncərəsi yaradıla bilmir:\n"
 "HTML editor tərkib hissəsi fəaliyyətə keçirilə bilmir."
 
-#: composer/e-msg-composer.c:4073
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: data/evolution.desktop.in.h:1
-msgid "The Evolution groupware suite"
+#: data/evolution.desktop.in.in.h:1
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Evolution ümumqrup proqram tə'minatı dəsti"
 
-#: data/evolution.desktop.in.h:2
-msgid "Ximian Evolution"
+#: data/evolution.desktop.in.in.h:2
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10705,13 +10981,16 @@ msgstr "Göndərdiyim bütün ismarışlar üçün oxunma xəbərdarlığı ist�
 
 #: designs/read_receipts/read.glade.h:11
 msgid "Unless the message is sent to a mailing list, and not to me personally"
-msgstr "İsmarışın məktublaşma qrupuna (şəxsən mənə göndərilmədiyi) göndərildiyi vaxtlar xaric"
+msgstr ""
+"İsmarışın məktublaşma qrupuna (şəxsən mənə göndərilmədiyi) göndərildiyi "
+"vaxtlar xaric"
 
 #: designs/read_receipts/read.glade.h:12
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
-msgstr "Oxunma xəbərdarlığı istəyən ismarış aldığınızda, Evolution nə etməlidir?"
+msgstr ""
+"Oxunma xəbərdarlığı istəyən ismarış aldığınızda, Evolution nə etməlidir?"
 
 #: e-util/e-dialog-utils.c:247
 msgid ""
@@ -10721,7 +11000,7 @@ msgstr ""
 "Eyni adlı bir fayl onsuz da mövcuddur.\n"
 "Üstünə yazılsın?"
 
-#: e-util/e-dialog-utils.c:249 mail/mail-display.c:199
+#: e-util/e-dialog-utils.c:249
 msgid "Overwrite file?"
 msgstr "Faylının üsütünə yazılsın?"
 
@@ -10812,13 +11091,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1404 widgets/misc/e-dateedit.c:1617
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1401 widgets/misc/e-dateedit.c:1614
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -10933,12 +11212,12 @@ msgstr "Faylı seç"
 msgid "Then"
 msgstr "Onda"
 
-#: filter/filter-folder.c:155
+#: filter/filter-folder.c:153
 msgid "You must specify a folder."
 msgstr "Qovluq bildirməlisiniz."
 
-#: filter/filter-folder.c:243 filter/vfolder-rule.c:438
-#: mail/mail-account-gui.c:1510 mail/mail-account-gui.c:1524
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
+#: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Qovluğu Seç"
 
@@ -10951,36 +11230,24 @@ msgstr ""
 "'%s' qaydalı ifadəsində xəta:\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:65
-#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1411
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Vacib"
 
-#. red
-#: filter/filter-label.c:122 mail/mail-config.c:66
-#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1412
-msgid "Work"
-msgstr "İş"
-
-#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
-#: shell/e-config-upgrade.c:1413
-msgid "Personal"
-msgstr "Şəxsi"
-
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1414
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "Ediləcəklər"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
-#: shell/e-config-upgrade.c:1415
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
+#: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Sonra"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Sınaq"
 
@@ -11080,7 +11347,7 @@ msgstr "əvvəl"
 msgid "months"
 msgstr "ay"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:174
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "saniyə"
 
@@ -11142,217 +11409,223 @@ msgid "Beep"
 msgstr "Bip Səsi Çıxart"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "bunu daxil edirsə"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Qovluğa Köçür"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Alınma tarixi"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Göndərilmə tarixi"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Silinən"
 
+#: filter/libfilter-i18n.h:12
+msgid "Do Not Exist"
+msgstr "Mövcud Deyildirsə"
+
 #: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "bunu daxil etmirsə"
+msgid "Draft"
+msgstr "Layihə"
 
 #: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "bununla sonlanmırsa"
+msgid "Exist"
+msgstr "Mövcuddursa"
 
 #: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "mövcud deyilsə"
+msgid "Expression"
+msgstr "İfadə"
 
 #: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "cavab göndərmirsə"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "oxşamırsa"
+msgid "Follow Up"
+msgstr "Sonrakı"
 
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "bununla başlamırsa"
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
+msgid "Label"
+msgstr "Etiket"
 
 #: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Mövcud Deyildirsə"
+msgid "Mailing list"
+msgstr "Məktublaşma qrupu"
 
 #: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Layihə"
+msgid "Message Body"
+msgstr "İsmarış Məzmunu"
 
 #: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "bununla sonlanırsa"
+msgid "Message Header"
+msgstr "İsmarış Başlığı"
 
 #: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Mövcuddursa"
+msgid "Move to Folder"
+msgstr "Qovluğa Daşı"
 
 #: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "mövcuddursa"
+msgid "Pipe Message to Shell Command"
+msgstr "İsmrışı Qabıq Əmrinə Göndər"
 
 #: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "İfadə"
+msgid "Play Sound"
+msgstr "Səs Çal"
 
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Sonrakı"
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
+msgid "Read"
+msgstr "Oxu"
+
+#: filter/libfilter-i18n.h:26
+msgid "Recipients"
+msgstr "Alıcılar"
 
 #: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "bərabərdir"
+msgid "Regex Match"
+msgstr "Qaydalı İfadə Nəticələri"
 
 #: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "bundan sonra isə"
+msgid "Replied to"
+msgstr "Cavab verilən"
 
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "bundan əvvəl isə"
+#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Xal"
 
 #: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "Bayraqlı isə"
+msgid "Sender"
+msgstr "Göndərən"
 
 #: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "bundan böyükdürsə"
+msgid "Set Status"
+msgstr "Vəziyyəti Dəyişdir"
 
 #: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "bundan kiçikdirsə"
+msgid "Shell Command"
+msgstr "Qabığ Əmri"
 
 #: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "bərabər deyilsə"
+msgid "Size (kB)"
+msgstr "Böyüklük (kB)"
 
 #: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "Bayraqlı deyilsə"
+msgid "Source Account"
+msgstr "Mənbə Hesabı"
 
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1822
-msgid "Label"
-msgstr "Etiket"
+#: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Çisələmə"
 
 #: filter/libfilter-i18n.h:36
-msgid "Mailing list"
-msgstr "Məktublaşma qrupu"
-
-#: filter/libfilter-i18n.h:37
-msgid "Message Body"
-msgstr "İsmarış Məzmunu"
+msgid "Specific header"
+msgstr "Xüsusi başlıq"
 
 #: filter/libfilter-i18n.h:38
-msgid "Message Header"
-msgstr "İsmarış Başlığı"
+msgid "Stop Processing"
+msgstr "Oxumağı Dayandır"
 
-#: filter/libfilter-i18n.h:39
-msgid "Move to Folder"
-msgstr "Qovluğa Daşı"
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
+msgid "Subject"
+msgstr "Mövzu"
 
 #: filter/libfilter-i18n.h:40
-msgid "Pipe Message to Shell Command"
-msgstr "İsmrışı Qabıq Əmrinə Göndər"
+msgid "Unset Status"
+msgstr "Vəziyyəti Geri Al"
 
 #: filter/libfilter-i18n.h:41
-msgid "Play Sound"
-msgstr "Səs Çal"
+msgid "contains"
+msgstr "bunu daxil edirsə"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
-msgid "Read"
-msgstr "Oxu"
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "bunu daxil etmirsə"
 
 #: filter/libfilter-i18n.h:43
-msgid "Recipients"
-msgstr "Alıcılar"
+msgid "does not end with"
+msgstr "bununla sonlanmırsa"
 
 #: filter/libfilter-i18n.h:44
-msgid "Regex Match"
-msgstr "Qaydalı İfadə Nəticələri"
+msgid "does not exist"
+msgstr "mövcud deyilsə"
 
 #: filter/libfilter-i18n.h:45
-msgid "Replied to"
-msgstr "Cavab verilən"
+msgid "does not return"
+msgstr "cavab göndərmirsə"
 
 #: filter/libfilter-i18n.h:46
-msgid "returns"
-msgstr "cavab göndərirsə"
+msgid "does not sound like"
+msgstr "oxşamırsa"
 
 #: filter/libfilter-i18n.h:47
-msgid "returns greater than"
-msgstr "bundan böyük cavab göndərirsə"
+msgid "does not start with"
+msgstr "bununla başlamırsa"
 
 #: filter/libfilter-i18n.h:48
-msgid "returns less than"
-msgstr "bundan kiçik cavab göndərirsə"
+msgid "ends with"
+msgstr "bununla sonlanırsa"
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Xal"
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr "mövcuddursa"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1820
-msgid "Sender"
-msgstr "Göndərən"
+#: filter/libfilter-i18n.h:50
+msgid "is Flagged"
+msgstr "Bayraqlı isə"
 
 #: filter/libfilter-i18n.h:51
-msgid "Set Status"
-msgstr "Vəziyyəti Dəyişdir"
+msgid "is after"
+msgstr "bundan sonra isə"
 
 #: filter/libfilter-i18n.h:52
-msgid "Shell Command"
-msgstr "Qabığ Əmri"
+msgid "is before"
+msgstr "bundan əvvəl isə"
 
 #: filter/libfilter-i18n.h:53
-msgid "Size (kB)"
-msgstr "Böyüklük (kB)"
+msgid "is greater than"
+msgstr "bundan böyükdürsə"
 
 #: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "buna oxşayırsa"
+msgid "is less than"
+msgstr "bundan kiçikdirsə"
 
 #: filter/libfilter-i18n.h:55
-msgid "Source Account"
-msgstr "Mənbə Hesabı"
+msgid "is not Flagged"
+msgstr "Bayraqlı deyilsə"
 
 #: filter/libfilter-i18n.h:56
-msgid "Specific header"
-msgstr "Xüsusi başlıq"
+msgid "is not"
+msgstr "bərabər deyilsə"
 
 #: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "bununla başlayırsa:"
+msgid "is"
+msgstr "bərabərdir"
+
+#: filter/libfilter-i18n.h:58
+msgid "returns greater than"
+msgstr "bundan böyük cavab göndərirsə"
 
 #: filter/libfilter-i18n.h:59
-msgid "Stop Processing"
-msgstr "Oxumağı Dayandır"
+msgid "returns less than"
+msgstr "bundan kiçik cavab göndərirsə"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:934
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
-msgid "Subject"
-msgstr "Mövzu"
+#: filter/libfilter-i18n.h:60
+msgid "returns"
+msgstr "cavab göndərirsə"
 
 #: filter/libfilter-i18n.h:61
-msgid "Unset Status"
-msgstr "Vəziyyəti Geri Al"
+msgid "sounds like"
+msgstr "buna oxşayırsa"
 
-#: filter/rule-context.c:664 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:917
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "bununla başlayırsa:"
+
+#: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "'%s' qayda adı xas olmalıdır, başqasını seçin."
@@ -11369,7 +11642,7 @@ msgstr "Qayda Əlavə Et"
 msgid "Edit Rule"
 msgstr "Qaydanı Dəyişdir"
 
-#: filter/rule-editor.c:691
+#: filter/rule-editor.c:692
 msgid "Rule name"
 msgstr "Qayda adı"
 
@@ -11385,167 +11658,17 @@ msgstr "Bu vqovluğa ad verməlisiniz."
 msgid "You need to to specify at least one folder as a source."
 msgstr "Mənbə olarq ən az bir qovluq bildirməlisiniz."
 
-#: filter/vfolder-rule.c:531
+#: filter/vfolder-rule.c:539
 msgid "VFolder source"
 msgstr "VQolvuq mənbəsi"
 
-#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
-msgid "Evolution is importing your old Elm mail"
-msgstr "Evolution sizin köhnə Elm məktublarınızı idxal edir"
-
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
-#: importers/pine-importer.c:101 mail/importers/elm-importer.c:106
-#: mail/importers/netscape-importer.c:1238 mail/importers/pine-importer.c:115
-msgid "Importing..."
-msgstr "İdxal edilir..."
-
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1230
-#: importers/pine-importer.c:103 mail/importers/elm-importer.c:108
-#: mail/importers/netscape-importer.c:1240 mail/importers/pine-importer.c:117
-msgid "Please wait"
-msgstr "Xahiş edirik gözləyin"
-
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1808
-#: importers/pine-importer.c:365 mail/importers/elm-importer.c:157
-#: mail/importers/netscape-importer.c:1759 mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "%s, %s olaraq idxal edilir"
-
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1917
-#: importers/pine-importer.c:471 mail/importers/elm-importer.c:392
-#: mail/importers/netscape-importer.c:1887 mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "%s oxunur"
-
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:117
-#: mail/folder-browser-ui.c:360 mail/importers/elm-importer.c:526
-#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
-#: my-evolution/my-evolution.glade.h:4
-msgid "Mail"
-msgstr "Məktub"
-
-#: importers/elm-importer.c:545 mail/importers/elm-importer.c:547
-msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution Elm məktub faylları tapdı.\n"
-"Onları Evolution içinə idxal etmək istəyirsiniz?"
-
-#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
-msgid "Elm"
-msgstr "Elm"
-
-#: importers/evolution-gnomecard-importer.c:246
-msgid ""
-"Evolution has found GnomeCard files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"Evolution GnomeCard faylları tapdı.\n"
-"Onları Evolution idxal etmək istəyirsiniz?"
-
-#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:75
-#, c-format
-msgid "Priority Filter \"%s\""
-msgstr "Əsas Filtr \"%s\""
-
-#: importers/netscape-importer.c:653 mail/importers/netscape-importer.c:663
-msgid ""
-"Some of your Netscape email filters are based on\n"
-"email priorities, which are not used in Evolution.\n"
-"Instead, Evolution provides scores in the range of\n"
-"-3 to 3 that can be assigned to emails and filtered\n"
-"accordingly.\n"
-"\n"
-"As a workaround, a set of filters called \"Priority Filter\"\n"
-"was added that converts Netscape's email priorities into\n"
-"Evolution's scores, and the affected filters use scores instead\n"
-"of priorities. Check the imported filters to make sure\n"
-"everything still works as intended."
-msgstr ""
-
-#: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:687
-msgid ""
-"Some of your Netscape email filters use\n"
-"the \"Ignore Thread\" or \"Watch Thread\"\n"
-"feature, which is not supported in Evolution.\n"
-"These filters will be dropped."
-msgstr ""
-
-#: importers/netscape-importer.c:694 mail/importers/netscape-importer.c:704
-msgid ""
-"Some of your Netscape email filters test the\n"
-"body of emails for (in)equality to a given string,\n"
-"which is not supported in Evolution. Those filters\n"
-"were modified to test whether that string is or is not\n"
-"contained in the message body."
-msgstr ""
-
-#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1237
-msgid "Evolution is importing your old Netscape data"
-msgstr "Evolution köhnə Netscape verilənlərinizi idxal edir"
-
-#. Fill in the new fields
-#: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1116 shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Zibil"
-
-#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr "Məktub filtrləri oxunur"
-
-#: importers/netscape-importer.c:2038 importers/pine-importer.c:570
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "Qovluq oxunur"
-
-#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
-#: shell/e-shell-startup-wizard.c:556
-msgid "Starting import"
-msgstr "İdxal başlanır"
-
-#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
-msgid "Settings"
-msgstr "Qurğular"
-
-#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
-msgid "Mail Filters"
-msgstr "Poçt Filtrləri"
-
-#: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2119
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"Evolution Netscape  məktub faylları tapdı.\n"
-"Onları Evolution içinə idxal edək?"
-
-#: importers/pine-importer.c:100 mail/importers/pine-importer.c:114
-msgid "Evolution is importing your old Pine data"
-msgstr "Evolution köhnə Pine verilənlərini idxal edir"
-
-#: importers/pine-importer.c:663 mail/importers/pine-importer.c:599
-msgid ""
-"Evolution has found Pine mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution Pine məktub faylları tapdı.\n"
-"Onları proqramımıza idxal edək?"
-
-#: importers/pine-importer.c:691 mail/importers/pine-importer.c:618
-msgid "Pine"
-msgstr "Pine"
-
 #: mail/GNOME_Evolution_Mail.server.in.in.h:1
 msgid "Composer Preferences"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:3
@@ -11577,293 +11700,1223 @@ msgid "Evolution Mail composer configuration control"
 msgstr "Evolution Məktub tərtib edicisi quraşdırma idarəsi"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail configuration interface"
-msgstr "Evolution Məktub quraşdırma ara üzü"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail folder viewer"
 msgstr "Evolutionun Məktub qovluğu nümayişcisi"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
 msgstr "Evolution Poçt xassələri idarəsi"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Məktub"
+
 #: mail/GNOME_Evolution_Mail.server.in.in.h:13
 msgid "Mail Accounts"
 msgstr "Poçt Hesabları"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
 msgid "Mail Preferences"
 msgstr ""
 
-#: mail/component-factory.c:117
-msgid "Folder containing mail"
-msgstr "Məktub daxil edən qovluq"
+#: mail/em-account-prefs.c:233
+msgid "Are you sure you want to delete this account?"
+msgstr "Bu hesabı həqiqətən də silmək istəyirsiniz?"
 
-#: mail/component-factory.c:118
-msgid "Public Mail"
-msgstr "İctimai Poçt"
+#: mail/em-account-prefs.c:241
+msgid "Don't delete"
+msgstr "Silmə"
 
-#: mail/component-factory.c:118
-msgid "Public folder containing mail"
-msgstr "Məktubları daxil edən ictimai qovluq"
+#: mail/em-account-prefs.c:315 mail/em-account-prefs.c:356
+#: mail/em-account-prefs.c:397 mail/em-composer-prefs.c:675
+#: mail/em-composer-prefs.c:693 mail/em-composer-prefs.c:717
+msgid "Disable"
+msgstr "Qeyri-fəallaşdır"
 
-#: mail/component-factory.c:119
-msgid "Virtual Trash"
-msgstr "Virtual Zibil"
+#: mail/em-account-prefs.c:315 mail/em-account-prefs.c:356
+#: mail/em-account-prefs.c:399 mail/em-composer-prefs.c:675
+#: mail/em-composer-prefs.c:693 mail/em-composer-prefs.c:717
+msgid "Enable"
+msgstr "Fəallaşdır"
 
-#: mail/component-factory.c:119
-msgid "Virtual Trash folder"
-msgstr "Virtual Zibil qovluğu"
+#. translators: default account indicator
+#: mail/em-account-prefs.c:439
+msgid "[Default]"
+msgstr "[Ön qurğulu]"
 
-#: mail/component-factory.c:147
-msgid "This folder cannot contain messages."
-msgstr "Bu qovluq ismarış daxil edə bilməz."
+#. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
+#. has "activatable" set.
+#: mail/em-account-prefs.c:487 mail/em-composer-prefs.c:708
+#: mail/em-composer-prefs.c:854
+msgid "Enabled"
+msgstr "Fəal"
 
-#: mail/component-factory.c:441
-msgid "Properties..."
-msgstr "Xassələr..."
+#: mail/em-account-prefs.c:493
+msgid "Account name"
+msgstr "Hesab adı"
 
-#: mail/component-factory.c:441
-msgid "Change this folder's properties"
-msgstr "Bu qovluğun xassələrini dəyişdir"
+#: mail/em-account-prefs.c:495
+msgid "Protocol"
+msgstr "Protokol"
+
+#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
+#: mail/mail-config.c:1250
+msgid "Unnamed"
+msgstr "Adsız"
+
+#: mail/em-composer-prefs.c:334
+msgid "You must specify a valid script name."
+msgstr "Hökmlü skript adı bildirməlisiniz."
+
+#: mail/em-composer-prefs.c:392 mail/em-composer-prefs.c:454
+msgid "[script]"
+msgstr "[skript]"
+
+#: mail/em-composer-prefs.c:858
+msgid "Language(s)"
+msgstr "Dil(lər)"
+
+#: mail/em-composer-prefs.c:900
+msgid "Add script signature"
+msgstr "Skript imzası əlavə et"
+
+#: mail/em-composer-prefs.c:920
+msgid "Signature(s)"
+msgstr "İmza(lar)"
 
-#: mail/component-factory.c:823
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
-"Some of your mail settings seem corrupt, please check that everything is in "
-"order."
+"You are sending an HTML-formatted message. Please make sure that\n"
+"the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
-"Bəzi məktub qurğularınız deyəsən xəsarət görüb, xahiş edirik, hər şeyin "
-"yerində olub olmadığını yoxlayın."
-
-#: mail/component-factory.c:1004
-msgid "You have not set a mail transport method"
-msgstr "Məktub nəql yolunu bildirməmisiniz"
+"HTML şəklində imsarış göndərirsiniz, xahiş edirik aşağıdakı alıcıların HTML\n"
+"şəklində məktub ala bildikləri və istədiklərindən əmin olun:\n"
 
-#: mail/component-factory.c:1027
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Göndərilməmiş ismarışlarınız var, yenə də çıxmaq istəyirsiniz?"
+#: mail/em-composer-utils.c:137
+msgid ""
+"This message has no subject.\n"
+"Really send?"
+msgstr ""
+"Bu ismarışın mövzusu yoxdur .\n"
+"Yenə də yollansın?"
 
-#: mail/component-factory.c:1067
-msgid "New Mail Message"
-msgstr "Yeni Məktub İsmarışı"
+#: mail/em-composer-utils.c:153
+msgid ""
+"Since the contact list you are sending to is configured to hide the list's "
+"addresses, this message will contain only Bcc recipients."
+msgstr ""
+"Əlaqə siyahınız qrup ünvanıarını gizləyəcək şəkildə sazlanıb, bi ismarış "
+"ancaq Bcc alıcılarını daxil edəcək."
 
-#: mail/component-factory.c:1067
-msgid "_Mail Message"
-msgstr "_Məktub İsmarışı"
+#: mail/em-composer-utils.c:157
+msgid "This message contains only Bcc recipients."
+msgstr "Bu ismarış ancaq Bcc alıcılarını daxil edir."
 
-#: mail/component-factory.c:1068
-msgid "Compose a new mail message"
-msgstr "Yeni məktub ismarışı yaz"
+#: mail/em-composer-utils.c:162
+msgid ""
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+"Ola bilsin ki, məktub vericisi alıcılara Aydın-Yollayan başlığı ilə "
+"mə'lumatlandırmaq istəsin.\n"
+"Yenə də yollansın?"
 
-#: mail/component-factory.c:1076
-msgid "New Message Post"
-msgstr "Yeni İsmarış Göndərilməsi"
+#: mail/em-composer-utils.c:301
+msgid "You must specify recipients in order to send this message."
+msgstr "Bu ismarışı göndərə bilmək üçün alıcıları bildirməlisiniz."
 
-#: mail/component-factory.c:1076
-msgid "_Post Message"
-msgstr "İsmarış _Yolla"
+#: mail/em-composer-utils.c:543
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"Bu hesabın qovluğu açıla bilmədi.\n"
+"Ön qurğulu layihə qovluğunu işlətmək istəyirsiniz?"
 
-#: mail/component-factory.c:1077
-msgid "Post a new mail message"
-msgstr "Yeni məktub ismarışı yolla"
+#: mail/em-folder-browser.c:128
+msgid "Create _Virtual Folder From Search..."
+msgstr "Axtarışdan _Virtual Qovluq Yarat..."
 
-#: mail/component-factory.c:1369
-msgid "Connecting..."
-msgstr "Bağlanır..."
+#: mail/em-folder-selection-button.c:116
+#: shell/evolution-folder-selector-button.c:100
+msgid "<click here to select a folder>"
+msgstr "<qovluq seçmək üçün buraya tıqlayın>"
 
-#: mail/component-factory.c:1380
-msgid "Cannot register storage with shell"
-msgstr "Nüsxə qabığ ilə qeyd edilə bilmədi"
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Yeni Qovluq Yarat"
 
-#: mail/folder-browser-ui.c:486
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "\"%s\" xassələri"
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Qovluğun yaradılacağı yeri bildirin:"
 
-#: mail/folder-browser-ui.c:488
-msgid "Properties"
-msgstr "Xassələr"
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
+msgstr "Qovluq _adı:"
 
-#: mail/folder-browser.c:329 mail/mail-display.c:393 mail/mail-display.c:921
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Müvəqqəti qovluq yaradıla bilmədi: %s"
 
-#: mail/folder-browser.c:804
-#, c-format
-msgid "%d new"
-msgstr "%d yeni"
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Müvəqqəti qovluq yaradıla bilmədi: %s"
 
-#: mail/folder-browser.c:807 mail/folder-browser.c:815
-#: mail/folder-browser.c:818
-msgid ", "
-msgstr ", "
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "'%s' müvəqqəti faylı yaradıla bilmədi : %s"
 
-#: mail/folder-browser.c:809
-#, c-format
-msgid "%d hidden"
-msgstr "%d gizli"
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Müvəqqəti qovluq bağlana bilmədi: %s"
 
-#: mail/folder-browser.c:811
-#, c-format
-msgid "%d visible"
-msgstr "%d görünən"
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Yüklənir..."
 
-#: mail/folder-browser.c:816
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
 #, c-format
-msgid "%d selected"
-msgstr "%d seçili"
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
+msgid "Select folder"
+msgstr "Qovluq seçin"
 
-#: mail/folder-browser.c:821
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Yeni qovluq yarat"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "`%s' qovluğu silinə bilmədi: %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "\"%s\" qovluğu həqiqətən də silinsin?"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
 #, c-format
-msgid "%d unsent"
-msgstr "%d yollanmamış"
+msgid "Delete \"%s\""
+msgstr "\"%s\"-i Sil"
 
-#: mail/folder-browser.c:823
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
 #, c-format
-msgid "%d sent"
-msgstr "%d yollanmış"
+msgid "Rename the \"%s\" folder to:"
+msgstr "%s qovluğu adını buna dəyişdir:"
 
-#: mail/folder-browser.c:825
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+msgid "Rename Folder"
+msgstr "Qovluğu Yenidən Adlandır"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
 #, c-format
-msgid "%d total"
-msgstr "cəmi %d"
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
 
-#: mail/folder-browser.c:1204
-msgid "Create _Virtual Folder From Search..."
-msgstr "Axtarışdan _Virtual Qovluq Yarat..."
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Yazı Növü Qurğuları"
 
-#: mail/folder-browser.c:1758
-msgid "VFolder on _Subject"
-msgstr "_Mövzuya görə VQovluğa"
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Xassələr"
 
-#: mail/folder-browser.c:1759
-msgid "VFolder on Se_nder"
-msgstr "_Göndərənə görə VQovluğa"
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "_Qovluq Adı:"
 
-#: mail/folder-browser.c:1760
-msgid "VFolder on _Recipients"
-msgstr "_Alıcılara görə VQovluğa"
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Görünüş"
 
-#: mail/folder-browser.c:1761
-msgid "VFolder on Mailing _List"
-msgstr "Məktublaşma _Qrupuna görə VQovluğa"
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Yeni Pəncərədə Aç"
 
-#: mail/folder-browser.c:1765
-msgid "Filter on Sub_ject"
-msgstr "_Mövzuya görə filtrlə"
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Daşı"
 
-#: mail/folder-browser.c:1766
-msgid "Filter on Sen_der"
-msgstr "_Göndərənə görə filtrlə"
+#: mail/em-folder-tree.c:1500
+msgid "_New Folder..."
+msgstr "_Yeni Qovluq..."
 
-#: mail/folder-browser.c:1767
-msgid "Filter on Re_cipients"
-msgstr "_Alıcıya görə filtrlə"
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "_Yenidən Adlandır"
 
-#: mail/folder-browser.c:1768 mail/folder-browser.c:2092
-msgid "Filter on _Mailing List"
-msgstr "_Məktublaşma Qrupuna görə filtrlə"
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "_Xassələr..."
 
-#: mail/folder-browser.c:1786
+#. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "Yeni İsmarış olaraq _Düzəlt ..."
 
-#: mail/folder-browser.c:1788
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "_Çap Et"
 
-#: mail/folder-browser.c:1792 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "Göndərənə _Cavab Ver"
 
-#: mail/folder-browser.c:1793 ui/evolution-mail-message.xml.h:75
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "_Qrupa Cavab Ver"
 
-#: mail/folder-browser.c:1794 ui/evolution-mail-message.xml.h:74
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "_Hamısına Cavab Ver"
 
-#: mail/folder-browser.c:1795
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "Ö_tür"
 
-#: mail/folder-browser.c:1799
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1800
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr "_Bitirilmiş olaraq işarələ"
 
-#: mail/folder-browser.c:1801
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "_Bayrağı Sil"
 
-#. separator here?
-#: mail/folder-browser.c:1805 ui/evolution-mail-message.xml.h:43
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Oxun_muş olaraq işarələ"
 
-#: mail/folder-browser.c:1806
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "Ox_unmamış olaraq işarələ"
 
-#: mail/folder-browser.c:1807
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "_Vacib olaraq işarələ"
 
-#: mail/folder-browser.c:1808
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "_Qeyri-vacib olaraq işarələ"
 
-#: mail/folder-browser.c:1813
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Ox_unmamış olaraq işarələ"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "_Vacib olaraq işarələ"
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "_Geri Gətir"
 
-#: mail/folder-browser.c:1817
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "Qovluğa _Daşı..."
 
-#: mail/folder-browser.c:1818 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "Qovluğa _Köçür..."
 
-#: mail/folder-browser.c:1826
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "Yollayanı Ünvan _Kitabçasına Əlavə Et"
 
-#: mail/folder-browser.c:1830
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "Filtrləri _Tədbiq Et"
 
-#: mail/folder-browser.c:1834
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "İsmarışdan Qayda _Yarat"
 
-#: mail/folder-browser.c:2093
-msgid "VFolder on M_ailing List"
-msgstr "_Məktublaşma Qrupuna görə VQovluğa"
+#: mail/em-folder-view.c:725
+msgid "VFolder on _Subject"
+msgstr "_Mövzuya görə VQovluğa"
 
-#: mail/folder-browser.c:2095
-#, c-format
-msgid "Filter on _Mailing List (%s)"
-msgstr "(%s) _Məktublaşma Qrupuna görə filtrlə"
+#: mail/em-folder-view.c:726
+msgid "VFolder on Se_nder"
+msgstr "_Göndərənə görə VQovluğa"
 
-#: mail/folder-browser.c:2096
-#, c-format
-msgid "VFolder on M_ailing List (%s)"
-msgstr "(%s) Məktublaşma Qrupuna görə VQovluğa"
+#: mail/em-folder-view.c:727
+msgid "VFolder on _Recipients"
+msgstr "_Alıcılara görə VQovluğa"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/em-folder-view.c:728
+msgid "VFolder on Mailing _List"
+msgstr "Məktublaşma _Qrupuna görə VQovluğa"
+
+#: mail/em-folder-view.c:730
+#, fuzzy
+msgid "VFolder on Thread"
+msgstr "_Göndərənə görə VQovluğa"
+
+#: mail/em-folder-view.c:734
+msgid "Filter on Sub_ject"
+msgstr "_Mövzuya görə filtrlə"
+
+#: mail/em-folder-view.c:735
+msgid "Filter on Sen_der"
+msgstr "_Göndərənə görə filtrlə"
+
+#: mail/em-folder-view.c:736
+msgid "Filter on Re_cipients"
+msgstr "_Alıcıya görə filtrlə"
+
+#: mail/em-folder-view.c:737
+msgid "Filter on _Mailing List"
+msgstr "_Məktublaşma Qrupuna görə filtrlə"
+
+#: mail/em-folder-view.c:739
+#, fuzzy
+msgid "Filter on Thread"
+msgstr "_Göndərənə görə filtrlə"
+
+#. default charset used in mail view
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Ön qurğulu"
 
-#: mail/folder-info.c:70
-msgid "Getting Folder Information"
-msgstr "Qovluq Mə'lumatı Alınır"
+#: mail/em-folder-view.c:1583
+msgid "Print Message"
+msgstr "İsmarışı Çap Et"
+
+#: mail/em-folder-view.c:1825
+#, fuzzy
+msgid "_Copy Link Location"
+msgstr "Körpü Ünvanını Köçür"
+
+#. message-search popup match count string
+#: mail/em-format-html-display.c:368
+#, fuzzy, c-format
+msgid "Matches: %d"
+msgstr "Nəticələr:"
+
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Vəzifələndirilmiş"
+
+#: mail/em-format-html-display.c:597
+#, fuzzy
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr ""
+"Bu ismarış dijital olaraq imzalanmışdır amma orijinal olduğu təsdiq edilə "
+"bilmir."
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "İmzanı dəyişdir"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "İmzanı qeyd et"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Kəsildi"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "PGP Şifrələməsi"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "MIME ismarışı oxuna bilmədi: Mənbə olaraq göstərilir."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Dəstəklənməyən sxem"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Yarpaq sertifikatı təsdiqlənə bilmədi"
+
+#: mail/em-format-html-display.c:917
+#, fuzzy
+msgid "_View Inline"
+msgstr "Daxili Olaraq Göstər"
+
+#: mail/em-format-html-display.c:918
+#, fuzzy
+msgid "_Hide"
+msgstr "Gizlə"
+
+#: mail/em-format-html-print.c:99
+#, c-format
+msgid "Page %d of %d"
+msgstr "Səhifə: %d (Cəmi %d)"
+
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
+#, fuzzy, c-format
+msgid "Retrieving `%s'"
+msgstr "%s ismarışı alınır"
+
+#: mail/em-format-html.c:826
+msgid "Malformed external-body part."
+msgstr "Xəsərli xarici proqram parçası."
+
+#: mail/em-format-html.c:856
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "FTP saytını göstərən ox (%s)"
+
+#: mail/em-format-html.c:867
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Yerli faylı (%s) göstərən ox \"%s\" saytında hökmlüdür"
+
+#: mail/em-format-html.c:869
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Yerli faylı (%s) göstərən ox"
+
+#: mail/em-format-html.c:890
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Uzaq mə'lumatı (%s) göstərən ox"
+
+#: mail/em-format-html.c:901
+#, 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/em-format-html.c:1029
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "MIME ismarışı oxuna bilmədi: Mənbə olaraq göstərilir."
+
+#: mail/em-format-html.c:1141
+#, fuzzy
+msgid "Formatting message"
+msgstr "İsmarışlar daşınır"
+
+#: mail/em-format-html.c:1423 mail/em-format.c:673
+#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+msgid "From"
+msgstr "Göndərən"
+
+#: mail/em-format-html.c:1425 mail/em-format.c:674
+msgid "Reply-To"
+msgstr "Cavablama-Ünvanı"
+
+#: mail/em-format-html.c:1427 mail/em-format.c:675
+#: mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Alıcı:"
+
+#: mail/em-format-html.c:1429 mail/em-format.c:676
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1431 mail/em-format.c:677
+msgid "Bcc"
+msgstr "Bcc"
+
+#: mail/em-format-html.c:1450
+msgid "Mailer"
+msgstr "Göndərici"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1477
+msgid "<I> (%a, %R %Z)</I>"
+msgstr ""
+
+#. translators: strftime format for local time equivalent in Date header display, without day
+#: mail/em-format-html.c:1480
+msgid "<I> (%R %Z)</I>"
+msgstr ""
+
+#: mail/em-format-html.c:1491 mail/em-format.c:679
+#: mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Tarix"
+
+#: mail/em-format.c:892
+#, c-format
+msgid "%s attachment"
+msgstr "%s ilişdirilmiş fayl"
+
+#: mail/em-format.c:1185
+#, fuzzy
+msgid "Session not initialised"
+msgstr "Bonobo hazırlana bilmədi"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+"Bu ismarış dijital olaraq imzalanmışdır və onun orijinal olduğu təsdiq "
+"edildi."
+
+#: mail/em-format.c:1212
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"Bu ismarış dijital olaraq imzalanmışdır amma orijinal olduğu təsdiq edilə "
+"bilmir."
+
+#: mail/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Gözləyir..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "%s pinglənir"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "%s ön yaddaşa alına bilmədi: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "'%s'-a boru yaradıla bilmədi:'%s'"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "`%s' qovşağı tapıla bilmədi: %s"
+
+#: mail/em-popup.c:599
+#, fuzzy
+msgid "Save As..."
+msgstr "_Fərqli Qeyd Et..."
+
+#: mail/em-popup.c:647
+msgid "Set as _Background"
+msgstr ""
+
+#: mail/em-popup.c:649
+#, fuzzy
+msgid "_Reply to sender"
+msgstr "Göndərənə _Cavab Ver"
+
+#: mail/em-popup.c:697
+#, fuzzy
+msgid "_Open Link in Browser"
+msgstr "Körpünü Səyyahda Aç"
+
+#: mail/em-popup.c:698
+#, fuzzy
+msgid "Se_nd message to..."
+msgstr "Qrupa _ismarış göndər..."
+
+#: mail/em-popup.c:699
+#, fuzzy
+msgid "_Add to Addressbook"
+msgstr "Yollayanı Ünvan Kitabçasına Əlavə Et"
+
+#: mail/em-popup.c:805
+#, c-format
+msgid "Open in %s..."
+msgstr "%s ilə aç..."
+
+#: mail/em-subscribe-editor.c:583
+#, fuzzy
+msgid "This store does not support subscriptions, or the are not enabled."
+msgstr "Bu verici LDAPv3 sxem mə'lumatını dəstəkləmir"
+
+#: mail/em-subscribe-editor.c:612
+#, fuzzy
+msgid "Subscribed"
+msgstr "Qeydiyyatdan Keç"
+
+#: mail/em-subscribe-editor.c:616
+msgid "Folder"
+msgstr "Qovluq"
+
+#. FIXME: This is just to get the shadow, is there a better way?
+#: mail/em-subscribe-editor.c:803
+msgid "Please select a server."
+msgstr "Xahiş edirik, verici seçin."
+
+#: mail/em-subscribe-editor.c:824
+msgid "No server has been selected"
+msgstr "Heç bir verici seçilməyib"
+
+#: mail/em-utils.c:93
+msgid "Don't show this message again."
+msgstr "Bu ismarışı bir də göstərmə."
+
+#: mail/em-utils.c:275
+#, c-format
+msgid ""
+"Error loading filter information:\n"
+"%s"
+msgstr ""
+"Filtr mə'lumatını yükləmə xətası:\n"
+"%s"
+
+#: mail/em-utils.c:284
+msgid "Filters"
+msgstr "Filtrlər"
+
+#: mail/em-utils.c:491
+#, fuzzy
+msgid "-------- Forwarded Message --------"
+msgstr "Ötürülmüş İsmarış"
+
+#: mail/em-utils.c:1044
+msgid "an unknown sender"
+msgstr "namə'lum yollayan"
+
+#. translators: attribution string used when quoting messages,
+#. it must contain a single single %%+05d followed by a single '%%s'
+#: mail/em-utils.c:1054
+#, fuzzy
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "%a, %Y-%m-%d %H:%M tarixində %%s yazmışdır ki:"
+
+#: mail/em-utils.c:1330
+#, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"`%s' mövqeyinə qeyd edilə bilmir\n"
+" %s"
+
+#: mail/em-utils.c:1335
+#, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"%s onsuz da mövcuddur.\n"
+"Üstünə yazılsın?"
+
+#: mail/em-utils.c:1378
+#, fuzzy
+msgid "message"
+msgstr "İsmarış"
+
+#: mail/em-utils.c:1435
+#, fuzzy
+msgid "Save Message..."
+msgstr "İsmarışı Fərqli Qeyd Et..."
+
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Ünvan"
+
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
+msgid ""
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Bu əməliyyat silinnənlər deyə işarələnmiş bütün məktubları həmişəlik\n"
+"siləcəkdir. Davam etsəniz, bu ismarışları geri gətirə bilməyəcəksiniz.\n"
+"\n"
+"Bu ismarışlar həqiqətən də silinsin?"
+
+#: mail/em-utils.c:2288
+#, fuzzy
+msgid ""
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Bu əməliyyat silinnənlər deyə işarələnmiş bütün məktubları həmişəlik\n"
+"siləcəkdir. Davam etsəniz, bu ismarışları geri gətirə bilməyəcəksiniz.\n"
+"\n"
+"Bu ismarışlar həqiqətən də silinsin?"
+
+#: mail/evolution-mail.schemas.in.in.h:1
+msgid "Automatic link recognition"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:2
+msgid "Automatic smiley recognition"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
+msgid "Default charset in which to compose messages"
+msgstr "İsmarışın ön qurğulu mövzusu."
+
+#: mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
+msgid "Default charset in which to compose messages."
+msgstr "İsmarışın ön qurğulu mövzusu."
+
+#: mail/evolution-mail.schemas.in.in.h:8
+#, fuzzy
+msgid "Default charset in which to display messages"
+msgstr "Göstərilən ismarışın məzmununda mətni axtar"
+
+#: mail/evolution-mail.schemas.in.in.h:9
+#, fuzzy
+msgid "Default charset in which to display messages."
+msgstr "Göstərilən ismarışın məzmununda mətni axtar"
+
+#: mail/evolution-mail.schemas.in.in.h:10
+#, fuzzy
+msgid "Default forward style"
+msgstr "Ötürmə _tərzi:"
+
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default reply style"
+msgstr "Cavab _tərzi:"
+
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Empty Trash folders on exit"
+msgstr "Çıxışda zibil qovluqlarını _boşalt"
+
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Çıxışda zibil qovluqlarını _boşalt"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
+msgstr "Poçt Hesabları"
+
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "Gedişatı işə sal"
+
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Yeni Məktub Bildirişi"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Yeni Məktub Bildirişi"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+"HTML məktublarını bu tərz məktub istəməyən əlaqələrə göndərdiyimdə _təsdiq "
+"istə"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "Ancaq _Bcc alıcıları bildirlən ismarış yollamağa çalışdığımda bildir"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "HTML Məktubu Göndərilsin?"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "HTML Məktubu Göndərilsin?"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "Animasiyalı rəsmləri _göstər"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "Animasiyalı rəsmləri _göstər"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "İsmarışı normal tərzdə göstər"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "_Nümayiş Paneli"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "Yeni məktub alındığında _səs çal"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "İmla _Yoxlaması"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "_Terminal Yazı Növü:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "Çap üçün HTML dəyişən yazı növünü seç"
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "İlgəklənmiş İsmarış Siyahısı"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "İlgəklənmiş İsmarış Siyahısı"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "Bu hesabı ön _qurğulu hesabım et"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "_Dəyişən-en:"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 msgid "Evolution Elm importer"
@@ -11893,6 +12946,129 @@ msgstr "Outlook Express 4 (.mbx)"
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine idxalçısı"
 
+#: mail/importers/elm-importer.c:105
+msgid "Evolution is importing your old Elm mail"
+msgstr "Evolution sizin köhnə Elm məktublarınızı idxal edir"
+
+#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
+#: mail/importers/pine-importer.c:115
+msgid "Importing..."
+msgstr "İdxal edilir..."
+
+#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
+#: mail/importers/pine-importer.c:117
+msgid "Please wait"
+msgstr "Xahiş edirik gözləyin"
+
+#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
+#: mail/importers/pine-importer.c:288
+#, c-format
+msgid "Importing %s as %s"
+msgstr "%s, %s olaraq idxal edilir"
+
+#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
+#: mail/importers/pine-importer.c:425
+#, c-format
+msgid "Scanning %s"
+msgstr "%s oxunur"
+
+#: mail/importers/elm-importer.c:547
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution Elm məktub faylları tapdı.\n"
+"Onları Evolution içinə idxal etmək istəyirsiniz?"
+
+#: mail/importers/elm-importer.c:568
+msgid "Elm"
+msgstr "Elm"
+
+#: mail/importers/netscape-importer.c:75
+#, c-format
+msgid "Priority Filter \"%s\""
+msgstr "Əsas Filtr \"%s\""
+
+#: mail/importers/netscape-importer.c:663
+msgid ""
+"Some of your Netscape email filters are based on\n"
+"email priorities, which are not used in Evolution.\n"
+"Instead, Evolution provides scores in the range of\n"
+"-3 to 3 that can be assigned to emails and filtered\n"
+"accordingly.\n"
+"\n"
+"As a workaround, a set of filters called \"Priority Filter\"\n"
+"was added that converts Netscape's email priorities into\n"
+"Evolution's scores, and the affected filters use scores instead\n"
+"of priorities. Check the imported filters to make sure\n"
+"everything still works as intended."
+msgstr ""
+
+#: mail/importers/netscape-importer.c:687
+msgid ""
+"Some of your Netscape email filters use\n"
+"the \"Ignore Thread\" or \"Watch Thread\"\n"
+"feature, which is not supported in Evolution.\n"
+"These filters will be dropped."
+msgstr ""
+
+#: mail/importers/netscape-importer.c:704
+msgid ""
+"Some of your Netscape email filters test the\n"
+"body of emails for (in)equality to a given string,\n"
+"which is not supported in Evolution. Those filters\n"
+"were modified to test whether that string is or is not\n"
+"contained in the message body."
+msgstr ""
+
+#: mail/importers/netscape-importer.c:1237
+msgid "Evolution is importing your old Netscape data"
+msgstr "Evolution köhnə Netscape verilənlərinizi idxal edir"
+
+#: mail/importers/netscape-importer.c:1995
+msgid "Scanning mail filters"
+msgstr "Məktub filtrləri oxunur"
+
+#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
+msgid "Scanning directory"
+msgstr "Qovluq oxunur"
+
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
+msgid "Starting import"
+msgstr "İdxal başlanır"
+
+#: mail/importers/netscape-importer.c:2090
+msgid "Settings"
+msgstr "Qurğular"
+
+#: mail/importers/netscape-importer.c:2095
+msgid "Mail Filters"
+msgstr "Poçt Filtrləri"
+
+#: mail/importers/netscape-importer.c:2119
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution Netscape  məktub faylları tapdı.\n"
+"Onları Evolution içinə idxal edək?"
+
+#: mail/importers/pine-importer.c:114
+msgid "Evolution is importing your old Pine data"
+msgstr "Evolution köhnə Pine verilənlərini idxal edir"
+
+#: mail/importers/pine-importer.c:599
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution Pine məktub faylları tapdı.\n"
+"Onları proqramımıza idxal edək?"
+
+#: mail/importers/pine-importer.c:618
+msgid "Pine"
+msgstr "Pine"
+
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Hazırkı saxlama şəkli:"
@@ -11932,95 +13108,60 @@ msgid "You have not filled in all of the required information."
 msgstr "Lazımi bütün mə'lumatlar verilməlidir."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution Hesab Editoru"
 
-#: mail/mail-account-gui.c:752 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Qovşaq:"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "_İstifadəçi adı:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Cığır:"
 
-#: mail/mail-account-gui.c:1887
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Eyni adla iki hesab yarada bilməzsiniz."
 
-#: mail/mail-accounts.c:231
-msgid "Are you sure you want to delete this account?"
-msgstr "Bu hesabı həqiqətən də silmək istəyirsiniz?"
-
-#: mail/mail-accounts.c:239
-msgid "Don't delete"
-msgstr "Silmə"
-
-#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:391
-#: mail/mail-composer-prefs.c:675 mail/mail-composer-prefs.c:693
-#: mail/mail-composer-prefs.c:717
-msgid "Disable"
-msgstr "Qeyri-fəallaşdır"
-
-#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:393
-#: mail/mail-composer-prefs.c:675 mail/mail-composer-prefs.c:693
-#: mail/mail-composer-prefs.c:717
-msgid "Enable"
-msgstr "Fəallaşdır"
-
-#. translators: default account indicator
-#: mail/mail-accounts.c:433
-msgid "[Default]"
-msgstr "[Ön qurğulu]"
-
-#. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
-#. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
-msgid "Enabled"
-msgstr "Fəal"
-
-#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
-msgid "Account name"
-msgstr "Hesab adı"
-
-#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
-msgid "Protocol"
-msgstr "Protokol"
-
 #: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "%s ünvanına məktub"
 
-#: mail/mail-autofilter.c:238
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Mövzu %s-dır"
 
-#: mail/mail-autofilter.c:254
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "%s-dan məktub"
 
-#: mail/mail-autofilter.c:271
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s məktublaşma qrupu"
 
-#: mail/mail-autofilter.c:323
+#: mail/mail-autofilter.c:317
+#, fuzzy, c-format
+msgid "Replies to %s"
+msgstr "Cavab verilən"
+
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Filtr Qaydası Əlavə Et"
 
-#: mail/mail-autofilter.c:372
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "Aşağıdakı filtr qaydaları:\n"
 
-#: mail/mail-autofilter.c:378
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12031,282 +13172,69 @@ msgstr ""
 "    '%s'\n"
 "O yeniləndi."
 
-#. Add the "Don't show this message again." checkbox
-#: mail/mail-callbacks.c:101 widgets/misc/e-messagebox.c:226
-msgid "Don't show this message again."
-msgstr "Bu ismarışı bir də göstərmə."
-
-#: mail/mail-callbacks.c:190
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-"Məktub alıcısını quraşdırmamışsınız.\n"
-"Məktub yazmaq, almaq və göndərmədən əvvəl \n"
-"bunu etməlisiniz.\n"
-"Alıcınızı indi quraşdırmaq istəyirsiniz?"
-
-#: mail/mail-callbacks.c:212
-msgid ""
-"You need to configure an account\n"
-"before you can compose mail."
-msgstr ""
-"Məktub göndərmədən əvvəl bir \n"
-"hesab quraşdırmalısınız."
-
-#: mail/mail-callbacks.c:226
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"Məktub göndərmədən əvvəl bir \n"
-"şəxs quraşdırmalısınız."
-
-#: mail/mail-callbacks.c:233
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-"Məktub göndərmədən əvvəl bir \n"
-"poçt nəqliyyatı quraşdırmalısınız."
-
-#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
-msgid ""
-"You are sending an HTML-formatted message. Please make sure that\n"
-"the following recipients are willing and able to receive HTML mail:\n"
-msgstr ""
-"HTML şəklində imsarış göndərirsiniz, xahiş edirik aşağıdakı alıcıların HTML\n"
-"şəklində məktub ala bildikləri və istədiklərindən əmin olun:\n"
-
-#: mail/mail-callbacks.c:267
-msgid "Send anyway?"
-msgstr "Yenə də yollansın?"
-
-#: mail/mail-callbacks.c:288
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Bu ismarışın mövzusu yoxdur .\n"
-"Yenə də yollansın?"
-
-#: mail/mail-callbacks.c:314
-msgid ""
-"Since the contact list you are sending to is configured to hide the list's "
-"addresses, this message will contain only Bcc recipients."
-msgstr ""
-"Əlaqə siyahınız qrup ünvanıarını gizləyəcək şəkildə "
-"sazlanıb, bi ismarış ancaq Bcc alıcılarını daxil edəcək."
-
-#: mail/mail-callbacks.c:318
-msgid "This message contains only Bcc recipients."
-msgstr "Bu ismarış ancaq Bcc alıcılarını daxil edir."
-
-#: mail/mail-callbacks.c:323
-msgid ""
-"It is possible that the mail server may reveal the recipients by adding an "
-"Apparently-To header.\n"
-"Send anyway?"
-msgstr ""
-"Ola bilsin ki, məktub vericisi alıcılara Aydın-Yollayan başlığı ilə "
-"mə'lumatlandırmaq istəsin.\n"
-"Yenə də yollansın?"
-
-#: mail/mail-callbacks.c:472
-msgid "You must specify recipients in order to send this message."
-msgstr "Bu ismarışı göndərə bilmək üçün alıcıları bildirməlisiniz."
-
-#: mail/mail-callbacks.c:724
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
+#: mail/mail-component.c:214
+msgid "On this Computer"
 msgstr ""
-"Bu hesabın qovluğu açıla bilmədi.\n"
-"Ön qurğulu layihə qovluğunu işlətmək istəyirsiniz?"
 
-#: mail/mail-callbacks.c:1189
-msgid "an unknown sender"
-msgstr "namə'lum yollayan"
-
-#: mail/mail-callbacks.c:1193
-msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
-msgstr "%a, %Y-%m-%d %H:%M tarixində %%s yazmışdır ki:"
-
-#: mail/mail-callbacks.c:1700 mail/message-browser.c:132
-msgid "Move message(s) to"
-msgstr "İsmarış(ları) daşı"
-
-#: mail/mail-callbacks.c:1702 mail/message-browser.c:134
-msgid "Copy message(s) to"
-msgstr "İsmarış(ları) köçür"
-
-#: mail/mail-callbacks.c:2344
-#, c-format
-msgid "Are you sure you want to edit all %d messages?"
-msgstr "Bütün `%d' ismarışlarını dəyişdirmək istədiyinizə əminsiniz?"
-
-#: mail/mail-callbacks.c:2360
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"Ancaq Layihələr qovluğundakı\n"
-"ismarışları dəyişdirə bilərsiniz."
-
-#: mail/mail-callbacks.c:2393
-msgid ""
-"You may only resend messages\n"
-"in the Sent folder."
-msgstr ""
-"Ancaq Göndərilən qovluğundakı\n"
-"ismarışları yenidən göndərə bilərsiniz."
-
-#: mail/mail-callbacks.c:2403
-#, c-format
-msgid "Are you sure you want to resend all %d messages?"
-msgstr "Bütün `%d' ismarışlarını yenidən göndərmək istədiyinizə əminsiniz?"
-
-#: mail/mail-callbacks.c:2424
-msgid "No Message Selected"
-msgstr "Seçili İsmarış Yoxdur"
-
-#: mail/mail-callbacks.c:2465
-#, c-format
-msgid ""
-"Cannot save to `%s'\n"
-" %s"
-msgstr ""
-"`%s' mövqeyinə qeyd edilə bilmir\n"
-" %s"
-
-#: mail/mail-callbacks.c:2470
-#, c-format
-msgid ""
-"`%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"%s onsuz da mövcuddur.\n"
-"Üstünə yazılsın?"
-
-#: mail/mail-callbacks.c:2511
-msgid "Save Message As..."
-msgstr "İsmarışı Fərqli Qeyd Et..."
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Yeni Məktub İsmarışı"
 
-#: mail/mail-callbacks.c:2513
-msgid "Save Messages As..."
-msgstr "İsmarışları Fərqli Qeyd Et..."
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "_Məktub İsmarışı"
 
-#: mail/mail-callbacks.c:2686
-msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
-"\n"
-"Really erase these messages?"
-msgstr ""
-"Bu əməliyyat silinnənlər deyə işarələnmiş bütün məktubları həmişəlik\n"
-"siləcəkdir. Davam etsəniz, bu ismarışları geri gətirə bilməyəcəksiniz.\n"
-"\n"
-"Bu ismarışlar həqiqətən də silinsin?"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "Yeni məktub ismarışı yaz"
 
-#: mail/mail-callbacks.c:2781
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
-"Error loading filter information:\n"
+"The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
-"Filtr mə'lumatını yükləmə xətası:\n"
-"%s"
-
-#: mail/mail-callbacks.c:2789
-msgid "Filters"
-msgstr "Filtrlər"
-
-#: mail/mail-callbacks.c:2830
-#, c-format
-msgid "Page %d of %d"
-msgstr "Səhifə: %d (Cəmi %d)"
-
-#: mail/mail-callbacks.c:2886
-msgid "Print Message"
-msgstr "İsmarışı Çap Et"
-
-#: mail/mail-callbacks.c:2954
-msgid "Printing of message failed"
-msgstr "İsmarışın çap edilməsi bacarılmadı"
-
-#: mail/mail-callbacks.c:3149
-#, c-format
-msgid "Are you sure you want to open all %d messages in separate windows?"
-msgstr "Bütün %d ismarışı ayrı ayrı pəncərələrdə açmaq istəyirsiniz?"
-
-#: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
-#: mail/mail-config.c:1376
-msgid "Unnamed"
-msgstr "Adsız"
-
-#: mail/mail-composer-prefs.c:334
-msgid "You must specify a valid script name."
-msgstr "Hökmlü skript adı bildirməlisiniz."
-
-#: mail/mail-composer-prefs.c:392 mail/mail-composer-prefs.c:454
-msgid "[script]"
-msgstr "[skript]"
-
-#: mail/mail-composer-prefs.c:858
-msgid "Language(s)"
-msgstr "Dil(lər)"
-
-#: mail/mail-composer-prefs.c:900
-msgid "Add script signature"
-msgstr "Skript imzası əlavə et"
 
-#: mail/mail-composer-prefs.c:920
-msgid "Signature(s)"
-msgstr "İmza(lar)"
-
-#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:61
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Şəxsiyyət"
 
-#: mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:369
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
 msgid "Receiving Mail"
 msgstr "Poçtun Alınması"
 
-#: mail/mail-config-druid.c:390
+#: mail/mail-config-druid.c:377
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:397
+#: mail/mail-config-druid.c:384
 msgid "Please select among the following options"
 msgstr "Xaniş edirik, aşağıdakı seçənəklər arasından seçin"
 
-#: mail/mail-config-druid.c:400
+#: mail/mail-config-druid.c:387
 msgid "Sending Mail"
 msgstr "Poçtun Göndərilməsi"
 
-#: mail/mail-config-druid.c:402
+#: mail/mail-config-druid.c:389
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr "."
 
-#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:10
 msgid "Account Management"
 msgstr "Hesab İdarəsi"
 
-#: mail/mail-config-druid.c:409
+#: mail/mail-config-druid.c:396
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12315,11 +13243,11 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:1080
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Yoxlama Xidməti"
 
-#: mail/mail-config.c:1158 mail/mail-config.c:1162
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Vericiyə bağlanır..."
 
@@ -12336,8 +13264,10 @@ 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:7
-msgid "A_lways encrypt to myself when sending encrypted mail"
-msgstr "Şifrələnmiş məktub göndərildiyi vaxt məktubu _həmişə mənim üçün də şifrələ"
+#, fuzzy
+msgid "A_lso encrypt to self when sending encrypted mail"
+msgstr ""
+"Şifrələnmiş məktub göndərildiyi vaxt məktubu _həmişə mənim üçün də şifrələ"
 
 #: mail/mail-config.glade.h:8
 msgid "Account Editor"
@@ -12357,52 +13287,54 @@ msgstr "Yeni imza əlavə et..."
 
 #: mail/mail-config.glade.h:13
 msgid "Al_ways encrypt to myself when sending encrypted mail"
-msgstr "Şifrələnmiş məktub göndərildiyi vaxt məktubu həmişə _mənim üçün də şifrələ"
-
-#: mail/mail-config.glade.h:15
-msgid "Alwa_ys sign outgoing messages when using this account"
-msgstr "Bu hesab işlədildiyində göndərilən ismarışları həmişə _imzala"
+msgstr ""
+"Şifrələnmiş məktub göndərildiyi vaxt məktubu həmişə _mənim üçün də şifrələ"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Bu ünvana həmişə məktubun _gizli nüsxəsini (Bcc) yolla:"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Bu ünvana həmişə məktubun _nüsxəsini (Cc) yolla:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Şifrələrkən açar dairəmdəki açarlara _həmişə e'tibar et"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Attach original message"
 msgstr "Orijinal ismarışı ilişdir"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "İlişdirilmiş fayl"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "Tanıtma"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltik (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltik (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "C_haracter set:"
 msgstr "_Hərf dəstəsi:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_olors"
 msgstr "_Rənglər"
 
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Yeni Məktubların Yoxlanması"
+
 #: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "Yazdığımda imlanı _yoxla"
@@ -12412,18 +13344,22 @@ msgid "Checking for New Mail"
 msgstr "Yeni Məktubların Yoxlanması"
 
 #: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "Səhv imlalı mətnin _rəngi:"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "İsmarışların Yazılması"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Quraşdırma"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12439,289 +13375,306 @@ msgstr ""
 "\n"
 "Qurğularınızı qeyd etmək üçün \"Tədbiq Et\" düyməsinə basın."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "Ön _qurğulu"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Ön Qurğulu Davranış"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "Ön qurğulu hərf _kodlaması:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Poçtun Silinməsi"
 
-#: mail/mail-config.glade.h:44
-msgid "Digital IDs..."
-msgstr "Dijital ID-lər..."
-
 #: mail/mail-config.glade.h:45
+#, fuzzy
+msgid "Digitally _sign outgoing messages (by default)"
+msgstr "Bu hesab işlədildiyində bütün məktubları _həmişə imzala"
+
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "Orijinal ismarışı sitatlama"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Görüş istəklərini _imzalama (Outlook ilə uyğunluq üçün)"
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Başa çatdı"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "_Layihələr qovluğu:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "_Fəallaşdır"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "Epoçt Hesabları"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "_Epoçt ünvanı:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "Çıxışda zibil qovluqlarını _boşalt"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Encry_ption certificate:"
+msgstr "_Sertifikat ID-si:"
+
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Evolution Hesab Bələdçisi"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Əmr İcra Et..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "_Tən-aralıqlı en:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "Filtrlər"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "Yazı Növü Qurğuları"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "İsmarışları _HTML olaraq şəkilləndir"
 
-#: mail/mail-config.glade.h:58
-msgid "Get Digital ID..."
-msgstr "Dijital ID-ni Al..."
-
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "Sitatları belə _işıqlandır:"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Daxili"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Etiket və Rənglər"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Rəsmlərin Yüklənməsi"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Poçt Qurğuları"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Məktub qutusu mövqeyi"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "İsmarış Tərtib Edicisi"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "İsmarış Görünüşü"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 msgid "Message Fonts"
 msgstr "İsmarış Yazı Növləri"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Yeni Məktub Bildirişi"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
-msgstr "Qeyd: İlk dəfə bağlanana dək sizdən şifrənizi daxil etməniz istənəcəkdir"
+msgstr ""
+"Qeyd: İlk dəfə bağlanana dək sizdən şifrənizi daxil etməniz istənəcəkdir"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Arzuya Bağlı Mə'lumatlar"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "_Orqanizasiya:"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Açar ID-si:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Rəng seç"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Ancaq _Bcc alıcıları bildirlən ismarış yollamağa çalışdığımda bildir"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Çap Edilən Yazı Növləri"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail poçt qovluğu"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "Orijinal ismarışı sitatlandır"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Sitatlandırılmış"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "Bu şifrəni _yadda saxla"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "_Cavablama-Ünvanı:"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Poçtun Alınması"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "Alınma _Seçimləri"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "Bu şifrəni _yadda saxla"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Lazımi Mə'lumat"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "Ön Qurğulara Geri Dön"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "_Təhlükəsizlik"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "E'tibarlı MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr "HTML tən-aralıqlı yazı növünü seç"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr "Çap üçün HTML tən-aralıqlı yazı növünü seç"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr "HTML dəyişən yazı növünü seç"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr "Çap üçün HTML dəyişən yazı növünü seç"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Poçtun Göndərilməsi"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Göndərilən _ismarışlar qovluğu:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Göndərilən və Layihə İsmarışları"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Veri_ci tanıtmanı məcbur qılır"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Verici Qurğuları"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Verici _Növü: "
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:115
+#, fuzzy
+msgid "Si_gning certificate:"
+msgstr "_Sertifikat ID-si:"
+
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "Fayl adı _bildir:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "İmla _Yoxlaması"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Standart UNIX mbox"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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:121
+#: mail/mail-config.glade.h:124
 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:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "_Dəyişən-en:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12731,400 +13684,180 @@ msgstr ""
 "\n"
 "Başlamaq üçün \"Sonrakı\" düyməsinə basın."
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "_İmza Əlavə Et"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "_Netdən rəsmləri həmişə yüklə"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Bu hesab işlədildiyində bütün məktubları _həmişə imzala"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "_Tanıtma Növü: "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "_Tanıtma növü: "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr "Yeni məktubları _avtomatik olaraq bu aralıqla yoxla:"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "Emosiya rəsmlərini avtomatik olaraq _daxil et"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "Yeni məktub alındığında _bip səsi çıxart"
 
-#: mail/mail-config.glade.h:138
-msgid "_Certificate ID:"
-msgstr "_Sertifikat ID-si:"
-
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "Qovluq həmişəlik silinirkən _təsdiq istə"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "Ön qurğulu _imza:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "Ö_n qurğular"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "Yeni məktub alındığında bildirmə"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "_Fəallaşdır"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:148
+msgid "_Encrypt outgoing messages (by default)"
+msgstr ""
+
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "Ötürmə _tərzi:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "_Tam ad:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "_HTML Məktub"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "Şə_xsiyyət"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "İyun"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "Yollayan ünvan kitabçasında varsa, rəsmləri _yüklə"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "Bu hesabı ön _qurğulu hesabım et"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "İsmarışları oxunmuş olaraq işarələmə _vaxtı:"
 
-#: mail/mail-config.glade.h:154 my-evolution/e-summary-preferences.c:575
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Ad:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "Netdən rəsmləri _qətiyyən endirmə"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "Yeni məktub alındığında _səs çal"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
-msgstr "HTML məktublarını bu tərz məktub istəməyən əlaqələrə göndərdiyimdə _təsdiq istə"
+msgstr ""
+"HTML məktublarını bu tərz məktub istəməyən əlaqələrə göndərdiyimdə _təsdiq "
+"istə"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Boş mövzulu məktub göndərdiyimdə təsdiq istə"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "Poçt _Alınması"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "Cavab _tərzi:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "Ön qurğulara geri _dön"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
+#, fuzzy
+msgid "_Select..."
+msgstr "Sil..."
+
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "Poçtun _Göndərilməsi"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "Animasiyalı rəsmləri _göstər"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_İmzalar"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr "_Standart Yazı Növü:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr "_Terminal Yazı Növü:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "_E'tibarlı bağlantı (SSL) işlət:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr "_Diqər proqramların işlətdiyi yazı növlərini işlət"
 
-#: mail/mail-config.glade.h:171
-msgid "color"
-msgstr "rəng"
-
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "izahat"
 
-#: mail/mail-crypto.c:84
-msgid "Could not create a S/MIME signature context."
-msgstr "S/MIME imza məzmunu yaradıla bilmədi."
-
-#: mail/mail-crypto.c:116
-msgid "Could not create a S/MIME certsonly context."
-msgstr "S/MIME sırf-sert məzmunu yaradıla bilmədi."
-
-#: mail/mail-crypto.c:148
-msgid "Could not create a S/MIME encryption context."
-msgstr "S/MIME şifrələmə məzmunu yaradıla bilmədi."
-
-#: mail/mail-crypto.c:180
-msgid "Could not create a S/MIME envelope context."
-msgstr "S/MIME zərf məzmunu yaradıla bilmədi."
-
-#: mail/mail-crypto.c:211
-msgid "Could not create a S/MIME decode context."
-msgstr "S/MIME şifrə açma məzmunu yaradıla bilmədi."
-
-#: mail/mail-display.c:196
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"`%s' faylı onsuzda mövcuddur.\n"
-"Üstünə yazılsın?"
-
-#: mail/mail-display.c:335
-msgid "Save Attachment"
-msgstr "İlişdirilmiş Faylı Qeyd Et"
-
-#: mail/mail-display.c:408
-#, c-format
-msgid "Could not create temporary file '%s': %s"
-msgstr "'%s' müvəqqəti faylı yaradıla bilmədi : %s"
-
-#: mail/mail-display.c:480
-msgid "Save Attachment..."
-msgstr "İlişdirilmiş Faylı Qeyd Et..."
-
-#: mail/mail-display.c:481
-msgid "View Inline"
-msgstr "Daxili Olaraq Göstər"
-
-#: mail/mail-display.c:482
-#, c-format
-msgid "Open in %s..."
-msgstr "%s ilə aç..."
-
-#: mail/mail-display.c:542
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "Daxili Olaraq Göstər (%s ilə)"
-
-#: mail/mail-display.c:546
-msgid "Hide"
-msgstr "Gizlə"
-
-#: mail/mail-display.c:566
-msgid "External Viewer"
-msgstr "Xarici Nümayişçi"
-
-#: mail/mail-display.c:1352
-msgid "Downloading images"
-msgstr "Rəsmlərin Endirilməsi"
-
-#: mail/mail-display.c:1529
-msgid "Loading message content"
-msgstr "İsmarış məzmununun yüklənməsi"
-
-#: mail/mail-display.c:1871
-msgid "Overdue:"
-msgstr "Gecikmiş işlər:"
-
-#: mail/mail-display.c:1875
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%B %d, %Y, %l:%M %p tarixinə dək"
-
-#: mail/mail-display.c:2239
-msgid "Open Link in Browser"
-msgstr "Körpünü Səyyahda Aç"
-
-#: mail/mail-display.c:2240
-msgid "Copy Link Location"
-msgstr "Körpü Ünvanını Köçür"
-
-#: mail/mail-display.c:2242
-msgid "Save Link as (FIXME)"
-msgstr "Körpünü Fərqli Qeyd Et"
-
-#: mail/mail-display.c:2244
-msgid "Save Image as..."
-msgstr "Rəsmi Fərqli Qeyd Et..."
-
-#: mail/mail-folder-cache.c:745
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr "%s pinglənir"
 
-#: mail/mail-format.c:665
-#, c-format
-msgid "%s attachment"
-msgstr "%s ilişdirilmiş fayl"
-
-#: mail/mail-format.c:707 mail/mail-format.c:1370 mail/mail-format.c:1439
-#: mail/mail-format.c:1559 mail/mail-format.c:1683 mail/mail-format.c:1708
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "MIME ismarışı oxuna bilmədi: Mənbə olaraq göstərilir."
-
-#: mail/mail-format.c:785 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Tarix"
-
-#: mail/mail-format.c:871
-msgid "Bad Address"
-msgstr "Səhv Ünvan"
-
-#: mail/mail-format.c:912 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
-msgid "From"
-msgstr "Göndərən"
-
-#: mail/mail-format.c:916
-msgid "Reply-To"
-msgstr "Cavablama-Ünvanı"
-
-#: mail/mail-format.c:921 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Alıcı:"
-
-#: mail/mail-format.c:926
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/mail-format.c:931
-msgid "Bcc"
-msgstr "Bcc"
-
-#: mail/mail-format.c:1482
-msgid "This message is digitally signed. Click the lock icon for more information."
-msgstr ""
-"Bu ismarış dijital olaraq imzalanmışdır. Ətraflı mə'lumat üçün qıfıl "
-"timsalına tıqlayın."
-
-#: mail/mail-format.c:1510
-msgid "Could not create a PGP verfication context"
-msgstr "PGP təsdiq məzmunu yaradıla bilmədi"
-
-#: mail/mail-format.c:1518
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Bu ismarış dijital olaraq imzalanmışdır və onun orijinal olduğu təsdiq edildi."
-
-#: mail/mail-format.c:1525
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "Bu ismarış dijital olaraq imzalanmışdır amma orijinal olduğu təsdiq edilə bilmir."
-
-#: mail/mail-format.c:1789
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "FTP saytını göstərən ox (%s)"
-
-#: mail/mail-format.c:1800
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Yerli faylı (%s) göstərən ox \"%s\" saytında hökmlüdür"
-
-#: mail/mail-format.c:1803
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Yerli faylı (%s) göstərən ox"
-
-#: mail/mail-format.c:1830
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Uzaq mə'lumatı (%s) göstərən ox"
-
-#: mail/mail-format.c:1836
-#, 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:1838
-msgid "Malformed external-body part."
-msgstr "Xəsərli xarici proqram parçası."
-
-#: mail/mail-local.c:541 mail/mail-local.c:543
-#, c-format
-msgid "Local folders/%s"
-msgstr "Yerli qovluqlar/%s"
-
-#: mail/mail-local.c:671
-msgid "Reconfiguring folder"
-msgstr "Qovluq yenidən quraşdırılır"
-
-#: mail/mail-local.c:752
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you may find you can't\n"
-"open this folder anymore: %s: %s"
-msgstr ""
-"Qovluğun meta mə'lumatı qeyd edilə bilmir;\n"
-"Bu qovluğu bir də aça bilməyə bilərsiniz: %s: %s"
-
-#: mail/mail-local.c:808
-#, c-format
-msgid "Cannot save folder metainfo to %s: %s"
-msgstr "%s üstündə meta mə'lumatı qeyd edilə bilmir: %s"
-
-#: mail/mail-local.c:860
-#, c-format
-msgid "Cannot delete folder metadata %s: %s"
-msgstr "Qovluq meta mə'lumatı %s silinə bilmir: %s"
-
-#: mail/mail-local.c:1323
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr "\"%s\" qovluğu \"%s\" şəklinə çevrilir"
-
-#: mail/mail-local.c:1348
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
-msgstr ""
-"Bu qovluğu bir də aça bilməsəniz, onu əllə\n"
-"bərpa etməlisiniz."
-
-#: mail/mail-local.c:1448
-#, c-format
-msgid "Reconfigure /%s"
-msgstr "Yenidən quraşdır /%s"
-
-#: mail/mail-local.c:1512
-msgid "You cannot change the format of a non-local folder."
-msgstr "Yerli olmayan qovluqların şəklini dəyişdirə bilməzsiniz."
-
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13133,7 +13866,7 @@ msgstr ""
 "'%s' sırasında xəta:\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13142,11 +13875,11 @@ msgstr ""
 "Əməliyyat aparılırkən xəta:\n"
 "%s"
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "İşləyir"
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:88
 msgid "Filtering Folder"
 msgstr "Qovluq Filtrdən Keçirilir"
 
@@ -13154,12 +13887,12 @@ msgstr "Qovluq Filtrdən Keçirilir"
 msgid "Fetching Mail"
 msgstr "Poçt Alınır"
 
-#: mail/mail-ops.c:563
+#: mail/mail-ops.c:558
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Göndərmə filtrləri tədbiq edilə bilmədi: %s"
 
-#: mail/mail-ops.c:584
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13168,107 +13901,106 @@ msgstr ""
 "%s faylına əlavə edilə bilmədi: %s\n"
 "Onun əvəzinə yerli 'Göndərilənlər' qovluğuna əlavə edilir."
 
-#: mail/mail-ops.c:593
+#: mail/mail-ops.c:588
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:635
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" göndərilir"
 
-#: mail/mail-ops.c:753
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d ismarış göndərilir"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "%d / %d ismarışında xəta baş verdi"
 
-#: mail/mail-ops.c:774 mail/mail-send-recv.c:581
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Başa çatdı."
 
-#: mail/mail-ops.c:868
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "İsmarışlar qovluğa qeyd edilir"
 
-#: mail/mail-ops.c:949
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "İsmarışlar %s qovluğuna daşınır"
 
-#: mail/mail-ops.c:949
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "İsmarışlar %s qovluğuna köçürülür"
 
-#: mail/mail-ops.c:1066
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\"dakı qovluqlar oxunur"
 
-#: mail/mail-ops.c:1254
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Ötürülmüş ismarışlar"
 
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s qovluğu açılır"
 
-#: mail/mail-ops.c:1369
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "%s mənbəsi açılır"
 
-#: mail/mail-ops.c:1447
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s qovluğu çıxardılır"
 
-#: mail/mail-ops.c:1541
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s qovluğu saxlanılır"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Qovluq yenilənir"
 
-#: mail/mail-ops.c:1628 mail/mail-ops.c:1679
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Qovluq silinir"
 
-#: mail/mail-ops.c:1676
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' içindəki zibil boşaldılır"
 
-#: mail/mail-ops.c:1677 my-evolution/e-summary-mail.c:483
-#: shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Yerli Qovluqlar"
 
-#: mail/mail-ops.c:1752
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s ismarışı alınır"
 
-#: mail/mail-ops.c:1824
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d ismarış alınır"
 
-#: mail/mail-ops.c:1910
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d ismarış qeyd edilir"
 
-#: mail/mail-ops.c:1958
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13277,7 +14009,7 @@ msgstr ""
 "Yekun faylı yaradıla bilmir: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1986
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13286,11 +14018,11 @@ msgstr ""
 "İsmarışların mövqeyə qeyd edilmə xətası: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2060
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "İlişdirilmiş fayl qeyd edilir"
 
-#: mail/mail-ops.c:2077
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13299,68 +14031,72 @@ msgstr ""
 "Yekun faylı yaradıla bilmir: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2107
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Mə'lumat yazıla bilmədi: %s"
 
-#: mail/mail-ops.c:2255
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s ilə bağlantı kəsilir"
 
-#: mail/mail-ops.c:2255
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s ilə bağlantı yenidən qurulur"
 
-#: mail/mail-search.c:154
-msgid "(Untitled Message)"
-msgstr "(Adsız İsmarış)"
-
-#: mail/mail-search.c:236
-msgid "Untitled Message"
-msgstr "Adsız İsmarış"
-
-#: mail/mail-search.c:238
-msgid "Empty Message"
-msgstr "Boş İsmarış"
-
-#: mail/mail-search.c:287
-msgid "Find in Message"
-msgstr "İsmarışda Axtar"
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
 
-#: mail/mail-search.c:320
+#: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Böyük Kiçik Hərfə Həssas"
 
-#: mail/mail-search.c:322
-msgid "Search Forward"
-msgstr "İrəliyə Doğru Axtar"
+#: mail/mail-search.glade.h:3
+msgid "Find in Message"
+msgstr "İsmarışda Axtar"
 
-#: mail/mail-search.c:342
+#: mail/mail-search.glade.h:4
 msgid "Find:"
 msgstr "Axtar:"
 
-#: mail/mail-search.c:346
-msgid "Matches:"
-msgstr "Nəticələr:"
+#: mail/mail-search.glade.h:5
+#, fuzzy
+msgid "Search"
+msgstr "A_xtar"
+
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "İmzanı dəyişdir"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Xaric Tutulanlar"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Hesab Mə'lumatı"
 
 #: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Ləğv edilir..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Verici: %s, Növ: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Cığır: %s, Növ: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Növ: %s"
@@ -13373,32 +14109,32 @@ msgstr "Məktub Göndər & Al"
 msgid "Cancel _All"
 msgstr "Hamısını_ Ləğv Et"
 
-#: mail/mail-send-recv.c:389
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Yenilənir..."
 
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:446
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Gözləyir..."
 
-#: mail/mail-session.c:226
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "İstifadəçi əməliyyatı ləğv etdi."
 
-#: mail/mail-session.c:259
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s üçün şifrəni bildirin"
 
-#: mail/mail-session.c:261
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Şifrəni Bildirin"
 
-#: mail/mail-session.c:284
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "Bu şifrəni _yadda saxla"
 
-#: mail/mail-session.c:285
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr "Hazırkı iclas boyunca bu şifrəni _yadda saxla"
 
@@ -13437,30 +14173,31 @@ msgstr "Bu imza üçün bir ad bildirin."
 msgid "Name:"
 msgstr "Ad:"
 
-#: mail/mail-tools.c:276
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Ötürülmüş ismarış - %s"
 
-#: mail/mail-tools.c:278
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Ötürülmüş ismarış"
 
-#: mail/mail-tools.c:459 mail/mail-tools.c:466
-msgid "Forwarded Message"
-msgstr "Ötürülmüş İsmarış"
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "%s qovluğu açılır"
 
-#: mail/mail-vfolder.c:92
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "vqovluq quraşdırılır: %s"
 
-#: mail/mail-vfolder.c:210
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Uri üçün vqovluqlar yenilənir: %s"
 
-#: mail/mail-vfolder.c:468
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13473,97 +14210,88 @@ msgstr ""
 "    '%1$s'\n"
 "Onlar yeniləndilər."
 
-#: mail/mail-vfolder.c:777
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "VQovluqlar"
 
-#: mail/mail-vfolder.c:835
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "vQovluqlar"
 
-#: mail/mail-vfolder.c:874
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "VQovluğu Dəyişdir"
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Mövcud olmayan '%s' vqovluğu dəyişdirilməyə çalışılır."
 
-#: mail/mail-vfolder.c:966
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Yeni VQovluq"
 
-#: mail/message-browser.c:233
-msgid "(No subject)"
-msgstr "(Mövzusuz)"
-
-#: mail/message-browser.c:235
-#, c-format
-msgid "%s - Message"
-msgstr "%s - İsmarış"
-
-#: mail/message-list.c:741
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Görülməmiş"
 
-#: mail/message-list.c:742
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Görülmüş"
 
-#: mail/message-list.c:743
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Cavab verilmiş"
 
-#: mail/message-list.c:744
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Çoxlu Görülməmiş İsmarış"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Çoxlu İsmarış"
 
-#: mail/message-list.c:749
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Ən Alçaq"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Daha Alçaq"
 
-#: mail/message-list.c:754
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Daha Yüksək"
 
-#: mail/message-list.c:755
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Ən Yüksək"
 
-#: mail/message-list.c:1072
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1079
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Bugün %l:%M %p"
 
-#: mail/message-list.c:1088
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Dünən: %l:%M %p"
 
-#: mail/message-list.c:1100
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %l %M %p"
 
-#: mail/message-list.c:1108
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2649
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "İsmarış siyahısı yaradılır"
 
@@ -13611,7 +14339,7 @@ msgstr "Növbəti"
 msgid "For Your Information"
 msgstr "Nəzərinizə"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
 msgid "Forward"
 msgstr "Ötür"
 
@@ -13619,11 +14347,11 @@ msgstr "Ötür"
 msgid "No Response Necessary"
 msgstr "Cavab Məcburi Deyil"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Cavab yaz"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Hamısına cavab yaz"
 
@@ -13653,39 +14381,6 @@ msgstr "_Bitiş vaxtı:"
 msgid "_Flag:"
 msgstr "_Bayraq:"
 
-#: mail/subscribe-dialog.c:230
-#, c-format
-msgid "Scanning folders under %s on \"%s\""
-msgstr "%s altındakı qovluqlar oxunur (\"%s\" üstündəki)"
-
-#: mail/subscribe-dialog.c:232
-#, c-format
-msgid "Scanning root-level folders on \"%s\""
-msgstr "\"%s\" üstündəki kök səviyyəsi qovluqlar oxunur"
-
-#: mail/subscribe-dialog.c:329
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "\"%s\" qovluğuna qeydiyyat aparılır"
-
-#: mail/subscribe-dialog.c:331
-#, c-format
-msgid "Unsubscribing to folder \"%s\""
-msgstr "\"%s\" qovluğundan qeydiyyat silinir"
-
-#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.etspec.h:2
-msgid "Folder"
-msgstr "Qovluq"
-
-#: mail/subscribe-dialog.c:1499
-msgid "No server has been selected"
-msgstr "Heç bir verici seçilməyib"
-
-#: mail/subscribe-dialog.c:1598
-msgid "Please select a server."
-msgstr "Xahiş edirik, verici seçin."
-
 #: mail/subscribe-dialog.glade.h:1
 msgid "Folder Subscriptions"
 msgstr "Qovluq Qeydiyyatları"
@@ -13699,14071 +14394,12483 @@ msgid "S_erver:"
 msgstr "_Verici:"
 
 #: mail/subscribe-dialog.glade.h:4
-msgid "Scanning folders ..."
-msgstr "Qovluqlar oxunur ..."
-
-#: mail/subscribe-dialog.glade.h:5
 msgid "_Subscribe"
 msgstr "Qeydiyyatdan _Keç"
 
-#: mail/subscribe-dialog.glade.h:6
+#: mail/subscribe-dialog.glade.h:5
 msgid "_Unsubscribe"
 msgstr "Qeydiyyatdan Çı_x"
 
-#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
-msgid "Configure the appearance of the Evolution Summary here"
-msgstr "Evolution İcmalının görünüşünü buradan quraşdırın"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Evolution Qabığı"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Qovluq Qurğuları"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "80%"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Bu qısa yol qrupunu yenidən adlandır"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Qovluq çubuğunun nümayiş etdiriləcəyini bildir"
 
-#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
-msgid "Evolution Summary"
-msgstr "Evolutionun İcmalı"
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Vəziyyət çubuğunu gizlə"
 
-#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
-msgid "Evolution Summary component"
-msgstr "Evolution İcmal tərkib hissəsi"
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Ö_n Qurğulu Üstünlük:"
 
-#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
-msgid "Evolution Summary configuration control"
-msgstr "Evolution İcmal quraşdırma idarəsi"
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Ö_n Qurğulu Üstünlük:"
 
-#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
-msgid "Summary Preferences"
-msgstr "İcmal Xassələri"
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Evolution Məktub quraşdırma ara üzü"
 
-#: my-evolution/Locations.h:1
-msgid "Aarhus"
-msgstr "Aarhus"
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
 
-#: my-evolution/Locations.h:2
-msgid "Abakan"
-msgstr "Abakan"
+#: shell/apps_evolution_shell.schemas.in.in.h:9
+msgid ""
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
+msgstr ""
 
-#: my-evolution/Locations.h:3
-msgid "Abbotsford"
-msgstr "Abbotsford"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
 
-#: my-evolution/Locations.h:4
-msgid "Aberdeen"
-msgstr "Aberdeen"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
 
-#: my-evolution/Locations.h:5
-msgid "Abha"
-msgstr "Abha"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
 
-#: my-evolution/Locations.h:6
-msgid "Abilene"
-msgstr "Abilene"
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "Ön qurğulu vəzifələr qovluğu açılır"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Ön qurğulu vəzifələr qovluğu açılır"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Ön qurğulu vəzifələr qovluğu açılır"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Ön qurğulu vəzifələr qovluğu açılır"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Qovluq çubuğunun nümayiş etdiriləcəyini bildir"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Qısa yol çubuğunun nümayiş etdiriləcəyini bildir"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "Epoçt"
+
+#: shell/e-setup.c:144
+msgid "Could not update files correctly"
+msgstr "Fayllar düzgün güncəllənə bilmədi"
+
+#: shell/e-setup.c:165
+#, c-format
+msgid ""
+"Cannot create the directory\n"
+"%s\n"
+"Error: %s"
+msgstr ""
+"%s qovluğunu yarada bilmədim\n"
+"\n"
+"Xəta : %s"
+
+#: shell/e-setup.c:176
+#, c-format
+msgid ""
+"An error occurred in copying files into\n"
+"`%s'."
+msgstr ""
+"`%s' işinə fayllar köçürülürkən xəta\n"
+"baş verdi."
+
+#: shell/e-setup.c:242
+#, c-format
+msgid ""
+"The file `%s' is not a directory.\n"
+"Please move it in order to allow installation\n"
+"of the Evolution user files."
+msgstr ""
+"`%s' bir qovluq deyildir.\n"
+"\"Evolution\" istifadəçi fayllarınin qurulması\n"
+"üçün onu sil."
+
+#: shell/e-setup.c:251
+#, c-format
+msgid ""
+"The directory `%s' exists but is not the\n"
+"Evolution directory.  Please move it in order\n"
+"to allow installation of the Evolution user files."
+msgstr ""
+"`%s' qovluğu mövcuddur, amma\n"
+"\"Evolution\" qovluğunda yerləşmir. \"Evolution\" \n"
+"istifadəçi fayllarınin qurulması üçün onu sil."
+
+#: shell/e-shell-about-box.c:45
+msgid "Brought to you by"
+msgstr "İnkişafçılar"
+
+#: shell/e-shell-config-autocompletion.c:110
+msgid "Extra Completion folders"
+msgstr "Əlavə Tamamlama qovluqalrı"
+
+#: shell/e-shell-config-default-folders.c:149
+msgid "Select Default Folder"
+msgstr "Ön Qurğulu Qovluğu Seç"
 
-#: my-evolution/Locations.h:7
-msgid "Abingdon"
-msgstr "Abingdon"
+#: shell/e-shell-config-folder-settings.c:70
+msgid "Default Folders"
+msgstr "Ön Qurğulu Qovluqlar"
+
+#: shell/e-shell-config-folder-settings.c:73
+msgid "Offline Folders"
+msgstr "Xətdən Qopuq Cərgələr"
+
+#: shell/e-shell-config-folder-settings.c:76
+msgid "Autocompletion Folders"
+msgstr "Avtomatik Tamamlama Qovluqları"
+
+#: shell/e-shell-folder-commands.c:140
+#, c-format
+msgid "Cannot copy folder: %s"
+msgstr "Qovluq köçürülə bilmir: %s"
+
+#: shell/e-shell-folder-commands.c:142
+#, c-format
+msgid "Cannot move folder: %s"
+msgstr ""
+"Qovluq daşına bilmir:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:188
+msgid "Cannot move a folder over itself."
+msgstr "Qovluq öz üstünə daşına bilməz."
+
+#: shell/e-shell-folder-commands.c:190
+msgid "Cannot copy a folder over itself."
+msgstr "Qovluq öz üstünə köçürülə bilməz."
+
+#: shell/e-shell-folder-commands.c:204
+msgid "Cannot move a folder into one of its descendants."
+msgstr "Qovluq içindəkilərdən birinə daçına bilməz."
+
+#: shell/e-shell-folder-commands.c:319
+#, c-format
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr "\"%s\" qovluğunun köçürələcəyi qovluğu bildir:"
+
+#: shell/e-shell-folder-commands.c:323
+msgid "Copy Folder"
+msgstr "Qovluğu Köçür"
+
+#: shell/e-shell-folder-commands.c:363
+#, c-format
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr "\"%s\" qovluğunun daşınacağı qovluğu bildir:"
+
+#: shell/e-shell-folder-commands.c:367
+msgid "Move Folder"
+msgstr "Qovluğu Daşı"
+
+#: shell/e-shell-folder-commands.c:391
+#, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr ""
+"Qovluq silinə bilmir:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:405
+#, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr "\"%s\" qovluğu həqiqətən də silinsin?"
+
+#: shell/e-shell-folder-commands.c:489
+#, c-format
+msgid ""
+"Cannot rename folder:\n"
+"%s"
+msgstr ""
+"Qovluaq adı dəyişdirilə bilmir:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
+#, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "Bildirilən qovluq adı hökmlü deyildir: %s"
+
+#: shell/e-shell-folder-commands.c:584
+msgid "Selected folder does not belong to another user"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:587
+#, c-format
+msgid ""
+"Cannot remove folder:\n"
+"%s"
+msgstr ""
+"Qovluaq silinə bilmir:\n"
+"%s"
+
+#: shell/e-shell-folder-creation-dialog.c:137
+#, c-format
+msgid ""
+"Cannot create the specified folder:\n"
+"%s"
+msgstr ""
+"Bildirilən qovluq yaradıla bilmədi:\n"
+"%s"
+
+#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
+msgid "(Untitled)"
+msgstr "( Adsız )"
+
+#: shell/e-shell-importer.c:138
+msgid "Choose the type of importer to run:"
+msgstr "İcra ediləcək idxalçı növlərinis seçin:"
+
+#: shell/e-shell-importer.c:141
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"\"Evolution\" içinə almaq istədiyiniz faylı seçin. Aşağıdakı siyahıdan "
+"alacağınız faylın növünü də seçin.\n"
+"\n"
+"Əgər təsəvvürünüz yoxdursa \"Avtomatik\" seçənəyini seçin, \"Evolution\" özü "
+"bildiyi kimi edər."
+
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
+msgid "Please select the information that you would like to import:"
+msgstr "Xahiş edirik, idxal etmək istədiyiniz mə'lumatı seçin:"
+
+#: shell/e-shell-importer.c:150
+msgid ""
+"Evolution checked for settings to import from the following\n"
+"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
+"that could be imported where found. If you would like to\n"
+"try again, please click the \"Back\" button.\n"
+msgstr ""
+
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"%s idxal edilir\n"
+"%d üzvü idxal edilir."
+
+#: shell/e-shell-importer.c:322
+msgid "Select importer"
+msgstr "İdxalçı seçin"
+
+#: shell/e-shell-importer.c:463
+#, c-format
+msgid "File %s does not exist"
+msgstr "`%s' faylı mövcud deyil"
+
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
+msgid "Evolution Error"
+msgstr "Evolution Xətası"
+
+#: shell/e-shell-importer.c:480
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"%s növünü \n"
+"idxal edə biləcək idxalçı mövcud deyil"
+
+#: shell/e-shell-importer.c:489
+msgid "Importing"
+msgstr "İdxal edilir"
+
+#: shell/e-shell-importer.c:496
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"%s idxal edilir.\n"
+"%s başladılır"
+
+#: shell/e-shell-importer.c:508
+#, c-format
+msgid "Error starting %s"
+msgstr "%s başladılırkən xəta"
+
+#: shell/e-shell-importer.c:522
+#, c-format
+msgid "Error loading %s"
+msgstr "%s yüklənirkən xəta"
+
+#: shell/e-shell-importer.c:539
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"%s idxal edilir\n"
+"İdxal edilən üzv 1."
+
+#: shell/e-shell-importer.c:593
+msgid "Automatic"
+msgstr "Avtomatik"
+
+#: shell/e-shell-importer.c:642
+#, fuzzy
+msgid "_Filename:"
+msgstr "Fayl adı:"
+
+#: shell/e-shell-importer.c:647
+msgid "Select a file"
+msgstr "Fayl seçin"
+
+#: shell/e-shell-importer.c:657
+#, fuzzy
+msgid "File _type:"
+msgstr "Fayl növü:"
+
+#: shell/e-shell-importer.c:683
+#, fuzzy
+msgid "Import data and settings from _older programs"
+msgstr "Başqa proqramlardan verilən və qurğuları idxal et"
+
+#: shell/e-shell-importer.c:686
+#, fuzzy
+msgid "Import a _single file"
+msgstr "Tək fayl idxal et"
+
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+"Xahiş edirik gözləyin...\n"
+"Mövcud qurğular axtarılır"
+
+#: shell/e-shell-importer.c:757
+msgid "Starting Intelligent Importers"
+msgstr "İnternet İdxalçıları Başladılır"
+
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
+#, c-format
+msgid "From %s:"
+msgstr "Göndərən %s:"
+
+#: shell/e-shell-importer.c:1061
+msgid "Select a destination folder for importing this data"
+msgstr "Bu verilənin idxal ediləcəyi hədəf qovluğu seçin"
+
+#: shell/e-shell-importer.c:1190
+#, fuzzy
+msgid "_Import"
+msgstr "İdxal Et"
+
+#: shell/e-shell-offline-handler.c:596
+msgid "Closing connections..."
+msgstr "Bağlantılar bağlanır..."
+
+#: shell/e-shell-settings-dialog.c:346
+msgid "Evolution Settings"
+msgstr "Evolution Qurğuları"
+
+#. It would be nice to insensitivize the OK button appropriately
+#. instead of doing this, but unfortunately we can't do this for the
+#. Bonobo control.
+#: shell/e-shell-shared-folder-picker-dialog.c:281
+msgid "Please select a user."
+msgstr "Xahiş edirik, istifadəçi seçin."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:387
+msgid "Opening Folder"
+msgstr "Qovluq Açılır"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:393
+#, c-format
+msgid "Opening Folder \"%s\""
+msgstr "\"%s\" qovluğu açılır"
 
-#: my-evolution/Locations.h:8
-msgid "Abu Dhabi"
-msgstr "Abu Dhabi"
+#: shell/e-shell-shared-folder-picker-dialog.c:398
+#, c-format
+msgid "in \"%s\" ..."
+msgstr "\"%s\" içində..."
 
-#: my-evolution/Locations.h:9
-msgid "Abu Dhabi - Bateen"
-msgstr "Abu Dhabi - Bateen"
+#: shell/e-shell-shared-folder-picker-dialog.c:482
+#, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Bölüşülmüş qovluq açıla bilmir: %s."
 
-#: my-evolution/Locations.h:10
-msgid "Acajutla"
-msgstr "Acajutla"
+#: shell/e-shell-shared-folder-picker-dialog.c:535
+msgid "Cannot find the specified shared folder."
+msgstr "Bildirilən bölüşülmüş qovluq tapıla bilmir"
 
-#: my-evolution/Locations.h:11
-msgid "Acapulco"
-msgstr "Acapulco"
+#: shell/e-shell-startup-wizard.c:778
+msgid ""
+"If you quit the Evolution Setup Assistant now, all of the information that "
+"you have entered will be forgotten. You will need to run this assistant "
+"again before using Evolution.\n"
+"\n"
+"Do you want to quit using the Assistant now?"
+msgstr ""
 
-#: my-evolution/Locations.h:12
-msgid "Acarigua"
-msgstr "Acarigua"
+#: shell/e-shell-startup-wizard.c:789
+#, fuzzy
+msgid "Quit Assistant"
+msgstr "Yardımçı"
 
-#: my-evolution/Locations.h:13
-msgid "Adak"
-msgstr "Adak"
+#: shell/e-shell-utils.c:116
+msgid "No folder name specified."
+msgstr "Qovluq adı bildirilməyib."
 
-#: my-evolution/Locations.h:14
-msgid "Adana"
-msgstr "Adana"
+#: shell/e-shell-utils.c:123
+msgid "Folder name cannot contain the Return character."
+msgstr "Qovluq adı Return hərfini daxil edə bilməz."
 
-#: my-evolution/Locations.h:15
-msgid "Adana/Incirlik"
-msgstr "Adana/Incirlik"
+#: shell/e-shell-utils.c:129
+msgid "Folder name cannot contain the character \"/\"."
+msgstr "Qovluq adı \"/\" hərfini daxil edə bilməz."
 
-#: my-evolution/Locations.h:16
-msgid "Adelaide"
-msgstr "Adelaide"
+#: shell/e-shell-utils.c:135
+msgid "Folder name cannot contain the character \"#\"."
+msgstr "Qovluq adı \"#\" hərfini daxil edə bilməz."
 
-#: my-evolution/Locations.h:17
-msgid "Aden"
-msgstr "Aden"
+#: shell/e-shell-utils.c:141
+msgid "'.' and '..' are reserved folder names."
+msgstr "'.' və '..' saxlanmış qovluq adlarıdır."
 
-#: my-evolution/Locations.h:18
-msgid "Adrar"
-msgstr "Adrar"
+#: shell/e-shell-view-menu.c:89 shell/e-shell-window-commands.c:58
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr "Sisteminizdə GNOME Pilot vasitələri qurulu deyil."
 
-#: my-evolution/Locations.h:19
-msgid "Aeroparque"
-msgstr "Aeroparque"
+#: shell/e-shell-view-menu.c:97 shell/e-shell-window-commands.c:66
+#, c-format
+msgid "Error executing %s."
+msgstr "%s icra xətası."
 
-#: my-evolution/Locations.h:20
-msgid "Aeropuerto del Norte"
-msgstr "Aeropuerto del Norte"
+#: shell/e-shell-view-menu.c:193 shell/e-shell-window-commands.c:120
+msgid "Bug buddy is not installed."
+msgstr "Bug buddy qurulu deyil."
 
-#: my-evolution/Locations.h:21
-msgid "Afonsos"
-msgstr "Afonsos"
+#: shell/e-shell-view-menu.c:201 shell/e-shell-window-commands.c:128
+msgid "Bug buddy could not be run."
+msgstr "Bug buddy işə salına bilmədi."
 
-#: my-evolution/Locations.h:22
-msgid "Africa"
-msgstr "Africa"
+#: shell/e-shell-view-menu.c:247 shell/e-shell-window-commands.c:170
+msgid "About Ximian Evolution"
+msgstr "Ximian Evolution Haqqında"
 
-#: my-evolution/Locations.h:23
-msgid "Afyon"
-msgstr "Afyon"
+#: shell/e-shell-view-menu.c:502
+msgid "Go to folder..."
+msgstr "Qovluğa get..."
 
-#: my-evolution/Locations.h:24
-msgid "Agen"
-msgstr "Agen"
+#: shell/e-shell-view-menu.c:503
+msgid "Select the folder that you want to open"
+msgstr "Açmaq istədiyiniz qovluğu seçin"
 
-#: my-evolution/Locations.h:25
-msgid "Aguascaliantes"
-msgstr "Aguascaliantes"
+#: shell/e-shell-view-menu.c:617
+msgid "Create New Shortcut"
+msgstr "Yeni Qısa Yol Yarat"
 
-#: my-evolution/Locations.h:26
-msgid "Ahmadabad"
-msgstr "Ahmadabad"
+#: shell/e-shell-view-menu.c:618
+msgid "Select the folder you want the shortcut to point to:"
+msgstr "Qısa yolun nişanlayacağı qovluğu seçin:"
 
-#: my-evolution/Locations.h:27
-msgid "Ahwaz"
-msgstr "Ahwaz"
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
+msgid "_Work Online"
+msgstr "Xətdə _İşlə"
 
-#: my-evolution/Locations.h:28
-msgid "Ainsworth"
-msgstr "Ainsworth"
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
+msgid "_Work Offline"
+msgstr "Xətdən Qopuq _İşlə"
 
-#: my-evolution/Locations.h:29
-msgid "Air Force"
-msgstr "Air Force"
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
+msgid "Work Offline"
+msgstr "Xətdən Qopuq İşlə"
 
-#: my-evolution/Locations.h:30
-msgid "Ajaccio/Campo dell'Oro"
-msgstr "Ajaccio/Campo dell'Oro"
+#: shell/e-shell-window.c:324
+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."
 
-#: my-evolution/Locations.h:31
-msgid "Akeno Ab"
-msgstr "Akeno Ab"
+#: shell/e-shell-window.c:331
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Ximian Evolution xətdən çıxma fəaliyyətindədir."
 
-#: my-evolution/Locations.h:32
-msgid "Akita Airport"
-msgstr "Akita Airport"
+#: shell/e-shell-window.c:337
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution hazırda xətdə deyil. Xətdə girmək üçün bu düyməyə tıqlayın."
 
-#: my-evolution/Locations.h:33
-msgid "Akron"
-msgstr "Akron"
+#: shell/e-shell.c:1003
+msgid "Invalid arguments"
+msgstr "Hökmsüz arqumentlər"
 
-#: my-evolution/Locations.h:34
-msgid "Akrotiri"
-msgstr "Akrotiri"
+#: shell/e-shell.c:1005
+msgid "Cannot register on OAF"
+msgstr "OAF-a qeyd edilə bilmir"
 
-#: my-evolution/Locations.h:35
-msgid "Alabama"
-msgstr "Alabama"
+#: shell/e-shell.c:1007
+msgid "Configuration Database not found"
+msgstr "Quraşdırma Mə'lumat Bazası tapılmadı"
 
-#: my-evolution/Locations.h:36
-msgid "Al Ahsa"
-msgstr "Al Ahsa"
+#: shell/e-shell.c:1009
+msgid "Generic error"
+msgstr "Ümumi xəta"
 
-#: my-evolution/Locations.h:37
-msgid "Al Ain"
-msgstr "Al Ain"
+#: shell/e-shortcuts-view.c:80
+msgid "Create New Shortcut Group"
+msgstr "Yeni Qısa Yol Qrupu Yarat"
 
-#: my-evolution/Locations.h:38
-msgid "Alamogordo"
-msgstr "Alamogordo"
+#: shell/e-shortcuts-view.c:81
+msgid "Group name:"
+msgstr "Qrup adı:"
 
-#: my-evolution/Locations.h:39
-msgid "Alamosa"
-msgstr "Alamosa"
+#: shell/e-shortcuts-view.c:179
+#, c-format
+msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+msgstr "Həqiqətən də \"%s\" qrupunu qısa yol çubuğundan silmək istəyirsiniz?"
 
-#: my-evolution/Locations.h:40
-msgid "Alaska"
-msgstr "Alaska"
+#: shell/e-shortcuts-view.c:222
+msgid "Rename Shortcut Group"
+msgstr "Qısa Yol Qrupunu Yenidən Adlandır"
 
-#: my-evolution/Locations.h:41
-msgid "Al Baha"
-msgstr "Al Baha"
+#: shell/e-shortcuts-view.c:223
+msgid "Rename selected shortcut group to:"
+msgstr "Seçili qısa yol qrupunun adını bununla dəyişdir:"
 
-#: my-evolution/Locations.h:43
-msgid "Albany"
-msgstr "Albany"
+#: shell/e-shortcuts-view.c:255
+msgid "_Small Icons"
+msgstr "_Kiçik Timsallar"
 
-#: my-evolution/Locations.h:44
-msgid "Albenga"
-msgstr "Albenga"
+#: shell/e-shortcuts-view.c:256
+msgid "Show the shortcuts as small icons"
+msgstr "Qısa yolları kiçik timsallar olaraq göstər"
 
-#: my-evolution/Locations.h:45
-msgid "Alberta"
-msgstr "Alberta"
+#: shell/e-shortcuts-view.c:258
+msgid "_Large Icons"
+msgstr "_Böyük Timsallar"
 
-#: my-evolution/Locations.h:46
-msgid "Alborg"
-msgstr "Alborg"
+#: shell/e-shortcuts-view.c:259
+msgid "Show the shortcuts as large icons"
+msgstr "Qısa yolları böyük timsallar olaraq göstər"
 
-#: my-evolution/Locations.h:47
-msgid "Albuquerque"
-msgstr "Albuquerque"
+#: shell/e-shortcuts-view.c:270
+msgid "_Add Group..."
+msgstr "Qrup Ə_lavə Et..."
 
-#: my-evolution/Locations.h:48
-msgid "Alderney"
-msgstr "Alderney"
+#: shell/e-shortcuts-view.c:271
+msgid "Create a new shortcut group"
+msgstr "Yeni qısa yol qrupu yarat"
 
-#: my-evolution/Locations.h:49
-msgid "Alesund"
-msgstr "Alesund"
+#: shell/e-shortcuts-view.c:273
+msgid "_Remove this Group..."
+msgstr "Bu Qrupu _Sil..."
 
-#: my-evolution/Locations.h:50
-msgid "Alexandria"
-msgstr "Alexandria"
+#: shell/e-shortcuts-view.c:274
+msgid "Remove this shortcut group"
+msgstr "Bu qısa yol qrupunu sil"
 
-#: my-evolution/Locations.h:51
-msgid "Alexandria-Esler"
-msgstr "Alexandria-Esler"
+#: shell/e-shortcuts-view.c:276
+msgid "Re_name this Group..."
+msgstr "Bu Qrupu _Yenidən Adlandır..."
 
-#: my-evolution/Locations.h:52
-msgid "Alexandria/Nouzha"
-msgstr "Alexandria/Nouzha"
+#: shell/e-shortcuts-view.c:277
+msgid "Rename this shortcut group"
+msgstr "Bu qısa yol qrupunu yenidən adlandır"
 
-#: my-evolution/Locations.h:53
-msgid "Alexandroupolis"
-msgstr "Alexandroupolis"
+#: shell/e-shortcuts-view.c:282
+msgid "_Hide the Shortcut Bar"
+msgstr "Vəziyyət Çubuğunu _Gizlə"
 
-#: my-evolution/Locations.h:55
-msgid "Alghero"
-msgstr "Alghero"
+#: shell/e-shortcuts-view.c:283
+msgid "Hide the shortcut bar"
+msgstr "Vəziyyət çubuğunu gizlə"
 
-#: my-evolution/Locations.h:56
-msgid "Algona"
-msgstr "Algona"
+#: shell/e-shortcuts-view.c:288
+msgid "Create _Default Shortcuts"
+msgstr "Ön _Qurğulu Qısa Yolları Yarat"
 
-#: my-evolution/Locations.h:57
-msgid "Alicante"
-msgstr "Alicante"
+#: shell/e-shortcuts-view.c:289
+msgid "Create Default Shortcuts"
+msgstr "Ön Qurğulu Qısa Yolları Yarat"
 
-#: my-evolution/Locations.h:58
-msgid "Alice"
-msgstr "Alice"
+#: shell/e-shortcuts-view.c:408
+msgid "Rename Shortcut"
+msgstr "Qısa Yolu Yenidən Adlandır"
 
-#: my-evolution/Locations.h:59
-msgid "Alice Springs"
-msgstr "Alice Springs"
+#: shell/e-shortcuts-view.c:409
+msgid "Rename selected shortcut to:"
+msgstr "Bu qısa yolun adını bununla dəyişdir:"
 
-#: my-evolution/Locations.h:60
-msgid "Al-Jouf"
-msgstr "Al-Jouf"
+#: shell/e-shortcuts-view.c:422
+msgid "Open the folder linked to this shortcut"
+msgstr "Bu qısa yola bağlanmış qovluğu aç"
 
-#: my-evolution/Locations.h:61
-msgid "Allentown"
-msgstr "Allentown"
+#: shell/e-shortcuts-view.c:424
+msgid "Open in New _Window"
+msgstr "Yeni _Pəncərədə Aç"
 
-#: my-evolution/Locations.h:62
-msgid "Alliance"
-msgstr "Alliance"
+#: shell/e-shortcuts-view.c:424
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "Bu qısa yol ilə bağlanmış qovluğu yeni pəncərədə aç"
 
-#: my-evolution/Locations.h:63
-msgid "Alma"
-msgstr "Alma"
+#: shell/e-shortcuts-view.c:427
+msgid "Rename this shortcut"
+msgstr "Bu qısa yolu yenidən adlandır"
 
-#: my-evolution/Locations.h:64
-msgid "Almeria"
-msgstr "Almeria"
+#: shell/e-shortcuts-view.c:429
+msgid "Re_move"
+msgstr "_Sil"
 
-#: my-evolution/Locations.h:65
-msgid "Alpena"
-msgstr "Alpena"
+#: shell/e-shortcuts-view.c:429
+msgid "Remove this shortcut from the shortcut bar"
+msgstr "Bu qısa yolu qısa yol çubuğundan sil"
 
-#: my-evolution/Locations.h:66
-msgid "Al Qaysumah"
-msgstr "Al Qaysumah"
+#: shell/e-shortcuts.c:650
+msgid "Error saving shortcuts."
+msgstr "Qısa yolları qeyd edərkən xəta."
 
-#: my-evolution/Locations.h:67
-msgid "Alta"
-msgstr "Alta"
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Gələnlər qutusu"
 
-#: my-evolution/Locations.h:68
-msgid "Altamira"
-msgstr "Altamira"
+#: shell/e-shortcuts.c:1097
+msgid "Shortcuts"
+msgstr "Qısa yollar"
 
-#: my-evolution/Locations.h:69
-msgid "Alton"
-msgstr "Alton"
+#: shell/e-task-widget.c:211
+#, c-format
+msgid "%s (...)"
+msgstr "%s (...)"
 
-#: my-evolution/Locations.h:70
-msgid "Altoona"
-msgstr "Altoona"
+#: shell/e-task-widget.c:216
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% başa çatdı)"
 
-#: my-evolution/Locations.h:71
-msgid "Alturas"
-msgstr "Alturas"
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Yeni"
 
-#: my-evolution/Locations.h:72
-msgid "Altus"
-msgstr "Altus"
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "\"%2$s\" içində \"%1$s\""
 
-#: my-evolution/Locations.h:73
-msgid "Amami Airport"
-msgstr "Amami Airport"
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Namə'lum xəta."
 
-#: my-evolution/Locations.h:74
-msgid "Amapala"
-msgstr "Amapala"
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Tərkib hissəsi sistemi xətası:\n"
+"%s"
 
-#: my-evolution/Locations.h:75
-msgid "Amarillo"
-msgstr "Amarillo"
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Fəallaşdırma sistemi xətası:\n"
+"%s"
 
-#: my-evolution/Locations.h:76
-msgid "Amasya"
-msgstr "Amasya"
+#: shell/glade/e-active-connection-dialog.glade.h:1
+msgid "Active Connections"
+msgstr "Fəal Bağlantılar"
 
-#: my-evolution/Locations.h:77
-msgid "Ambler"
-msgstr "Ambler"
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr "Bu bağlantıları kəsərək xətdən qopmaq üçün Oldu-ya tıqlayın"
 
-#: my-evolution/Locations.h:78
-msgid "Amelia"
-msgstr "Amelia"
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "The following connections are currently active:"
+msgstr "Aıağıdakı bağlantılar hazırda fəaldır:"
 
-#: my-evolution/Locations.h:79
-msgid "Amendola"
-msgstr "Amendola"
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "_Təqvim:"
 
-#: my-evolution/Locations.h:80
-msgid "Ames"
-msgstr "Ames"
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+msgid "_Contacts:"
+msgstr "Ə_laqələr:"
 
-#: my-evolution/Locations.h:81
-msgid "Amritsar"
-msgstr "Amritsar"
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "_Məktub:"
 
-#: my-evolution/Locations.h:82
-msgid "Amsterdam"
-msgstr "Amsterdam"
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "_Vəzifələr:"
 
-#: my-evolution/Locations.h:83
-msgid "Anadyr"
-msgstr "Anadyr"
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "Qovluq _növü:"
 
-#: my-evolution/Locations.h:84
-msgid "Anaktuvuk"
-msgstr "Anaktuvuk"
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Başqa İstifadəçinin Qovluğunu Aç"
 
-#: my-evolution/Locations.h:85
-msgid "Anapa"
-msgstr "Anapa"
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "_Hesab:"
 
-#: my-evolution/Locations.h:86
-msgid "Anchorage"
-msgstr "Anchorage"
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "_Qovluq Adı:"
 
-#: my-evolution/Locations.h:87
-msgid "Anchorage - Elmendorf AFB"
-msgstr "Anchorage - Elmendorf AFB"
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "_İstifadəci:"
 
-#: my-evolution/Locations.h:88
-msgid "Ancona"
-msgstr "Ancona"
+#: shell/glade/evolution-startup-wizard.glade.h:2
+msgid "Evolution Setup Assistant"
+msgstr "Evolution Sazlama Yardımçısı"
 
-#: my-evolution/Locations.h:89
-msgid "Andahuayla"
-msgstr "Andahuayla"
+#: shell/glade/evolution-startup-wizard.glade.h:3
+msgid "Importing Files"
+msgstr "Fayllar İdxal Edilir"
 
-#: my-evolution/Locations.h:90
-msgid "Anderson"
-msgstr "Anderson"
+#: shell/glade/evolution-startup-wizard.glade.h:4
+msgid "Timezone "
+msgstr "Vaxt zolağı"
 
-#: my-evolution/Locations.h:91
-msgid "Andoya"
-msgstr "Andoya"
+#: shell/glade/evolution-startup-wizard.glade.h:5
+msgid "Welcome"
+msgstr "Xoş Gəldiniz"
 
-#: my-evolution/Locations.h:92
-msgid "Andravida"
-msgstr "Andravida"
+#: shell/glade/evolution-startup-wizard.glade.h:6
+msgid ""
+"Welcome to Evolution. The next few screens will allow\n"
+"Evolution to connect to your email accounts, and to import\n"
+"files from other applications. \n"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+"Evolution dünyasına xoş gəldiniz. Növbəti ekranlar\n"
+"Evolution proqramına epoçt hesablarınıza bağlanmaq və başqa\n"
+"rpoqramlardan faylları idxal etməyə yardım edəcəklər. \n"
+"\n"
+"Xahiş edirik, davam etmək üçün \"Sonrakı\" düyməsinə basın. "
 
-#: my-evolution/Locations.h:93
-msgid "Andrews AFB"
-msgstr "Andrews AFB"
+#: shell/glade/evolution-startup-wizard.glade.h:11
+msgid ""
+"You have successfully entered all of the information\n"
+"needed to set up Evolution. \n"
+"\n"
+"Click the \"Apply\" button to save your settings. "
+msgstr ""
+"Evolution proqramını sazlamaq üçün lazımi bütün mə'lumatları bildirdiniz.\n"
+"\n"
+"Qurğularınızı qeyd etmək üçün \"Tədbiq Et\" düyməsinə basın. "
 
-#: my-evolution/Locations.h:94
-msgid "Angleton"
-msgstr "Angleton"
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr "Faylı Evolution içinə almaq üçün \"İdxal Et\" düyməsini tıqlayın. "
 
-#: my-evolution/Locations.h:95
-msgid "Aniak"
-msgstr "Aniak"
+#: shell/importer/import.glade.h:2
+msgid "Evolution Import Assistant"
+msgstr "Evolution İdxal Yardımçısı"
 
-#: my-evolution/Locations.h:96
-msgid "Ankara/Esenboga"
-msgstr "Ankara/Esenboga"
+#: shell/importer/import.glade.h:3
+msgid "Import File (step 3 of 3)"
+msgstr "Fayl İdxal Et (3 addımın 3-cüsü)"
 
-#: my-evolution/Locations.h:97
-msgid "Ankara/Etimesgut"
-msgstr "Ankara/Etimesgut"
+#: shell/importer/import.glade.h:4
+msgid "Importer Type (step 1 of 3)"
+msgstr "İdxalçı Növü (3 addımın 1-cisi)"
 
-#: my-evolution/Locations.h:98
-msgid "Annaba"
-msgstr "Annaba"
+#: shell/importer/import.glade.h:5
+msgid "Select Importers (step 2 of 3)"
+msgstr "İdxalçıları Seçin (3 addımın 2-cisi)"
 
-#: my-evolution/Locations.h:99
-msgid "Ann Arbor"
-msgstr "Ann Arbor"
+#: shell/importer/import.glade.h:6
+msgid "Select a File (step 2 of 3)"
+msgstr "Faylı Seçin (3 addımın 2-cisi)"
 
-#: my-evolution/Locations.h:100
-msgid "Annette"
-msgstr "Annette"
+#: 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"
+"importing external files into Evolution."
+msgstr ""
+"Evolution İdxal Yardımçısına Xoş Gəldiniz.\n"
+"Bu vasitə ilə xarici fayllarınızı Evolution içinə\n"
+"ala biləcəksiniz."
 
-#: my-evolution/Locations.h:101
-msgid "Anniston"
-msgstr "Anniston"
+#: shell/importer/intelligent.c:189
+msgid "Importers"
+msgstr "İdxalçılar"
 
-#: my-evolution/Locations.h:102
-msgid "Antalya"
-msgstr "Antalya"
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
+msgid "Import"
+msgstr "İdxal Et"
 
-#: my-evolution/Locations.h:103
-msgid "Antartica"
-msgstr "Antartica"
+#: shell/importer/intelligent.c:195
+msgid "Don't import"
+msgstr "İdxal etmə"
 
-#: my-evolution/Locations.h:104
-msgid "Antigo"
-msgstr "Antigo"
+#: shell/importer/intelligent.c:199
+msgid "Don't ask me again"
+msgstr "Bir də soruşma"
 
-#: my-evolution/Locations.h:105
-msgid "Antigua"
-msgstr "Antigua"
+#: shell/importer/intelligent.c:207
+msgid "Evolution can import data from the following files:"
+msgstr "Evolution aşağıdakı fayllardan verilənləri idxal edə bilər:"
 
-#: my-evolution/Locations.h:106
-msgid "Antigua and Barbuda"
-msgstr "Antigua and Barbuda"
+#: shell/main.c:114 shell/main.c:559
+msgid "Evolution"
+msgstr "Evolution"
 
-#: my-evolution/Locations.h:107
-msgid "Antofagasta"
-msgstr "Antofagasta"
+#: shell/main.c:120
+msgid "Evolution is now exiting ..."
+msgstr "Evolution indi bağlanır ..."
 
-#: my-evolution/Locations.h:108
-msgid "Antwerpen/Deurne"
-msgstr "Antwerpen/Deurne"
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:270
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
 
-#: my-evolution/Locations.h:109
-msgid "Aomori Airport"
-msgstr "Aomori Airport"
+#: shell/main.c:294
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr ""
+"Sağolun\n"
+"Ximian Evolution Komandası\n"
 
-#: my-evolution/Locations.h:110
-msgid "Apalachicola"
-msgstr "Apalachicola"
+#: shell/main.c:302
+msgid "Don't tell me again"
+msgstr "Bunu bir daha demə"
 
-#: my-evolution/Locations.h:111
-msgid "Appleton"
-msgstr "Appleton"
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
 
-#: my-evolution/Locations.h:112
-msgid "Aquadilla"
-msgstr "Aquadilla"
+#: shell/main.c:411
+msgid "Cannot access the Ximian Evolution shell."
+msgstr "Ximian Evolution qabığına yetişilə bilmir."
 
-#: my-evolution/Locations.h:113
-msgid "Aracaju"
-msgstr "Aracaju"
+#: shell/main.c:420
+#, c-format
+msgid "Cannot initialize the Ximian Evolution shell: %s"
+msgstr "Ximian Evolution qabığı başladıla bilmir: %s"
 
-#: my-evolution/Locations.h:114
-msgid "Arad"
-msgstr "Arad"
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
 
-#: my-evolution/Locations.h:115
-msgid "Arar"
-msgstr "Arar"
+#: shell/main.c:528
+msgid "Start in offline mode"
+msgstr "Xətdən qopuq modda başla"
 
-#: my-evolution/Locations.h:116
-msgid "Araxos"
-msgstr "Araxos"
+#: shell/main.c:530
+msgid "Start in online mode"
+msgstr "Xətdə modunda başla"
 
-#: my-evolution/Locations.h:117
-msgid "Arcata"
-msgstr "Arcata"
+#: shell/main.c:533
+msgid "Forcibly shut down all evolution components"
+msgstr "Bütün evolution tərkib hissələrini bağlanmaya məcbur et"
 
-#: my-evolution/Locations.h:118
-msgid "Ardmore"
-msgstr "Ardmore"
+#: shell/main.c:536
+msgid "Send the debugging output of all components to a file."
+msgstr "Bütün tərkib hissələrinin xəta ayırma verilənlərini bir fayla göndər."
 
-#: my-evolution/Locations.h:119
-msgid "Arequipa"
-msgstr "Arequipa"
+#: shell/main.c:563
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
 
-#: my-evolution/Locations.h:121
-msgid "Arica"
-msgstr "Arica"
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "İdxalçı seçin"
 
-#: my-evolution/Locations.h:122
-msgid "Arizona"
-msgstr "Arizona"
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
+#, fuzzy
+msgid "Certificate Name"
+msgstr "_Sertifikat ID-si:"
 
-#: my-evolution/Locations.h:123
-msgid "Arkansas"
-msgstr "Arkansas"
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
+#, fuzzy
+msgid "Purposes"
+msgstr "İrəliləmə"
 
-#: my-evolution/Locations.h:124
-msgid "Arkhangelsk"
-msgstr "Arkhangelsk"
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
+msgid "Serial Number"
+msgstr ""
 
-#: my-evolution/Locations.h:125
-msgid "Arlington"
-msgstr "Arlington"
+#: smime/gui/certificate-manager.c:174
+#, fuzzy
+msgid "Expires"
+msgstr "İfadə"
 
-#: my-evolution/Locations.h:126
-msgid "Artigas"
-msgstr "Artigas"
+#: smime/gui/certificate-manager.c:323
+#, fuzzy
+msgid "E-Mail Address"
+msgstr "E-Poçt Ünvanını Birləşdir"
 
-#: my-evolution/Locations.h:127
-msgid "Asahikawa Ab"
-msgstr "Asahikawa Ab"
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"Sertifikatın vaxtı başa çatıb: %s\n"
+"Nəşriyyatçı: %s"
 
-#: my-evolution/Locations.h:128
-msgid "Asahikawa Airport"
-msgstr "Asahikawa Airport"
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
 
-#: my-evolution/Locations.h:129
-msgid "Ashburnam"
-msgstr "Ashburnam"
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
 
-#: my-evolution/Locations.h:130
-msgid "Asheville"
-msgstr "Asheville"
+#: smime/gui/smime-ui.glade.h:1
+msgid "<Not Part of Certificate>"
+msgstr ""
 
-#: my-evolution/Locations.h:131
-msgid "Ashfield"
-msgstr "Ashfield"
+#: smime/gui/smime-ui.glade.h:2
+#, fuzzy
+msgid "<b>Certificate Fields</b>"
+msgstr "Sertifikat Ləğv Edildi"
 
-#: my-evolution/Locations.h:132
-msgid "Ashiya Ab"
-msgstr "Ashiya Ab"
+#: smime/gui/smime-ui.glade.h:3
+msgid "<b>Certificate Hierarchy</b>"
+msgstr ""
 
-#: my-evolution/Locations.h:133
-msgid "Ashland"
-msgstr "Ashland"
+#: smime/gui/smime-ui.glade.h:4
+#, fuzzy
+msgid "<b>Field Value</b>"
+msgstr "<b>Epoçt Göndərilməsi:</b>"
 
-#: my-evolution/Locations.h:134
-msgid "Asia"
-msgstr "Asia"
+#: smime/gui/smime-ui.glade.h:5
+msgid "<b>Fingerprints</b>"
+msgstr ""
 
-#: my-evolution/Locations.h:135
-msgid "Aspen"
-msgstr "Aspen"
+#: smime/gui/smime-ui.glade.h:6
+#, fuzzy
+msgid "<b>Issued By</b>"
+msgstr "<b>Qalıb:</b> "
 
-#: my-evolution/Locations.h:136
-msgid "Asswan"
-msgstr "Asswan"
+#: smime/gui/smime-ui.glade.h:7
+#, fuzzy
+msgid "<b>Issued To</b>"
+msgstr "<b>Qalıb:</b> "
 
-#: my-evolution/Locations.h:137
-msgid "Astoria"
-msgstr "Astoria"
+#: smime/gui/smime-ui.glade.h:8
+msgid "<b>This certificate has been verified for the following uses:</b>"
+msgstr ""
 
-#: my-evolution/Locations.h:138
-msgid "Astrakhan"
-msgstr "Astrakhan"
+#: smime/gui/smime-ui.glade.h:9
+#, fuzzy
+msgid "<b>Validity</b>"
+msgstr "<b>Vəziyyət:</b>"
 
-#: my-evolution/Locations.h:139
-msgid "Asturias"
-msgstr "Asturias"
+#: smime/gui/smime-ui.glade.h:10
+#, fuzzy
+msgid "Authorities"
+msgstr "Poitiers"
 
-#: my-evolution/Locations.h:140
-msgid "Asuncion"
-msgstr "Asuncion"
+#: smime/gui/smime-ui.glade.h:11
+#, fuzzy
+msgid "Backup"
+msgstr "Blackpool"
 
-#: my-evolution/Locations.h:141
-msgid "Athens"
-msgstr "Athens"
+#: smime/gui/smime-ui.glade.h:12
+#, fuzzy
+msgid "Backup All"
+msgstr "Blackpool"
 
-#: my-evolution/Locations.h:142
-msgid "Athinai"
-msgstr "Athinai"
+#: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
 
-#: my-evolution/Locations.h:143
-msgid "Atlanta"
-msgstr "Atlanta"
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "_Sertifikat ID-si:"
 
-#: my-evolution/Locations.h:144
-msgid "Atlantic"
-msgstr "Atlantic"
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Sertifikat e'tibarlı deyil"
 
-#: my-evolution/Locations.h:145
-msgid "Atlantic City"
-msgstr "Atlantic City"
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "Sertifikat hələ hökmlü deyil"
 
-#: my-evolution/Locations.h:146
-msgid "Atsugi US NAS"
-msgstr "Atsugi US NAS"
+#: smime/gui/smime-ui.glade.h:17
+#, fuzzy
+msgid "Common Name (CN)"
+msgstr "Ümumi Ad"
 
-#: my-evolution/Locations.h:147
-msgid "Auburn"
-msgstr "Auburn"
+#: smime/gui/smime-ui.glade.h:18
+#, fuzzy
+msgid "Contact Certificates"
+msgstr "_Sertifikat ID-si:"
 
-#: my-evolution/Locations.h:148
-msgid "Auckland"
-msgstr "Auckland"
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
 
-#: my-evolution/Locations.h:149
-msgid "Augsburg"
-msgstr "Augsburg"
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
 
-#: my-evolution/Locations.h:150
-msgid "Augusta"
-msgstr "Augusta"
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Edit"
+msgstr "_Düzəlt"
 
-#: my-evolution/Locations.h:151
-msgid "Aurora"
-msgstr "Aurora"
+#: smime/gui/smime-ui.glade.h:24
+msgid "Email Recipient Certificate"
+msgstr ""
 
-#: my-evolution/Locations.h:152
-msgid "Austin"
-msgstr "Austin"
+#: smime/gui/smime-ui.glade.h:25
+#, fuzzy
+msgid "Email Signer Certificate"
+msgstr "Sertifikatlar təsdiqlənə bilmədi."
 
-#: my-evolution/Locations.h:153
-msgid "Australasia"
-msgstr "Australasia"
+#: smime/gui/smime-ui.glade.h:26
+#, fuzzy
+msgid "Expires On"
+msgstr "İfadə"
 
-#: my-evolution/Locations.h:156
-msgid "Avalon"
-msgstr "Avalon"
+#: smime/gui/smime-ui.glade.h:29
+msgid "Issued On"
+msgstr ""
 
-#: my-evolution/Locations.h:157
-msgid "Aviano"
-msgstr "Aviano"
+#: smime/gui/smime-ui.glade.h:30
+msgid "MD5 Fingerprint"
+msgstr ""
 
-#: my-evolution/Locations.h:158
-msgid "Ayacucho"
-msgstr "Ayacucho"
+#: smime/gui/smime-ui.glade.h:31
+#, fuzzy
+msgid "Organization (O)"
+msgstr "Quruluş"
 
-#: my-evolution/Locations.h:159
-msgid "Bage"
-msgstr "Bage"
+#: smime/gui/smime-ui.glade.h:32
+#, fuzzy
+msgid "Organizational Unit (OU)"
+msgstr "Quruluş Bölümü"
 
-#: my-evolution/Locations.h:160
-msgid "Bagotville"
-msgstr "Bagotville"
+#: smime/gui/smime-ui.glade.h:33
+msgid "SHA1 Fingerprint"
+msgstr ""
 
-#: my-evolution/Locations.h:162
-msgid "Bahia Blanca"
-msgstr "Bahia Blanca"
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+msgid "SSL Client Certificate"
+msgstr ""
 
-#: my-evolution/Locations.h:163
-msgid "Bahias de Huatulco"
-msgstr "Bahias de Huatulco"
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+msgid "SSL Server Certificate"
+msgstr ""
 
-#: my-evolution/Locations.h:165
-msgid "Baker City"
-msgstr "Baker City"
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
 
-#: my-evolution/Locations.h:166
-msgid "Bakersfield"
-msgstr "Bakersfield"
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
 
-#: my-evolution/Locations.h:167
-msgid "Bale-Mulhouse"
-msgstr "Bale-Mulhouse"
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
 
-#: my-evolution/Locations.h:168
-msgid "Balikesir"
-msgstr "Balikesir"
+#: smime/gui/smime-ui.glade.h:40
+#, fuzzy
+msgid "View"
+msgstr "_Görünüş"
 
-#: my-evolution/Locations.h:169
-msgid "Balikesir/Bandirma"
-msgstr "Balikesir/Bandirma"
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "_Sertifikat ID-si:"
 
-#: my-evolution/Locations.h:170
-msgid "Ball Mountain"
-msgstr "Ball Mountain"
+#: smime/gui/smime-ui.glade.h:42
+#, fuzzy
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr "Hökmsüz Sertifikat Təsdiqi (CA)"
 
-#: my-evolution/Locations.h:171
-msgid "Baltimore"
-msgstr "Baltimore"
+#: smime/gui/smime-ui.glade.h:43
+msgid "You have certificates from these organizations that identify you:"
+msgstr ""
 
-#: my-evolution/Locations.h:172
-msgid "Baltimore-Glen Burnie"
-msgstr "Baltimore-Glen Burnie"
+#: smime/gui/smime-ui.glade.h:44
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
+msgstr ""
 
-#: my-evolution/Locations.h:173
-msgid "Banak"
-msgstr "Banak"
+#: smime/gui/smime-ui.glade.h:45
+msgid "You have certificates on file that identify these people:"
+msgstr ""
 
-#: my-evolution/Locations.h:174
-msgid "Bandarabbass"
-msgstr "Bandarabbass"
+#: smime/gui/smime-ui.glade.h:46
+#, fuzzy
+msgid "Your Certificates"
+msgstr "_Sertifikat ID-si:"
 
-#: my-evolution/Locations.h:175
-msgid "Bangor"
-msgstr "Bangor"
+#: smime/lib/e-cert-db.c:494
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "Kard ID onsuz da mövcuddur"
 
-#: my-evolution/Locations.h:176
-msgid "Baracoa"
-msgstr "Baracoa"
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%m/%d/%Y"
 
-#: my-evolution/Locations.h:177
-msgid "Barbers Point"
-msgstr "Barbers Point"
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Vermont"
 
-#: my-evolution/Locations.h:178
-msgid "Barcelona"
-msgstr "Barcelona"
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Vermillion"
 
-#: my-evolution/Locations.h:179
-msgid "Bardufoss"
-msgstr "Bardufoss"
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Vermillion"
 
-#: my-evolution/Locations.h:180
-msgid "Bar Harbor"
-msgstr "Bar Harbor"
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Vermillion"
 
-#: my-evolution/Locations.h:181
-msgid "Bari"
-msgstr "Bari"
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
 
-#: my-evolution/Locations.h:182
-msgid "Bariloche"
-msgstr "Bariloche"
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
 
-#: my-evolution/Locations.h:183
-msgid "Barinas"
-msgstr "Barinas"
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
 
-#: my-evolution/Locations.h:184
-msgid "Barking Sand"
-msgstr "Barking Sand"
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
 
-#: my-evolution/Locations.h:185
-msgid "Barksdale"
-msgstr "Barksdale"
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "N"
 
-#: my-evolution/Locations.h:186
-msgid "Barnaul"
-msgstr "Barnaul"
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
 
-#: my-evolution/Locations.h:187
-msgid "Barquisimeto"
-msgstr "Barquisimeto"
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "Oldu"
 
-#: my-evolution/Locations.h:188
-msgid "Barranquilla/Ernestocortissoz"
-msgstr "Barranquilla/Ernestocortissoz"
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
 
-#: my-evolution/Locations.h:189
-msgid "Barrow"
-msgstr "Barrow"
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "N"
 
-#: my-evolution/Locations.h:190
-msgid "Barter Island"
-msgstr "Barter Island"
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
 
-#: my-evolution/Locations.h:191
-msgid "Bartlesville"
-msgstr "Bartlesville"
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
 
-#: my-evolution/Locations.h:192
-msgid "Bartow"
-msgstr "Bartow"
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
 
-#: my-evolution/Locations.h:193
-msgid "Bastia"
-msgstr "Bastia"
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "Sertifikat Ləğv Edildi"
 
-#: my-evolution/Locations.h:194
-msgid "Batesville"
-msgstr "Batesville"
+#: smime/lib/e-cert.c:615
+msgid "Netscape Certificate Type"
+msgstr ""
 
-#: my-evolution/Locations.h:195
-msgid "Batman"
-msgstr "Batman"
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "Sertifikat e'tibarlı deyil"
 
-#: my-evolution/Locations.h:196
-msgid "Baton Rouge"
-msgstr "Baton Rouge"
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "ID"
 
-#: my-evolution/Locations.h:197
-msgid "Battle Creek"
-msgstr "Battle Creek"
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
 
-#: my-evolution/Locations.h:198
-msgid "Battle Mountain"
-msgstr "Battle Mountain"
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
 
-#: my-evolution/Locations.h:199
-msgid "Bauru"
-msgstr "Bauru"
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
 
-#: my-evolution/Locations.h:200
-msgid "Bayamo"
-msgstr "Bayamo"
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
 
-#: my-evolution/Locations.h:201
-msgid "Bayreuth"
-msgstr "Bayreuth"
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
 
-#: my-evolution/Locations.h:202
-msgid "Beatrice"
-msgstr "Beatrice"
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Mövzu %s-dır"
 
-#: my-evolution/Locations.h:203
-msgid "Beaufort"
-msgstr "Beaufort"
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Növbə qovluğu həll edilə bilmədi"
 
-#: my-evolution/Locations.h:204
-msgid "Beaumont"
-msgstr "Beaumont"
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
 
-#: my-evolution/Locations.h:205
-msgid "Beaumont-Port Arthur"
-msgstr "Beaumont-Port Arthur"
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "Hökmsüz Sertifikat Təsdiqi (CA)"
 
-#: my-evolution/Locations.h:206
-msgid "Beauvais-Tille"
-msgstr "Beauvais-Tille"
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Hökmsüz Sertifikat Təsdiqi (CA)"
 
-#: my-evolution/Locations.h:207
-msgid "Beauvechain"
-msgstr "Beauvechain"
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Stauning"
 
-#: my-evolution/Locations.h:208
-msgid "Beckley"
-msgstr "Beckley"
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Mə'lumat Yoxdur"
 
-#: my-evolution/Locations.h:209
-msgid "Bedford"
-msgstr "Bedford"
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
 
-#: my-evolution/Locations.h:210
-msgid "Beijing"
-msgstr "Beijing"
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "ilişdirilmiş fayl"
 
-#: my-evolution/Locations.h:211
-msgid "Beirut"
-msgstr "Beirut"
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
 
-#: my-evolution/Locations.h:212
-msgid "Beja"
-msgstr "Beja"
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "Sertifikat imzası xətası"
 
-#: my-evolution/Locations.h:213
-msgid "Belem"
-msgstr "Belem"
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
 
-#: my-evolution/Locations.h:214
-msgid "Belfast/Aldergrove"
-msgstr "Belfast/Aldergrove"
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Curitiba"
 
-#: my-evolution/Locations.h:215
-msgid "Belfast/Harbour"
-msgstr "Belfast/Harbour"
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "North Carolina"
 
-#: my-evolution/Locations.h:217
-msgid "Belgorod"
-msgstr "Belgorod"
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "İfadə"
 
-#: my-evolution/Locations.h:219
-msgid "Belleville"
-msgstr "Belleville"
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s %s"
 
-#: my-evolution/Locations.h:220
-msgid "Bellingham"
-msgstr "Bellingham"
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Sertifikat imzası xətası"
 
-#: my-evolution/Locations.h:221
-msgid "Belmar-Farmingdale"
-msgstr "Belmar-Farmingdale"
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "_Daxil Et"
 
-#: my-evolution/Locations.h:222
-msgid "Belo Horizonte"
-msgstr "Belo Horizonte"
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
 
-#: my-evolution/Locations.h:223
-msgid "Belo Horizonte Apt"
-msgstr "Belo Horizonte Apt"
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Mövzu %s-dır"
 
-#: my-evolution/Locations.h:224
-msgid "Bemidji"
-msgstr "Bemidji"
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Sertifikat imzası xətası"
 
-#: my-evolution/Locations.h:225
-msgid "Benbecula"
-msgstr "Benbecula"
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
 
-#: my-evolution/Locations.h:226
-msgid "Benina"
-msgstr "Benina"
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "%s üçün şifrəni bildirin"
 
-#: my-evolution/Locations.h:227
-msgid "Benton Harbor"
-msgstr "Benton Harbor"
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "_Sertifikat ID-si:"
 
-#: my-evolution/Locations.h:228
-msgid "Bentonville"
-msgstr "Bentonville"
+#: tools/evolution-launch-composer.c:324
+msgid "An attachment to add."
+msgstr "İlişdiriləcək əlavə."
 
-#: my-evolution/Locations.h:229
-msgid "Beograd"
-msgstr "Beograd"
+#: tools/evolution-launch-composer.c:325
+msgid "Content type of the attachment."
+msgstr "Əlavənin məzmun növü."
 
-#: my-evolution/Locations.h:230
-msgid "Bergamo"
-msgstr "Bergamo"
+#: tools/evolution-launch-composer.c:326
+msgid "The filename to display in the mail."
+msgstr "Poçtda göstəriləcək fayl adı"
 
-#: my-evolution/Locations.h:231
-msgid "Bergen"
-msgstr "Bergen"
+#: tools/evolution-launch-composer.c:327
+msgid "Description of the attachment."
+msgstr "Əlavənin izahatı."
 
-#: my-evolution/Locations.h:232
-msgid "Bergstrom AFB"
-msgstr "Bergstrom AFB"
+#: tools/evolution-launch-composer.c:328
+msgid "Mark attachment to be shown inline by default."
+msgstr ""
 
-#: my-evolution/Locations.h:233
-msgid "Berlevag"
-msgstr "Berlevag"
+#: tools/evolution-launch-composer.c:329
+msgid "Default subject for the message."
+msgstr "İsmarışın ön qurğulu mövzusu."
 
-#: my-evolution/Locations.h:234
-msgid "Berlin"
-msgstr "Berlin"
+#. This most likely means that KILL_PROCESS_CMD wasn't
+#. * found, so just bail completely.
+#.
+#: tools/killev.c:63
+#, c-format
+msgid "Could not execute '%s': %s\n"
+msgstr "'%s' icra edilə bilmədi: %s\n"
 
-#: my-evolution/Locations.h:235
-msgid "Berlin-Tegel"
-msgstr "Berlin-Tegel"
+#: tools/killev.c:78
+#, c-format
+msgid "Shutting down %s (%s)\n"
+msgstr "%s (%s) bağlanır\n"
 
-#: my-evolution/Locations.h:236
-msgid "Berlin-Tempelhof"
-msgstr "Berlin-Tempelhof"
+#: ui/evolution-addressbook.xml.h:3
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "Əlaqə(lər)ni Başqa Qovluğa Köçür..."
 
-#: my-evolution/Locations.h:237
-msgid "Bern"
-msgstr "Bern"
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
+msgid "Copy the selection"
+msgstr "Seçimi köçür"
 
-#: my-evolution/Locations.h:238
-msgid "Bethel"
-msgstr "Bethel"
+#: ui/evolution-addressbook.xml.h:5
+msgid "Copy to Folder..."
+msgstr "Qovluğa _Köçür..."
 
-#: my-evolution/Locations.h:239
-msgid "Bethlehem Airport"
-msgstr "Bethlehem Airport"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
+msgid "Cut the selection"
+msgstr "Seçimi kəs"
 
-#: my-evolution/Locations.h:240
-msgid "Bettles"
-msgstr "Bettles"
+#: ui/evolution-addressbook.xml.h:9
+msgid "Delete selected contacts"
+msgstr "Seçili əlaqələri sil"
 
-#: my-evolution/Locations.h:241
-msgid "Beverly"
-msgstr "Beverly"
+#: ui/evolution-addressbook.xml.h:11
+msgid "Move Contact(s) to Another Folder..."
+msgstr "Əlaqə(lər)ni Başqa Qovluğa Daşı..."
 
-#: my-evolution/Locations.h:242
-msgid "Biarritz-Bayonne"
-msgstr "Biarritz-Bayonne"
+#: ui/evolution-addressbook.xml.h:12
+msgid "Move to Folder..."
+msgstr "Qovluğa _Daşı..."
 
-#: my-evolution/Locations.h:243
-msgid "Bicycle Lake"
-msgstr "Bicycle Lake"
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
+msgid "Paste the clipboard"
+msgstr "Ara yaddaşı yapışdır"
 
-#: my-evolution/Locations.h:244
-msgid "Biggin Hill"
-msgstr "Biggin Hill"
+#: ui/evolution-addressbook.xml.h:15
+msgid "Previews the contacts to be printed"
+msgstr "Çap ediləcək əlaqələri nümayiş etdirər"
 
-#: my-evolution/Locations.h:245
-msgid "Big Piney"
-msgstr "Big Piney"
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
+#: ui/evolution-tasks.xml.h:13
+msgid "Print Pre_view"
+msgstr "Çap Nüma_yişi"
 
-#: my-evolution/Locations.h:246
-msgid "Big River Lake"
-msgstr "Big River Lake"
+#: ui/evolution-addressbook.xml.h:18
+msgid "Print selected contacts"
+msgstr "Seçili əlaqələri çap et"
 
-#: my-evolution/Locations.h:247
-msgid "Bilbao"
-msgstr "Bilbao"
+#: ui/evolution-addressbook.xml.h:20
+msgid "Save selected contacts as a VCard."
+msgstr "Seçili əlaqələri VCard olaraq qeyd et."
 
-#: my-evolution/Locations.h:248
-msgid "Billings"
-msgstr "Billings"
+#: ui/evolution-addressbook.xml.h:21
+msgid "Select All"
+msgstr "Hamısını Seç"
 
-#: my-evolution/Locations.h:249
-msgid "Billund"
-msgstr "Billund"
+#: ui/evolution-addressbook.xml.h:22
+msgid "Select all contacts"
+msgstr "Bütün əlaqələri seç"
 
-#: my-evolution/Locations.h:250
-msgid "Binghamton"
-msgstr "Binghamton"
+#: ui/evolution-addressbook.xml.h:23
+msgid "Send a mess to the selected contacts."
+msgstr "Seçili əlaqələrə ismarış göndər."
 
-#: my-evolution/Locations.h:251
-msgid "Birmingham"
-msgstr "Birmingham"
+#: ui/evolution-addressbook.xml.h:24
+msgid "Send message to contact"
+msgstr "Əlaqəyə ismarış göndər"
 
-#: my-evolution/Locations.h:252
-msgid "Bisha"
-msgstr "Bisha"
+#: ui/evolution-addressbook.xml.h:25
+msgid "Send selected contacts to another person."
+msgstr "Seçili əlaqələri başqa şəxsə göndər."
 
-#: my-evolution/Locations.h:253
-msgid "Bishop"
-msgstr "Bishop"
+#: ui/evolution-addressbook.xml.h:26
+msgid "Stop"
+msgstr "Dayandır"
 
-#: my-evolution/Locations.h:254
-msgid "Bismark"
-msgstr "Bismark"
+#: ui/evolution-addressbook.xml.h:27
+msgid "Stop Loading"
+msgstr "Yükləməni Dayandır"
 
-#: my-evolution/Locations.h:255
-msgid "Blackpool"
-msgstr "Blackpool"
+#: ui/evolution-addressbook.xml.h:28
+msgid "View the current contact"
+msgstr "Hazırkı əlaqəni göstər"
 
-#: my-evolution/Locations.h:256
-msgid "Blagoveschensk"
-msgstr "Blagoveschensk"
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-contact-list-editor.xml.h:11
+#: 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:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
+msgid "_Actions"
+msgstr "_Gedişatlar"
 
-#: my-evolution/Locations.h:257
-msgid "Blanding"
-msgstr "Blanding"
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
+msgid "_Forward Contact..."
+msgstr "Əlaqənı Ö_tür..."
 
-#: my-evolution/Locations.h:258
-msgid "Block Island"
-msgstr "Block Island"
+#: ui/evolution-addressbook.xml.h:35
+msgid "_Move to Folder..."
+msgstr "Qovluğa _Daşı..."
 
-#: my-evolution/Locations.h:259
-msgid "Bloemfontein J. B. M. Hertzog "
-msgstr "Bloemfontein J. B. M. Hertzog "
+#: ui/evolution-addressbook.xml.h:39
+msgid "_Save as VCard"
+msgstr "VCard olaraq _Qeyd Et"
 
-#: my-evolution/Locations.h:260
-msgid "Bloomington"
-msgstr "Bloomington"
+#: ui/evolution-addressbook.xml.h:40
+msgid "_Search for Contacts"
+msgstr "Əlaqə _Axtar"
 
-#: my-evolution/Locations.h:261
-msgid "Blue Canyon"
-msgstr "Blue Canyon"
+#: ui/evolution-addressbook.xml.h:41
+msgid "_Select All"
+msgstr "Hamısını _Seç"
 
-#: my-evolution/Locations.h:262
-msgid "Bluefield"
-msgstr "Bluefield"
+#: ui/evolution-addressbook.xml.h:42
+msgid "_Send Message to Contact..."
+msgstr "Əlaqəyə İsmarış _Göndər..."
 
-#: my-evolution/Locations.h:263
-msgid "Bluefields"
-msgstr "Bluefields"
+#: ui/evolution-calendar.xml.h:3
+#, fuzzy
+msgid "Create a new calendar"
+msgstr "Yeni qovluq yarat"
 
-#: my-evolution/Locations.h:264
-msgid "Blythe"
-msgstr "Blythe"
+#: ui/evolution-calendar.xml.h:5
+msgid "Day"
+msgstr "Gün"
 
-#: my-evolution/Locations.h:265
-msgid "Boa Vista"
-msgstr "Boa Vista"
+#: ui/evolution-calendar.xml.h:6
+msgid "Delete All Occurrences"
+msgstr "Bütün Vaqeələri Sil"
 
-#: my-evolution/Locations.h:266
-msgid "Bocas del Toro"
-msgstr "Bocas del Toro"
+#: ui/evolution-calendar.xml.h:7
+msgid "Delete the appointment"
+msgstr "Görüşü sil"
 
-#: my-evolution/Locations.h:267
-msgid "Bodo"
-msgstr "Bodo"
+#: ui/evolution-calendar.xml.h:8
+msgid "Delete this Occurrence"
+msgstr "Bu Vaqeəni Sil"
 
-#: my-evolution/Locations.h:268
-msgid "Bogota/Eldorado"
-msgstr "Bogota/Eldorado"
+#: ui/evolution-calendar.xml.h:9
+msgid "Delete this occurrence"
+msgstr "Bu _vaqeəni sil"
 
-#: my-evolution/Locations.h:269
-msgid "Boise"
-msgstr "Boise"
+#: ui/evolution-calendar.xml.h:10
+msgid "Go To"
+msgstr "Get"
 
-#: my-evolution/Locations.h:271
-msgid "Bologna"
-msgstr "Bologna"
+#: ui/evolution-calendar.xml.h:11
+msgid "Go back"
+msgstr "Geri get"
 
-#: my-evolution/Locations.h:272
-msgid "Bolzano"
-msgstr "Bolzano"
+#: ui/evolution-calendar.xml.h:12
+msgid "Go forward"
+msgstr "İrəli get"
 
-#: my-evolution/Locations.h:273
-msgid "Bombay/Santacruz"
-msgstr "Bombay/Santacruz"
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Date"
+msgstr "_Tarixə Get"
 
-#: my-evolution/Locations.h:274
-msgid "Boone"
-msgstr "Boone"
+#: ui/evolution-calendar.xml.h:15
+msgid "Go to a specific date"
+msgstr "Xüsusi tarixə get"
 
-#: my-evolution/Locations.h:275
-msgid "Bordeaux"
-msgstr "Bordeaux"
+#: ui/evolution-calendar.xml.h:16
+msgid "Go to today"
+msgstr "Bugünə get"
 
-#: my-evolution/Locations.h:276
-msgid "Borger"
-msgstr "Borger"
+#: ui/evolution-calendar.xml.h:17
+msgid "List"
+msgstr "Siyahı"
 
-#: my-evolution/Locations.h:277
-msgid "Bornholm"
-msgstr "Bornholm"
+#: ui/evolution-calendar.xml.h:18
+msgid "Month"
+msgstr "Ay"
 
-#: my-evolution/Locations.h:278
-msgid "Boscombe Down"
-msgstr "Boscombe Down"
+#: ui/evolution-calendar.xml.h:19
+#, fuzzy
+msgid "New _Calendar"
+msgstr "Yeni Kaledoniya"
 
-#: my-evolution/Locations.h:279
-msgid "Bosnia-Herzegovina"
-msgstr "Bosnia-Herzegovina"
+#: ui/evolution-calendar.xml.h:21
+msgid "Previews the calendar to be printed"
+msgstr "Çap ediləcək təqvimi nümayiş etdirər"
 
-#: my-evolution/Locations.h:280
-msgid "Boston"
-msgstr "Boston"
+#: ui/evolution-calendar.xml.h:23
+msgid "Print this calendar"
+msgstr "Bu təqvimi çap et"
 
-#: my-evolution/Locations.h:281
-msgid "Boulmer"
-msgstr "Boulmer"
+#: ui/evolution-calendar.xml.h:24
+msgid "Publish Free/Busy information for this calendar"
+msgstr "Bu təqvim üçün Sərbəst/Məşğul mə'lumatını dərc et"
 
-#: my-evolution/Locations.h:282
-msgid "Bourges"
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
+#, fuzzy
+msgid "Purg_e"
 msgstr "Bourges"
 
-#: my-evolution/Locations.h:283
-msgid "Bournemouth"
-msgstr "Bournemouth"
+#: ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Purge old appointments and meetings"
+msgstr "Görüş və hadisələri daxil edən ictimai qovluq"
 
-#: my-evolution/Locations.h:284
-msgid "Bowling Green"
-msgstr "Bowling Green"
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Show as list"
+msgstr "Təfsilatı Göstər"
 
-#: my-evolution/Locations.h:285
-msgid "Bozeman"
-msgstr "Bozeman"
+#: ui/evolution-calendar.xml.h:28
+msgid "Show one day"
+msgstr "Bir günü göstər"
 
-#: my-evolution/Locations.h:286
-msgid "Bradford"
-msgstr "Bradford"
+#: ui/evolution-calendar.xml.h:29
+msgid "Show one month"
+msgstr "Bir ayı göstər"
 
-#: my-evolution/Locations.h:287
-msgid "Bradshaw Field"
-msgstr "Bradshaw Field"
+#: ui/evolution-calendar.xml.h:30
+msgid "Show one week"
+msgstr "Bir həftəni göster"
 
-#: my-evolution/Locations.h:288
-msgid "Brainerd"
-msgstr "Brainerd"
+#: ui/evolution-calendar.xml.h:31
+msgid "Show the working week"
+msgstr "İş həftəsini göstər"
 
-#: my-evolution/Locations.h:289
-msgid "Brasilia"
-msgstr "Brasilia"
+#: ui/evolution-calendar.xml.h:32
+msgid "Week"
+msgstr "Həftə"
 
-#: my-evolution/Locations.h:290
-msgid "Brasschaat"
-msgstr "Brasschaat"
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution.xml.h:3
+msgid "Close"
+msgstr "Bağla"
 
-#: my-evolution/Locations.h:291
-msgid "Bratislava"
-msgstr "Bratislava"
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this item"
+msgstr "Bu üzvü bağla"
 
-#: my-evolution/Locations.h:292
-msgid "Bratsk"
-msgstr "Bratsk"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
+msgid "Delete this item"
+msgstr "Bu üzvü sil"
 
-#: my-evolution/Locations.h:293
-msgid "Braunschweig"
-msgstr "Braunschweig"
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:9
+msgid "Main toolbar"
+msgstr "Ana vasitə çubuğu"
 
-#: my-evolution/Locations.h:295
-msgid "Bremen"
-msgstr "Bremen"
+#: ui/evolution-comp-editor.xml.h:7
+msgid "Preview the printed item"
+msgstr "Çap edilən üzvü göstər"
 
-#: my-evolution/Locations.h:296
-msgid "Bremerton"
-msgstr "Bremerton"
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
+msgid "Print this item"
+msgstr "Bu üzvü çap et"
 
-#: my-evolution/Locations.h:297
-msgid "Brest"
-msgstr "Brest"
+#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "_Fərqli Qeyd Et..."
 
-#: my-evolution/Locations.h:298
-msgid "Bridgeport"
-msgstr "Bridgeport"
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-signature-editor.xml.h:7
+msgid "Save and Close"
+msgstr "Qeyd Et və Bağla"
 
-#: my-evolution/Locations.h:299
-msgid "Brindisi"
-msgstr "Brindisi"
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:8
+msgid "Save and _Close"
+msgstr "Qeyd Et və _Bağla"
 
-#: my-evolution/Locations.h:300
-msgid "Brisbane"
-msgstr "Brisbane"
+#: ui/evolution-comp-editor.xml.h:14
+msgid "Save the item and close the dialog box"
+msgstr "Üzvü qeyd et və dialoq qutusunu bağla"
 
-#: my-evolution/Locations.h:301
-msgid "Bristol"
-msgstr "Bristol"
+#: ui/evolution-comp-editor.xml.h:15
+msgid "Save this item to disk"
+msgstr "Bu üzvü diskə qeyd et"
 
-#: my-evolution/Locations.h:302
-msgid "British Columbia"
-msgstr "British Columbia"
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:13
+#: ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:25
+msgid "_File"
+msgstr "_Fayl"
 
-#: my-evolution/Locations.h:303
-msgid "Brno"
-msgstr "Brno"
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
+msgid "_Save"
+msgstr "_Qeyd Et..."
 
-#: my-evolution/Locations.h:304
-msgid "Broadus"
-msgstr "Broadus"
+#: ui/evolution-composer-entries.xml.h:1
+msgid "Copy selected text to the clipboard"
+msgstr "Seçili mətni ara yaddaşa köçür"
 
-#: my-evolution/Locations.h:305
-msgid "Broken Bow"
-msgstr "Broken Bow"
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
+msgid "Cu_t"
+msgstr "Kə_s"
 
-#: my-evolution/Locations.h:306
-msgid "Bronnoysund"
-msgstr "Bronnoysund"
+#: ui/evolution-composer-entries.xml.h:3
+msgid "Cut selected text to the clipboard"
+msgstr "Seçili mətni ara yaddaşa kəs"
 
-#: my-evolution/Locations.h:307
-msgid "Brookings"
-msgstr "Brookings"
+#: ui/evolution-composer-entries.xml.h:4
+msgid "Paste text from the clipboard"
+msgstr "Mətni ara yaddaşdan yapışdır"
 
-#: my-evolution/Locations.h:308
-msgid "Brooksville"
-msgstr "Brooksville"
+#: ui/evolution-composer-entries.xml.h:5 ui/evolution-mail-list.xml.h:13
+#: ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "_Hamısını Seç"
 
-#: my-evolution/Locations.h:309
-msgid "Broome"
-msgstr "Broome"
+#: ui/evolution-composer-entries.xml.h:6
+msgid "Select all text"
+msgstr "Bütün mətni seç"
 
-#: my-evolution/Locations.h:310
-msgid "Brownsville"
-msgstr "Brownsville"
+#: ui/evolution-contact-editor.xml.h:6
+msgid "Print En_velope..."
+msgstr "_Zərfi Çap Et..."
 
-#: my-evolution/Locations.h:311
-msgid "Brunswick"
-msgstr "Brunswick"
+#: ui/evolution-contact-editor.xml.h:11
+msgid "Save the contact and close the dialog box"
+msgstr "Əlaqəni qeyd et və dialoq qutusunu bağla"
 
-#: my-evolution/Locations.h:312
-msgid "Brussels-National Airport"
-msgstr "Brussels-National Airport"
+#: ui/evolution-contact-editor.xml.h:12
+msgid "Send _Message to Contact..."
+msgstr "Əlaqəyə _İsmarış Göndər..."
 
-#: my-evolution/Locations.h:313
-msgid "Bryansk"
-msgstr "Bryansk"
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete this list"
+msgstr "Bu siyahını sil"
 
-#: my-evolution/Locations.h:314
-msgid "Bryce Canyon"
-msgstr "Bryce Canyon"
+#: ui/evolution-contact-list-editor.xml.h:8
+msgid "Save the list and close the dialog box"
+msgstr "Siyahını qeyd et və dialoqu qutusunu bağla"
 
-#: my-evolution/Locations.h:315
-msgid "Bucaramanga/Palonegro"
-msgstr "Bucaramanga/Palonegro"
+#: ui/evolution-contact-list-editor.xml.h:9
+msgid "Se_nd list to other..."
+msgstr "Siyahını başqalarına gö_ndər..."
 
-#: my-evolution/Locations.h:316
-msgid "Bucuresti"
-msgstr "Bucuresti"
+#: ui/evolution-contact-list-editor.xml.h:10
+msgid "Send _message to list..."
+msgstr "Qrupa _ismarış göndər..."
 
-#: my-evolution/Locations.h:317
-msgid "Bucuresti-Otopeni"
-msgstr "Bucuresti-Otopeni"
+#: ui/evolution-contact-list-editor.xml.h:12
+#, fuzzy
+msgid "_Delete..."
+msgstr "Sil..."
 
-#: my-evolution/Locations.h:318
-msgid "Budapest"
-msgstr "Budapest"
+#: ui/evolution-event-editor.xml.h:1
+msgid "Cancel Mee_ting"
+msgstr "Görüşü _Ləğv Et"
 
-#: my-evolution/Locations.h:319
-msgid "Buffalo"
-msgstr "Buffalo"
+#: ui/evolution-event-editor.xml.h:2
+msgid "Cancel the meeting for this item"
+msgstr "Bu üzv üçün görüşü ləğv et"
 
-#: my-evolution/Locations.h:321
-msgid "Bullfrog"
-msgstr "Bullfrog"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
+msgid "Forward as i_Calendar"
+msgstr "i_Calendar şəklində ötür"
 
-#: my-evolution/Locations.h:322
-msgid "Burbank"
-msgstr "Burbank"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
+msgid "Forward this item via email"
+msgstr "Bu üzvü məktubla ötür"
 
-#: my-evolution/Locations.h:323
-msgid "Burgas"
-msgstr "Burgas"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Obtain the latest meeting information"
+msgstr "Ən son görüş mə'lumatını al"
 
-#: my-evolution/Locations.h:324
-msgid "Burley"
-msgstr "Burley"
+#: ui/evolution-event-editor.xml.h:8
+msgid "Re_fresh Meeting"
+msgstr "Görüşü Ye_nilə"
 
-#: my-evolution/Locations.h:325
-msgid "Burlington"
-msgstr "Burlington"
+#: ui/evolution-event-editor.xml.h:9
+msgid "Schedule _Meeting"
+msgstr "_Görüş Planlaşdır"
 
-#: my-evolution/Locations.h:326
-msgid "Burnet"
-msgstr "Burnet"
+#: ui/evolution-event-editor.xml.h:10
+msgid "Schedule a meeting for this item"
+msgstr "Bu üzv üçün görüş planlaşdır"
 
-#: my-evolution/Locations.h:327
-msgid "Burns"
-msgstr "Burns"
+#: ui/evolution-executive-summary.xml.h:1
+msgid "Customize My Evolution"
+msgstr "Evolution Proqramımı Xüsusiləşdir"
 
-#: my-evolution/Locations.h:328
-msgid "Bursa"
-msgstr "Bursa"
+#: ui/evolution-mail-global.xml.h:2
+msgid "Cancel the current mail operation"
+msgstr "Hazırkı məktub əməliyyatını ləğv et"
 
-#: my-evolution/Locations.h:329
-msgid "Burwell"
-msgstr "Burwell"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose _New Message"
+msgstr "_Yeni İsmarış Yaz"
 
-#: my-evolution/Locations.h:330
-msgid "Butte"
-msgstr "Butte"
+#: ui/evolution-mail-global.xml.h:4
+msgid "Create or edit rules for filtering new mail"
+msgstr "Yeni məktub filtrlənməsi üçün qaydalar yaradın və ya təkmilləşdirin"
 
-#: my-evolution/Locations.h:331
-msgid "Caen-Carpiquet"
-msgstr "Caen-Carpiquet"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit virtual folder definitions"
+msgstr "Virtual qovluq izahatları yaradın və ya təkmilləşdirin"
 
-#: my-evolution/Locations.h:332
-msgid "Cagliari"
-msgstr "Cagliari"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Empty _Trash"
+msgstr "Zibil Qutusunu _Boşalt"
 
-#: my-evolution/Locations.h:333
-msgid "Cairns"
-msgstr "Cairns"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Forget _Passwords"
+msgstr "Ş_ifrələri Unut"
 
-#: my-evolution/Locations.h:334
-msgid "Cairo"
-msgstr "Cairo"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr "Yadda saxlanan bütün şifrələri unudaraq onları gələcəkdə yenidən istə"
 
-#: my-evolution/Locations.h:335
-msgid "Calabozo"
-msgstr "Calabozo"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Open a window for composing a mail message"
+msgstr "Məktub ismarışı yazmaq üçün pəncərə aç"
 
-#: my-evolution/Locations.h:336
-msgid "Calcutta/Dum Dum"
-msgstr "Calcutta/Dum Dum"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Bütün qovluqlardaki silinmiş ismarışları həmişəlik sil"
 
-#: my-evolution/Locations.h:337
-msgid "Caldwell"
-msgstr "Caldwell"
+#: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post Ne_w Message"
+msgstr "Yeni İsmarış Göndər"
 
-#: my-evolution/Locations.h:338
-msgid "Calgary"
-msgstr "Calgary"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Post a message to a Public folder"
+msgstr "İctimai qovluğa ismarış göndər"
 
-#: my-evolution/Locations.h:339
-msgid "Cali/Alfonso Bonillaaragon"
-msgstr "Cali/Alfonso Bonillaaragon"
+#: ui/evolution-mail-global.xml.h:13
+msgid "S_ubscribe to Folders..."
+msgstr "Qovluqlarda Qe_ydiyyatdan Keç..."
 
-#: my-evolution/Locations.h:340
-msgid "Caliente"
-msgstr "Caliente"
+#: ui/evolution-mail-global.xml.h:14
+msgid "Show message preview window"
+msgstr "İsmarış nümayiş pəncərəsini göstər"
 
-#: my-evolution/Locations.h:341
-msgid "California"
-msgstr "California"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "Uzaq vericilərdəki qovluqlarda qeydiyyatdan keç ya da qeydiyyatdan çıx"
 
-#: my-evolution/Locations.h:342
-msgid "Calvi-Ste-Catherine"
-msgstr "Calvi-Ste-Catherine"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Virtual Folder _Editor..."
+msgstr "Virtual Qovluq _Editoru..."
 
-#: my-evolution/Locations.h:343
-msgid "Camaguey"
-msgstr "Camaguey"
+#: ui/evolution-mail-global.xml.h:18
+msgid "_Filters..."
+msgstr "_Filtrlər..."
 
-#: my-evolution/Locations.h:344
-msgid "Camarillo"
-msgstr "Camarillo"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Preview Pane"
+msgstr "_Nümayiş Paneli"
 
-#: my-evolution/Locations.h:345
-msgid "Cambridge"
-msgstr "Cambridge"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr "Bu qovluğun xassələrini dəyişdir"
 
-#: my-evolution/Locations.h:346
-msgid "Cameron"
-msgstr "Cameron"
+#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Seçili ismarış(lar)ı ara yaddaşa köçür"
 
-#: my-evolution/Locations.h:347
-msgid "Camiri"
-msgstr "Camiri"
+#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Seçili ismarış(lar)ı ara yaddaşa kəs"
 
-#: my-evolution/Locations.h:348
-msgid "Campeche"
-msgstr "Campeche"
+#: ui/evolution-mail-list.xml.h:4
+#, fuzzy
+msgid "E_xpunge"
+msgstr "_Cız"
 
-#: my-evolution/Locations.h:349
-msgid "Campinas"
-msgstr "Campinas"
+#: ui/evolution-mail-list.xml.h:5
+msgid "Hide S_elected Messages"
+msgstr "S_eçili İsmarışları Gizlə"
 
-#: my-evolution/Locations.h:350
-msgid "Campo"
-msgstr "Campo"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide _Deleted Messages"
+msgstr "_Silinmiş İsmarışları Gizlə"
 
-#: my-evolution/Locations.h:351
-msgid "Campo Grande"
-msgstr "Campo Grande"
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Read Messages"
+msgstr "_Oxunmuş İsmarışları Gizlə"
 
-#: my-evolution/Locations.h:352
-msgid "Camp Stanley/H-207"
-msgstr "Camp Stanley/H-207"
+#: ui/evolution-mail-list.xml.h:8
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr "Üstünə çızıq çəkmək yerinə silinmiş ismarışları gizlə"
 
-#: my-evolution/Locations.h:353
-msgid "Canaan"
-msgstr "Canaan"
+#: ui/evolution-mail-list.xml.h:9
+msgid "Mark All as _Read"
+msgstr "Hamısını _Oxunmış Olaraq İşarələ"
 
-#: my-evolution/Locations.h:355
-msgid "Canarias/Fuerteventura"
-msgstr "Canarias/Fuerteventura"
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark all visible messages as read"
+msgstr "Bütün görünən ismarışları oxunmuş olaraq işarələ"
 
-#: my-evolution/Locations.h:356
-msgid "Canarias/Gran Canaria"
-msgstr "Canarias/Gran Canaria"
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
+msgid "Paste message(s) from the clipboard"
+msgstr "Ara yaddaşdakı ismarış(lar)ı yapışdır"
 
-#: my-evolution/Locations.h:357
-msgid "Canarias/Hierro"
-msgstr "Canarias/Hierro"
+#: ui/evolution-mail-list.xml.h:12
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Bu qovluqdan silinmiş ismarışları həmişəlik sil"
 
-#: my-evolution/Locations.h:358
-msgid "Canarias/Lanzarote"
-msgstr "Canarias/Lanzarote"
+#: ui/evolution-mail-list.xml.h:14
+msgid "Select _Thread"
+msgstr "İl_gəyi Seç"
 
-#: my-evolution/Locations.h:359
-msgid "Canarias/La Palma"
-msgstr "Canarias/La Palma"
+#: ui/evolution-mail-list.xml.h:15
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
+"Ancaq hazırda seçili olmayan ismarışlar olmaq üzərə bütün ismarışları seç"
 
-#: my-evolution/Locations.h:360
-msgid "Canarias/Tenerife Norte"
-msgstr "Canarias/Tenerife Norte"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select all messages in the same thread as the selected message"
+msgstr "Eyni ilgəkdəki bütün ismarışları seçili ismarış olaraq seç"
 
-#: my-evolution/Locations.h:361
-msgid "Canarias/Tenerife Sur"
-msgstr "Canarias/Tenerife Sur"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all visible messages"
+msgstr "Bütün görünən ismarışları seç"
 
-#: my-evolution/Locations.h:362
-msgid "Canberra"
-msgstr "Canberra"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Sh_ow Hidden Messages"
+msgstr "_Gizli İsmarışları Göstər"
 
-#: my-evolution/Locations.h:363
-msgid "Cancun"
-msgstr "Cancun"
+#: ui/evolution-mail-list.xml.h:19
+msgid "Show messages that have been temporarily hidden"
+msgstr "Müvəqqəti olaraq gizlədilmiş ismarışları göstər"
 
-#: my-evolution/Locations.h:364
-msgid "Cannes-Mandelieu"
-msgstr "Cannes-Mandelieu"
+#: ui/evolution-mail-list.xml.h:20
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Oxunmuş bütün ismarışları müvəqqəti olaraq gizlə"
 
-#: my-evolution/Locations.h:365
-msgid "Cantwell"
-msgstr "Cantwell"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Temporarily hide the selected messages"
+msgstr "Seçili ismarışları müvəqqəti olaraq gizlə"
 
-#: my-evolution/Locations.h:366
-msgid "Cape Girardeau"
-msgstr "Cape Girardeau"
+#: ui/evolution-mail-list.xml.h:22
+msgid "Threaded Message list"
+msgstr "İlgəklənmiş İsmarış Siyahısı"
 
-#: my-evolution/Locations.h:367
-msgid "Cape Hatteras"
-msgstr "Cape Hatteras"
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Folder"
+msgstr "_Qovluq"
 
-#: my-evolution/Locations.h:368
-msgid "Cape Lisburne"
-msgstr "Cape Lisburne"
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "Seçimi _Tərs Çevir"
 
-#: my-evolution/Locations.h:369
-msgid "Cape Newenham"
-msgstr "Cape Newenham"
+#: ui/evolution-mail-list.xml.h:28
+msgid "_Threaded Message List"
+msgstr "İlgək_lənmiş İsmarış Siyahısı"
 
-#: my-evolution/Locations.h:370
-msgid "Cape Romanzoff"
-msgstr "Cape Romanzoff"
+#: ui/evolution-mail-message.xml.h:1
+msgid "A_dd Sender to Addressbook"
+msgstr "Yollayanı Ünvan Kitabçasına Ə_lavə Et"
 
-#: my-evolution/Locations.h:371
-msgid "Cape Town D. F. Malan "
-msgstr "Cape Town D. F. Malan "
+#: ui/evolution-mail-message.xml.h:2
+msgid "A_pply Filters"
+msgstr "Filtr _Tədbiq Et"
 
-#: my-evolution/Locations.h:372
-msgid "Capitan Corbeta"
-msgstr "Capitan Corbeta"
+#: ui/evolution-mail-message.xml.h:3
+msgid "Add Sender to Addressbook"
+msgstr "Yollayanı Ünvan Kitabçasına Əlavə Et"
 
-#: my-evolution/Locations.h:373
-msgid "Capo Mele"
-msgstr "Capo Mele"
+#: ui/evolution-mail-message.xml.h:4
+msgid "Apply filter rules to the selected messages"
+msgstr "Seçili ismarışlarlara filtr qaydalarını tədbiq et"
 
-#: my-evolution/Locations.h:374
-msgid "Caracas La Carlota"
-msgstr "Caracas La Carlota"
+#: ui/evolution-mail-message.xml.h:5
+#, fuzzy
+msgid "Caret _Mode"
+msgstr "Mətn Modeli"
 
-#: my-evolution/Locations.h:375
-msgid "Caracas Maiquetia"
-msgstr "Caracas Maiquetia"
+#: ui/evolution-mail-message.xml.h:6
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "Seçili ismarışın bütün alıcılarına cavab yaz"
 
-#: my-evolution/Locations.h:376
-msgid "Caravelas"
-msgstr "Caravelas"
+#: ui/evolution-mail-message.xml.h:7
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "Seçili ismarış göndərən məktublaşma qrupuna cavab yaz"
 
-#: my-evolution/Locations.h:377
-msgid "Carbondale"
-msgstr "Carbondale"
+#: ui/evolution-mail-message.xml.h:8
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Seçili ismarışı göndərənə cavab yaz"
 
-#: my-evolution/Locations.h:378
-msgid "Cardiff"
-msgstr "Cardiff"
+#: ui/evolution-mail-message.xml.h:11
+msgid "Copy selected messages to another folder"
+msgstr "Seçili ismarışları başqa qovluğa köçür"
 
-#: my-evolution/Locations.h:379
-msgid "Caribou"
-msgstr "Caribou"
+#: ui/evolution-mail-message.xml.h:12
+msgid "Create _Virtual Folder From Message"
+msgstr "İsmarışdan _Virtual Qovluq Yarat"
 
-#: my-evolution/Locations.h:380
-msgid "Carlisle"
-msgstr "Carlisle"
+#: ui/evolution-mail-message.xml.h:13
+msgid "Create a rule to filter messages from this sender"
+msgstr "Bu yollayanın ismarışlarını filtrləmək üçün qayda yarat"
 
-#: my-evolution/Locations.h:381
-msgid "Carlsbad"
-msgstr "Carlsbad"
+#: ui/evolution-mail-message.xml.h:14
+msgid "Create a rule to filter messages to these recipients"
+msgstr "Bu alıcıların ismarışlarını filtrləmək üçün qayda yarat"
 
-#: my-evolution/Locations.h:382
-msgid "Carroll"
-msgstr "Carroll"
+#: ui/evolution-mail-message.xml.h:15
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "Bu məktublaşma qrupundakı ismarışları filtrləmək üçün qayda yarat"
 
-#: my-evolution/Locations.h:383
-msgid "Cartagena/Rafael Nunez"
-msgstr "Cartagena/Rafael Nunez"
+#: ui/evolution-mail-message.xml.h:16
+msgid "Create a rule to filter messages with this subject"
+msgstr "Bu mövzulu ismarışları filtrləmək üçün qayda yarat"
 
-#: my-evolution/Locations.h:384
-msgid "Casa Granda"
-msgstr "Casa Granda"
+#: ui/evolution-mail-message.xml.h:17
+msgid "Create a virtual folder for these recipients"
+msgstr "Bu alıcılar üçün virtual qovluq yarat"
 
-#: my-evolution/Locations.h:385
-msgid "Cascade"
-msgstr "Cascade"
+#: ui/evolution-mail-message.xml.h:18
+msgid "Create a virtual folder for this mailing list"
+msgstr "Bu məktublaşma qrupu üçün virtual qovluq yarat"
 
-#: my-evolution/Locations.h:386
-msgid "Casper"
-msgstr "Casper"
+#: ui/evolution-mail-message.xml.h:19
+msgid "Create a virtual folder for this sender"
+msgstr "Bu yollayan üçün virtual qovluq yarat"
 
-#: my-evolution/Locations.h:387
-msgid "Catacamas"
-msgstr "Catacamas"
+#: ui/evolution-mail-message.xml.h:20
+msgid "Create a virtual folder for this subject"
+msgstr "Bu mövzu üçün virtual qovluq yarat"
 
-#: my-evolution/Locations.h:388
-msgid "Catania"
-msgstr "Catania"
+#: ui/evolution-mail-message.xml.h:23
+msgid "Decrease the text size"
+msgstr "Mətn böyüklüyünü azalt"
 
-#: my-evolution/Locations.h:390
-msgid "Cayo Largo del Sur"
-msgstr "Cayo Largo del Sur"
+#: ui/evolution-mail-message.xml.h:25
+msgid "Display the next important message"
+msgstr "Sonrakı vacib ismarışı göstər"
 
-#: my-evolution/Locations.h:391
-msgid "Cazaux"
-msgstr "Cazaux"
+#: ui/evolution-mail-message.xml.h:26
+msgid "Display the next message"
+msgstr "Sonrakı ismarışı göstər"
 
-#: my-evolution/Locations.h:392
-msgid "Cecil NAS"
-msgstr "Cecil NAS"
+#: ui/evolution-mail-message.xml.h:27
+msgid "Display the next unread message"
+msgstr "Sonrakı oxunamış ismarışı göstər"
 
-#: my-evolution/Locations.h:393
-msgid "Cedar City"
-msgstr "Cedar City"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Display the next unread thread"
+msgstr "Sonrakı oxunmamış ilgəyi göstər"
 
-#: my-evolution/Locations.h:394
-msgid "Cedar Rapids"
-msgstr "Cedar Rapids"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Display the previous important message"
+msgstr "Əvvəlki vacib ismarışı göstər"
 
-#: my-evolution/Locations.h:395
-msgid "Central and South America"
-msgstr "Central and South America"
+#: ui/evolution-mail-message.xml.h:30
+msgid "Display the previous message"
+msgstr "Əvvəlki ismarışı göstər"
 
-#: my-evolution/Locations.h:396
-msgid "Cervia"
-msgstr "Cervia"
+#: ui/evolution-mail-message.xml.h:31
+msgid "Display the previous unread message"
+msgstr "Əvvəlki oxunmamış ismarışı göstər"
 
-#: my-evolution/Locations.h:397
-msgid "Chacarita"
-msgstr "Chacarita"
+#: ui/evolution-mail-message.xml.h:32
+msgid "F_orward"
+msgstr "Ö_tür"
 
-#: my-evolution/Locations.h:398
-msgid "Chadron"
-msgstr "Chadron"
+#: ui/evolution-mail-message.xml.h:33
+msgid "Filter on Mailing _List..."
+msgstr "Məktublaşma _Qrupuna görə filtrlə..."
 
-#: my-evolution/Locations.h:399
-msgid "Challis"
-msgstr "Challis"
+#: ui/evolution-mail-message.xml.h:34
+msgid "Filter on Se_nder..."
+msgstr "_Göndərənə görə filtrlə..."
 
-#: my-evolution/Locations.h:400
-msgid "Chamberlain"
-msgstr "Chamberlain"
+#: ui/evolution-mail-message.xml.h:35
+msgid "Filter on _Recipients..."
+msgstr "_Alıcılara görə giltrlə..."
 
-#: my-evolution/Locations.h:401
-msgid "Chambery"
-msgstr "Chambery"
+#: ui/evolution-mail-message.xml.h:36
+msgid "Filter on _Subject..."
+msgstr "_Mövzuya görə filtrlə..."
 
-#: my-evolution/Locations.h:402
-msgid "Champaign"
-msgstr "Champaign"
+#: ui/evolution-mail-message.xml.h:37
+msgid "Flag selected message(s) for follow-up"
+msgstr ""
 
-#: my-evolution/Locations.h:403
-msgid "Chandalar Lake"
-msgstr "Chandalar Lake"
+#: ui/evolution-mail-message.xml.h:38
+msgid "Follow _Up..."
+msgstr ""
 
-#: my-evolution/Locations.h:404
-msgid "Chandler"
-msgstr "Chandler"
+#: ui/evolution-mail-message.xml.h:39
+msgid "Force images in HTML mail to be loaded"
+msgstr "HTML məktublardakı rəsmləri yüklənməyə məcbur et"
 
-#: my-evolution/Locations.h:405
-msgid "Chania"
-msgstr "Chania"
+#: ui/evolution-mail-message.xml.h:41
+msgid "Forward the selected message in the body of a new message"
+msgstr "Seçili ismarışı yeni ismarışın məzmununda ötür"
 
-#: my-evolution/Locations.h:406
-msgid "Chanute"
-msgstr "Chanute"
+#: ui/evolution-mail-message.xml.h:42
+msgid "Forward the selected message quoted like a reply"
+msgstr "Seçili ismarışı sitatlı cavab olaraq ötür"
 
-#: my-evolution/Locations.h:407
-msgid "Chariton"
-msgstr "Chariton"
+#: ui/evolution-mail-message.xml.h:43
+msgid "Forward the selected message to someone"
+msgstr "Seçili ismarışı başqasına ötür"
 
-#: my-evolution/Locations.h:408
-msgid "Charleroi-Brussels South"
-msgstr "Charleroi-Brussels South"
+#: ui/evolution-mail-message.xml.h:44
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Seçili ismarışı başqasına ilişdirərək ötür"
 
-#: my-evolution/Locations.h:409
-msgid "Charles City"
-msgstr "Charles City"
+#: ui/evolution-mail-message.xml.h:45
+msgid "Increase the text size"
+msgstr "Mətn böyüklüyünü artır"
 
-#: my-evolution/Locations.h:410
-msgid "Charleston"
-msgstr "Charleston"
+#: ui/evolution-mail-message.xml.h:47
+msgid "Load _Images"
+msgstr "_Rəsmləri Yüklə"
 
-#: my-evolution/Locations.h:411
-msgid "Charlotte"
-msgstr "Charlotte"
+#: ui/evolution-mail-message.xml.h:49
+msgid "Mark as I_mportant"
+msgstr "_Vacib olaraq işarələ"
 
-#: my-evolution/Locations.h:412
-msgid "Charlottesville"
-msgstr "Charlottesville"
+#: ui/evolution-mail-message.xml.h:50
+msgid "Mark as U_nread"
+msgstr "Ox_unmamış olaraq işarələ"
 
-#: my-evolution/Locations.h:413
-msgid "Chatham"
-msgstr "Chatham"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Mark as Unimp_ortant"
+msgstr "Va_cib olmayan olaraq işarələ"
 
-#: my-evolution/Locations.h:414
-msgid "Chattanooga"
-msgstr "Chattanooga"
+#: ui/evolution-mail-message.xml.h:54
+msgid "Mark the selected message(s) as having been read"
+msgstr "Seçili ismarışları oxunmuş olaraq işarələ"
 
-#: my-evolution/Locations.h:415
-msgid "Cheboksary"
-msgstr "Cheboksary"
+#: ui/evolution-mail-message.xml.h:55
+msgid "Mark the selected message(s) as important"
+msgstr "Seçili ismarışları vacib olaraq işarələ"
 
-#: my-evolution/Locations.h:416
-msgid "Cheju"
-msgstr "Cheju"
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Seçili ismarışları vacib olaraq işarələ"
 
-#: my-evolution/Locations.h:417
-msgid "Chelyabinsk"
-msgstr "Chelyabinsk"
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "İsmarışları oxunmamış olaraq işarələ"
 
-#: my-evolution/Locations.h:418
-msgid "Chengdu"
-msgstr "Chengdu"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Mark the selected message(s) as not having been read"
+msgstr "İsmarışları oxunmamış olaraq işarələ"
 
-#: my-evolution/Locations.h:419
-msgid "Cherbourg"
-msgstr "Cherbourg"
+#: ui/evolution-mail-message.xml.h:59
+msgid "Mark the selected message(s) as unimportant"
+msgstr "Seçili ismarışları vacib olaraq işarələ"
 
-#: my-evolution/Locations.h:420
-msgid "Cherry Point"
-msgstr "Cherry Point"
+#: ui/evolution-mail-message.xml.h:60
+msgid "Mark the selected messages for deletion"
+msgstr "Seçili ismarışları silmə üçün işarələ"
 
-#: my-evolution/Locations.h:421
-msgid "Chetumal"
-msgstr "Chetumal"
+#: ui/evolution-mail-message.xml.h:61
+msgid "Move"
+msgstr "Daşı"
 
-#: my-evolution/Locations.h:422
-msgid "Cheyenne"
-msgstr "Cheyenne"
+#: ui/evolution-mail-message.xml.h:62
+msgid "Move selected message(s) to another folder"
+msgstr "Seçili ismarışları başqa qovluğa daşı"
 
-#: my-evolution/Locations.h:423
-msgid "Chiang Kai Shek"
-msgstr "Chiang Kai Shek"
+#: ui/evolution-mail-message.xml.h:63
+msgid "Next"
+msgstr "Sonrakı"
 
-#: my-evolution/Locations.h:424
-msgid "Chia Tung"
-msgstr "Chia Tung"
+#: ui/evolution-mail-message.xml.h:64
+msgid "Next _Important Message"
+msgstr "Sonrakı _Vacib İsmarış"
 
-#: my-evolution/Locations.h:425
-msgid "Chiayi"
-msgstr "Chiayi"
+#: ui/evolution-mail-message.xml.h:65
+msgid "Next _Thread"
+msgstr "Sonrakı _İlgək"
 
-#: my-evolution/Locations.h:426
-msgid "Chicago-DuPage"
-msgstr "Chicago-DuPage"
+#: ui/evolution-mail-message.xml.h:66
+msgid "Next _Unread Message"
+msgstr "_Sonrakı Oxunmamış İsmarış"
 
-#: my-evolution/Locations.h:427
-msgid "Chicago-Lakefront"
-msgstr "Chicago-Lakefront"
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Tapıla bilmədi"
 
-#: my-evolution/Locations.h:428
-msgid "Chicago-Midway"
-msgstr "Chicago-Midway"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Open the selected message in a new window"
+msgstr "Seçili ismarışı yeni pəncərədə aç"
 
-#: my-evolution/Locations.h:429
-msgid "Chicago-O'Hare"
-msgstr "Chicago-O'Hare"
+#: ui/evolution-mail-message.xml.h:69
+msgid "Open the selected message in the composer to re-send it"
+msgstr "Seçili ismarışı yenidən göndərmək üçün tərtib edicidə aç"
 
-#: my-evolution/Locations.h:430
-msgid "Chichijima"
-msgstr "Chichijima"
+#: ui/evolution-mail-message.xml.h:70
+msgid "Original Si_ze"
+msgstr "Əsl Bö_yüklük"
 
-#: my-evolution/Locations.h:431
-msgid "Chiclayo"
-msgstr "Chiclayo"
+#: ui/evolution-mail-message.xml.h:71
+msgid "P_revious Unread Message"
+msgstr "Ə_vvəlki Oxunmamış İsmarış"
 
-#: my-evolution/Locations.h:432
-msgid "Chico"
-msgstr "Chico"
+#: ui/evolution-mail-message.xml.h:73
+#, fuzzy
+msgid "Post a Repl_y"
+msgstr "Cavab Yaz"
 
-#: my-evolution/Locations.h:433
-msgid "Chicopee Falls"
-msgstr "Chicopee Falls"
+#: ui/evolution-mail-message.xml.h:74
+msgid "Post a reply to a message in a Public folder"
+msgstr "İctimai qovluqdakı ismarışa cavab yaz"
 
-#: my-evolution/Locations.h:434
-msgid "Chievres"
-msgstr "Chievres"
+#: ui/evolution-mail-message.xml.h:75
+msgid "Pr_evious Important Message"
+msgstr "Əvvəlki _Vacib İsmarış"
 
-#: my-evolution/Locations.h:435
-msgid "Chihhang"
-msgstr "Chihhang"
+#: ui/evolution-mail-message.xml.h:76
+msgid "Preview the message to be printed"
+msgstr "Çap ediləcək ismarışı göstər"
 
-#: my-evolution/Locations.h:436
-msgid "Chihuahua"
-msgstr "Chihuahua"
+#: ui/evolution-mail-message.xml.h:77
+msgid "Previous"
+msgstr "Əvvəlki"
 
-#: my-evolution/Locations.h:437
-msgid "Childress"
-msgstr "Childress"
+#: ui/evolution-mail-message.xml.h:80
+msgid "Print this message"
+msgstr "Bu ismarışı çap et"
 
-#: my-evolution/Locations.h:439
-msgid "China Lake"
-msgstr "China Lake"
+#: ui/evolution-mail-message.xml.h:81
+msgid "Re_direct"
+msgstr "İsti_qamətləndir"
 
-#: my-evolution/Locations.h:440
-msgid "Chinandega"
-msgstr "Chinandega"
+#: ui/evolution-mail-message.xml.h:82
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Seçili ismarışı başqasına istiqamətləndir"
 
-#: my-evolution/Locations.h:441
-msgid "Chinmem/Shatou"
-msgstr "Chinmem/Shatou"
+#: ui/evolution-mail-message.xml.h:87
+msgid "Reset the text to its original size"
+msgstr "Mətni əsl böyüklüyünə sıfırla"
 
-#: my-evolution/Locations.h:442
-msgid "Chino"
-msgstr "Chino"
+#: ui/evolution-mail-message.xml.h:88
+#, fuzzy
+msgid "S_earch in Message..."
+msgstr "İsmarışı A_xtar..."
 
-#: my-evolution/Locations.h:443
-msgid "Chippewa County"
-msgstr "Chippewa County"
+#: ui/evolution-mail-message.xml.h:89
+msgid "S_maller"
+msgstr "Daha Ki_çik"
 
-#: my-evolution/Locations.h:444
-msgid "Chita"
-msgstr "Chita"
+#: ui/evolution-mail-message.xml.h:90
+msgid "Save the message as a text file"
+msgstr "İsmarışı mətn faylı olaraq qeyd et"
 
-#: my-evolution/Locations.h:445
-msgid "Chitose Ab"
-msgstr "Chitose Ab"
+#: ui/evolution-mail-message.xml.h:91
+msgid "Search for text in the body of the displayed message"
+msgstr "Göstərilən ismarışın məzmununda mətni axtar"
 
-#: my-evolution/Locations.h:446
-msgid "Chitose ASDF"
-msgstr "Chitose ASDF"
+#: ui/evolution-mail-message.xml.h:92
+msgid "Set up the page settings for your current printer"
+msgstr "Səhifə qurğularını hazırkı çap edicinizə göra uyğunlaşdırın"
 
-#: my-evolution/Locations.h:447
-msgid "Chofu Airport"
-msgstr "Chofu Airport"
+#: ui/evolution-mail-message.xml.h:93
+msgid "Show Email _Source"
+msgstr "Məktub _Mənbəsini Göstər"
 
-#: my-evolution/Locations.h:448
-msgid "Choluteca"
-msgstr "Choluteca"
+#: ui/evolution-mail-message.xml.h:94
+msgid "Show Full _Headers"
+msgstr "_Bütün Başlıqları Göstər"
 
-#: my-evolution/Locations.h:449
-msgid "Chongju Ab"
-msgstr "Chongju Ab"
+#: ui/evolution-mail-message.xml.h:95
+#, fuzzy
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "Göstərilən ismarışın məzmununda mətni axtar"
 
-#: my-evolution/Locations.h:450
-msgid "Christchurch"
-msgstr "Christchurch"
+#: ui/evolution-mail-message.xml.h:96
+msgid "Show message in the normal style"
+msgstr "İsmarışı normal tərzdə göstər"
 
-#: my-evolution/Locations.h:452
-msgid "Chulitna"
-msgstr "Chulitna"
+#: ui/evolution-mail-message.xml.h:97
+msgid "Show message with all email headers"
+msgstr "İsmarışı bütün poçt başlıqları ilə göstər"
 
-#: my-evolution/Locations.h:453
-msgid "Churchill"
-msgstr "Churchill"
+#: ui/evolution-mail-message.xml.h:98
+msgid "Show the raw email source of the message"
+msgstr "İsmarışın xam mənbəsini göstər"
 
-#: my-evolution/Locations.h:454
-msgid "Churchill Falls"
-msgstr "Churchill Falls"
+#: ui/evolution-mail-message.xml.h:99
+msgid "Text Si_ze"
+msgstr "Mətn Bö_yüklüyü"
 
-#: my-evolution/Locations.h:455
-msgid "Cincinnati"
-msgstr "Cincinnati"
+#: ui/evolution-mail-message.xml.h:100
+msgid "Un-delete the selected messages"
+msgstr "Seçili ismarışları geri qətir"
 
-#: my-evolution/Locations.h:456
-msgid "Circle City"
-msgstr "Circle City"
+#: ui/evolution-mail-message.xml.h:101
+msgid "VFolder on Mailing _List..."
+msgstr "Məktublaşma _Qrupuna görə VQovluğa..."
 
-#: my-evolution/Locations.h:457
-msgid "Ciudad Bolivar"
-msgstr "Ciudad Bolivar"
+#: ui/evolution-mail-message.xml.h:102
+msgid "VFolder on Se_nder..."
+msgstr "_Göndərənə görə VQovluğa..."
 
-#: my-evolution/Locations.h:458
-msgid "Ciudad del Carmen"
-msgstr "Ciudad del Carmen"
+#: ui/evolution-mail-message.xml.h:103
+msgid "VFolder on _Recipients..."
+msgstr "_Alıcılara görə VQovluğa..."
 
-#: my-evolution/Locations.h:459
-msgid "Ciudad Juarez"
-msgstr "Ciudad Juarez"
+#: ui/evolution-mail-message.xml.h:104
+msgid "VFolder on _Subject..."
+msgstr "_Mövzuya görə VQovluğa..."
 
-#: my-evolution/Locations.h:460
-msgid "Ciudad Obregon"
-msgstr "Ciudad Obregon"
+#: ui/evolution-mail-message.xml.h:106
+msgid "_Attached"
+msgstr "_İlişdirilmiş"
 
-#: my-evolution/Locations.h:461
-msgid "Ciudad Victoria"
-msgstr "Ciudad Victoria"
+#: ui/evolution-mail-message.xml.h:108
+msgid "_Copy to Folder"
+msgstr "Qovluğa _Köçür"
 
-#: my-evolution/Locations.h:462
-msgid "Clarinda"
-msgstr "Clarinda"
+#: ui/evolution-mail-message.xml.h:109
+msgid "_Create Filter From Message"
+msgstr "İsmarışdan Filtr _Yarat"
 
-#: my-evolution/Locations.h:463
-msgid "Clarion"
-msgstr "Clarion"
+#: ui/evolution-mail-message.xml.h:111
+msgid "_Forward Message"
+msgstr "İsmarışı Ö_tür"
 
-#: my-evolution/Locations.h:464
-msgid "Clarksburg"
-msgstr "Clarksburg"
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Go To"
+msgstr "_Get"
 
-#: my-evolution/Locations.h:465
-msgid "Clayton"
-msgstr "Clayton"
+#: ui/evolution-mail-message.xml.h:113
+msgid "_Inline"
+msgstr "_Daxili"
 
-#: my-evolution/Locations.h:466
-msgid "Clayton Lake"
-msgstr "Clayton Lake"
+#: ui/evolution-mail-message.xml.h:114
+msgid "_Larger"
+msgstr "Daha _Geniş"
 
-#: my-evolution/Locations.h:467
-msgid "Clermont-Ferrand"
-msgstr "Clermont-Ferrand"
+#: ui/evolution-mail-message.xml.h:115
+msgid "_Message Display"
+msgstr "_İsmarış Görünüşü"
 
-#: my-evolution/Locations.h:468
-msgid "Cleveland"
-msgstr "Cleveland"
+#: ui/evolution-mail-message.xml.h:116
+msgid "_Move to Folder"
+msgstr "Qovluğa _Daşı"
 
-#: my-evolution/Locations.h:469
-msgid "Cleveland/Cuyahoga"
-msgstr "Cleveland/Cuyahoga"
+#: ui/evolution-mail-message.xml.h:117
+msgid "_Next Message"
+msgstr "_Sonrakı İsmarış"
 
-#: my-evolution/Locations.h:470
-msgid "Cleveland-Lakefront"
-msgstr "Cleveland-Lakefront"
+#: ui/evolution-mail-message.xml.h:118
+msgid "_Normal Display"
+msgstr "_Normal Görünüş"
 
-#: my-evolution/Locations.h:471
-msgid "Clinton"
-msgstr "Clinton"
+#: ui/evolution-mail-message.xml.h:119
+msgid "_Open Message"
+msgstr "İsmarışı _Aç"
 
-#: my-evolution/Locations.h:472
-msgid "Clovis-Cannon AFB"
-msgstr "Clovis-Cannon AFB"
+#: ui/evolution-mail-message.xml.h:121
+msgid "_Previous Message"
+msgstr "Ə_vvəlki İsmarış"
 
-#: my-evolution/Locations.h:473
-msgid "Cobija"
-msgstr "Cobija"
+#: ui/evolution-mail-message.xml.h:123
+msgid "_Quoted"
+msgstr "_Sitatlandırılmış"
 
-#: my-evolution/Locations.h:474
-msgid "Cochabamba"
-msgstr "Cochabamba"
+#: ui/evolution-mail-message.xml.h:125
+msgid "_Resend..."
+msgstr "_Yenidən Göndər..."
 
-#: my-evolution/Locations.h:475
-msgid "Cocoa Beach"
-msgstr "Cocoa Beach"
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
+msgid "_Tools"
+msgstr "_Vasitələr"
 
-#: my-evolution/Locations.h:476
-msgid "Cocos Island"
-msgstr "Cocos Island"
+#: ui/evolution-mail-message.xml.h:128
+msgid "_Undelete"
+msgstr "_Geri Gətir"
 
-#: my-evolution/Locations.h:477
-msgid "Cody"
-msgstr "Cody"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Bu pəncərəni bağla"
 
-#: my-evolution/Locations.h:478
-msgid "Coeur d'Alene"
-msgstr "Coeur d'Alene"
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "_Bağla"
 
-#: my-evolution/Locations.h:479
-msgid "Cold Bay"
-msgstr "Cold Bay"
+#: ui/evolution-message-composer.xml.h:1
+msgid "Attach"
+msgstr "İlişdir"
 
-#: my-evolution/Locations.h:480
-msgid "Colima"
-msgstr "Colima"
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Fayl ilişdir"
 
-#: my-evolution/Locations.h:481
-msgid "College Station"
-msgstr "College Station"
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
+msgid "Close the current file"
+msgstr "Hazırkı faylı bağla"
 
-#: my-evolution/Locations.h:482
-msgid "Colmar-Meyenheim"
-msgstr "Colmar-Meyenheim"
+#: ui/evolution-message-composer.xml.h:5
+msgid "Delete all but signature"
+msgstr "İmza xaricindəkiləri sil"
 
-#: my-evolution/Locations.h:484
-msgid "Colonia"
-msgstr "Colonia"
+#: ui/evolution-message-composer.xml.h:6
+msgid "Encrypt this message with PGP"
+msgstr "Bu ismarışı PGP ilə şifrələ"
 
-#: my-evolution/Locations.h:485
-msgid "Colorado"
-msgstr "Colorado"
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr "Bu ismarışı şəxsi S/MIME Sertifikatınızla şifrələyin"
 
-#: my-evolution/Locations.h:486
-msgid "Colorado Springs"
-msgstr "Colorado Springs"
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
+msgid "For_mat"
+msgstr "Şə_kil"
 
-#: my-evolution/Locations.h:487
-msgid "Columbia"
-msgstr "Columbia"
+#: ui/evolution-message-composer.xml.h:9
+msgid "HT_ML"
+msgstr "HT_ML"
 
-#: my-evolution/Locations.h:488
-msgid "Columbia-McEntire"
-msgstr "Columbia-McEntire"
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Aç"
 
-#: my-evolution/Locations.h:489
-msgid "Columbus"
-msgstr "Columbus"
+#: ui/evolution-message-composer.xml.h:11
+msgid "Open a file"
+msgstr "Fayl aç"
 
-#: my-evolution/Locations.h:490
-msgid "Columbus-Fort Benning"
-msgstr "Columbus-Fort Benning"
+#: ui/evolution-message-composer.xml.h:12
+msgid "PGP Encrypt"
+msgstr "PGP Şifrələməsi"
 
-#: my-evolution/Locations.h:491
-msgid "Columbus-Gahanna"
-msgstr "Columbus-Gahanna"
+#: ui/evolution-message-composer.xml.h:13
+msgid "PGP Sign"
+msgstr "PGP İmzası"
 
-#: my-evolution/Locations.h:492
-msgid "Columbus-OSU"
-msgstr "Columbus-OSU"
+#: ui/evolution-message-composer.xml.h:14
+msgid "S/MIME Encrypt"
+msgstr "S/MIME Şifrələməsi"
 
-#: my-evolution/Locations.h:493
-msgid "Columbus-W Point-Starkville"
-msgstr "Columbus-W Point-Starkville"
+#: ui/evolution-message-composer.xml.h:15
+msgid "S/MIME Sign"
+msgstr "S/MIME İmzası"
 
-#: my-evolution/Locations.h:494
-msgid "Colville"
-msgstr "Colville"
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:6
+msgid "Save"
+msgstr "Qeyd Et"
 
-#: my-evolution/Locations.h:495
-msgid "Comodoro Rivadavia"
-msgstr "Comodoro Rivadavia"
+#: ui/evolution-message-composer.xml.h:17
+msgid "Save As"
+msgstr "Fərqli Qeyd Et"
 
-#: my-evolution/Locations.h:496
-msgid "Comox"
-msgstr "Comox"
+#: ui/evolution-message-composer.xml.h:19
+msgid "Save _Draft"
+msgstr "_Layihəni Qeyd Et"
 
-#: my-evolution/Locations.h:497
-msgid "Conceicao Do Araguaia"
-msgstr "Conceicao Do Araguaia"
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save in folder..."
+msgstr "_Qovluğa qeyd et..."
 
-#: my-evolution/Locations.h:498
-msgid "Concepcion"
-msgstr "Concepcion"
+#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-signature-editor.xml.h:9
+msgid "Save the current file"
+msgstr "Hazırkı faylı qeyd et"
 
-#: my-evolution/Locations.h:499
-msgid "Concord"
-msgstr "Concord"
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save the current file with a different name"
+msgstr "Hazırkı faylı fərqli ad altında qeyd et"
 
-#: my-evolution/Locations.h:500
-msgid "Concordia"
-msgstr "Concordia"
+#: ui/evolution-message-composer.xml.h:23
+msgid "Save the message in a specified folder"
+msgstr "İsmarışı bildirilən qovluğa qeyd et"
 
-#: my-evolution/Locations.h:501
-msgid "Connaught"
-msgstr "Connaught"
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Göndər"
 
-#: my-evolution/Locations.h:502
-msgid "Connecticut"
-msgstr "Connecticut"
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:11
+msgid "Send the mail in HTML format"
+msgstr "Poçtu HTML şəklində göndər"
 
-#: my-evolution/Locations.h:503
-msgid "Conroe"
-msgstr "Conroe"
+#: ui/evolution-message-composer.xml.h:26
+msgid "Send this message"
+msgstr "Bu ismarışı göndər"
 
-#: my-evolution/Locations.h:504
-msgid "Constantine"
-msgstr "Constantine"
+#: ui/evolution-message-composer.xml.h:27
+msgid "Show / hide attachments"
+msgstr "Əlavələri göstər / gizlət"
 
-#: my-evolution/Locations.h:505
-msgid "Copper Harbor"
-msgstr "Copper Harbor"
+#: ui/evolution-message-composer.xml.h:28
+msgid "Show _attachments"
+msgstr "Ə_lavələri göstər"
 
-#: my-evolution/Locations.h:506
-msgid "Cordoba"
-msgstr "Cordoba"
+#: ui/evolution-message-composer.xml.h:29
+msgid "Show attachments"
+msgstr "Əlavələri göstər"
 
-#: my-evolution/Locations.h:507
-msgid "Cordova"
-msgstr "Cordova"
+#: ui/evolution-message-composer.xml.h:30
+msgid "Sign this message with your PGP key"
+msgstr "Bu ismarışı şəxsi PGP açarınızla imzalayın"
 
-#: my-evolution/Locations.h:508
-msgid "Cork"
-msgstr "Cork"
+#: ui/evolution-message-composer.xml.h:31
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Bu ismarışı şəxsi S/MIME İmza Sertifikatınızla imzalayın"
 
-#: my-evolution/Locations.h:509
-msgid "Coro"
-msgstr "Coro"
+#: ui/evolution-message-composer.xml.h:32
+msgid "Toggles whether the BCC field is displayed"
+msgstr "BCC girişinin göstərilib göstərilməyəcəyini bildirir"
 
-#: my-evolution/Locations.h:510
-msgid "Corona"
-msgstr "Corona"
+#: ui/evolution-message-composer.xml.h:33
+msgid "Toggles whether the CC field is displayed"
+msgstr "CC girişinin göstərilib göstərilməyəcəyini bildirir"
 
-#: my-evolution/Locations.h:511
-msgid "Corpus Christi"
-msgstr "Corpus Christi"
+#: ui/evolution-message-composer.xml.h:34
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Göndərən girişinin göstərilib göstərilməyəcəyini bildirir"
 
-#: my-evolution/Locations.h:512
-msgid "Corpus Christi NAS"
-msgstr "Corpus Christi NAS"
+#: ui/evolution-message-composer.xml.h:35
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "Cavab-Ünvanı girişinin göstərilib göstərilməyəcəyini bildirir"
 
-#: my-evolution/Locations.h:513
-msgid "Corrientes"
-msgstr "Corrientes"
+#: ui/evolution-message-composer.xml.h:36
+msgid "_Attachment..."
+msgstr "Ə_lavə..."
 
-#: my-evolution/Locations.h:514
-msgid "Corsicana"
-msgstr "Corsicana"
+#: ui/evolution-message-composer.xml.h:37
+msgid "_Bcc Field"
+msgstr "_Bcc Girişi"
 
-#: my-evolution/Locations.h:515
-msgid "Cortez"
-msgstr "Cortez"
+#: ui/evolution-message-composer.xml.h:38
+msgid "_Cc Field"
+msgstr "_Cc Girişi"
 
-#: my-evolution/Locations.h:516
-msgid "Corumba"
-msgstr "Corumba"
+#: ui/evolution-message-composer.xml.h:40
+msgid "_Delete all"
+msgstr "Hamısını _sil"
 
-#: my-evolution/Locations.h:518
-msgid "Cotulla"
-msgstr "Cotulla"
+#: ui/evolution-message-composer.xml.h:43
+msgid "_From Field"
+msgstr "_Göndərən Girişi"
 
-#: my-evolution/Locations.h:519
-msgid "Council Bluffs"
-msgstr "Council Bluffs"
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
+msgid "_Insert"
+msgstr "_Daxil Et"
 
-#: my-evolution/Locations.h:520
-msgid "Coventry"
-msgstr "Coventry"
+#: ui/evolution-message-composer.xml.h:45
+msgid "_Open..."
+msgstr "_Aç..."
 
-#: my-evolution/Locations.h:521
-msgid "Covington"
-msgstr "Covington"
+#: ui/evolution-message-composer.xml.h:46
+msgid "_Reply-To Field"
+msgstr "_Cavab-Ünvanı Girişi"
 
-#: my-evolution/Locations.h:522
-msgid "Cozumel"
-msgstr "Cozumel"
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "_Təhlükəsizlik"
 
-#: my-evolution/Locations.h:523
-msgid "Craig"
-msgstr "Craig"
+#: ui/evolution-signature-editor.xml.h:5
+msgid "H_TML"
+msgstr "H_TML"
 
-#: my-evolution/Locations.h:524
-msgid "Cranfield"
-msgstr "Cranfield"
+#: ui/evolution-signature-editor.xml.h:10
+msgid "Save the current file and close the window"
+msgstr "Hazırkı faylı qeyd et və pəncərəni bağla"
 
-#: my-evolution/Locations.h:525
-msgid "Crescent City"
-msgstr "Crescent City"
+#: ui/evolution-subscribe.xml.h:1
+msgid "Add folder to your list of subscribed folders"
+msgstr "Qovluğu qeydiyyatlı qovluqlar siyahısına al"
 
-#: my-evolution/Locations.h:526
-msgid "Creston"
-msgstr "Creston"
+#: ui/evolution-subscribe.xml.h:2
+msgid "F_older"
+msgstr "_Qovluq"
 
-#: my-evolution/Locations.h:527
-msgid "Crestview"
-msgstr "Crestview"
+#: ui/evolution-subscribe.xml.h:3
+msgid "Refresh List"
+msgstr "Siyahını Yenilə"
 
-#: my-evolution/Locations.h:529
-msgid "Cross City"
-msgstr "Cross City"
+#: ui/evolution-subscribe.xml.h:4
+msgid "Refresh List of Folders"
+msgstr "Qovluqlar Siyahısını Yenilə"
 
-#: my-evolution/Locations.h:530
-msgid "Crossville"
-msgstr "Crossville"
+#: ui/evolution-subscribe.xml.h:5
+msgid "Remove folder from your list of subscribed folders"
+msgstr "Qovluğu qeydiyyatlı qovluqlar siyahısından çıxart"
 
-#: my-evolution/Locations.h:531
-msgid "Crotone"
-msgstr "Crotone"
+#: ui/evolution-subscribe.xml.h:7
+msgid "Subscribe"
+msgstr "Qeydiyyatdan Keç"
 
-#: my-evolution/Locations.h:533
-msgid "Cuba Awrs"
-msgstr "Cuba Awrs"
+#: ui/evolution-subscribe.xml.h:8
+msgid "Unsubscribe"
+msgstr "Qeydiyyatdan Çıx"
 
-#: my-evolution/Locations.h:534
-msgid "Cuernavaca"
-msgstr "Cuernavaca"
+#: ui/evolution-task-editor.xml.h:1
+msgid "Assign Task"
+msgstr "Vəzifə Ver"
 
-#: my-evolution/Locations.h:535
-msgid "Cuiaba"
-msgstr "Cuiaba"
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr "Bu vəzifəni başqalarına ver"
 
-#: my-evolution/Locations.h:536
-msgid "Culdrose"
-msgstr "Culdrose"
+#: ui/evolution-task-editor.xml.h:3
+msgid "Cancel Task"
+msgstr "Vəzifəni Ləğv Et"
 
-#: my-evolution/Locations.h:537
-msgid "Culiacan"
-msgstr "Culiacan"
+#: ui/evolution-task-editor.xml.h:4
+msgid "Cancel this task"
+msgstr "Bu vəzifəni ləğv et"
 
-#: my-evolution/Locations.h:538
-msgid "Cumana"
-msgstr "Cumana"
+#: ui/evolution-task-editor.xml.h:7
+msgid "Obtain the latest task information"
+msgstr "Son vəzifə mə'lumatını al"
 
-#: my-evolution/Locations.h:539
-msgid "Cumberland"
-msgstr "Cumberland"
+#: ui/evolution-task-editor.xml.h:8
+msgid "Re_fresh Task"
+msgstr "Vəzifəni Ye_nilə"
 
-#: my-evolution/Locations.h:540
-msgid "Curitiba"
-msgstr "Curitiba"
+#: ui/evolution-tasks.xml.h:3
+msgid "Copy selected task"
+msgstr "Seçili vəzifəni köçür"
 
-#: my-evolution/Locations.h:541
-msgid "Curitiba Apt"
-msgstr "Curitiba Apt"
+#: ui/evolution-tasks.xml.h:5
+msgid "Cut selected task"
+msgstr "Seçili vəzifəni kəs"
 
-#: my-evolution/Locations.h:542
-msgid "Custer"
-msgstr "Custer"
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete completed tasks"
+msgstr "Başa çatmış vəzifələri sil"
 
-#: my-evolution/Locations.h:543
-msgid "Cut Bank"
-msgstr "Cut Bank"
+#: ui/evolution-tasks.xml.h:7
+msgid "Delete selected tasks"
+msgstr "Seçili vəzifələri sil"
 
-#: my-evolution/Locations.h:544
-msgid "Cuzco"
-msgstr "Cuzco"
+#: ui/evolution-tasks.xml.h:8
+msgid "Mar_k as Complete"
+msgstr "Başa Çatmış Olaraq _İşarələ"
 
-#: my-evolution/Locations.h:547
-msgid "Dagali"
-msgstr "Dagali"
+#: ui/evolution-tasks.xml.h:9
+msgid "Mark selected tasks as complete"
+msgstr "Seçili vəzifələri başa çatmış olaraq _işarələ"
 
-#: my-evolution/Locations.h:548
-msgid "Daggett"
-msgstr "Daggett"
+#: ui/evolution-tasks.xml.h:11
+msgid "Paste task from the clipboard"
+msgstr "Vəzifəni ara yaddaşdan yapışdır"
 
-#: my-evolution/Locations.h:549
-msgid "Dalhart"
-msgstr "Dalhart"
+#: ui/evolution-tasks.xml.h:12
+msgid "Previews the list of tasks to be printed"
+msgstr "Çap ediləcək vəzifələr siyahısını göstərir"
 
-#: my-evolution/Locations.h:550
-msgid "Dalian"
-msgstr "Dalian"
+#: ui/evolution-tasks.xml.h:14
+msgid "Print the list of tasks"
+msgstr "Vəzifələr siyahısını çap et"
 
-#: my-evolution/Locations.h:551
-msgid "Dallas-Addison"
-msgstr "Dallas-Addison"
+#: ui/evolution.xml.h:1
+msgid "About Ximian Evolution..."
+msgstr "Ximian Evolution Haqqında..."
 
-#: my-evolution/Locations.h:552
-msgid "Dallas-Fort Worth"
-msgstr "Dallas-Fort Worth"
+#: ui/evolution.xml.h:2
+msgid "Change Evolution's settings"
+msgstr "Evolution qurğularını dəyişdir"
 
-#: my-evolution/Locations.h:553
-msgid "Dallas-Love Field"
-msgstr "Dallas-Love Field"
+#: ui/evolution.xml.h:5
+#, fuzzy
+msgid "Create a new window"
+msgstr "Yeni qovluq yarat"
 
-#: my-evolution/Locations.h:554
-msgid "Dallas-Redbird"
-msgstr "Dallas-Redbird"
+#: ui/evolution.xml.h:6
+msgid "E_xit"
+msgstr "Çı_x"
 
-#: my-evolution/Locations.h:555
-msgid "Da Nang"
-msgstr "Da Nang"
+#: ui/evolution.xml.h:7
+msgid "Exit the program"
+msgstr "Proqramdan çıx"
 
-#: my-evolution/Locations.h:556
-msgid "Danbury"
-msgstr "Danbury"
+#: ui/evolution.xml.h:8
+msgid "Import data from other programs"
+msgstr "Başqa proqramlardan mə'lumatları idxal et"
 
-#: my-evolution/Locations.h:557
-msgid "Danville"
-msgstr "Danville"
+#: ui/evolution.xml.h:10
+#, fuzzy
+msgid "Open a new window"
+msgstr "Yeni Pəncərədə Aç"
 
-#: my-evolution/Locations.h:558
-msgid "Dar-El-Beida"
-msgstr "Dar-El-Beida"
+#: ui/evolution.xml.h:11
+msgid "Pi_lot Settings..."
+msgstr "Pi_lot Qurğuları..."
 
-#: my-evolution/Locations.h:559
-msgid "Davenport"
-msgstr "Davenport"
+#: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Göndər / Al"
 
-#: my-evolution/Locations.h:560
-msgid "David"
-msgstr "David"
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr "Növbədəki məktubları göndər və yenilərini al"
 
-#: my-evolution/Locations.h:561
-msgid "Dawadmi"
-msgstr "Dawadmi"
+#: ui/evolution.xml.h:14
+msgid "Set up Pilot configuration"
+msgstr "Pilot qurğularını sazla"
 
-#: my-evolution/Locations.h:562
-msgid "Dayton"
-msgstr "Dayton"
+#: ui/evolution.xml.h:15
+msgid "Show information about Ximian Evolution"
+msgstr "Ximian Evolution haqqında mə'lumat göstər"
 
-#: my-evolution/Locations.h:563
-msgid "Daytona Beach"
-msgstr "Daytona Beach"
+#: ui/evolution.xml.h:16
+msgid "Submit Bug Report"
+msgstr "Xəta Raportu Göndər"
 
-#: my-evolution/Locations.h:564
-msgid "Dayton-Fairborn"
-msgstr "Dayton-Fairborn"
+#: ui/evolution.xml.h:17
+msgid "Submit _Bug Report"
+msgstr "_Xəta Raportu Göndər"
 
-#: my-evolution/Locations.h:565
-msgid "Dayton-South Airport"
-msgstr "Dayton-South Airport"
+#: ui/evolution.xml.h:18
+msgid "Submit a bug report using Bug Buddy"
+msgstr "Bug Buddy ilə xəta raportu göndər"
 
-#: my-evolution/Locations.h:566
-msgid "Dead Horse"
-msgstr "Dead Horse"
+#: ui/evolution.xml.h:19
+msgid "Toggle whether we are working offline."
+msgstr "Xətdən qopuq modda işlədiyimizi bildir."
 
-#: my-evolution/Locations.h:567
-msgid "Deauville-Saint-Gatien"
-msgstr "Deauville-Saint-Gatien"
+#: ui/evolution.xml.h:21
+msgid "Ximian Evolution _FAQ"
+msgstr "Ximian Evolution _TSS"
 
-#: my-evolution/Locations.h:568
-msgid "Decatur"
-msgstr "Decatur"
+#: ui/evolution.xml.h:22
+msgid "_About Ximian Evolution..."
+msgstr "Ximian Evolution _Haqqında..."
 
-#: my-evolution/Locations.h:569
-msgid "Decimomannu"
-msgstr "Decimomannu"
+#: ui/evolution.xml.h:26
+msgid "_Help"
+msgstr "_Yardım"
 
-#: my-evolution/Locations.h:570
-msgid "Decorah"
-msgstr "Decorah"
+#: ui/evolution.xml.h:27
+msgid "_Import..."
+msgstr "_İdxal Et..."
 
-#: my-evolution/Locations.h:571
-msgid "Deelen"
-msgstr "Deelen"
+#: ui/evolution.xml.h:28
+msgid "_New"
+msgstr "_Yeni"
 
-#: my-evolution/Locations.h:572
-msgid "Dekalb/Peachtree"
-msgstr "Dekalb/Peachtree"
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Göndər / Al"
 
-#: my-evolution/Locations.h:573
-msgid "Delaware"
-msgstr "Delaware"
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "İndi _Tap"
 
-#: my-evolution/Locations.h:574
-msgid "Del Bajio"
-msgstr "Del Bajio"
+#: ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr "İcmalı Çap Et"
 
-#: my-evolution/Locations.h:575
-msgid "Del Rio"
-msgstr "Del Rio"
+#: ui/my-evolution.xml.h:3
+msgid "Print summary"
+msgstr "Çap icmalı"
 
-#: my-evolution/Locations.h:576
-msgid "Delta"
-msgstr "Delta"
+#: ui/my-evolution.xml.h:4
+msgid "Reload"
+msgstr "Yenilə"
 
-#: my-evolution/Locations.h:577
-msgid "Deming"
-msgstr "Deming"
+#: ui/my-evolution.xml.h:5
+msgid "Reload the view"
+msgstr "Nümayişi yenilə"
 
-#: my-evolution/Locations.h:578
-msgid "Den Helder/De Kooy"
-msgstr "Den Helder/De Kooy"
+#: views/addressbook/galview.xml.h:1
+msgid "By _Company"
+msgstr "Ş_irkətə Görə"
 
-#: my-evolution/Locations.h:579
-msgid "Denison"
-msgstr "Denison"
+#: views/addressbook/galview.xml.h:2
+msgid "_Address Cards"
+msgstr "Ünvan _Kartları"
 
-#: my-evolution/Locations.h:581
-msgid "Denton"
-msgstr "Denton"
+#: views/addressbook/galview.xml.h:3
+msgid "_Phone List"
+msgstr "_Telefon Siyahısı"
 
-#: my-evolution/Locations.h:582
-msgid "Denver"
-msgstr "Denver"
+#: views/calendar/galview.xml.h:1
+msgid "W_eek View"
+msgstr "_Həftəlik Nümayiş"
 
-#: my-evolution/Locations.h:583
-msgid "Denver-Aurora"
-msgstr "Denver-Aurora"
+#: views/calendar/galview.xml.h:2
+msgid "_Day View"
+msgstr "_Gündəlik Nümayiş"
 
-#: my-evolution/Locations.h:584
-msgid "Denver-Broomfield"
-msgstr "Denver-Broomfield"
+#: views/calendar/galview.xml.h:3
+msgid "_Month View"
+msgstr "_Aylıq Nümayiş"
 
-#: my-evolution/Locations.h:585
-msgid "Denver-Cherry Knolls"
-msgstr "Denver-Cherry Knolls"
+#: views/calendar/galview.xml.h:4
+msgid "_Work Week View"
+msgstr "İş _Həftəsi Nümayişi"
 
-#: my-evolution/Locations.h:586
-msgid "Desert Rock"
-msgstr "Desert Rock"
+#: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "As _Sent Folder"
+msgstr "Göndərilənlər Qovluğu Olaraq"
 
-#: my-evolution/Locations.h:587
-msgid "Des Moines"
-msgstr "Des Moines"
+#: views/mail/galview.xml.h:2
+#, fuzzy
+msgid "By S_tatus"
+msgstr "Vəziyyətinə Görə"
 
-#: my-evolution/Locations.h:588
-msgid "Destin"
-msgstr "Destin"
+#: views/mail/galview.xml.h:3
+#, fuzzy
+msgid "By Se_nder"
+msgstr "Göndərəninə Görə"
 
-#: my-evolution/Locations.h:589
-msgid "Detroit"
-msgstr "Detroit"
+#: views/mail/galview.xml.h:4
+#, fuzzy
+msgid "By Su_bject"
+msgstr "Mövzuya Görə"
 
-#: my-evolution/Locations.h:590
-msgid "Detroit Lakes"
-msgstr "Detroit Lakes"
+#: views/mail/galview.xml.h:5
+#, fuzzy
+msgid "By _Follow Up Flag"
+msgstr "Bayrağa Görə"
 
-#: my-evolution/Locations.h:591
-msgid "Detroit-Taylor"
-msgstr "Detroit-Taylor"
+#: views/mail/galview.xml.h:6
+#, fuzzy
+msgid "_Messages"
+msgstr "İsmarışlar"
 
-#: my-evolution/Locations.h:592
-msgid "Detroit/Ypsilanti"
-msgstr "Detroit/Ypsilanti"
+#: views/tasks/galview.xml.h:1
+msgid "With _Category"
+msgstr "_Kateqoriya İlə"
 
-#: my-evolution/Locations.h:593
-msgid "Devils Lake"
-msgstr "Devils Lake"
+#: views/tasks/galview.xml.h:2
+msgid "_Tasks"
+msgstr "_Vəzifələr"
 
-#: my-evolution/Locations.h:594
-msgid "Devils Lake (2)"
-msgstr "Devils Lake (2)"
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+msgid "UTC"
+msgstr "UTC"
 
-#: my-evolution/Locations.h:595
-msgid "Dhahran"
-msgstr "Dhahran"
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+msgid "Select a Time Zone"
+msgstr "Vaxt Zolağı Seçin"
 
-#: my-evolution/Locations.h:596
-msgid "Dickinson"
-msgstr "Dickinson"
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+msgid "Time Zones"
+msgstr "Vaxt Zolaqları"
 
-#: my-evolution/Locations.h:597
-msgid "Dijon"
-msgstr "Dijon"
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+"Use the right mouse button to zoom out."
+msgstr ""
+"Xəritə üstündə sahəni seçib vaxt zolağına qərar vermək üçün siçanın sol "
+"düyməsiylə o qismi böyüdərək seç.\n"
+"Sağ siçan düyməsini isə uzaqlaşdırmaq üçün işlədin."
 
-#: my-evolution/Locations.h:598
-msgid "Dillingham"
-msgstr "Dillingham"
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+msgid "_Selection:"
+msgstr "_Seçim:"
 
-#: my-evolution/Locations.h:599
-msgid "Dillon"
-msgstr "Dillon"
+#: widgets/menus/gal-view-menus.c:290
+msgid "_Current View"
+msgstr "_Hazırkı Görünüş"
 
-#: my-evolution/Locations.h:600
-msgid "Dinard"
-msgstr "Dinard"
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:349
+msgid "Custom View"
+msgstr "Xüsusi Görünüş"
 
-#: my-evolution/Locations.h:601
-msgid "District of Columbia"
-msgstr "District of Columbia"
+#: widgets/menus/gal-view-menus.c:358
+msgid "Save Custom View..."
+msgstr "Xüsusi Görünüşü Qeyd Et..."
 
-#: my-evolution/Locations.h:602
-msgid "Diyarbakir"
-msgstr "Diyarbakir"
+#: widgets/menus/gal-view-menus.c:371
+msgid "Define Views..."
+msgstr "Nümayişləri Təyin Et..."
 
-#: my-evolution/Locations.h:603
-msgid "Dnipropetrovsk"
-msgstr "Dnipropetrovsk"
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:423
+msgid "MTWTFSS"
+msgstr "MTWTFSS"
 
-#: my-evolution/Locations.h:604
-msgid "Dobbiaco"
-msgstr "Dobbiaco"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1128
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#: my-evolution/Locations.h:605
-msgid "Dodge City"
-msgstr "Dodge City"
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
+msgid "Now"
+msgstr "İndi"
 
-#: my-evolution/Locations.h:606
-msgid "Doha"
-msgstr "Doha"
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
+msgid "Today"
+msgstr "Bugün"
 
-#: my-evolution/Locations.h:607
-msgid "Dole"
-msgstr "Dole"
+#: widgets/misc/e-cell-date-edit.c:805
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "Vaxt %s şəklində olmalıdır"
 
-#: my-evolution/Locations.h:609
-msgid "Donetsk"
-msgstr "Donetsk"
+#: widgets/misc/e-cell-percent.c:77
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "Faiz qiyməti ikisi də daxil olam üzərə 0 ilə 100 arasında olmalıdır"
 
-#: my-evolution/Locations.h:610
-msgid "Dongsha"
-msgstr "Dongsha"
+#: widgets/misc/e-charset-picker.c:61
+msgid "Baltic"
+msgstr "Baltik"
 
-#: my-evolution/Locations.h:611
-msgid "Dongshi"
-msgstr "Dongshi"
+#: widgets/misc/e-charset-picker.c:62
+msgid "Central European"
+msgstr "Mərkəzi Avropa"
 
-#: my-evolution/Locations.h:612
-msgid "Don Torcuato"
-msgstr "Don Torcuato"
+#: widgets/misc/e-charset-picker.c:63
+msgid "Chinese"
+msgstr "Çincə"
 
-#: my-evolution/Locations.h:613
-msgid "Dortmund-Wickede"
-msgstr "Dortmund-Wickede"
+#: widgets/misc/e-charset-picker.c:64
+msgid "Cyrillic"
+msgstr "Kiril"
 
-#: my-evolution/Locations.h:614
-msgid "Dothan"
-msgstr "Dothan"
+#: widgets/misc/e-charset-picker.c:65
+msgid "Greek"
+msgstr "Yunanca"
 
-#: my-evolution/Locations.h:615
-msgid "Douglas"
-msgstr "Douglas"
+#: widgets/misc/e-charset-picker.c:66
+msgid "Hebrew"
+msgstr "Yəhudicə"
 
-#: my-evolution/Locations.h:616
-msgid "Dover"
-msgstr "Dover"
+#: widgets/misc/e-charset-picker.c:67
+msgid "Japanese"
+msgstr "Yaponca"
 
-#: my-evolution/Locations.h:617
-msgid "Dresden-Klotzsche"
-msgstr "Dresden-Klotzsche"
+#: widgets/misc/e-charset-picker.c:68
+msgid "Korean"
+msgstr "Koreyaca"
 
-#: my-evolution/Locations.h:618
-msgid "Drummond"
-msgstr "Drummond"
+#: widgets/misc/e-charset-picker.c:69
+msgid "Turkish"
+msgstr "Türkçə"
 
-#: my-evolution/Locations.h:619
-msgid "Dubai"
-msgstr "Dubai"
+#: widgets/misc/e-charset-picker.c:70
+msgid "Unicode"
+msgstr "Yunikod"
 
-#: my-evolution/Locations.h:620
-msgid "Dubbo"
-msgstr "Dubbo"
+#: widgets/misc/e-charset-picker.c:71
+msgid "Western European"
+msgstr "Qərbi Avropa"
 
-#: my-evolution/Locations.h:621
-msgid "Dublin"
-msgstr "Dublin"
+#: widgets/misc/e-charset-picker.c:88 widgets/misc/e-charset-picker.c:89
+#: widgets/misc/e-charset-picker.c:90
+msgid "Traditional"
+msgstr "Ənənəvi"
 
-#: my-evolution/Locations.h:622
-msgid "Du Bois"
-msgstr "Du Bois"
+#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:93 widgets/misc/e-charset-picker.c:94
+msgid "Simplified"
+msgstr "Bəsitləşdirilmiş"
 
-#: my-evolution/Locations.h:623
-msgid "Dubrovnik"
-msgstr "Dubrovnik"
+#: widgets/misc/e-charset-picker.c:97
+msgid "Ukrainian"
+msgstr "Ukraynaca"
 
-#: my-evolution/Locations.h:624
-msgid "Dubuque"
-msgstr "Dubuque"
+#: widgets/misc/e-charset-picker.c:100
+msgid "Visual"
+msgstr "Əyani"
 
-#: my-evolution/Locations.h:625
-msgid "Dugway"
-msgstr "Dugway"
+#: widgets/misc/e-charset-picker.c:168
+#, c-format
+msgid "Unknown character set: %s"
+msgstr "Namə'lum hərf dəstəsi: %s"
 
-#: my-evolution/Locations.h:626
-msgid "Duluth"
-msgstr "Duluth"
+#: widgets/misc/e-charset-picker.c:213 widgets/misc/e-charset-picker.c:442
+msgid "Character Encoding"
+msgstr "Hərf Kodlaması"
 
-#: my-evolution/Locations.h:627
-msgid "Dundee"
-msgstr "Dundee"
+#: widgets/misc/e-charset-picker.c:222
+msgid "Enter the character set to use"
+msgstr "İşlədiləcək hərf dəstəsini bildirin"
 
-#: my-evolution/Locations.h:628
-msgid "Durango"
-msgstr "Durango"
+#: widgets/misc/e-charset-picker.c:318
+msgid "Other..."
+msgstr "Başqa..."
 
-#: my-evolution/Locations.h:629
-msgid "Durango Awrs"
-msgstr "Durango Awrs"
+#: widgets/misc/e-clipped-label.c:111
+msgid "..."
+msgstr "..."
 
-#: my-evolution/Locations.h:630
-msgid "Durazno"
-msgstr "Durazno"
+#: widgets/misc/e-filter-bar.c:185
+msgid "Search Editor"
+msgstr "Axtarış Editoru"
 
-#: my-evolution/Locations.h:631
-msgid "Durban Louis Botha "
-msgstr "Durban Louis Botha "
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:206
+msgid "Save Search"
+msgstr "Axtarışı Qeyd Et"
 
-#: my-evolution/Locations.h:632
-msgid "Dusseldorf"
-msgstr "Dusseldorf"
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
+msgid "_Save Search..."
+msgstr "Axtarışı _Qeyd Et..."
 
-#: my-evolution/Locations.h:633
-msgid "Dutch Harbor"
-msgstr "Dutch Harbor"
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
+msgid "_Edit Saved Searches..."
+msgstr "Qeyd Edilmiş Axtarışları Düzəlt..."
 
-#: my-evolution/Locations.h:634
-msgid "Dyersburg"
-msgstr "Dyersburg"
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+msgid "_Advanced..."
+msgstr "Ə_traflı..."
 
-#: my-evolution/Locations.h:635
-msgid "Eagle"
-msgstr "Eagle"
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
+msgstr "A_xtar"
 
-#: my-evolution/Locations.h:636
-msgid "Eagle Range"
-msgstr "Eagle Range"
+#: widgets/misc/e-search-bar.c:537
+msgid "_Find Now"
+msgstr "İndi _Tap"
 
-#: my-evolution/Locations.h:637
-msgid "East London"
-msgstr "East London"
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+msgid "_Clear"
+msgstr "_Təmizlə"
 
-#: my-evolution/Locations.h:638
-msgid "East Midlands"
-msgstr "East Midlands"
+#: widgets/misc/e-search-bar.c:836
+msgid "Item ID"
+msgstr "Üzv ID-si"
 
-#: my-evolution/Locations.h:639
-msgid "East St Louis"
-msgstr "East St Louis"
+#: widgets/misc/e-search-bar.c:843
+msgid "Subitem ID"
+msgstr "Alt üzv-si ID"
 
-#: my-evolution/Locations.h:640
-msgid "Eau Claire"
-msgstr "Eau Claire"
+#: widgets/misc/e-search-bar.c:850
+msgid "Text"
+msgstr "Mətn"
 
-#: my-evolution/Locations.h:642
-msgid "Edinburgh"
-msgstr "Edinburgh"
+#: widgets/misc/e-search-bar.c:930
+#, fuzzy
+msgid "Find _Now"
+msgstr "Axtar"
 
-#: my-evolution/Locations.h:643
-msgid "Edmonton"
-msgstr "Edmonton"
+#~ msgid "Evolution LDIF importer"
+#~ msgstr "Evolution LDIF idxalçısı"
 
-#: my-evolution/Locations.h:644
-msgid "Edmonton/Villeneuve"
-msgstr "Edmonton/Villeneuve"
+#~ msgid "LDAP Data Interchange Format (.ldif)"
+#~ msgstr "LDAP Mə'lumat Dəyişdirmə Formatı (.ldif)"
 
-#: my-evolution/Locations.h:645
-msgid "Eduardo Gomes International"
-msgstr "Eduardo Gomes International"
+#~ msgid "Evolution VCard Importer"
+#~ msgstr "Evolution VCard İdxalçısı"
 
-#: my-evolution/Locations.h:646
-msgid "Edwards AFB"
-msgstr "Edwards AFB"
+#~ msgid "Evolution VCard importer"
+#~ msgstr "Evolution VCard idxalçısı"
 
-#: my-evolution/Locations.h:647
-msgid "Egilsstadir"
-msgstr "Egilsstadir"
+#~ msgid "VCard (.vcf, .gcrd)"
+#~ msgstr "VCard (.vcf, .gcrd)"
 
-#: my-evolution/Locations.h:648
-msgid "Eglin"
-msgstr "Eglin"
+#~ msgid "Primary"
+#~ msgstr "İlk"
 
-#: my-evolution/Locations.h:649
-msgid "Eglington/Londonderry"
-msgstr "Eglington/Londonderry"
+#~ msgid "Prim"
+#~ msgstr "İlk"
 
-#: my-evolution/Locations.h:651
-msgid "Eindhoven"
-msgstr "Eindhoven"
+#~ msgid "Bus"
+#~ msgstr "İş"
 
-#: my-evolution/Locations.h:652
-msgid "Ekofisk"
-msgstr "Ekofisk"
+#~ msgid "Callback"
+#~ msgstr "Qayıdış"
 
-#: my-evolution/Locations.h:653
-msgid "Elazig"
-msgstr "Elazig"
+#~ msgid "Company"
+#~ msgstr "Şirkət"
 
-#: my-evolution/Locations.h:654
-msgid "El Centro"
-msgstr "El Centro"
+#~ msgid "Comp"
+#~ msgstr "Şir"
 
-#: my-evolution/Locations.h:655
-msgid "El Dorado"
-msgstr "El Dorado"
+#~ msgid "Org"
+#~ msgstr "Qur"
 
-#: my-evolution/Locations.h:656
-msgid "Elefsis"
-msgstr "Elefsis"
+#~ msgid "Mobile"
+#~ msgstr "Mobil Telefonu"
 
-#: my-evolution/Locations.h:657
-msgid "Elfin Cove"
-msgstr "Elfin Cove"
+#~ msgid "Car"
+#~ msgstr "Maşın"
 
-#: my-evolution/Locations.h:658
-msgid "Elizabeth City"
-msgstr "Elizabeth City"
+#~ msgid "Bus Fax"
+#~ msgstr "İş Faksı"
 
-#: my-evolution/Locations.h:659
-msgid "Elk City"
-msgstr "Elk City"
+#~ msgid "Business 2"
+#~ msgstr "İş 2"
 
-#: my-evolution/Locations.h:660
-msgid "Elkhart"
-msgstr "Elkhart"
+#~ msgid "Bus 2"
+#~ msgstr "İş 2"
 
-#: my-evolution/Locations.h:661
-msgid "Elkins"
-msgstr "Elkins"
+#~ msgid "Home 2"
+#~ msgstr "Ev 2"
 
-#: my-evolution/Locations.h:662
-msgid "Elko"
-msgstr "Elko"
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
 
-#: my-evolution/Locations.h:663
-msgid "Elmira"
-msgstr "Elmira"
+#~ msgid "TTY"
+#~ msgstr "TTY"
 
-#: my-evolution/Locations.h:664
-msgid "El Monte"
-msgstr "El Monte"
+#~ msgid "Url"
+#~ msgstr "Url"
 
-#: my-evolution/Locations.h:665
-msgid "El Paso"
-msgstr "El Paso"
+#~ msgid "Department"
+#~ msgstr "Bölmə"
 
-#: my-evolution/Locations.h:667
-msgid "El Salvador Int."
-msgstr "El Salvador Int."
+#~ msgid "Dep"
+#~ msgstr "Böl"
 
-#: my-evolution/Locations.h:668
-msgid "Elsenborn"
-msgstr "Elsenborn"
+#~ msgid "Off"
+#~ msgstr "İda"
 
-#: my-evolution/Locations.h:669
-msgid "Ely"
-msgstr "Ely"
+#~ msgid "Profession"
+#~ msgstr "Məslək"
 
-#: my-evolution/Locations.h:670
-msgid "Emmonak"
-msgstr "Emmonak"
+#~ msgid "Prof"
+#~ msgstr "Məs"
 
-#: my-evolution/Locations.h:671
-msgid "Emporia"
-msgstr "Emporia"
+#~ msgid "Man"
+#~ msgstr "İda"
 
-#: my-evolution/Locations.h:672
-msgid "Enid"
-msgstr "Enid"
+#~ msgid "Ass"
+#~ msgstr "Yar"
 
-#: my-evolution/Locations.h:673
-msgid "Enid/Woodring"
-msgstr "Enid/Woodring"
+#~ msgid "Nick"
+#~ msgstr "Ləqəb"
 
-#: my-evolution/Locations.h:674
-msgid "Enosburg Falls"
-msgstr "Enosburg Falls"
+#~ msgid "Calendar URI"
+#~ msgstr "Təqvim URI"
 
-#: my-evolution/Locations.h:675
-msgid "Ephrata"
-msgstr "Ephrata"
+#~ msgid "CALUri"
+#~ msgstr "TƏQUri"
 
-#: my-evolution/Locations.h:676
-msgid "Ercan"
-msgstr "Ercan"
+#~ msgid "Free-busy URL"
+#~ msgstr "Sərbəst-məşğul URL"
 
-#: my-evolution/Locations.h:677
-msgid "Erie"
-msgstr "Erie"
+#~ msgid "FBUrl"
+#~ msgstr "SMUrl"
 
-#: my-evolution/Locations.h:678
-msgid "Erzurum"
-msgstr "Erzurum"
+#~ msgid "Default server calendar"
+#~ msgstr "Ön qurğulu verici təqvimi"
 
-#: my-evolution/Locations.h:679
-msgid "Esbjerg"
-msgstr "Esbjerg"
+#~ msgid "icsCalendar"
+#~ msgstr "icsTəqvim"
 
-#: my-evolution/Locations.h:680
-msgid "Escanaba"
-msgstr "Escanaba"
+#~ msgid "Anniversary"
+#~ msgstr "İldönümü"
 
-#: my-evolution/Locations.h:681
-msgid "Esfahan"
-msgstr "Esfahan"
+#~ msgid "Anniv"
+#~ msgstr "İldö"
 
-#: my-evolution/Locations.h:682
-msgid "Eskisehir"
-msgstr "Eskisehir"
+#~ msgid "Birth Date"
+#~ msgstr "Ad Günü"
 
-#: my-evolution/Locations.h:683
-msgid "Estherville"
-msgstr "Estherville"
+#~ msgid "ECard"
+#~ msgstr "ECard"
 
-#: my-evolution/Locations.h:685
-msgid "Eugene"
-msgstr "Eugene"
+#~ msgid "%x"
+#~ msgstr "%x"
 
-#: my-evolution/Locations.h:686
-msgid "Eureka"
-msgstr "Eureka"
+#~ msgid "Address Label"
+#~ msgstr "Ünvan Etiketi"
 
-#: my-evolution/Locations.h:687
-msgid "Europe"
-msgstr "Europe"
+#~ msgid "Birth date"
+#~ msgstr "Doğum tarixi"
 
-#: my-evolution/Locations.h:688
-msgid "Evanston"
-msgstr "Evanston"
+#~ msgid "Free/Busy URL"
+#~ msgstr "Sərbəst/Məşğul URL"
 
-#: my-evolution/Locations.h:689
-msgid "Evansville"
-msgstr "Evansville"
+#~ msgid "ICS Calendar"
+#~ msgstr "ICS Təqvimi"
 
-#: my-evolution/Locations.h:690
-msgid "Everett"
-msgstr "Everett"
+#~ msgid "Related Contacts"
+#~ msgstr "Bağlı Əlaqələr"
 
-#: my-evolution/Locations.h:691
-msgid "Evergreen"
-msgstr "Evergreen"
+#~ msgid "Category List"
+#~ msgstr "Kateqoriya Siyahısı"
 
-#: my-evolution/Locations.h:692
-msgid "Evreux-Fauville"
-msgstr "Evreux-Fauville"
+#~ msgid "Wants HTML"
+#~ msgstr "HTML İstəyir"
 
-#: my-evolution/Locations.h:693
-msgid "Exeter"
-msgstr "Exeter"
+#~ msgid "Wants HTML set"
+#~ msgstr "HTML dəstəsini istəyir"
 
-#: my-evolution/Locations.h:694
-msgid "Ezeiza"
-msgstr "Ezeiza"
+#~ msgid "List Show Addresses"
+#~ msgstr "Siyahı Ünvanları Göstərsin"
 
-#: my-evolution/Locations.h:695
-msgid "Fagernes"
-msgstr "Fagernes"
+#~ msgid "Arbitrary"
+#~ msgstr "Sərbəst"
 
-#: my-evolution/Locations.h:696
-msgid "Fairbanks"
-msgstr "Fairbanks"
+#~ msgid "Last Use"
+#~ msgstr "Son İstifadə"
 
-#: my-evolution/Locations.h:697
-msgid "Fairchild"
-msgstr "Fairchild"
+#~ msgid "Use Score"
+#~ msgstr "İstifadə Xalı"
 
-#: my-evolution/Locations.h:698
-msgid "Fairfield"
-msgstr "Fairfield"
+#~ msgid "Searching..."
+#~ msgstr "Axtarılır..."
 
-#: my-evolution/Locations.h:699
-msgid "Fairmont"
-msgstr "Fairmont"
+#~ msgid "Using Distinguished Name (DN)"
+#~ msgstr "Fərqlənən Ad (DN) İşlədilir"
 
-#: my-evolution/Locations.h:700
-msgid "Fallon"
-msgstr "Fallon"
+#~ msgid "Using Email Address"
+#~ msgstr "Epoçt Ünvanı İşlədilir"
 
-#: my-evolution/Locations.h:701
-msgid "Falls City"
-msgstr "Falls City"
+#~ msgid "Reconnecting to LDAP server..."
+#~ msgstr "LDAP vericisinə yenidən bağlanır..."
 
-#: my-evolution/Locations.h:702
-msgid "Falmouth-Otis AFB"
-msgstr "Falmouth-Otis AFB"
+#~ msgid "Adding card to LDAP server..."
+#~ msgstr "Kart LDAP vericisinə əlavə edilir..."
 
-#: my-evolution/Locations.h:703
-msgid "Farbanks/Eielson AFB"
-msgstr "Farbanks/Eielson AFB"
+#~ msgid "Removing card from LDAP server..."
+#~ msgstr "Kart LDAP vericisindən çıxardılır..."
 
-#: my-evolution/Locations.h:704
-msgid "Fargo"
-msgstr "Fargo"
+#~ msgid "Modifying card from LDAP server..."
+#~ msgstr "LDAP vericisindəki kart təkmilləşdirilir..."
 
-#: my-evolution/Locations.h:705
-msgid "Farmingdale"
-msgstr "Farmingdale"
+#~ msgid "Receiving LDAP search results..."
+#~ msgstr "LDAP axtarış nəticələri alınır..."
 
-#: my-evolution/Locations.h:706
-msgid "Farmington"
-msgstr "Farmington"
+#~ msgid "Error performing search"
+#~ msgstr "Axtarma xətası"
 
-#: my-evolution/Locations.h:707
-msgid "Farmville"
-msgstr "Farmville"
+#~ msgid "Cursor could not be loaded\n"
+#~ msgstr "Kursir yüklənə bilmədi\n"
 
-#: my-evolution/Locations.h:708
-msgid "Faro"
-msgstr "Faro"
+#~ msgid "EBook not loaded\n"
+#~ msgstr "EKitab yüklü deyil\n"
 
-#: my-evolution/Locations.h:709
-msgid "Fayetteville"
-msgstr "Fayetteville"
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "LDAP qovluq vericilərinizə yetişməni buradan quraşdırın"
 
-#: my-evolution/Locations.h:710
-msgid "Feng Nin"
-msgstr "Feng Nin"
+#~ msgid "Directory Servers"
+#~ msgstr "Qovluq Vericiləri"
 
-#: my-evolution/Locations.h:711
-msgid "Fergus Falls"
-msgstr "Fergus Falls"
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Evolution Ünvan Kitabçası LDAP Quraşdırma İdarəsi"
 
-#: my-evolution/Locations.h:712
-msgid "Fernando De Noronha"
-msgstr "Fernando De Noronha"
+#~ msgid "Folder containing contact information"
+#~ msgstr "Əlaqələr haqqında mə'lumatı daxil edən qovluq"
 
-#: my-evolution/Locations.h:713
-msgid "Ferrara"
-msgstr "Ferrara"
+#~ msgid "LDAP server containing contact information"
+#~ msgstr "Əlaqələr haqqında mə'lumatı daxil edən LDAP vericisi"
 
-#: my-evolution/Locations.h:714
-msgid "Figari"
-msgstr "Figari"
+#~ msgid "Public Contacts"
+#~ msgstr "İctimai Əlaqələr"
 
-#: my-evolution/Locations.h:715
-msgid "Findlay"
-msgstr "Findlay"
+#~ msgid "Public folder containing contact information"
+#~ msgstr "Əlaqələr haqqında mə'lumatı daxil edən ictimai qovluq"
 
-#: my-evolution/Locations.h:717
-msgid "Firenze"
-msgstr "Firenze"
+#~ msgid "Account Name"
+#~ msgstr "Hesab Adı"
 
-#: my-evolution/Locations.h:718
-msgid "Fitchburg"
-msgstr "Fitchburg"
+#~ msgid "Server Name"
+#~ msgstr "Verici Adı"
 
-#: my-evolution/Locations.h:719
-msgid "Flagstaff"
-msgstr "Flagstaff"
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "Evolution proqramının bu inşasında LDAP dəstəyi fəallaşdırılmayıb"
 
-#: my-evolution/Locations.h:720
-msgid "Flint"
-msgstr "Flint"
+#~ msgid "Other Contacts"
+#~ msgstr "Başqa Əlaqələr"
 
-#: my-evolution/Locations.h:721
-msgid "Flippin"
-msgstr "Flippin"
+#~ msgid "The URI that the Folder Browser will display"
+#~ msgstr "Qovluq Səyyahının göstərəcəyi URI"
 
-#: my-evolution/Locations.h:722
-msgid "Florence"
-msgstr "Florence"
+#~ msgid "Disable Queries"
+#~ msgstr "Sorğuları Qeyri-fəallaşdır"
 
-#: my-evolution/Locations.h:723
-msgid "Florennes"
-msgstr "Florennes"
+#~ msgid "Enable Queries (Dangerous!)"
+#~ msgstr "Sorğuları Fəallaşdır (Təhlükəlidir!)"
 
-#: my-evolution/Locations.h:724
-msgid "Flores"
-msgstr "Flores"
+#~ msgid "Add LDAP Server"
+#~ msgstr "LDAP Vericisi Əlavə Et"
 
-#: my-evolution/Locations.h:725
-msgid "Florianopolis"
-msgstr "Florianopolis"
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Addım 4: Ad Göstərilir"
 
-#: my-evolution/Locations.h:726
-msgid "Florida"
-msgstr "Florida"
+#~ msgid "Find contact in"
+#~ msgstr "Əlaqəni burada tap"
 
-#: my-evolution/Locations.h:727
-msgid "Floro"
-msgstr "Floro"
+#~ msgid "Card"
+#~ msgstr "Kart"
 
-#: my-evolution/Locations.h:728
-msgid "Fond Du Lac"
-msgstr "Fond Du Lac"
+#~ msgid "Is New Card"
+#~ msgstr "Yeni Kart Mı"
 
-#: my-evolution/Locations.h:729
-msgid "Forde/Bringeland"
-msgstr "Forde/Bringeland"
+#~ msgid "No cards"
+#~ msgstr "Kart yoxdur"
 
-#: my-evolution/Locations.h:730
-msgid "Forli"
-msgstr "Forli"
+#~ msgid "1 card"
+#~ msgstr "1 kart"
 
-#: my-evolution/Locations.h:731
-msgid "Formosa"
-msgstr "Formosa"
+#~ msgid "%d cards"
+#~ msgstr "%d kart"
 
-#: my-evolution/Locations.h:732
-msgid "Fortaleza"
-msgstr "Fortaleza"
+#~ 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"
 
-#: my-evolution/Locations.h:733
-msgid "Fort Belvoir"
-msgstr "Fort Belvoir"
+#~ 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"
 
-#: my-evolution/Locations.h:734
-msgid "Fort Benning"
-msgstr "Fort Benning"
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Əlaqə əlavə etmək üçün buraya tıqlayın *"
 
-#: my-evolution/Locations.h:735
-msgid "Fort Bragg"
-msgstr "Fort Bragg"
+#~ msgid "Business Address"
+#~ msgstr "İş Ünvanı"
 
-#: my-evolution/Locations.h:736
-msgid "Fort Campbell"
-msgstr "Fort Campbell"
+#~ msgid "Print cards"
+#~ msgstr "Kartları çap et"
 
-#: my-evolution/Locations.h:737
-msgid "Fort Carson"
-msgstr "Fort Carson"
+#~ msgid "Print card"
+#~ msgstr "Kartı çap et"
 
-#: my-evolution/Locations.h:738
-msgid "Fort Collins"
-msgstr "Fort Collins"
+#~ msgid "Untitled appointment"
+#~ msgstr "Adsız görüş"
 
-#: my-evolution/Locations.h:739
-msgid "Fort Collins/Lovel"
-msgstr "Fort Collins/Lovel"
+#~ msgid "Error while communicating with calendar server"
+#~ msgstr "Təqvim vericisi ilə bağlantı qurulurkən xəta oldu"
 
-#: my-evolution/Locations.h:740
-msgid "Fort Dodge"
-msgstr "Fort Dodge"
+#~ msgid ""
+#~ "Could not create the calendar view.  Please check your ORBit and OAF "
+#~ "setup."
+#~ msgstr ""
+#~ "Təqvimin görünüşü quraşdırıla bilmir. Lütfən ORBIT və OAF qurğularınızı "
+#~ "yoxlayın."
 
-#: my-evolution/Locations.h:741
-msgid "Fort Drum"
-msgstr "Fort Drum"
+#~ msgid "Folder containing appointments and events"
+#~ msgstr "Görüş və hadisələri daxil edən qovluq"
 
-#: my-evolution/Locations.h:742
-msgid "Fort Eustis"
-msgstr "Fort Eustis"
+#~ msgid "Public Calendar"
+#~ msgstr "İctimai Təqvim"
 
-#: my-evolution/Locations.h:743
-msgid "Fort Greely/Allen AAF"
-msgstr "Fort Greely/Allen AAF"
+#~ msgid "Folder containing to-do items"
+#~ msgstr "Ediləcək işləri daxil edən qovluq"
 
-#: my-evolution/Locations.h:744
-msgid "Fort Huachuca"
-msgstr "Fort Huachuca"
+#~ msgid "Public Tasks"
+#~ msgstr "İctimai Vəzifələr"
 
-#: my-evolution/Locations.h:745
-msgid "Fort Knox"
-msgstr "Fort Knox"
+#~ msgid "Public folder containing to-do items"
+#~ msgstr "Ediləcək işləri daxil edən ictimai qovluq"
 
-#: my-evolution/Locations.h:746
-msgid "Fort Lauderdale"
-msgstr "Fort Lauderdale"
+#~ msgid "Could not update invalid object"
+#~ msgstr "Hökmsüz cism yenilənə bilmədi"
 
-#: my-evolution/Locations.h:747
-msgid "Fort Lauderdale (International)"
-msgstr "Fort Lauderdale (International)"
+#~ msgid "Object not found, not updated"
+#~ msgstr "Cism tapıla bilmədi, yenilənmədi"
 
-#: my-evolution/Locations.h:748
-msgid "Fort Leonard"
-msgstr "Fort Leonard"
+#~ msgid "You don't have permissions to update this object"
+#~ msgstr "Bu cismi yeniləmə səlahiyyətlərinə malik deyilsiniz"
 
-#: my-evolution/Locations.h:749
-msgid "Fort Lewis"
-msgstr "Fort Lewis"
+#~ msgid "That person is already attending the meeting!"
+#~ msgstr "Bu şəxs onsuz da iclasın iştirakçısıdır!"
 
-#: my-evolution/Locations.h:750
-msgid "Fort Madison"
-msgstr "Fort Madison"
+#~ msgid "URL:"
+#~ msgstr "URL:"
 
-#: my-evolution/Locations.h:751
-msgid "Fort Meade"
-msgstr "Fort Meade"
+#~ msgid "_Save as..."
+#~ msgstr "_Fərqli qeyd et..."
 
-#: my-evolution/Locations.h:752
-msgid "Fort Myers (Page Field)"
-msgstr "Fort Myers (Page Field)"
+#~ msgid "End Date"
+#~ msgstr "Bitiş Tarixi"
 
-#: my-evolution/Locations.h:753
-msgid "Fort Myers (Southwest Florida International)"
-msgstr "Fort Myers (Southwest Florida International)"
+#~ msgid "New _Appointment"
+#~ msgstr "Yeni _Görüş"
 
-#: my-evolution/Locations.h:754
-msgid "Fort Polk-Leesville"
-msgstr "Fort Polk-Leesville"
+#~ msgid "Print..."
+#~ msgstr "Çap Et..."
 
-#: my-evolution/Locations.h:755
-msgid "Fort Riley"
-msgstr "Fort Riley"
+#~ msgid "Make this Occurrence _Movable"
+#~ msgstr "Bu Vaqiə _Daşına Bilsin"
 
-#: my-evolution/Locations.h:756
-msgid "Fort Sill"
-msgstr "Fort Sill"
+#~ msgid "You do not have the right permissions to update the calendar\n"
+#~ msgstr "Təqvimi yeniləmək üçün düzgün səlahiyyətləriniz yoxdur\n"
 
-#: my-evolution/Locations.h:757
-msgid "Fort Smith"
-msgstr "Fort Smith"
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Vəzifələr %s vaxtı açılır"
 
-#: my-evolution/Locations.h:758
-msgid "Fort Stewart"
-msgstr "Fort Stewart"
+#~ msgid "Opening calendar at %s"
+#~ msgstr "Təqvim %s vaxtı açılır"
 
-#: my-evolution/Locations.h:759
-msgid "Fort Stockton"
-msgstr "Fort Stockton"
+#~ msgid "Can't save calendar data: Malformed URI."
+#~ msgstr "Təqvim mə'lumatları qeyd edilə bilmir: Pozulmuş URI."
 
-#: my-evolution/Locations.h:760
-msgid "Fort Wayne"
-msgstr "Fort Wayne"
+#~ msgid "time-now expects 0 arguments"
+#~ msgstr "indiki-vaxt 0 arqument gözləyir"
 
-#: my-evolution/Locations.h:761
-msgid "Fort Worth-Alliance"
-msgstr "Fort Worth-Alliance"
+#~ msgid "make-time expects 1 argument"
+#~ msgstr "vaxt-düzəlt 1 arqument gözləyir"
 
-#: my-evolution/Locations.h:762
-msgid "Fort Worth-Meacham"
-msgstr "Fort Worth-Meacham"
+#~ msgid "make-time expects argument 1 to be a string"
+#~ msgstr "vaxt-düzəlt 1 qatar arqument gözləyir"
 
-#: my-evolution/Locations.h:763
-msgid "Fort Worth NAS"
-msgstr "Fort Worth NAS"
+#~ msgid "make-time argument 1 must be an ISO 8601 date/time string"
+#~ msgstr "vaxt-düzəlt arqumenti 1 ISO 8601 tarix/vaxt qatarı olmalıdır"
 
-#: my-evolution/Locations.h:764
-msgid "Fourchon"
-msgstr "Fourchon"
+#~ msgid "time-add-day expects 2 arguments"
+#~ msgstr "vaxt-gün-əlavə-et 2 arqument gözləyir"
 
-#: my-evolution/Locations.h:765
-msgid "Foz Do Iguacu"
-msgstr "Foz Do Iguacu"
+#~ msgid "time-add-day expects argument 1 to be a time_t"
+#~ msgstr "vaxt-gün-əlavə-et gözlədiyi 1 arqumentinin vaxt_t olmağını gözləyir"
 
-#: my-evolution/Locations.h:767
-msgid "Frankfort"
-msgstr "Frankfort"
+#~ msgid "time-add-day expects argument 2 to be an integer"
+#~ msgstr ""
+#~ "vaxt-gün-əlavə-et gözlədiyi 2 arqumentinin tam sayı olmağını gözləyir"
 
-#: my-evolution/Locations.h:768
-msgid "Frankfurt/Main"
-msgstr "Frankfurt/Main"
+#~ msgid "time-day-begin expects 1 argument"
+#~ msgstr "vaxt-gün-başlanğıcı 1 arqumentini gözləyir"
 
-#: my-evolution/Locations.h:769
-msgid "Franklin"
-msgstr "Franklin"
+#~ msgid "time-day-begin expects argument 1 to be a time_t"
+#~ msgstr ""
+#~ "vaxt-gün-başlanğıcı gözlədiyi 1 arqumentinin vaxt_t olmağını gözləyir"
 
-#: my-evolution/Locations.h:770
-msgid "Fredericton"
-msgstr "Fredericton"
+#~ msgid "time-day-end expects 1 argument"
+#~ msgstr "vaxt-gün-sonu 1 arqumentini gözləyir"
 
-#: my-evolution/Locations.h:771
-msgid "Freeport"
-msgstr "Freeport"
+#~ msgid "time-day-end expects argument 1 to be a time_t"
+#~ msgstr "vaxt-gün-sonu gözlədiyi 1 arqumentinin vaxt_t olmağını gözləyir"
 
-#: my-evolution/Locations.h:772
-msgid "Frenchville"
-msgstr "Frenchville"
+#~ msgid "get-vtype expects 0 arguments"
+#~ msgstr "get-vtype 0 arqument gözləyir"
 
-#: my-evolution/Locations.h:773
-msgid "Fresno"
-msgstr "Fresno"
+#~ msgid "occur-in-time-range? expects 2 arguments"
+#~ msgstr "occur-in-time-range? 2 arqument gözləyir"
 
-#: my-evolution/Locations.h:774
-msgid "Fresno-Chandler"
-msgstr "Fresno-Chandler"
+#~ msgid "occur-in-time-range? expects argument 1 to be a time_t"
+#~ msgstr "occur-in-time-range? time_t olan 1 arqument gözləyir"
 
-#: my-evolution/Locations.h:775
-msgid "Friday Harbor"
-msgstr "Friday Harbor"
+#~ msgid "occur-in-time-range? expects argument 2 to be a time_t"
+#~ msgstr "occur-in-time-range? time_t olan 2 arqument gözləyir"
 
-#: my-evolution/Locations.h:776
-msgid "Friedrichshafen"
-msgstr "Friedrichshafen"
+#~ msgid "contains? expects 2 arguments"
+#~ msgstr "contains? 2 arqument gözləyir"
 
-#: my-evolution/Locations.h:777
-msgid "Frigg"
-msgstr "Frigg"
+#~ msgid "contains? expects argument 1 to be a string"
+#~ msgstr "contains? qatar olan arqument 1 gözləyir"
 
-#: my-evolution/Locations.h:778
-msgid "Frontone"
-msgstr "Frontone"
+#~ msgid "contains? expects argument 2 to be a string"
+#~ msgstr "contains? qatar olan arqument 2 gözləyir"
 
-#: my-evolution/Locations.h:779
-msgid "Frosinone"
-msgstr "Frosinone"
+#~ msgid ""
+#~ "contains? expects argument 1 to be one of \"any\", \"summary\", "
+#~ "\"description\""
+#~ msgstr ""
+#~ "contains? \"any\", \"summary\", \"description\" olan arqument 1 gözləyir"
 
-#: my-evolution/Locations.h:780
-msgid "Fryeburg"
-msgstr "Fryeburg"
+#~ msgid "has-categories? expects at least 1 argument"
+#~ msgstr "has-categories? ən az 1 arqument gözləyir"
 
-#: my-evolution/Locations.h:781
-msgid "Fujairah"
-msgstr "Fujairah"
+#~ msgid ""
+#~ "has-categories? expects all arguments to be strings or one and only one "
+#~ "argument to be a boolean false (#f)"
+#~ msgstr ""
+#~ "has-categories? expects all arguments to be strings or one and only one "
+#~ "argument to be a boolean false (#f)"
 
-#: my-evolution/Locations.h:782
-msgid "Fuji Ab"
-msgstr "Fuji Ab"
+#~ msgid "is-completed? expects 0 arguments"
+#~ msgstr "is-completed? 0 argument gözləyir"
 
-#: my-evolution/Locations.h:783
-msgid "Fukue Airport"
-msgstr "Fukue Airport"
+#~ msgid "completed-before? expects 1 argument"
+#~ msgstr "completed-before? 1 arqument gözləyir"
 
-#: my-evolution/Locations.h:784
-msgid "Fukui Airport"
-msgstr "Fukui Airport"
+#~ msgid "completed-before? expects argument 1 to be a time_t"
+#~ msgstr "completed-before? time_t olan arqumnet 1 gözləyir"
 
-#: my-evolution/Locations.h:785
-msgid "Fukuoka Airport"
-msgstr "Fukuoka Airport"
+#~ msgid "Evaluation of the search expression did not yield a boolean value"
+#~ msgstr "Axtarış ifadəsi boolean qiymət qəbul etmir"
 
-#: my-evolution/Locations.h:786
-msgid "Fullerton"
-msgstr "Fullerton"
+#~ msgid "Failed to decrypt MIME part: parse error"
+#~ msgstr "MIME hissəsinin şifrəsi açıla bilmədi: oxuma xətası"
 
-#: my-evolution/Locations.h:787
-msgid "Funchal"
-msgstr "Funchal"
+#~ msgid "Please enter your password for %s"
+#~ msgstr "Xahiş edirik, %s üçün şifrənizi bildirin"
 
-#: my-evolution/Locations.h:788
-msgid "FYR Macedonia"
-msgstr "FYR Macedonia"
+#~ msgid "Please indicate the nickname of a certificate to sign with."
+#~ msgstr "Xahiş edirik, imzalamaq istədiyiniz sertifikatın ləqəbini bildirin."
 
-#: my-evolution/Locations.h:789
-msgid "Gadsden"
-msgstr "Gadsden"
+#~ msgid "The signature certificate for \"%s\" does not exist."
+#~ msgstr "\"%s\" üçün imza sertifikatı mövcud deyil."
 
-#: my-evolution/Locations.h:790
-msgid "Gage"
-msgstr "Gage"
+#~ msgid "The encryption certificate for \"%s\" does not exist."
+#~ msgstr "\"%s\" üçün şifrələmə sertifikatı mövcud deyil."
 
-#: my-evolution/Locations.h:791
-msgid "Gainesville"
-msgstr "Gainesville"
+#~ msgid "Failed to find certificate for \"%s\"."
+#~ msgstr "\"%s\" üçün sertifikat tapıla bilmədi."
 
-#: my-evolution/Locations.h:792
-msgid "Galax-Hillsville"
-msgstr "Galax-Hillsville"
+#~ msgid "Failed to find a common bulk algorithm."
+#~ msgstr "Ümumi bulk alqoritmi tapıla bilmədi."
 
-#: my-evolution/Locations.h:793
-msgid "Galbraith Lake"
-msgstr "Galbraith Lake"
+#~ msgid "Failed to decode message."
+#~ msgstr "İsmarış şifrəsi açıla bilmədi."
 
-#: my-evolution/Locations.h:794
-msgid "Galeao"
-msgstr "Galeao"
+#~ msgid "Could not create a PGP signature context"
+#~ msgstr "PGP imza məzmunu yaradıla bilmədi."
 
-#: my-evolution/Locations.h:795
-msgid "Galena"
-msgstr "Galena"
+#~ msgid ""
+#~ "Evolution has found GnomeCard files.\n"
+#~ "Would you like them to be imported into Evolution?"
+#~ msgstr ""
+#~ "Evolution GnomeCard faylları tapdı.\n"
+#~ "Onları Evolution idxal etmək istəyirsiniz?"
 
-#: my-evolution/Locations.h:796
-msgid "Galesburg"
-msgstr "Galesburg"
+#~ msgid "Folder containing mail"
+#~ msgstr "Məktub daxil edən qovluq"
 
-#: my-evolution/Locations.h:797
-msgid "Gallup"
-msgstr "Gallup"
+#~ msgid "Public Mail"
+#~ msgstr "İctimai Poçt"
 
-#: my-evolution/Locations.h:798
-msgid "Galveston"
-msgstr "Galveston"
+#~ msgid "Public folder containing mail"
+#~ msgstr "Məktubları daxil edən ictimai qovluq"
 
-#: my-evolution/Locations.h:799
-msgid "Gambell"
-msgstr "Gambell"
+#~ msgid "Virtual Trash"
+#~ msgstr "Virtual Zibil"
 
-#: my-evolution/Locations.h:800
-msgid "Gander"
-msgstr "Gander"
+#~ msgid "Virtual Trash folder"
+#~ msgstr "Virtual Zibil qovluğu"
 
-#: my-evolution/Locations.h:801
-msgid "Garden City"
-msgstr "Garden City"
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Bu qovluq ismarış daxil edə bilməz."
 
-#: my-evolution/Locations.h:802
-msgid "Gary"
-msgstr "Gary"
+#~ msgid "Change this folder's properties"
+#~ msgstr "Bu qovluğun xassələrini dəyişdir"
 
-#: my-evolution/Locations.h:803
-msgid "Gassim"
-msgstr "Gassim"
+#~ msgid ""
+#~ "Some of your mail settings seem corrupt, please check that everything is "
+#~ "in order."
+#~ msgstr ""
+#~ "Bəzi məktub qurğularınız deyəsən xəsarət görüb, xahiş edirik, hər şeyin "
+#~ "yerində olub olmadığını yoxlayın."
 
-#: my-evolution/Locations.h:804
-msgid "Gatineau"
-msgstr "Gatineau"
+#~ msgid "You have not set a mail transport method"
+#~ msgstr "Məktub nəql yolunu bildirməmisiniz"
 
-#: my-evolution/Locations.h:805
-msgid "Gaziantep"
-msgstr "Gaziantep"
+#~ msgid "You have unsent messages, do you wish to quit anyway?"
+#~ msgstr "Göndərilməmiş ismarışlarınız var, yenə də çıxmaq istəyirsiniz?"
 
-#: my-evolution/Locations.h:806
-msgid "Gdansk"
-msgstr "Gdansk"
+#~ msgid "New Message Post"
+#~ msgstr "Yeni İsmarış Göndərilməsi"
 
-#: my-evolution/Locations.h:807
-msgid "Geneve"
-msgstr "Geneve"
+#~ msgid "_Post Message"
+#~ msgstr "İsmarış _Yolla"
 
-#: my-evolution/Locations.h:808
-msgid "Genova"
-msgstr "Genova"
+#~ msgid "Post a new mail message"
+#~ msgstr "Yeni məktub ismarışı yolla"
 
-#: my-evolution/Locations.h:809
-msgid "George Airport"
-msgstr "George Airport"
+#~ msgid "Connecting..."
+#~ msgstr "Bağlanır..."
 
-#: my-evolution/Locations.h:810
-msgid "Georgetown"
-msgstr "Georgetown"
+#~ msgid "Cannot register storage with shell"
+#~ msgstr "Nüsxə qabığ ilə qeyd edilə bilmədi"
 
-#: my-evolution/Locations.h:813
-msgid "Ghardaia"
-msgstr "Ghardaia"
+#~ msgid "Properties for \"%s\""
+#~ msgstr "\"%s\" xassələri"
 
-#: my-evolution/Locations.h:814
-msgid "Ghedi"
-msgstr "Ghedi"
+#~ msgid "%d new"
+#~ msgstr "%d yeni"
 
-#: my-evolution/Locations.h:816
-msgid "Gifu Ab"
-msgstr "Gifu Ab"
+#~ msgid ", "
+#~ msgstr ", "
 
-#: my-evolution/Locations.h:817
-msgid "Gila Bend"
-msgstr "Gila Bend"
+#~ msgid "%d hidden"
+#~ msgstr "%d gizli"
 
-#: my-evolution/Locations.h:818
-msgid "Gillette"
-msgstr "Gillette"
+#~ msgid "%d visible"
+#~ msgstr "%d görünən"
 
-#: my-evolution/Locations.h:819
-msgid "Gilze-Rijen"
-msgstr "Gilze-Rijen"
+#~ msgid "%d selected"
+#~ msgstr "%d seçili"
 
-#: my-evolution/Locations.h:820
-msgid "Gioia del Colle"
-msgstr "Gioia del Colle"
+#~ msgid "%d unsent"
+#~ msgstr "%d yollanmamış"
 
-#: my-evolution/Locations.h:821
-msgid "Girona"
-msgstr "Girona"
+#~ msgid "%d sent"
+#~ msgstr "%d yollanmış"
 
-#: my-evolution/Locations.h:822
-msgid "Gizan"
-msgstr "Gizan"
+#~ msgid "%d total"
+#~ msgstr "cəmi %d"
 
-#: my-evolution/Locations.h:823
-msgid "Glasgow"
-msgstr "Glasgow"
+#~ msgid "VFolder on M_ailing List"
+#~ msgstr "_Məktublaşma Qrupuna görə VQovluğa"
 
-#: my-evolution/Locations.h:824
-msgid "Glendive"
-msgstr "Glendive"
+#~ msgid "Filter on _Mailing List (%s)"
+#~ msgstr "(%s) _Məktublaşma Qrupuna görə filtrlə"
 
-#: my-evolution/Locations.h:825
-msgid "Glens Falls"
-msgstr "Glens Falls"
+#~ msgid "VFolder on M_ailing List (%s)"
+#~ msgstr "(%s) Məktublaşma Qrupuna görə VQovluğa"
 
-#: my-evolution/Locations.h:826
-msgid "Goiania"
-msgstr "Goiania"
+#~ msgid "Getting Folder Information"
+#~ msgstr "Qovluq Mə'lumatı Alınır"
 
-#: my-evolution/Locations.h:827
-msgid "Goldsboro"
-msgstr "Goldsboro"
+#~ msgid ""
+#~ "You have not configured the mail client.\n"
+#~ "You need to do this before you can send,\n"
+#~ "receive or compose mail.\n"
+#~ "Would you like to configure it now?"
+#~ msgstr ""
+#~ "Məktub alıcısını quraşdırmamışsınız.\n"
+#~ "Məktub yazmaq, almaq və göndərmədən əvvəl \n"
+#~ "bunu etməlisiniz.\n"
+#~ "Alıcınızı indi quraşdırmaq istəyirsiniz?"
 
-#: my-evolution/Locations.h:828
-msgid "Goodland"
-msgstr "Goodland"
+#~ msgid ""
+#~ "You need to configure an account\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "Məktub göndərmədən əvvəl bir \n"
+#~ "hesab quraşdırmalısınız."
 
-#: my-evolution/Locations.h:829
-msgid "Goose Bay"
-msgstr "Goose Bay"
+#~ msgid ""
+#~ "You need to configure an identity\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "Məktub göndərmədən əvvəl bir \n"
+#~ "şəxs quraşdırmalısınız."
 
-#: my-evolution/Locations.h:830
-msgid "Goteborg (Landvetter)"
-msgstr "Goteborg (Landvetter)"
+#~ msgid ""
+#~ "You need to configure a mail transport\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "Məktub göndərmədən əvvəl bir \n"
+#~ "poçt nəqliyyatı quraşdırmalısınız."
 
-#: my-evolution/Locations.h:831
-msgid "Goteborg (Save)"
-msgstr "Goteborg (Save)"
+#~ msgid "Send anyway?"
+#~ msgstr "Yenə də yollansın?"
 
-#: my-evolution/Locations.h:832
-msgid "Granada"
-msgstr "Granada"
+#~ msgid "Move message(s) to"
+#~ msgstr "İsmarış(ları) daşı"
 
-#: my-evolution/Locations.h:833
-msgid "Grand Canyon"
-msgstr "Grand Canyon"
+#~ msgid "Copy message(s) to"
+#~ msgstr "İsmarış(ları) köçür"
 
-#: my-evolution/Locations.h:834
-msgid "Grand Cayman"
-msgstr "Grand Cayman"
+#~ msgid "Are you sure you want to edit all %d messages?"
+#~ msgstr "Bütün `%d' ismarışlarını dəyişdirmək istədiyinizə əminsiniz?"
 
-#: my-evolution/Locations.h:835
-msgid "Grand Forks"
-msgstr "Grand Forks"
+#~ msgid ""
+#~ "You may only edit messages saved\n"
+#~ "in the Drafts folder."
+#~ msgstr ""
+#~ "Ancaq Layihələr qovluğundakı\n"
+#~ "ismarışları dəyişdirə bilərsiniz."
 
-#: my-evolution/Locations.h:836
-msgid "Grand Island"
-msgstr "Grand Island"
+#~ msgid ""
+#~ "You may only resend messages\n"
+#~ "in the Sent folder."
+#~ msgstr ""
+#~ "Ancaq Göndərilən qovluğundakı\n"
+#~ "ismarışları yenidən göndərə bilərsiniz."
 
-#: my-evolution/Locations.h:837
-msgid "Grand Isle"
-msgstr "Grand Isle"
+#~ msgid "Are you sure you want to resend all %d messages?"
+#~ msgstr "Bütün `%d' ismarışlarını yenidən göndərmək istədiyinizə əminsiniz?"
 
-#: my-evolution/Locations.h:838
-msgid "Grand Junction"
-msgstr "Grand Junction"
+#~ msgid "No Message Selected"
+#~ msgstr "Seçili İsmarış Yoxdur"
 
-#: my-evolution/Locations.h:839
-msgid "Grand Marais"
-msgstr "Grand Marais"
+#~ msgid "Save Messages As..."
+#~ msgstr "İsmarışları Fərqli Qeyd Et..."
 
-#: my-evolution/Locations.h:840
-msgid "Grand Rapids"
-msgstr "Grand Rapids"
+#~ msgid "Printing of message failed"
+#~ msgstr "İsmarışın çap edilməsi bacarılmadı"
 
-#: my-evolution/Locations.h:841
-msgid "Grandview"
-msgstr "Grandview"
+#~ msgid "Are you sure you want to open all %d messages in separate windows?"
+#~ msgstr "Bütün %d ismarışı ayrı ayrı pəncərələrdə açmaq istəyirsiniz?"
 
-#: my-evolution/Locations.h:842
-msgid "Grangeville"
-msgstr "Grangeville"
+#~ msgid "Alwa_ys sign outgoing messages when using this account"
+#~ msgstr "Bu hesab işlədildiyində göndərilən ismarışları həmişə _imzala"
 
-#: my-evolution/Locations.h:843
-msgid "Grants"
-msgstr "Grants"
+#~ msgid "Digital IDs..."
+#~ msgstr "Dijital ID-lər..."
 
-#: my-evolution/Locations.h:844
-msgid "Graz"
-msgstr "Graz"
+#~ msgid "Get Digital ID..."
+#~ msgstr "Dijital ID-ni Al..."
 
-#: my-evolution/Locations.h:845
-msgid "Great Falls"
-msgstr "Great Falls"
+#~ msgid "Could not create a S/MIME signature context."
+#~ msgstr "S/MIME imza məzmunu yaradıla bilmədi."
 
-#: my-evolution/Locations.h:847
-msgid "Greeley"
-msgstr "Greeley"
+#~ msgid "Could not create a S/MIME certsonly context."
+#~ msgstr "S/MIME sırf-sert məzmunu yaradıla bilmədi."
 
-#: my-evolution/Locations.h:848
-msgid "Green Bay"
-msgstr "Green Bay"
+#~ msgid "Could not create a S/MIME encryption context."
+#~ msgstr "S/MIME şifrələmə məzmunu yaradıla bilmədi."
 
-#: my-evolution/Locations.h:849
-msgid "Green River"
-msgstr "Green River"
+#~ msgid "Could not create a S/MIME envelope context."
+#~ msgstr "S/MIME zərf məzmunu yaradıla bilmədi."
 
-#: my-evolution/Locations.h:850
-msgid "Greensboro"
-msgstr "Greensboro"
+#~ msgid "Could not create a S/MIME decode context."
+#~ msgstr "S/MIME şifrə açma məzmunu yaradıla bilmədi."
 
-#: my-evolution/Locations.h:851
-msgid "Greenville"
-msgstr "Greenville"
+#~ msgid ""
+#~ "File `%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "`%s' faylı onsuzda mövcuddur.\n"
+#~ "Üstünə yazılsın?"
 
-#: my-evolution/Locations.h:852
-msgid "Greenville-Spartanburg"
-msgstr "Greenville-Spartanburg"
+#~ msgid "Save Attachment"
+#~ msgstr "İlişdirilmiş Faylı Qeyd Et"
 
-#: my-evolution/Locations.h:853
-msgid "Greenwood"
-msgstr "Greenwood"
+#~ msgid "Save Attachment..."
+#~ msgstr "İlişdirilmiş Faylı Qeyd Et..."
 
-#: my-evolution/Locations.h:854
-msgid "Grenoble-Saint-Geoirs"
-msgstr "Grenoble-Saint-Geoirs"
+#~ msgid "View Inline (via %s)"
+#~ msgstr "Daxili Olaraq Göstər (%s ilə)"
 
-#: my-evolution/Locations.h:855
-msgid "Griffiss AFB"
-msgstr "Griffiss AFB"
+#~ msgid "External Viewer"
+#~ msgstr "Xarici Nümayişçi"
 
-#: my-evolution/Locations.h:856
-msgid "Groningen"
-msgstr "Groningen"
+#~ msgid "Downloading images"
+#~ msgstr "Rəsmlərin Endirilməsi"
 
-#: my-evolution/Locations.h:857
-msgid "Grosseto"
-msgstr "Grosseto"
+#~ msgid "Loading message content"
+#~ msgstr "İsmarış məzmununun yüklənməsi"
 
-#: my-evolution/Locations.h:858
-msgid "Groton"
-msgstr "Groton"
+#~ msgid "Overdue:"
+#~ msgstr "Gecikmiş işlər:"
 
-#: my-evolution/Locations.h:859
-msgid "Guadalajara"
-msgstr "Guadalajara"
+#~ msgid "by %B %d, %Y, %l:%M %p"
+#~ msgstr "%B %d, %Y, %l:%M %p tarixinə dək"
 
-#: my-evolution/Locations.h:860
-msgid "Guadalupe Pass"
-msgstr "Guadalupe Pass"
+#~ msgid "Save Link as (FIXME)"
+#~ msgstr "Körpünü Fərqli Qeyd Et"
 
-#: my-evolution/Locations.h:861
-msgid "Guanare"
-msgstr "Guanare"
+#~ msgid "Save Image as..."
+#~ msgstr "Rəsmi Fərqli Qeyd Et..."
 
-#: my-evolution/Locations.h:862
-msgid "Guangzhou"
-msgstr "Guangzhou"
+#~ msgid "Bad Address"
+#~ msgstr "Səhv Ünvan"
 
-#: my-evolution/Locations.h:863
-msgid "Guantanamo"
-msgstr "Guantanamo"
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "Bu ismarış dijital olaraq imzalanmışdır. Ətraflı mə'lumat üçün qıfıl "
+#~ "timsalına tıqlayın."
 
-#: my-evolution/Locations.h:864
-msgid "Guarany"
-msgstr "Guarany"
+#~ msgid "Could not create a PGP verfication context"
+#~ msgstr "PGP təsdiq məzmunu yaradıla bilmədi"
 
-#: my-evolution/Locations.h:865
-msgid "Guaratingueta"
-msgstr "Guaratingueta"
+#~ msgid "Local folders/%s"
+#~ msgstr "Yerli qovluqlar/%s"
 
-#: my-evolution/Locations.h:866
-msgid "Guarulhos"
-msgstr "Guarulhos"
+#~ msgid "Reconfiguring folder"
+#~ msgstr "Qovluq yenidən quraşdırılır"
 
-#: my-evolution/Locations.h:868
-msgid "Guayaquil/Simon Bolivar"
-msgstr "Guayaquil/Simon Bolivar"
+#~ msgid ""
+#~ "Cannot save folder metainfo; you may find you can't\n"
+#~ "open this folder anymore: %s: %s"
+#~ msgstr ""
+#~ "Qovluğun meta mə'lumatı qeyd edilə bilmir;\n"
+#~ "Bu qovluğu bir də aça bilməyə bilərsiniz: %s: %s"
 
-#: my-evolution/Locations.h:869
-msgid "Guaymas"
-msgstr "Guaymas"
+#~ msgid "Cannot save folder metainfo to %s: %s"
+#~ msgstr "%s üstündə meta mə'lumatı qeyd edilə bilmir: %s"
 
-#: my-evolution/Locations.h:870
-msgid "Guernsey"
-msgstr "Guernsey"
+#~ msgid "Cannot delete folder metadata %s: %s"
+#~ msgstr "Qovluq meta mə'lumatı %s silinə bilmir: %s"
 
-#: my-evolution/Locations.h:871
-msgid "Guidonia"
-msgstr "Guidonia"
+#~ msgid "Changing folder \"%s\" to \"%s\" format"
+#~ msgstr "\"%s\" qovluğu \"%s\" şəklinə çevrilir"
 
-#: my-evolution/Locations.h:872
-msgid "Gulfport"
-msgstr "Gulfport"
+#~ msgid ""
+#~ "If you can no longer open this mailbox, then\n"
+#~ "you may need to repair it manually."
+#~ msgstr ""
+#~ "Bu qovluğu bir də aça bilməsəniz, onu əllə\n"
+#~ "bərpa etməlisiniz."
 
-#: my-evolution/Locations.h:873
-msgid "Gulkana"
-msgstr "Gulkana"
+#~ msgid "Reconfigure /%s"
+#~ msgstr "Yenidən quraşdır /%s"
 
-#: my-evolution/Locations.h:874
-msgid "Gullfax C"
-msgstr "Gullfax C"
+#~ msgid "You cannot change the format of a non-local folder."
+#~ msgstr "Yerli olmayan qovluqların şəklini dəyişdirə bilməzsiniz."
 
-#: my-evolution/Locations.h:875
-msgid "Gunnison"
-msgstr "Gunnison"
+#~ msgid "(Untitled Message)"
+#~ msgstr "(Adsız İsmarış)"
 
-#: my-evolution/Locations.h:876
-msgid "Gunnison (2)"
-msgstr "Gunnison (2)"
+#~ msgid "Untitled Message"
+#~ msgstr "Adsız İsmarış"
 
-#: my-evolution/Locations.h:877
-msgid "Guriat"
-msgstr "Guriat"
+#~ msgid "Empty Message"
+#~ msgstr "Boş İsmarış"
 
-#: my-evolution/Locations.h:878
-msgid "Gustavus"
-msgstr "Gustavus"
+#~ msgid "Search Forward"
+#~ msgstr "İrəliyə Doğru Axtar"
 
-#: my-evolution/Locations.h:879
-msgid "Guymon"
-msgstr "Guymon"
+#~ msgid "(No subject)"
+#~ msgstr "(Mövzusuz)"
 
-#: my-evolution/Locations.h:880
-msgid "Habana"
-msgstr "Habana"
+#~ msgid "%s - Message"
+#~ msgstr "%s - İsmarış"
 
-#: my-evolution/Locations.h:881
-msgid "Hachijojima Airport"
-msgstr "Hachijojima Airport"
+#~ msgid "Scanning folders under %s on \"%s\""
+#~ msgstr "%s altındakı qovluqlar oxunur (\"%s\" üstündəki)"
 
-#: my-evolution/Locations.h:882
-msgid "Hachinohe Ab"
-msgstr "Hachinohe Ab"
+#~ msgid "Scanning root-level folders on \"%s\""
+#~ msgstr "\"%s\" üstündəki kök səviyyəsi qovluqlar oxunur"
 
-#: my-evolution/Locations.h:883
-msgid "Hafr Al-Batin"
-msgstr "Hafr Al-Batin"
+#~ msgid "Subscribing to folder \"%s\""
+#~ msgstr "\"%s\" qovluğuna qeydiyyat aparılır"
 
-#: my-evolution/Locations.h:884
-msgid "Hagerstown"
-msgstr "Hagerstown"
+#~ msgid "Unsubscribing to folder \"%s\""
+#~ msgstr "\"%s\" qovluğundan qeydiyyat silinir"
 
-#. HAIL
-#: my-evolution/Locations.h:885 my-evolution/metar.c:218
-msgid "Hail"
-msgstr "Dolu"
+#~ msgid "Scanning folders ..."
+#~ msgstr "Qovluqlar oxunur ..."
 
-#: my-evolution/Locations.h:886
-msgid "Hailey-Sun Valley"
-msgstr "Hailey-Sun Valley"
+#~ msgid "Configure the appearance of the Evolution Summary here"
+#~ msgstr "Evolution İcmalının görünüşünü buradan quraşdırın"
 
-#: my-evolution/Locations.h:887
-msgid "Haines"
-msgstr "Haines"
+#~ msgid "Evolution Summary"
+#~ msgstr "Evolutionun İcmalı"
 
-#: my-evolution/Locations.h:889
-msgid "Hakodate Airport"
-msgstr "Hakodate Airport"
+#~ msgid "Evolution Summary component"
+#~ msgstr "Evolution İcmal tərkib hissəsi"
 
-#: my-evolution/Locations.h:890
-msgid "Halifax"
-msgstr "Halifax"
+#~ msgid "Evolution Summary configuration control"
+#~ msgstr "Evolution İcmal quraşdırma idarəsi"
 
-#: my-evolution/Locations.h:891
-msgid "Hamamatsu Ab"
-msgstr "Hamamatsu Ab"
+#~ msgid "Summary Preferences"
+#~ msgstr "İcmal Xassələri"
 
-#: my-evolution/Locations.h:892
-msgid "Hamburg"
-msgstr "Hamburg"
+#~ msgid "Aarhus"
+#~ msgstr "Aarhus"
 
-#: my-evolution/Locations.h:893
-msgid "Hamburg-Finkenwerder"
-msgstr "Hamburg-Finkenwerder"
+#~ msgid "Abakan"
+#~ msgstr "Abakan"
 
-#: my-evolution/Locations.h:894
-msgid "Hamilton"
-msgstr "Hamilton"
+#~ msgid "Abbotsford"
+#~ msgstr "Abbotsford"
 
-#: my-evolution/Locations.h:895
-msgid "Hammerfest"
-msgstr "Hammerfest"
+#~ msgid "Aberdeen"
+#~ msgstr "Aberdeen"
 
-#: my-evolution/Locations.h:896
-msgid "Hampton"
-msgstr "Hampton"
+#~ msgid "Abha"
+#~ msgstr "Abha"
 
-#: my-evolution/Locations.h:897
-msgid "Hanamaki Airport"
-msgstr "Hanamaki Airport"
+#~ msgid "Abilene"
+#~ msgstr "Abilene"
 
-#: my-evolution/Locations.h:898
-msgid "Hancock"
-msgstr "Hancock"
+#~ msgid "Abingdon"
+#~ msgstr "Abingdon"
 
-#: my-evolution/Locations.h:899
-msgid "Hangzhou"
-msgstr "Hangzhou"
+#~ msgid "Abu Dhabi"
+#~ msgstr "Abu Dhabi"
 
-#: my-evolution/Locations.h:900
-msgid "Hanksville"
-msgstr "Hanksville"
+#~ msgid "Abu Dhabi - Bateen"
+#~ msgstr "Abu Dhabi - Bateen"
 
-#: my-evolution/Locations.h:901
-msgid "Hannover"
-msgstr "Hannover"
+#~ msgid "Acajutla"
+#~ msgstr "Acajutla"
 
-#: my-evolution/Locations.h:902
-msgid "Ha Noi"
-msgstr "Ha Noi"
+#~ msgid "Acapulco"
+#~ msgstr "Acapulco"
 
-#: my-evolution/Locations.h:903
-msgid "Harbor Beach"
-msgstr "Harbor Beach"
+#~ msgid "Acarigua"
+#~ msgstr "Acarigua"
 
-#: my-evolution/Locations.h:904
-msgid "Harlingen"
-msgstr "Harlingen"
+#~ msgid "Adak"
+#~ msgstr "Adak"
 
-#: my-evolution/Locations.h:905
-msgid "Harlowton"
-msgstr "Harlowton"
+#~ msgid "Adana"
+#~ msgstr "Adana"
 
-#: my-evolution/Locations.h:906
-msgid "Harrisburg"
-msgstr "Harrisburg"
+#~ msgid "Adana/Incirlik"
+#~ msgstr "Adana/Incirlik"
 
-#: my-evolution/Locations.h:907
-msgid "Harrison"
-msgstr "Harrison"
+#~ msgid "Adelaide"
+#~ msgstr "Adelaide"
 
-#: my-evolution/Locations.h:908
-msgid "Harstad/Narvik/Evenes"
-msgstr "Harstad/Narvik/Evenes"
+#~ msgid "Aden"
+#~ msgstr "Aden"
 
-#: my-evolution/Locations.h:909
-msgid "Hartford"
-msgstr "Hartford"
+#~ msgid "Adrar"
+#~ msgstr "Adrar"
 
-#: my-evolution/Locations.h:910
-msgid "Hassi-Messaoud"
-msgstr "Hassi-Messaoud"
+#~ msgid "Aeroparque"
+#~ msgstr "Aeroparque"
 
-#: my-evolution/Locations.h:911
-msgid "Hastings"
-msgstr "Hastings"
+#~ msgid "Aeropuerto del Norte"
+#~ msgstr "Aeropuerto del Norte"
 
-#: my-evolution/Locations.h:912
-msgid "Haugesund"
-msgstr "Haugesund"
+#~ msgid "Afonsos"
+#~ msgstr "Afonsos"
 
-#: my-evolution/Locations.h:913
-msgid "Havre"
-msgstr "Havre"
+#~ msgid "Africa"
+#~ msgstr "Africa"
 
-#: my-evolution/Locations.h:914
-msgid "Hawaii"
-msgstr "Hawaii"
+#~ msgid "Afyon"
+#~ msgstr "Afyon"
 
-#: my-evolution/Locations.h:915
-msgid "Hawthorne"
-msgstr "Hawthorne"
+#~ msgid "Agen"
+#~ msgstr "Agen"
 
-#: my-evolution/Locations.h:916
-msgid "Hayden"
-msgstr "Hayden"
+#~ msgid "Aguascaliantes"
+#~ msgstr "Aguascaliantes"
 
-#: my-evolution/Locations.h:917
-msgid "Hayes River"
-msgstr "Hayes River"
+#~ msgid "Ahmadabad"
+#~ msgstr "Ahmadabad"
 
-#: my-evolution/Locations.h:918
-msgid "Hays"
-msgstr "Hays"
+#~ msgid "Ahwaz"
+#~ msgstr "Ahwaz"
 
-#: my-evolution/Locations.h:919
-msgid "Hayward"
-msgstr "Hayward"
+#~ msgid "Ainsworth"
+#~ msgstr "Ainsworth"
 
-#: my-evolution/Locations.h:920
-msgid "Healy River"
-msgstr "Healy River"
+#~ msgid "Air Force"
+#~ msgstr "Air Force"
 
-#: my-evolution/Locations.h:921
-msgid "Helena"
-msgstr "Helena"
+#~ msgid "Ajaccio/Campo dell'Oro"
+#~ msgstr "Ajaccio/Campo dell'Oro"
 
-#: my-evolution/Locations.h:922
-msgid "Helsinki"
-msgstr "Helsinki"
+#~ msgid "Akeno Ab"
+#~ msgstr "Akeno Ab"
 
-#: my-evolution/Locations.h:923
-msgid "Henderson"
-msgstr "Henderson"
+#~ msgid "Akita Airport"
+#~ msgstr "Akita Airport"
 
-#: my-evolution/Locations.h:924
-msgid "Hengchun"
-msgstr "Hengchun"
+#~ msgid "Akron"
+#~ msgstr "Akron"
 
-#: my-evolution/Locations.h:925
-msgid "Hermosillo"
-msgstr "Hermosillo"
+#~ msgid "Akrotiri"
+#~ msgstr "Akrotiri"
 
-#: my-evolution/Locations.h:926
-msgid "Hibbing"
-msgstr "Hibbing"
+#~ msgid "Alabama"
+#~ msgstr "Alabama"
 
-#: my-evolution/Locations.h:927
-msgid "Hickory"
-msgstr "Hickory"
+#~ msgid "Al Ahsa"
+#~ msgstr "Al Ahsa"
 
-#: my-evolution/Locations.h:928
-msgid "Hill City"
-msgstr "Hill City"
+#~ msgid "Al Ain"
+#~ msgstr "Al Ain"
 
-#: my-evolution/Locations.h:929
-msgid "Hillsboro"
-msgstr "Hillsboro"
+#~ msgid "Alamogordo"
+#~ msgstr "Alamogordo"
 
-#: my-evolution/Locations.h:930
-msgid "Hilo"
-msgstr "Hilo"
+#~ msgid "Alamosa"
+#~ msgstr "Alamosa"
 
-#: my-evolution/Locations.h:931
-msgid "Hinesville"
-msgstr "Hinesville"
+#~ msgid "Alaska"
+#~ msgstr "Alaska"
 
-#: my-evolution/Locations.h:932
-msgid "Hiroshima Airport"
-msgstr "Hiroshima Airport"
+#~ msgid "Al Baha"
+#~ msgstr "Al Baha"
 
-#: my-evolution/Locations.h:933
-msgid "Hobart"
-msgstr "Hobart"
+#~ msgid "Albany"
+#~ msgstr "Albany"
 
-#: my-evolution/Locations.h:934
-msgid "Hobbs"
-msgstr "Hobbs"
+#~ msgid "Albenga"
+#~ msgstr "Albenga"
 
-#: my-evolution/Locations.h:935
-msgid "Ho Chi Minh"
-msgstr "Ho Chi Minh"
+#~ msgid "Alberta"
+#~ msgstr "Alberta"
 
-#: my-evolution/Locations.h:936
-msgid "Hodeidah"
-msgstr "Hodeidah"
+#~ msgid "Alborg"
+#~ msgstr "Alborg"
 
-#: my-evolution/Locations.h:937
-msgid "Hof"
-msgstr "Hof"
+#~ msgid "Albuquerque"
+#~ msgstr "Albuquerque"
 
-#: my-evolution/Locations.h:938
-msgid "Hoffman"
-msgstr "Hoffman"
+#~ msgid "Alderney"
+#~ msgstr "Alderney"
 
-#: my-evolution/Locations.h:939
-msgid "Hofu Ab"
-msgstr "Hofu Ab"
+#~ msgid "Alesund"
+#~ msgstr "Alesund"
 
-#: my-evolution/Locations.h:940
-msgid "Hohenems"
-msgstr "Hohenems"
+#~ msgid "Alexandria"
+#~ msgstr "Alexandria"
 
-#: my-evolution/Locations.h:941
-msgid "Holguin"
-msgstr "Holguin"
+#~ msgid "Alexandria-Esler"
+#~ msgstr "Alexandria-Esler"
 
-#: my-evolution/Locations.h:942
-msgid "Homer"
-msgstr "Homer"
+#~ msgid "Alexandria/Nouzha"
+#~ msgstr "Alexandria/Nouzha"
 
-#: my-evolution/Locations.h:943
-msgid "Homestead AFB"
-msgstr "Homestead AFB"
+#~ msgid "Alexandroupolis"
+#~ msgstr "Alexandroupolis"
 
-#: my-evolution/Locations.h:944
-msgid "Hondo"
-msgstr "Hondo"
+#~ msgid "Alghero"
+#~ msgstr "Alghero"
 
-#: my-evolution/Locations.h:947
-msgid "Honningsvag"
-msgstr "Honningsvag"
+#~ msgid "Algona"
+#~ msgstr "Algona"
 
-#: my-evolution/Locations.h:948
-msgid "Honolulu"
-msgstr "Honolulu"
+#~ msgid "Alicante"
+#~ msgstr "Alicante"
 
-#: my-evolution/Locations.h:949
-msgid "Hoonah"
-msgstr "Hoonah"
+#~ msgid "Alice"
+#~ msgstr "Alice"
 
-#: my-evolution/Locations.h:950
-msgid "Hoquiam"
-msgstr "Hoquiam"
+#~ msgid "Alice Springs"
+#~ msgstr "Alice Springs"
 
-#: my-evolution/Locations.h:951
-msgid "Hot Springs"
-msgstr "Hot Springs"
+#~ msgid "Al-Jouf"
+#~ msgstr "Al-Jouf"
 
-#: my-evolution/Locations.h:952
-msgid "Houghton Lake"
-msgstr "Houghton Lake"
+#~ msgid "Allentown"
+#~ msgstr "Allentown"
 
-#: my-evolution/Locations.h:953
-msgid "Houlton"
-msgstr "Houlton"
+#~ msgid "Alliance"
+#~ msgstr "Alliance"
 
-#: my-evolution/Locations.h:954
-msgid "Houma"
-msgstr "Houma"
+#~ msgid "Alma"
+#~ msgstr "Alma"
 
-#: my-evolution/Locations.h:955
-msgid "Houston-Bush"
-msgstr "Houston-Bush"
+#~ msgid "Almeria"
+#~ msgstr "Almeria"
 
-#: my-evolution/Locations.h:956
-msgid "Houston-Clover"
-msgstr "Houston-Clover"
+#~ msgid "Alpena"
+#~ msgstr "Alpena"
 
-#: my-evolution/Locations.h:957
-msgid "Houston-Ellington Field"
-msgstr "Houston-Ellington Field"
+#~ msgid "Al Qaysumah"
+#~ msgstr "Al Qaysumah"
 
-#: my-evolution/Locations.h:958
-msgid "Houston-Hobby"
-msgstr "Houston-Hobby"
+#~ msgid "Alta"
+#~ msgstr "Alta"
 
-#: my-evolution/Locations.h:959
-msgid "Houston-Hooks"
-msgstr "Houston-Hooks"
+#~ msgid "Altamira"
+#~ msgstr "Altamira"
 
-#: my-evolution/Locations.h:960
-msgid "Howard AFB"
-msgstr "Howard AFB"
+#~ msgid "Alton"
+#~ msgstr "Alton"
 
-#: my-evolution/Locations.h:961
-msgid "Hsinchu"
-msgstr "Hsinchu"
+#~ msgid "Altoona"
+#~ msgstr "Altoona"
 
-#: my-evolution/Locations.h:962
-msgid "Huanuco"
-msgstr "Huanuco"
+#~ msgid "Alturas"
+#~ msgstr "Alturas"
 
-#: my-evolution/Locations.h:963
-msgid "Huehuetenango"
-msgstr "Huehuetenango"
+#~ msgid "Altus"
+#~ msgstr "Altus"
 
-#: my-evolution/Locations.h:964
-msgid "Hulien"
-msgstr "Hulien"
+#~ msgid "Amami Airport"
+#~ msgstr "Amami Airport"
 
-#: my-evolution/Locations.h:965
-msgid "Humberside"
-msgstr "Humberside"
+#~ msgid "Amapala"
+#~ msgstr "Amapala"
 
-#: my-evolution/Locations.h:967
-msgid "Huntington"
-msgstr "Huntington"
+#~ msgid "Amarillo"
+#~ msgstr "Amarillo"
 
-#: my-evolution/Locations.h:968
-msgid "Huntsville"
-msgstr "Huntsville"
+#~ msgid "Amasya"
+#~ msgstr "Amasya"
 
-#: my-evolution/Locations.h:969
-msgid "Hurlburt"
-msgstr "Hurlburt"
+#~ msgid "Ambler"
+#~ msgstr "Ambler"
 
-#: my-evolution/Locations.h:970
-msgid "Huron"
-msgstr "Huron"
+#~ msgid "Amelia"
+#~ msgstr "Amelia"
 
-#: my-evolution/Locations.h:971
-msgid "Hutchinson"
-msgstr "Hutchinson"
+#~ msgid "Amendola"
+#~ msgstr "Amendola"
 
-#: my-evolution/Locations.h:972
-msgid "Hyakuri Ab"
-msgstr "Hyakuri Ab"
+#~ msgid "Ames"
+#~ msgstr "Ames"
 
-#: my-evolution/Locations.h:973
-msgid "Hyannis"
-msgstr "Hyannis"
+#~ msgid "Amritsar"
+#~ msgstr "Amritsar"
 
-#: my-evolution/Locations.h:974
-msgid "Hyderabad"
-msgstr "Hyderabad"
+#~ msgid "Amsterdam"
+#~ msgstr "Amsterdam"
 
-#: my-evolution/Locations.h:975
-msgid "Hyeres-Le Palyvestre"
-msgstr "Hyeres-Le Palyvestre"
+#~ msgid "Anadyr"
+#~ msgstr "Anadyr"
 
-#: my-evolution/Locations.h:976
-msgid "Iasi"
-msgstr "Iasi"
+#~ msgid "Anaktuvuk"
+#~ msgstr "Anaktuvuk"
 
-#: my-evolution/Locations.h:977
-msgid "Ibiza"
-msgstr "Ibiza"
+#~ msgid "Anapa"
+#~ msgstr "Anapa"
 
-#: my-evolution/Locations.h:979
-msgid "Ichikawa"
-msgstr "Ichikawa"
+#~ msgid "Anchorage"
+#~ msgstr "Anchorage"
 
-#: my-evolution/Locations.h:980
-msgid "Idaho"
-msgstr "Idaho"
+#~ msgid "Anchorage - Elmendorf AFB"
+#~ msgstr "Anchorage - Elmendorf AFB"
 
-#: my-evolution/Locations.h:981
-msgid "Idaho Falls"
-msgstr "Idaho Falls"
+#~ msgid "Ancona"
+#~ msgstr "Ancona"
 
-#: my-evolution/Locations.h:982
-msgid "Iguazu"
-msgstr "Iguazu"
+#~ msgid "Andahuayla"
+#~ msgstr "Andahuayla"
 
-#: my-evolution/Locations.h:983
-msgid "Iki Airport"
-msgstr "Iki Airport"
+#~ msgid "Anderson"
+#~ msgstr "Anderson"
 
-#: my-evolution/Locations.h:984
-msgid "Ilan"
-msgstr "Ilan"
+#~ msgid "Andoya"
+#~ msgstr "Andoya"
 
-#: my-evolution/Locations.h:985
-msgid "Iliamna"
-msgstr "Iliamna"
+#~ msgid "Andravida"
+#~ msgstr "Andravida"
 
-#: my-evolution/Locations.h:986
-msgid "Illinois"
-msgstr "Illinois"
+#~ msgid "Andrews AFB"
+#~ msgstr "Andrews AFB"
 
-#: my-evolution/Locations.h:987
-msgid "Imperial"
-msgstr "Imperial"
+#~ msgid "Angleton"
+#~ msgstr "Angleton"
 
-#: my-evolution/Locations.h:988
-msgid "Imperial (2)"
-msgstr "Imperial (2)"
+#~ msgid "Aniak"
+#~ msgstr "Aniak"
 
-#: my-evolution/Locations.h:989
-msgid "Imperial Beach"
-msgstr "Imperial Beach"
+#~ msgid "Ankara/Esenboga"
+#~ msgstr "Ankara/Esenboga"
 
-#: my-evolution/Locations.h:990
-msgid "In Amenas"
-msgstr "In Amenas"
+#~ msgid "Ankara/Etimesgut"
+#~ msgstr "Ankara/Etimesgut"
 
-#: my-evolution/Locations.h:992
-msgid "Indiana"
-msgstr "Indiana"
+#~ msgid "Annaba"
+#~ msgstr "Annaba"
 
-#: my-evolution/Locations.h:993
-msgid "Indianapolis"
-msgstr "Indianapolis"
+#~ msgid "Ann Arbor"
+#~ msgstr "Ann Arbor"
 
-#: my-evolution/Locations.h:994
-msgid "Indian Springs"
-msgstr "Indian Springs"
+#~ msgid "Annette"
+#~ msgstr "Annette"
 
-#: my-evolution/Locations.h:995
-msgid "Innsbruck"
-msgstr "Innsbruck"
+#~ msgid "Anniston"
+#~ msgstr "Anniston"
 
-#: my-evolution/Locations.h:996
-msgid "International Falls"
-msgstr "International Falls"
+#~ msgid "Antalya"
+#~ msgstr "Antalya"
 
-#: my-evolution/Locations.h:997
-msgid "Intracoastal"
-msgstr "Intracoastal"
+#~ msgid "Antartica"
+#~ msgstr "Antartica"
 
-#: my-evolution/Locations.h:998
-msgid "Inverness"
-msgstr "Inverness"
+#~ msgid "Antigo"
+#~ msgstr "Antigo"
 
-#: my-evolution/Locations.h:999
-msgid "Inyokern"
-msgstr "Inyokern"
+#~ msgid "Antigua"
+#~ msgstr "Antigua"
 
-#: my-evolution/Locations.h:1000
-msgid "Iowa"
-msgstr "Iowa"
+#~ msgid "Antigua and Barbuda"
+#~ msgstr "Antigua and Barbuda"
 
-#: my-evolution/Locations.h:1001
-msgid "Iowa City"
-msgstr "Iowa City"
+#~ msgid "Antofagasta"
+#~ msgstr "Antofagasta"
 
-#: my-evolution/Locations.h:1002
-msgid "Iqaluit"
-msgstr "Iqaluit"
+#~ msgid "Antwerpen/Deurne"
+#~ msgstr "Antwerpen/Deurne"
 
-#: my-evolution/Locations.h:1003
-msgid "Iquique/Diego Arac"
-msgstr "Iquique/Diego Arac"
+#~ msgid "Aomori Airport"
+#~ msgstr "Aomori Airport"
 
-#: my-evolution/Locations.h:1004
-msgid "Iquitos"
-msgstr "Iquitos"
+#~ msgid "Apalachicola"
+#~ msgstr "Apalachicola"
 
-#: my-evolution/Locations.h:1005
-msgid "Iraklion"
-msgstr "Iraklion"
+#~ msgid "Appleton"
+#~ msgstr "Appleton"
 
-#: my-evolution/Locations.h:1006
-msgid "Iran, Islamic Republic of"
-msgstr "İran, İslam Respublikası"
+#~ msgid "Aquadilla"
+#~ msgstr "Aquadilla"
 
-#: my-evolution/Locations.h:1008
-msgid "Iron Mountain"
-msgstr "Iron Mountain"
+#~ msgid "Aracaju"
+#~ msgstr "Aracaju"
 
-#: my-evolution/Locations.h:1009
-msgid "Ironwood"
-msgstr "Ironwood"
+#~ msgid "Arad"
+#~ msgstr "Arad"
 
-#: my-evolution/Locations.h:1010
-msgid "Iruma Ab"
-msgstr "Iruma Ab"
+#~ msgid "Arar"
+#~ msgstr "Arar"
 
-#: my-evolution/Locations.h:1011
-msgid "Islamabad"
-msgstr "İslamabad"
+#~ msgid "Araxos"
+#~ msgstr "Araxos"
 
-#: my-evolution/Locations.h:1012
-msgid "Isle of Man"
-msgstr "Isle of Man"
+#~ msgid "Arcata"
+#~ msgstr "Arcata"
 
-#: my-evolution/Locations.h:1013
-msgid "Islip"
-msgstr "Islip"
+#~ msgid "Ardmore"
+#~ msgstr "Ardmore"
 
-#: my-evolution/Locations.h:1014
-msgid "Istanbul"
-msgstr "İstanbul"
+#~ msgid "Arequipa"
+#~ msgstr "Arequipa"
 
-#: my-evolution/Locations.h:1015
-msgid "Itaituba"
-msgstr "Itaituba"
+#~ msgid "Arica"
+#~ msgstr "Arica"
 
-#: my-evolution/Locations.h:1017
-msgid "Ithaca"
-msgstr "Ithaca"
+#~ msgid "Arizona"
+#~ msgstr "Arizona"
 
-#: my-evolution/Locations.h:1018
-msgid "Ivano-Frankivsk"
-msgstr "Ivano-Frankivsk"
+#~ msgid "Arkansas"
+#~ msgstr "Arkansas"
 
-#: my-evolution/Locations.h:1019
-msgid "Iwakuni MCAS"
-msgstr "Iwakuni MCAS"
+#~ msgid "Arkhangelsk"
+#~ msgstr "Arkhangelsk"
 
-#: my-evolution/Locations.h:1020
-msgid "Iwojima"
-msgstr "Iwojima"
+#~ msgid "Arlington"
+#~ msgstr "Arlington"
 
-#: my-evolution/Locations.h:1021
-msgid "Ixtapa"
-msgstr "Ixtapa"
+#~ msgid "Artigas"
+#~ msgstr "Artigas"
 
-#: my-evolution/Locations.h:1022
-msgid "Izmir/Adnan Menderes"
-msgstr "İzmir/Adnan Menderes"
+#~ msgid "Asahikawa Ab"
+#~ msgstr "Asahikawa Ab"
 
-#: my-evolution/Locations.h:1023
-msgid "Izmir/Cigli"
-msgstr "İzmir/Cigli"
+#~ msgid "Asahikawa Airport"
+#~ msgstr "Asahikawa Airport"
 
-#: my-evolution/Locations.h:1024
-msgid "Izmit"
-msgstr "İzmit"
+#~ msgid "Ashburnam"
+#~ msgstr "Ashburnam"
 
-#: my-evolution/Locations.h:1025
-msgid "Izumo Airport"
-msgstr "Izumo Airport"
+#~ msgid "Asheville"
+#~ msgstr "Asheville"
 
-#: my-evolution/Locations.h:1026
-msgid "Jackson"
-msgstr "Jackson"
+#~ msgid "Ashfield"
+#~ msgstr "Ashfield"
 
-#: my-evolution/Locations.h:1027
-msgid "Jacksonville"
-msgstr "Jacksonville"
+#~ msgid "Ashiya Ab"
+#~ msgstr "Ashiya Ab"
 
-#: my-evolution/Locations.h:1028
-msgid "Jacksonville-Craig Airport"
-msgstr "Jacksonville-Craig Airport"
+#~ msgid "Ashland"
+#~ msgstr "Ashland"
 
-#: my-evolution/Locations.h:1029
-msgid "Jacksonville NAS"
-msgstr "Jacksonville NAS"
+#~ msgid "Asia"
+#~ msgstr "Asia"
 
-#: my-evolution/Locations.h:1030
-msgid "Jaffrey"
-msgstr "Jaffrey"
+#~ msgid "Aspen"
+#~ msgstr "Aspen"
 
-#: my-evolution/Locations.h:1032
-msgid "Jamestown"
-msgstr "Jamestown"
+#~ msgid "Asswan"
+#~ msgstr "Asswan"
 
-#: my-evolution/Locations.h:1033
-msgid "Janesville"
-msgstr "Janesville"
+#~ msgid "Astoria"
+#~ msgstr "Astoria"
 
-#: my-evolution/Locations.h:1034
-msgid "Jan Smuts"
-msgstr "Jan Smuts"
+#~ msgid "Astrakhan"
+#~ msgstr "Astrakhan"
 
-#: my-evolution/Locations.h:1036
-msgid "Jeddah King Abdul Aziz International Airport"
-msgstr "Jeddah King Abdul Aziz International Airport"
+#~ msgid "Asturias"
+#~ msgstr "Asturias"
 
-#: my-evolution/Locations.h:1037
-msgid "Jefferson City"
-msgstr "Jefferson City"
+#~ msgid "Asuncion"
+#~ msgstr "Asuncion"
 
-#: my-evolution/Locations.h:1038
-msgid "Jerez"
-msgstr "Jerez"
+#~ msgid "Athens"
+#~ msgstr "Athens"
 
-#: my-evolution/Locations.h:1039
-msgid "Jersey"
-msgstr "Jersey"
+#~ msgid "Athinai"
+#~ msgstr "Athinai"
 
-#: my-evolution/Locations.h:1040
-msgid "Jinotega"
-msgstr "Jinotega"
+#~ msgid "Atlanta"
+#~ msgstr "Atlanta"
 
-#: my-evolution/Locations.h:1041
-msgid "Johan A. Pengel"
-msgstr "Johan A. Pengel"
+#~ msgid "Atlantic"
+#~ msgstr "Atlantic"
 
-#: my-evolution/Locations.h:1042
-msgid "Johnstown"
-msgstr "Johnstown"
+#~ msgid "Atlantic City"
+#~ msgstr "Atlantic City"
 
-#: my-evolution/Locations.h:1043
-msgid "Jonesboro"
-msgstr "Jonesboro"
+#~ msgid "Atsugi US NAS"
+#~ msgstr "Atsugi US NAS"
 
-#: my-evolution/Locations.h:1044
-msgid "Jonkoping"
-msgstr "Jonkoping"
+#~ msgid "Auburn"
+#~ msgstr "Auburn"
 
-#: my-evolution/Locations.h:1045
-msgid "Joplin"
-msgstr "Joplin"
+#~ msgid "Auckland"
+#~ msgstr "Auckland"
 
-#: my-evolution/Locations.h:1047
-msgid "Juanjui"
-msgstr "Juanjui"
+#~ msgid "Augsburg"
+#~ msgstr "Augsburg"
 
-#: my-evolution/Locations.h:1048
-msgid "Juan Santamaria"
-msgstr "Juan Santamaria"
+#~ msgid "Augusta"
+#~ msgstr "Augusta"
 
-#: my-evolution/Locations.h:1049
-msgid "Juigalpa"
-msgstr "Juigalpa"
+#~ msgid "Aurora"
+#~ msgstr "Aurora"
 
-#: my-evolution/Locations.h:1050
-msgid "Jujuy"
-msgstr "Jujuy"
+#~ msgid "Austin"
+#~ msgstr "Austin"
 
-#: my-evolution/Locations.h:1051
-msgid "Juliaca"
-msgstr "Juliaca"
+#~ msgid "Australasia"
+#~ msgstr "Australasia"
 
-#: my-evolution/Locations.h:1052
-msgid "Junction"
-msgstr "Junction"
+#~ msgid "Avalon"
+#~ msgstr "Avalon"
 
-#: my-evolution/Locations.h:1053
-msgid "Juneau"
-msgstr "Juneau"
+#~ msgid "Aviano"
+#~ msgstr "Aviano"
 
-#: my-evolution/Locations.h:1054
-msgid "Kadena Ab"
-msgstr "Kadena Ab"
+#~ msgid "Ayacucho"
+#~ msgstr "Ayacucho"
 
-#: my-evolution/Locations.h:1055
-msgid "Kagoshima Airport"
-msgstr "Kagoshima Airport"
+#~ msgid "Bage"
+#~ msgstr "Bage"
 
-#: my-evolution/Locations.h:1056
-msgid "Kahului"
-msgstr "Kahului"
+#~ msgid "Bagotville"
+#~ msgstr "Bagotville"
 
-#: my-evolution/Locations.h:1057
-msgid "Kailua-Kona"
-msgstr "Kailua-Kona"
+#~ msgid "Bahia Blanca"
+#~ msgstr "Bahia Blanca"
 
-#: my-evolution/Locations.h:1058
-msgid "Kake"
-msgstr "Kake"
+#~ msgid "Bahias de Huatulco"
+#~ msgstr "Bahias de Huatulco"
 
-#: my-evolution/Locations.h:1059
-msgid "Kalamata"
-msgstr "Kalamata"
+#~ msgid "Baker City"
+#~ msgstr "Baker City"
 
-#: my-evolution/Locations.h:1060
-msgid "Kalamazoo"
-msgstr "Kalamazoo"
+#~ msgid "Bakersfield"
+#~ msgstr "Bakersfield"
 
-#: my-evolution/Locations.h:1061
-msgid "Kalispell"
-msgstr "Kalispell"
+#~ msgid "Bale-Mulhouse"
+#~ msgstr "Bale-Mulhouse"
 
-#: my-evolution/Locations.h:1062
-msgid "Kamigoto"
-msgstr "Kamigoto"
+#~ msgid "Balikesir"
+#~ msgstr "Balikesir"
 
-#: my-evolution/Locations.h:1063
-msgid "Kaneohe"
-msgstr "Kaneohe"
+#~ msgid "Balikesir/Bandirma"
+#~ msgstr "Balikesir/Bandirma"
 
-#: my-evolution/Locations.h:1064
-msgid "Kangshan"
-msgstr "Kangshan"
+#~ msgid "Ball Mountain"
+#~ msgstr "Ball Mountain"
 
-#: my-evolution/Locations.h:1065
-msgid "Kanoya Ab"
-msgstr "Kanoya Ab"
+#~ msgid "Baltimore"
+#~ msgstr "Baltimore"
 
-#: my-evolution/Locations.h:1066
-msgid "Kansai International Airport"
-msgstr "Kansai International Airport"
+#~ msgid "Baltimore-Glen Burnie"
+#~ msgstr "Baltimore-Glen Burnie"
 
-#: my-evolution/Locations.h:1067
-msgid "Kansas"
-msgstr "Kansas"
+#~ msgid "Banak"
+#~ msgstr "Banak"
 
-#: my-evolution/Locations.h:1068
-msgid "Kansas City"
-msgstr "Kansas City"
+#~ msgid "Bandarabbass"
+#~ msgstr "Bandarabbass"
 
-#: my-evolution/Locations.h:1069
-msgid "Kansas City-Gladstone"
-msgstr "Kansas City-Gladstone"
+#~ msgid "Bangor"
+#~ msgstr "Bangor"
 
-#: my-evolution/Locations.h:1070
-msgid "Kaohsiung"
-msgstr "Kaohsiung"
+#~ msgid "Baracoa"
+#~ msgstr "Baracoa"
 
-#: my-evolution/Locations.h:1071
-msgid "Karachi"
-msgstr "Karachi"
+#~ msgid "Barbers Point"
+#~ msgstr "Barbers Point"
 
-#: my-evolution/Locations.h:1072
-msgid "Karup"
-msgstr "Karup"
+#~ msgid "Barcelona"
+#~ msgstr "Barcelona"
 
-#: my-evolution/Locations.h:1073
-msgid "Kassel-Calden"
-msgstr "Kassel-Calden"
+#~ msgid "Bardufoss"
+#~ msgstr "Bardufoss"
 
-#: my-evolution/Locations.h:1074
-msgid "Kasumigaura Ab"
-msgstr "Kasumigaura Ab"
+#~ msgid "Bar Harbor"
+#~ msgstr "Bar Harbor"
 
-#: my-evolution/Locations.h:1075
-msgid "Kasuminome Ab"
-msgstr "Kasuminome Ab"
+#~ msgid "Bari"
+#~ msgstr "Bari"
 
-#: my-evolution/Locations.h:1076
-msgid "Katowice"
-msgstr "Katowice"
+#~ msgid "Bariloche"
+#~ msgstr "Bariloche"
 
-#: my-evolution/Locations.h:1077
-msgid "Kavala"
-msgstr "Kavala"
+#~ msgid "Barinas"
+#~ msgstr "Barinas"
 
-#: my-evolution/Locations.h:1078
-msgid "Kayseri"
-msgstr "Kayseri"
+#~ msgid "Barking Sand"
+#~ msgstr "Barking Sand"
 
-#: my-evolution/Locations.h:1079
-msgid "Kazan"
-msgstr "Kazan"
+#~ msgid "Barksdale"
+#~ msgstr "Barksdale"
 
-#: my-evolution/Locations.h:1080
-msgid "Kearney"
-msgstr "Kearney"
+#~ msgid "Barnaul"
+#~ msgstr "Barnaul"
 
-#: my-evolution/Locations.h:1081
-msgid "Keene"
-msgstr "Keene"
+#~ msgid "Barquisimeto"
+#~ msgstr "Barquisimeto"
 
-#: my-evolution/Locations.h:1082
-msgid "Kefallinia"
-msgstr "Kefallinia"
+#~ msgid "Barranquilla/Ernestocortissoz"
+#~ msgstr "Barranquilla/Ernestocortissoz"
 
-#: my-evolution/Locations.h:1083
-msgid "Keflavik"
-msgstr "Keflavik"
+#~ msgid "Barrow"
+#~ msgstr "Barrow"
 
-#: my-evolution/Locations.h:1084
-msgid "Kenai"
-msgstr "Kenai"
+#~ msgid "Barter Island"
+#~ msgstr "Barter Island"
 
-#: my-evolution/Locations.h:1085
-msgid "Kenosha"
-msgstr "Kenosha"
+#~ msgid "Bartlesville"
+#~ msgstr "Bartlesville"
 
-#: my-evolution/Locations.h:1086
-msgid "Kentucky"
-msgstr "Kentucky"
+#~ msgid "Bartow"
+#~ msgstr "Bartow"
 
-#: my-evolution/Locations.h:1087
-msgid "Keokuk"
-msgstr "Keokuk"
+#~ msgid "Bastia"
+#~ msgstr "Bastia"
 
-#: my-evolution/Locations.h:1088
-msgid "Kerkira"
-msgstr "Kerkira"
+#~ msgid "Batesville"
+#~ msgstr "Batesville"
 
-#: my-evolution/Locations.h:1089
-msgid "Kerman"
-msgstr "Kerman"
+#~ msgid "Batman"
+#~ msgstr "Batman"
 
-#: my-evolution/Locations.h:1090
-msgid "Ketchikan"
-msgstr "Ketchikan"
+#~ msgid "Baton Rouge"
+#~ msgstr "Baton Rouge"
 
-#: my-evolution/Locations.h:1091
-msgid "Key West"
-msgstr "Key West"
+#~ msgid "Battle Creek"
+#~ msgstr "Battle Creek"
 
-#: my-evolution/Locations.h:1092
-msgid "Key West NAS"
-msgstr "Key West NAS"
+#~ msgid "Battle Mountain"
+#~ msgstr "Battle Mountain"
 
-#: my-evolution/Locations.h:1093
-msgid "Khabarovsk"
-msgstr "Khabarovsk"
+#~ msgid "Bauru"
+#~ msgstr "Bauru"
 
-#: my-evolution/Locations.h:1094
-msgid "Khamis Mushait"
-msgstr "Khamis Mushait"
+#~ msgid "Bayamo"
+#~ msgstr "Bayamo"
 
-#: my-evolution/Locations.h:1095
-msgid "Kharkiv"
-msgstr "Kharkiv"
+#~ msgid "Bayreuth"
+#~ msgstr "Bayreuth"
 
-#: my-evolution/Locations.h:1096
-msgid "Kikai Island"
-msgstr "Kikai Island"
+#~ msgid "Beatrice"
+#~ msgstr "Beatrice"
 
-#: my-evolution/Locations.h:1097
-msgid "Killeen"
-msgstr "Killeen"
+#~ msgid "Beaufort"
+#~ msgstr "Beaufort"
 
-#: my-evolution/Locations.h:1098
-msgid "Killeen-Ft Hood"
-msgstr "Killeen-Ft Hood"
+#~ msgid "Beaumont"
+#~ msgstr "Beaumont"
 
-#: my-evolution/Locations.h:1099
-msgid "Killeen-Gray AAF"
-msgstr "Killeen-Gray AAF"
+#~ msgid "Beaumont-Port Arthur"
+#~ msgstr "Beaumont-Port Arthur"
 
-#: my-evolution/Locations.h:1100
-msgid "King Khaled International Airport"
-msgstr "King Khaled International Airport"
+#~ msgid "Beauvais-Tille"
+#~ msgstr "Beauvais-Tille"
 
-#: my-evolution/Locations.h:1101
-msgid "Kingman"
-msgstr "Kingman"
+#~ msgid "Beauvechain"
+#~ msgstr "Beauvechain"
 
-#: my-evolution/Locations.h:1102
-msgid "King Salmon"
-msgstr "King Salmon"
+#~ msgid "Beckley"
+#~ msgstr "Beckley"
 
-#: my-evolution/Locations.h:1103
-msgid "Kingston"
-msgstr "Kingston"
+#~ msgid "Bedford"
+#~ msgstr "Bedford"
 
-#: my-evolution/Locations.h:1104
-msgid "Kingsville"
-msgstr "Kingsville"
+#~ msgid "Beijing"
+#~ msgstr "Beijing"
 
-#: my-evolution/Locations.h:1105
-msgid "Kinloss"
-msgstr "Kinloss"
+#~ msgid "Beirut"
+#~ msgstr "Beirut"
 
-#: my-evolution/Locations.h:1106
-msgid "Kinston"
-msgstr "Kinston"
+#~ msgid "Beja"
+#~ msgstr "Beja"
 
-#: my-evolution/Locations.h:1107
-msgid "Kirkenes"
-msgstr "Kirkenes"
+#~ msgid "Belem"
+#~ msgstr "Belem"
 
-#: my-evolution/Locations.h:1108
-msgid "Kirksville"
-msgstr "Kirksville"
+#~ msgid "Belfast/Aldergrove"
+#~ msgstr "Belfast/Aldergrove"
 
-#: my-evolution/Locations.h:1109
-msgid "Kiruna"
-msgstr "Kiruna"
+#~ msgid "Belfast/Harbour"
+#~ msgstr "Belfast/Harbour"
 
-#: my-evolution/Locations.h:1110
-msgid "Kisarazu Ab"
-msgstr "Kisarazu Ab"
+#~ msgid "Belgorod"
+#~ msgstr "Belgorod"
 
-#: my-evolution/Locations.h:1111
-msgid "Kishineu"
-msgstr "Kishineu"
+#~ msgid "Belleville"
+#~ msgstr "Belleville"
 
-#: my-evolution/Locations.h:1112
-msgid "Kitakyushu Airport"
-msgstr "Kitakyushu Airport"
+#~ msgid "Bellingham"
+#~ msgstr "Bellingham"
 
-#: my-evolution/Locations.h:1113
-msgid "Klagenfurt"
-msgstr "Klagenfurt"
+#~ msgid "Belmar-Farmingdale"
+#~ msgstr "Belmar-Farmingdale"
 
-#: my-evolution/Locations.h:1114
-msgid "Klamath Falls"
-msgstr "Klamath Falls"
+#~ msgid "Belo Horizonte"
+#~ msgstr "Belo Horizonte"
 
-#: my-evolution/Locations.h:1115
-msgid "Klawock"
-msgstr "Klawock"
+#~ msgid "Belo Horizonte Apt"
+#~ msgstr "Belo Horizonte Apt"
 
-#: my-evolution/Locations.h:1116
-msgid "Kleine Brogel"
-msgstr "Kleine Brogel"
+#~ msgid "Bemidji"
+#~ msgstr "Bemidji"
 
-#: my-evolution/Locations.h:1117
-msgid "Kliningrad"
-msgstr "Kliningrad"
+#~ msgid "Benbecula"
+#~ msgstr "Benbecula"
 
-#: my-evolution/Locations.h:1118
-msgid "Knoxville"
-msgstr "Knoxville"
+#~ msgid "Benina"
+#~ msgstr "Benina"
 
-#: my-evolution/Locations.h:1119
-msgid "Knoxville-Downtown"
-msgstr "Knoxville-Downtown"
+#~ msgid "Benton Harbor"
+#~ msgstr "Benton Harbor"
 
-#: my-evolution/Locations.h:1120
-msgid "Kobenhavn/Kastrup"
-msgstr "Kobenhavn/Kastrup"
+#~ msgid "Bentonville"
+#~ msgstr "Bentonville"
 
-#: my-evolution/Locations.h:1121
-msgid "Kobenhavn/Roskilde"
-msgstr "Kobenhavn/Roskilde"
+#~ msgid "Beograd"
+#~ msgstr "Beograd"
 
-#: my-evolution/Locations.h:1122
-msgid "Kochi Airport"
-msgstr "Kochi Airport"
+#~ msgid "Bergamo"
+#~ msgstr "Bergamo"
 
-#: my-evolution/Locations.h:1123
-msgid "Kodiak"
-msgstr "Kodiak"
+#~ msgid "Bergen"
+#~ msgstr "Bergen"
 
-#: my-evolution/Locations.h:1124
-msgid "Kogalniceanu"
-msgstr "Kogalniceanu"
+#~ msgid "Bergstrom AFB"
+#~ msgstr "Bergstrom AFB"
 
-#: my-evolution/Locations.h:1125
-msgid "Kogalym"
-msgstr "Kogalym"
+#~ msgid "Berlevag"
+#~ msgstr "Berlevag"
 
-#: my-evolution/Locations.h:1126
-msgid "Koksijde"
-msgstr "Koksijde"
+#~ msgid "Berlin"
+#~ msgstr "Berlin"
 
-#: my-evolution/Locations.h:1127
-msgid "Kolding/Vandrup"
-msgstr "Kolding/Vandrup"
+#~ msgid "Berlin-Tegel"
+#~ msgstr "Berlin-Tegel"
 
-#: my-evolution/Locations.h:1128
-msgid "Koln/Bonn"
-msgstr "Koln/Bonn"
+#~ msgid "Berlin-Tempelhof"
+#~ msgstr "Berlin-Tempelhof"
 
-#: my-evolution/Locations.h:1129
-msgid "Komatsu Ab"
-msgstr "Komatsu Ab"
+#~ msgid "Bern"
+#~ msgstr "Bern"
 
-#: my-evolution/Locations.h:1130
-msgid "Komatsujima Ab"
-msgstr "Komatsujima Ab"
+#~ msgid "Bethel"
+#~ msgstr "Bethel"
 
-#: my-evolution/Locations.h:1131
-msgid "Konya"
-msgstr "Konya"
+#~ msgid "Bethlehem Airport"
+#~ msgstr "Bethlehem Airport"
 
-#: my-evolution/Locations.h:1132
-msgid "Korea, Democratic People's Republic of"
-msgstr "Korea, Democratic People's Republic of"
+#~ msgid "Bettles"
+#~ msgstr "Bettles"
 
-#: my-evolution/Locations.h:1133
-msgid "Korea, Republic of"
-msgstr "Korea, Republic of"
+#~ msgid "Beverly"
+#~ msgstr "Beverly"
 
-#: my-evolution/Locations.h:1134
-msgid "Kos"
-msgstr "Kos"
+#~ msgid "Biarritz-Bayonne"
+#~ msgstr "Biarritz-Bayonne"
 
-#: my-evolution/Locations.h:1135
-msgid "Kotzebue"
-msgstr "Kotzebue"
+#~ msgid "Bicycle Lake"
+#~ msgstr "Bicycle Lake"
 
-#: my-evolution/Locations.h:1136
-msgid "Kozani"
-msgstr "Kozani"
+#~ msgid "Biggin Hill"
+#~ msgstr "Biggin Hill"
 
-#: my-evolution/Locations.h:1137
-msgid "Krakow"
-msgstr "Krakow"
+#~ msgid "Big Piney"
+#~ msgstr "Big Piney"
 
-#: my-evolution/Locations.h:1138
-msgid "Krasnodar"
-msgstr "Krasnodar"
+#~ msgid "Big River Lake"
+#~ msgstr "Big River Lake"
 
-#: my-evolution/Locations.h:1139
-msgid "Krasnoyarsk"
-msgstr "Krasnoyarsk"
+#~ msgid "Bilbao"
+#~ msgstr "Bilbao"
 
-#: my-evolution/Locations.h:1140
-msgid "Kristiansand/Kjevik"
-msgstr "Kristiansand/Kjevik"
+#~ msgid "Billings"
+#~ msgstr "Billings"
 
-#: my-evolution/Locations.h:1141
-msgid "Kristiansund/Kvernberget"
-msgstr "Kristiansund/Kvernberget"
+#~ msgid "Billund"
+#~ msgstr "Billund"
 
-#: my-evolution/Locations.h:1142
-msgid "Kryviy Rig/Lozovatka"
-msgstr "Kryviy Rig/Lozovatka"
+#~ msgid "Binghamton"
+#~ msgstr "Binghamton"
 
-#: my-evolution/Locations.h:1143
-msgid "Kumamoto Airport"
-msgstr "Kumamoto Airport"
+#~ msgid "Birmingham"
+#~ msgstr "Birmingham"
 
-#: my-evolution/Locations.h:1144
-msgid "Kunming"
-msgstr "Kunming"
+#~ msgid "Bisha"
+#~ msgstr "Bisha"
 
-#: my-evolution/Locations.h:1145
-msgid "Kushiro Airport"
-msgstr "Kushiro Airport"
+#~ msgid "Bishop"
+#~ msgstr "Bishop"
 
-#: my-evolution/Locations.h:1147
-msgid "Kyiv/Boryspil"
-msgstr "Kyiv/Boryspil"
+#~ msgid "Bismark"
+#~ msgstr "Bismark"
 
-#: my-evolution/Locations.h:1148
-msgid "Kyiv/Zhulyany"
-msgstr "Kyiv/Zhulyany"
+#~ msgid "Blagoveschensk"
+#~ msgstr "Blagoveschensk"
 
-#: my-evolution/Locations.h:1149
-msgid "La Ceiba"
-msgstr "La Ceiba"
+#~ msgid "Blanding"
+#~ msgstr "Blanding"
 
-#: my-evolution/Locations.h:1150
-msgid "Laconia"
-msgstr "Laconia"
+#~ msgid "Block Island"
+#~ msgstr "Block Island"
 
-#: my-evolution/Locations.h:1151
-msgid "La Coruna"
-msgstr "La Coruna"
+#~ msgid "Bloemfontein J. B. M. Hertzog "
+#~ msgstr "Bloemfontein J. B. M. Hertzog "
 
-#: my-evolution/Locations.h:1152
-msgid "La Crosse"
-msgstr "La Crosse"
+#~ msgid "Bloomington"
+#~ msgstr "Bloomington"
 
-#: my-evolution/Locations.h:1153
-msgid "La Esperanza"
-msgstr "La Esperanza"
+#~ msgid "Blue Canyon"
+#~ msgstr "Blue Canyon"
 
-#: my-evolution/Locations.h:1154
-msgid "Lafayette"
-msgstr "Lafayette"
+#~ msgid "Bluefield"
+#~ msgstr "Bluefield"
 
-#: my-evolution/Locations.h:1155
-msgid "La Grande"
-msgstr "La Grande"
+#~ msgid "Bluefields"
+#~ msgstr "Bluefields"
 
-#: my-evolution/Locations.h:1156
-msgid "Lahaina"
-msgstr "Lahaina"
+#~ msgid "Blythe"
+#~ msgstr "Blythe"
 
-#: my-evolution/Locations.h:1157
-msgid "Lahore"
-msgstr "Lahore"
+#~ msgid "Boa Vista"
+#~ msgstr "Boa Vista"
 
-#: my-evolution/Locations.h:1158
-msgid "Lajes"
-msgstr "Lajes"
+#~ msgid "Bocas del Toro"
+#~ msgstr "Bocas del Toro"
 
-#: my-evolution/Locations.h:1159
-msgid "La Junta"
-msgstr "La Junta"
+#~ msgid "Bodo"
+#~ msgstr "Bodo"
 
-#: my-evolution/Locations.h:1160
-msgid "Lake Charles"
-msgstr "Lake Charles"
+#~ msgid "Bogota/Eldorado"
+#~ msgstr "Bogota/Eldorado"
 
-#: my-evolution/Locations.h:1161
-msgid "Lake Hood"
-msgstr "Lake Hood"
+#~ msgid "Boise"
+#~ msgstr "Boise"
 
-#: my-evolution/Locations.h:1162
-msgid "Lakehurst"
-msgstr "Lakehurst"
+#~ msgid "Bolzano"
+#~ msgstr "Bolzano"
 
-#: my-evolution/Locations.h:1163
-msgid "Lakeland"
-msgstr "Lakeland"
+#~ msgid "Bombay/Santacruz"
+#~ msgstr "Bombay/Santacruz"
 
-#: my-evolution/Locations.h:1164
-msgid "Lake Tahoe"
-msgstr "Lake Tahoe"
+#~ msgid "Boone"
+#~ msgstr "Boone"
 
-#: my-evolution/Locations.h:1165
-msgid "Lakeview"
-msgstr "Lakeview"
+#~ msgid "Bordeaux"
+#~ msgstr "Bordeaux"
 
-#: my-evolution/Locations.h:1166
-msgid "Lamar"
-msgstr "Lamar"
+#~ msgid "Borger"
+#~ msgstr "Borger"
 
-#: my-evolution/Locations.h:1167
-msgid "La Mesa"
-msgstr "La Mesa"
+#~ msgid "Bornholm"
+#~ msgstr "Bornholm"
 
-#: my-evolution/Locations.h:1168
-msgid "Lamezia"
-msgstr "Lamezia"
+#~ msgid "Boscombe Down"
+#~ msgstr "Boscombe Down"
 
-#: my-evolution/Locations.h:1169
-msgid "Lamoni"
-msgstr "Lamoni"
+#~ msgid "Bosnia-Herzegovina"
+#~ msgstr "Bosnia-Herzegovina"
 
-#: my-evolution/Locations.h:1170
-msgid "Lampedusa"
-msgstr "Lampedusa"
+#~ msgid "Boston"
+#~ msgstr "Boston"
 
-#: my-evolution/Locations.h:1171
-msgid "Lanai"
-msgstr "Lanai"
+#~ msgid "Boulmer"
+#~ msgstr "Boulmer"
 
-#: my-evolution/Locations.h:1172
-msgid "Lancaster"
-msgstr "Lancaster"
+#~ msgid "Bournemouth"
+#~ msgstr "Bournemouth"
 
-#: my-evolution/Locations.h:1173
-msgid "Lander"
-msgstr "Lander"
+#~ msgid "Bowling Green"
+#~ msgstr "Bowling Green"
 
-#: my-evolution/Locations.h:1174
-msgid "Langebaanweg"
-msgstr "Langebaanweg"
+#~ msgid "Bozeman"
+#~ msgstr "Bozeman"
 
-#: my-evolution/Locations.h:1175
-msgid "Langley AFB"
-msgstr "Langley AFB"
+#~ msgid "Bradford"
+#~ msgstr "Bradford"
 
-#: my-evolution/Locations.h:1176
-msgid "Lannion"
-msgstr "Lannion"
+#~ msgid "Bradshaw Field"
+#~ msgstr "Bradshaw Field"
 
-#: my-evolution/Locations.h:1177
-msgid "Lansing"
-msgstr "Lansing"
+#~ msgid "Brainerd"
+#~ msgstr "Brainerd"
 
-#: my-evolution/Locations.h:1178
-msgid "Lanzhou"
-msgstr "Lanzhou"
+#~ msgid "Brasilia"
+#~ msgstr "Brasilia"
 
-#: my-evolution/Locations.h:1179
-msgid "La Paz"
-msgstr "La Paz"
+#~ msgid "Brasschaat"
+#~ msgstr "Brasschaat"
 
-#: my-evolution/Locations.h:1180
-msgid "La Paz/Alto"
-msgstr "La Paz/Alto"
+#~ msgid "Bratislava"
+#~ msgstr "Bratislava"
 
-#: my-evolution/Locations.h:1181
-msgid "Laramie"
-msgstr "Laramie"
+#~ msgid "Bratsk"
+#~ msgstr "Bratsk"
 
-#: my-evolution/Locations.h:1182
-msgid "Laredo"
-msgstr "Laredo"
+#~ msgid "Braunschweig"
+#~ msgstr "Braunschweig"
 
-#: my-evolution/Locations.h:1183
-msgid "Larnaka"
-msgstr "Larnaka"
+#~ msgid "Bremen"
+#~ msgstr "Bremen"
 
-#: my-evolution/Locations.h:1184
-msgid "La Romana"
-msgstr "La Romana"
+#~ msgid "Bremerton"
+#~ msgstr "Bremerton"
 
-#: my-evolution/Locations.h:1185
-msgid "Las Americas"
-msgstr "Las Americas"
+#~ msgid "Brest"
+#~ msgstr "Brest"
 
-#: my-evolution/Locations.h:1186
-msgid "Las Tunas"
-msgstr "Las Tunas"
+#~ msgid "Bridgeport"
+#~ msgstr "Bridgeport"
 
-#: my-evolution/Locations.h:1187
-msgid "Las Vegas"
-msgstr "Las Vegas"
+#~ msgid "Brindisi"
+#~ msgstr "Brindisi"
 
-#: my-evolution/Locations.h:1188
-msgid "Latina"
-msgstr "Latina"
+#~ msgid "Brisbane"
+#~ msgstr "Brisbane"
 
-#: my-evolution/Locations.h:1189
-msgid "Latrobe"
-msgstr "Latrobe"
+#~ msgid "Bristol"
+#~ msgstr "Bristol"
 
-#: my-evolution/Locations.h:1190
-msgid "Laughlin"
-msgstr "Laughlin"
+#~ msgid "British Columbia"
+#~ msgstr "British Columbia"
 
-#: my-evolution/Locations.h:1191
-msgid "Laurel"
-msgstr "Laurel"
+#~ msgid "Brno"
+#~ msgstr "Brno"
 
-#: my-evolution/Locations.h:1192
-msgid "La Verne"
-msgstr "La Verne"
+#~ msgid "Broadus"
+#~ msgstr "Broadus"
 
-#: my-evolution/Locations.h:1193
-msgid "Lawrence"
-msgstr "Lawrence"
+#~ msgid "Broken Bow"
+#~ msgstr "Broken Bow"
 
-#: my-evolution/Locations.h:1194
-msgid "Lawton"
-msgstr "Lawton"
+#~ msgid "Bronnoysund"
+#~ msgstr "Bronnoysund"
 
-#: my-evolution/Locations.h:1195
-msgid "Leadville"
-msgstr "Leadville"
+#~ msgid "Brookings"
+#~ msgstr "Brookings"
 
-#: my-evolution/Locations.h:1196
-msgid "Learmouth"
-msgstr "Learmouth"
+#~ msgid "Brooksville"
+#~ msgstr "Brooksville"
 
-#: my-evolution/Locations.h:1198
-msgid "Lecce"
-msgstr "Lecce"
+#~ msgid "Broome"
+#~ msgstr "Broome"
 
-#: my-evolution/Locations.h:1199
-msgid "Leeds and Bradford"
-msgstr "Leeds and Bradford"
+#~ msgid "Brownsville"
+#~ msgstr "Brownsville"
 
-#: my-evolution/Locations.h:1200
-msgid "Leesburg"
-msgstr "Leesburg"
+#~ msgid "Brunswick"
+#~ msgstr "Brunswick"
 
-#: my-evolution/Locations.h:1201
-msgid "Leeuwarden"
-msgstr "Leeuwarden"
+#~ msgid "Brussels-National Airport"
+#~ msgstr "Brussels-National Airport"
 
-#: my-evolution/Locations.h:1202
-msgid "Le Havre-Octeville"
-msgstr "Le Havre-Octeville"
+#~ msgid "Bryansk"
+#~ msgstr "Bryansk"
 
-#: my-evolution/Locations.h:1203
-msgid "Leipzig-Schkeuditz"
-msgstr "Leipzig-Schkeuditz"
+#~ msgid "Bryce Canyon"
+#~ msgstr "Bryce Canyon"
 
-#: my-evolution/Locations.h:1204
-msgid "Leknes"
-msgstr "Leknes"
+#~ msgid "Bucaramanga/Palonegro"
+#~ msgstr "Bucaramanga/Palonegro"
 
-#: my-evolution/Locations.h:1205
-msgid "Le Mans"
-msgstr "Le Mans"
+#~ msgid "Bucuresti"
+#~ msgstr "Bucuresti"
 
-#: my-evolution/Locations.h:1206
-msgid "Le Marine"
-msgstr "Le Marine"
+#~ msgid "Bucuresti-Otopeni"
+#~ msgstr "Bucuresti-Otopeni"
 
-#: my-evolution/Locations.h:1207
-msgid "Lemmon"
-msgstr "Lemmon"
+#~ msgid "Budapest"
+#~ msgstr "Budapest"
 
-#: my-evolution/Locations.h:1208
-msgid "Lemoore"
-msgstr "Lemoore"
+#~ msgid "Buffalo"
+#~ msgstr "Buffalo"
 
-#: my-evolution/Locations.h:1209
-msgid "Leticia/Vasquez Cobo"
-msgstr "Leticia/Vasquez Cobo"
+#~ msgid "Bullfrog"
+#~ msgstr "Bullfrog"
 
-#: my-evolution/Locations.h:1210
-msgid "Le Touquet"
-msgstr "Le Touquet"
+#~ msgid "Burbank"
+#~ msgstr "Burbank"
 
-#: my-evolution/Locations.h:1211
-msgid "Leuchars"
-msgstr "Leuchars"
+#~ msgid "Burgas"
+#~ msgstr "Burgas"
 
-#: my-evolution/Locations.h:1212
-msgid "Lewisburg"
-msgstr "Lewisburg"
+#~ msgid "Burley"
+#~ msgstr "Burley"
 
-#: my-evolution/Locations.h:1213
-msgid "Lewiston"
-msgstr "Lewiston"
+#~ msgid "Burlington"
+#~ msgstr "Burlington"
 
-#: my-evolution/Locations.h:1214
-msgid "Lewistown"
-msgstr "Lewistown"
+#~ msgid "Burnet"
+#~ msgstr "Burnet"
 
-#: my-evolution/Locations.h:1215
-msgid "Lexington"
-msgstr "Lexington"
+#~ msgid "Burns"
+#~ msgstr "Burns"
 
-#: my-evolution/Locations.h:1216
-msgid "Liberal"
-msgstr "Liberal"
+#~ msgid "Bursa"
+#~ msgstr "Bursa"
 
-#: my-evolution/Locations.h:1218
-msgid "Libya"
-msgstr "Libya"
+#~ msgid "Burwell"
+#~ msgstr "Burwell"
 
-#: my-evolution/Locations.h:1219
-msgid "Lichtenburg"
-msgstr "Lichtenburg"
+#~ msgid "Butte"
+#~ msgstr "Butte"
 
-#: my-evolution/Locations.h:1220
-msgid "Lidgerwood"
-msgstr "Lidgerwood"
+#~ msgid "Caen-Carpiquet"
+#~ msgstr "Caen-Carpiquet"
 
-#: my-evolution/Locations.h:1221
-msgid "Liege"
-msgstr "Liege"
+#~ msgid "Cagliari"
+#~ msgstr "Cagliari"
 
-#: my-evolution/Locations.h:1222
-msgid "Lihue"
-msgstr "Lihue"
+#~ msgid "Cairns"
+#~ msgstr "Cairns"
 
-#: my-evolution/Locations.h:1223
-msgid "Lille-Lesquin"
-msgstr "Lille-Lesquin"
+#~ msgid "Cairo"
+#~ msgstr "Cairo"
 
-#: my-evolution/Locations.h:1224
-msgid "Lima-Callao"
-msgstr "Lima-Callao"
+#~ msgid "Calabozo"
+#~ msgstr "Calabozo"
 
-#: my-evolution/Locations.h:1225
-msgid "Limnos"
-msgstr "Limnos"
+#~ msgid "Calcutta/Dum Dum"
+#~ msgstr "Calcutta/Dum Dum"
 
-#: my-evolution/Locations.h:1226
-msgid "Limoges"
-msgstr "Limoges"
+#~ msgid "Caldwell"
+#~ msgstr "Caldwell"
 
-#: my-evolution/Locations.h:1227
-msgid "Limon"
-msgstr "Limon"
+#~ msgid "Calgary"
+#~ msgstr "Calgary"
 
-#: my-evolution/Locations.h:1228
-msgid "Lincoln"
-msgstr "Lincoln"
+#~ msgid "Cali/Alfonso Bonillaaragon"
+#~ msgstr "Cali/Alfonso Bonillaaragon"
 
-#: my-evolution/Locations.h:1229
-msgid "Linz"
-msgstr "Linz"
+#~ msgid "Caliente"
+#~ msgstr "Caliente"
 
-#: my-evolution/Locations.h:1230
-msgid "Lisboa"
-msgstr "Lisboa"
+#~ msgid "California"
+#~ msgstr "California"
 
-#: my-evolution/Locations.h:1231
-msgid "Lista"
-msgstr "Lista"
+#~ msgid "Calvi-Ste-Catherine"
+#~ msgstr "Calvi-Ste-Catherine"
 
-#: my-evolution/Locations.h:1232
-msgid "Litchfield"
-msgstr "Litchfield"
+#~ msgid "Camaguey"
+#~ msgstr "Camaguey"
 
-#: my-evolution/Locations.h:1234
-msgid "Little Rock"
-msgstr "Little Rock"
+#~ msgid "Camarillo"
+#~ msgstr "Camarillo"
 
-#: my-evolution/Locations.h:1235
-msgid "Little Rock AFB"
-msgstr "Little Rock AFB"
+#~ msgid "Cambridge"
+#~ msgstr "Cambridge"
 
-#: my-evolution/Locations.h:1236
-msgid "Livermore"
-msgstr "Livermore"
+#~ msgid "Cameron"
+#~ msgstr "Cameron"
 
-#: my-evolution/Locations.h:1237
-msgid "Liverpool"
-msgstr "Liverpool"
+#~ msgid "Camiri"
+#~ msgstr "Camiri"
 
-#: my-evolution/Locations.h:1238
-msgid "Livingston"
-msgstr "Livingston"
+#~ msgid "Campeche"
+#~ msgstr "Campeche"
 
-#: my-evolution/Locations.h:1239
-msgid "Ljubljana"
-msgstr "Ljubljana"
+#~ msgid "Campinas"
+#~ msgstr "Campinas"
 
-#: my-evolution/Locations.h:1240
-msgid "Logan"
-msgstr "Logan"
+#~ msgid "Campo"
+#~ msgstr "Campo"
 
-#: my-evolution/Locations.h:1241
-msgid "Lolland Falster"
-msgstr "Lolland Falster"
+#~ msgid "Campo Grande"
+#~ msgstr "Campo Grande"
 
-#: my-evolution/Locations.h:1242
-msgid "Lompoc"
-msgstr "Lompoc"
+#~ msgid "Camp Stanley/H-207"
+#~ msgstr "Camp Stanley/H-207"
 
-#: my-evolution/Locations.h:1243
-msgid "London"
-msgstr "London"
+#~ msgid "Canaan"
+#~ msgstr "Canaan"
 
-#: my-evolution/Locations.h:1244
-msgid "London/City"
-msgstr "London/City"
+#~ msgid "Canarias/Fuerteventura"
+#~ msgstr "Canarias/Fuerteventura"
 
-#: my-evolution/Locations.h:1245
-msgid "London/Gatwick"
-msgstr "London/Gatwick"
+#~ msgid "Canarias/Gran Canaria"
+#~ msgstr "Canarias/Gran Canaria"
 
-#: my-evolution/Locations.h:1246
-msgid "London/Heathrow"
-msgstr "London/Heathrow"
+#~ msgid "Canarias/Hierro"
+#~ msgstr "Canarias/Hierro"
 
-#: my-evolution/Locations.h:1247
-msgid "London/Stansted"
-msgstr "London/Stansted"
+#~ msgid "Canarias/Lanzarote"
+#~ msgstr "Canarias/Lanzarote"
 
-#: my-evolution/Locations.h:1248
-msgid "Londrina"
-msgstr "Londrina"
+#~ msgid "Canarias/La Palma"
+#~ msgstr "Canarias/La Palma"
 
-#: my-evolution/Locations.h:1249
-msgid "Lone Rock"
-msgstr "Lone Rock"
+#~ msgid "Canarias/Tenerife Norte"
+#~ msgstr "Canarias/Tenerife Norte"
 
-#: my-evolution/Locations.h:1250
-msgid "Long Beach"
-msgstr "Long Beach"
+#~ msgid "Canarias/Tenerife Sur"
+#~ msgstr "Canarias/Tenerife Sur"
 
-#: my-evolution/Locations.h:1251
-msgid "Longview"
-msgstr "Longview"
+#~ msgid "Canberra"
+#~ msgstr "Canberra"
 
-#: my-evolution/Locations.h:1252
-msgid "Lorient-Lann-Bihoue"
-msgstr "Lorient-Lann-Bihoue"
+#~ msgid "Cancun"
+#~ msgstr "Cancun"
 
-#: my-evolution/Locations.h:1253
-msgid "Los Alamos"
-msgstr "Los Alamos"
+#~ msgid "Cannes-Mandelieu"
+#~ msgstr "Cannes-Mandelieu"
 
-#: my-evolution/Locations.h:1254
-msgid "Los Angeles"
-msgstr "Los Angeles"
+#~ msgid "Cantwell"
+#~ msgstr "Cantwell"
 
-#: my-evolution/Locations.h:1255
-msgid "Los Mochis"
-msgstr "Los Mochis"
+#~ msgid "Cape Girardeau"
+#~ msgstr "Cape Girardeau"
 
-#: my-evolution/Locations.h:1256
-msgid "Lossiemouth"
-msgstr "Lossiemouth"
+#~ msgid "Cape Hatteras"
+#~ msgstr "Cape Hatteras"
 
-#: my-evolution/Locations.h:1257
-msgid "Louisville"
-msgstr "Louisville"
+#~ msgid "Cape Lisburne"
+#~ msgstr "Cape Lisburne"
 
-#: my-evolution/Locations.h:1258
-msgid "Louisville-Standiford Field"
-msgstr "Louisville-Standiford Field"
+#~ msgid "Cape Newenham"
+#~ msgstr "Cape Newenham"
 
-#: my-evolution/Locations.h:1259
-msgid "Lousiana"
-msgstr "Lousiana"
+#~ msgid "Cape Romanzoff"
+#~ msgstr "Cape Romanzoff"
 
-#: my-evolution/Locations.h:1260
-msgid "Lovelock"
-msgstr "Lovelock"
+#~ msgid "Cape Town D. F. Malan "
+#~ msgstr "Cape Town D. F. Malan "
 
-#: my-evolution/Locations.h:1261
-msgid "Lubbock"
-msgstr "Lubbock"
+#~ msgid "Capitan Corbeta"
+#~ msgstr "Capitan Corbeta"
 
-#: my-evolution/Locations.h:1262
-msgid "Lubeck-Blankensee"
-msgstr "Lubeck-Blankensee"
+#~ msgid "Capo Mele"
+#~ msgstr "Capo Mele"
 
-#: my-evolution/Locations.h:1263
-msgid "Lufkin"
-msgstr "Lufkin"
+#~ msgid "Caracas La Carlota"
+#~ msgstr "Caracas La Carlota"
 
-#: my-evolution/Locations.h:1264
-msgid "Lugano"
-msgstr "Lugano"
+#~ msgid "Caracas Maiquetia"
+#~ msgstr "Caracas Maiquetia"
 
-#: my-evolution/Locations.h:1265
-msgid "Luqa"
-msgstr "Luqa"
+#~ msgid "Caravelas"
+#~ msgstr "Caravelas"
 
-#: my-evolution/Locations.h:1266
-msgid "Luton"
-msgstr "Luton"
+#~ msgid "Carbondale"
+#~ msgstr "Carbondale"
 
-#: my-evolution/Locations.h:1268
-msgid "Luxeuil"
-msgstr "Luxeuil"
+#~ msgid "Cardiff"
+#~ msgstr "Cardiff"
 
-#: my-evolution/Locations.h:1269
-msgid "Luxor"
-msgstr "Luxor"
+#~ msgid "Caribou"
+#~ msgstr "Caribou"
 
-#: my-evolution/Locations.h:1270
-msgid "Lviv"
-msgstr "Lviv"
+#~ msgid "Carlisle"
+#~ msgstr "Carlisle"
 
-#: my-evolution/Locations.h:1271
-msgid "Lynchburg"
-msgstr "Lynchburg"
+#~ msgid "Carlsbad"
+#~ msgstr "Carlsbad"
 
-#: my-evolution/Locations.h:1272
-msgid "Lyneham"
-msgstr "Lyneham"
+#~ msgid "Carroll"
+#~ msgstr "Carroll"
 
-#: my-evolution/Locations.h:1273
-msgid "Lyon-Bron"
-msgstr "Lyon-Bron"
+#~ msgid "Cartagena/Rafael Nunez"
+#~ msgstr "Cartagena/Rafael Nunez"
 
-#: my-evolution/Locations.h:1274
-msgid "Lyon-Satolas"
-msgstr "Lyon-Satolas"
+#~ msgid "Casa Granda"
+#~ msgstr "Casa Granda"
 
-#: my-evolution/Locations.h:1275
-msgid "Maastricht"
-msgstr "Maastricht"
+#~ msgid "Cascade"
+#~ msgstr "Cascade"
 
-#: my-evolution/Locations.h:1276
-msgid "Macae"
-msgstr "Macae"
+#~ msgid "Casper"
+#~ msgstr "Casper"
 
-#: my-evolution/Locations.h:1277
-msgid "Macapa"
-msgstr "Macapa"
+#~ msgid "Catacamas"
+#~ msgstr "Catacamas"
 
-#: my-evolution/Locations.h:1278
-msgid "Maceio"
-msgstr "Maceio"
+#~ msgid "Catania"
+#~ msgstr "Catania"
 
-#: my-evolution/Locations.h:1279
-msgid "Macon"
-msgstr "Macon"
+#~ msgid "Cayo Largo del Sur"
+#~ msgstr "Cayo Largo del Sur"
 
-#: my-evolution/Locations.h:1280
-msgid "Madinah"
-msgstr "Madinah"
+#~ msgid "Cazaux"
+#~ msgstr "Cazaux"
 
-#: my-evolution/Locations.h:1281
-msgid "Madison"
-msgstr "Madison"
+#~ msgid "Cecil NAS"
+#~ msgstr "Cecil NAS"
 
-#: my-evolution/Locations.h:1282
-msgid "Madras/Minambakkam"
-msgstr "Madras/Minambakkam"
+#~ msgid "Cedar City"
+#~ msgstr "Cedar City"
 
-#: my-evolution/Locations.h:1283
-msgid "Madrid (Barajas)"
-msgstr "Madrid (Barajas)"
+#~ msgid "Cedar Rapids"
+#~ msgstr "Cedar Rapids"
 
-#: my-evolution/Locations.h:1284
-msgid "Madrid (Cuatro Vientos)"
-msgstr "Madrid (Cuatro Vientos)"
+#~ msgid "Central and South America"
+#~ msgstr "Central and South America"
 
-#: my-evolution/Locations.h:1285
-msgid "Magadan"
-msgstr "Magadan"
+#~ msgid "Cervia"
+#~ msgstr "Cervia"
 
-#: my-evolution/Locations.h:1286
-msgid "Magdalena"
-msgstr "Magdalena"
+#~ msgid "Chacarita"
+#~ msgstr "Chacarita"
 
-#: my-evolution/Locations.h:1287
-msgid "Maine"
-msgstr "Maine"
+#~ msgid "Chadron"
+#~ msgstr "Chadron"
 
-#: my-evolution/Locations.h:1288
-msgid "Makhachkala"
-msgstr "Makhachkala"
+#~ msgid "Challis"
+#~ msgstr "Challis"
 
-#: my-evolution/Locations.h:1289
-msgid "Makkah"
-msgstr "Makkah"
+#~ msgid "Chamberlain"
+#~ msgstr "Chamberlain"
 
-#: my-evolution/Locations.h:1290
-msgid "Makung"
-msgstr "Makung"
+#~ msgid "Chambery"
+#~ msgstr "Chambery"
 
-#: my-evolution/Locations.h:1291
-msgid "Malad City"
-msgstr "Malad City"
+#~ msgid "Champaign"
+#~ msgstr "Champaign"
 
-#: my-evolution/Locations.h:1292
-msgid "Malaga"
-msgstr "Malaga"
+#~ msgid "Chandalar Lake"
+#~ msgstr "Chandalar Lake"
 
-#: my-evolution/Locations.h:1293
-msgid "Malatya"
-msgstr "Malatya"
+#~ msgid "Chandler"
+#~ msgstr "Chandler"
 
-#: my-evolution/Locations.h:1294
-msgid "Maldonado/Punta Est"
-msgstr "Maldonado/Punta Est"
+#~ msgid "Chania"
+#~ msgstr "Chania"
 
-#: my-evolution/Locations.h:1295
-msgid "Malmo/Sturup"
-msgstr "Malmo/Sturup"
+#~ msgid "Chanute"
+#~ msgstr "Chanute"
 
-#: my-evolution/Locations.h:1297
-msgid "Mammoth Lakes"
-msgstr "Mammoth Lakes"
+#~ msgid "Chariton"
+#~ msgstr "Chariton"
 
-#: my-evolution/Locations.h:1298
-msgid "Managua"
-msgstr "Managua"
+#~ msgid "Charleroi-Brussels South"
+#~ msgstr "Charleroi-Brussels South"
 
-#: my-evolution/Locations.h:1299
-msgid "Manassas"
-msgstr "Manassas"
+#~ msgid "Charles City"
+#~ msgstr "Charles City"
 
-#: my-evolution/Locations.h:1300
-msgid "Manaus"
-msgstr "Manaus"
+#~ msgid "Charleston"
+#~ msgstr "Charleston"
 
-#: my-evolution/Locations.h:1301
-msgid "Manchester"
-msgstr "Manchester"
+#~ msgid "Charlotte"
+#~ msgstr "Charlotte"
 
-#: my-evolution/Locations.h:1302
-msgid "Mangilsan Ab"
-msgstr "Mangilsan Ab"
+#~ msgid "Charlottesville"
+#~ msgstr "Charlottesville"
 
-#: my-evolution/Locations.h:1303
-msgid "Manhattan"
-msgstr "Manhattan"
+#~ msgid "Chatham"
+#~ msgstr "Chatham"
 
-#: my-evolution/Locations.h:1304
-msgid "Manisa"
-msgstr "Manisa"
+#~ msgid "Chattanooga"
+#~ msgstr "Chattanooga"
 
-#: my-evolution/Locations.h:1305
-msgid "Manistee"
-msgstr "Manistee"
+#~ msgid "Cheboksary"
+#~ msgstr "Cheboksary"
 
-#: my-evolution/Locations.h:1306
-msgid "Manitoba"
-msgstr "Manitoba"
+#~ msgid "Cheju"
+#~ msgstr "Cheju"
 
-#: my-evolution/Locations.h:1307
-msgid "Manitowoc"
-msgstr "Manitowoc"
+#~ msgid "Chelyabinsk"
+#~ msgstr "Chelyabinsk"
 
-#: my-evolution/Locations.h:1308
-msgid "Mankato"
-msgstr "Mankato"
+#~ msgid "Chengdu"
+#~ msgstr "Chengdu"
 
-#: my-evolution/Locations.h:1309
-msgid "Mansfield"
-msgstr "Mansfield"
+#~ msgid "Cherbourg"
+#~ msgstr "Cherbourg"
 
-#: my-evolution/Locations.h:1310
-msgid "Manta"
-msgstr "Manta"
+#~ msgid "Cherry Point"
+#~ msgstr "Cherry Point"
 
-#: my-evolution/Locations.h:1311
-msgid "Manzanillo"
-msgstr "Manzanillo"
+#~ msgid "Chetumal"
+#~ msgstr "Chetumal"
 
-#: my-evolution/Locations.h:1312
-msgid "Maraba"
-msgstr "Maraba"
+#~ msgid "Cheyenne"
+#~ msgstr "Cheyenne"
 
-#: my-evolution/Locations.h:1313
-msgid "Maracaibo-La Chinita"
-msgstr "Maracaibo-La Chinita"
+#~ msgid "Chiang Kai Shek"
+#~ msgstr "Chiang Kai Shek"
 
-#: my-evolution/Locations.h:1314
-msgid "Maracay-B.A.Sucre"
-msgstr "Maracay-B.A.Sucre"
+#~ msgid "Chia Tung"
+#~ msgstr "Chia Tung"
 
-#: my-evolution/Locations.h:1315
-msgid "Marathon"
-msgstr "Marathon"
+#~ msgid "Chiayi"
+#~ msgstr "Chiayi"
 
-#: my-evolution/Locations.h:1316
-msgid "Mar Del Plata"
-msgstr "Mar Del Plata"
+#~ msgid "Chicago-DuPage"
+#~ msgstr "Chicago-DuPage"
 
-#: my-evolution/Locations.h:1317
-msgid "Margarita"
-msgstr "Margarita"
+#~ msgid "Chicago-Lakefront"
+#~ msgstr "Chicago-Lakefront"
 
-#: my-evolution/Locations.h:1318
-msgid "Marianna"
-msgstr "Marianna"
+#~ msgid "Chicago-Midway"
+#~ msgstr "Chicago-Midway"
 
-#: my-evolution/Locations.h:1319
-msgid "Marib"
-msgstr "Marib"
+#~ msgid "Chicago-O'Hare"
+#~ msgstr "Chicago-O'Hare"
 
-#: my-evolution/Locations.h:1320
-msgid "Maribor"
-msgstr "Maribor"
+#~ msgid "Chichijima"
+#~ msgstr "Chichijima"
 
-#: my-evolution/Locations.h:1321
-msgid "Marietta"
-msgstr "Marietta"
+#~ msgid "Chiclayo"
+#~ msgstr "Chiclayo"
 
-#: my-evolution/Locations.h:1322
-msgid "Marino di Ravenna"
-msgstr "Marino di Ravenna"
+#~ msgid "Chico"
+#~ msgstr "Chico"
 
-#: my-evolution/Locations.h:1323
-msgid "Marion"
-msgstr "Marion"
+#~ msgid "Chicopee Falls"
+#~ msgstr "Chicopee Falls"
 
-#: my-evolution/Locations.h:1324
-msgid "Marion-Wytheville"
-msgstr "Marion-Wytheville"
+#~ msgid "Chievres"
+#~ msgstr "Chievres"
 
-#: my-evolution/Locations.h:1325
-msgid "Marseille-Provence"
-msgstr "Marseille-Provence"
+#~ msgid "Chihhang"
+#~ msgstr "Chihhang"
 
-#: my-evolution/Locations.h:1326
-msgid "Marseilles"
-msgstr "Marseilles"
+#~ msgid "Chihuahua"
+#~ msgstr "Chihuahua"
 
-#: my-evolution/Locations.h:1327
-msgid "Marshall"
-msgstr "Marshall"
+#~ msgid "Childress"
+#~ msgstr "Childress"
 
-#: my-evolution/Locations.h:1328
-msgid "Marshalltown"
-msgstr "Marshalltown"
+#~ msgid "China Lake"
+#~ msgstr "China Lake"
 
-#: my-evolution/Locations.h:1329
-msgid "Marshfield"
-msgstr "Marshfield"
+#~ msgid "Chinandega"
+#~ msgstr "Chinandega"
 
-#: my-evolution/Locations.h:1330
-msgid "Marte"
-msgstr "Marte"
+#~ msgid "Chinmem/Shatou"
+#~ msgstr "Chinmem/Shatou"
 
-#: my-evolution/Locations.h:1331
-msgid "Marthas Vineyard"
-msgstr "Marthas Vineyard"
+#~ msgid "Chino"
+#~ msgstr "Chino"
 
-#: my-evolution/Locations.h:1332
-msgid "Martinsburg"
-msgstr "Martinsburg"
+#~ msgid "Chippewa County"
+#~ msgstr "Chippewa County"
 
-#: my-evolution/Locations.h:1333
-msgid "Martinsville"
-msgstr "Martinsville"
+#~ msgid "Chita"
+#~ msgstr "Chita"
 
-#: my-evolution/Locations.h:1334
-msgid "Maryland"
-msgstr "Maryland"
+#~ msgid "Chitose Ab"
+#~ msgstr "Chitose Ab"
 
-#: my-evolution/Locations.h:1335
-msgid "Marysville"
-msgstr "Marysville"
+#~ msgid "Chitose ASDF"
+#~ msgstr "Chitose ASDF"
 
-#: my-evolution/Locations.h:1336
-msgid "Marysville-Beale AFB"
-msgstr "Marysville-Beale AFB"
+#~ msgid "Chofu Airport"
+#~ msgstr "Chofu Airport"
 
-#: my-evolution/Locations.h:1337
-msgid "Mashhad"
-msgstr "Mashhad"
+#~ msgid "Choluteca"
+#~ msgstr "Choluteca"
 
-#: my-evolution/Locations.h:1338
-msgid "Masirah"
-msgstr "Masirah"
+#~ msgid "Chongju Ab"
+#~ msgstr "Chongju Ab"
 
-#: my-evolution/Locations.h:1339
-msgid "Mason City"
-msgstr "Mason City"
+#~ msgid "Christchurch"
+#~ msgstr "Christchurch"
 
-#: my-evolution/Locations.h:1340
-msgid "Massachusetts"
-msgstr "Massachusetts"
+#~ msgid "Chulitna"
+#~ msgstr "Chulitna"
 
-#: my-evolution/Locations.h:1341
-msgid "Massena"
-msgstr "Massena"
+#~ msgid "Churchill"
+#~ msgstr "Churchill"
 
-#: my-evolution/Locations.h:1342
-msgid "Matamoros"
-msgstr "Matamoros"
+#~ msgid "Churchill Falls"
+#~ msgstr "Churchill Falls"
 
-#: my-evolution/Locations.h:1343
-msgid "Matsumoto Airport"
-msgstr "Matsumoto Airport"
+#~ msgid "Cincinnati"
+#~ msgstr "Cincinnati"
 
-#: my-evolution/Locations.h:1344
-msgid "Matsushima Ab"
-msgstr "Matsushima Ab"
+#~ msgid "Circle City"
+#~ msgstr "Circle City"
 
-#: my-evolution/Locations.h:1345
-msgid "Matsuyama Airport"
-msgstr "Matsuyama Airport"
+#~ msgid "Ciudad Bolivar"
+#~ msgstr "Ciudad Bolivar"
 
-#: my-evolution/Locations.h:1346
-msgid "Mattoon"
-msgstr "Mattoon"
+#~ msgid "Ciudad del Carmen"
+#~ msgstr "Ciudad del Carmen"
 
-#: my-evolution/Locations.h:1347
-msgid "Mayaguez"
-msgstr "Mayaguez"
+#~ msgid "Ciudad Juarez"
+#~ msgstr "Ciudad Juarez"
 
-#: my-evolution/Locations.h:1348
-msgid "Mayport"
-msgstr "Mayport"
+#~ msgid "Ciudad Obregon"
+#~ msgstr "Ciudad Obregon"
 
-#: my-evolution/Locations.h:1349
-msgid "Mazatlan"
-msgstr "Mazatlan"
+#~ msgid "Ciudad Victoria"
+#~ msgstr "Ciudad Victoria"
 
-#: my-evolution/Locations.h:1350
-msgid "Mazu"
-msgstr "Mazu"
+#~ msgid "Clarinda"
+#~ msgstr "Clarinda"
 
-#: my-evolution/Locations.h:1351
-msgid "McAlester"
-msgstr "McAlester"
+#~ msgid "Clarion"
+#~ msgstr "Clarion"
 
-#: my-evolution/Locations.h:1352
-msgid "McAllen"
-msgstr "McAllen"
+#~ msgid "Clarksburg"
+#~ msgstr "Clarksburg"
 
-#: my-evolution/Locations.h:1353
-msgid "McCall"
-msgstr "McCall"
+#~ msgid "Clayton"
+#~ msgstr "Clayton"
 
-#: my-evolution/Locations.h:1354
-msgid "McCarthy"
-msgstr "McCarthy"
+#~ msgid "Clayton Lake"
+#~ msgstr "Clayton Lake"
 
-#: my-evolution/Locations.h:1355
-msgid "McClellan"
-msgstr "McClellan"
+#~ msgid "Clermont-Ferrand"
+#~ msgstr "Clermont-Ferrand"
 
-#: my-evolution/Locations.h:1356
-msgid "McComb"
-msgstr "McComb"
+#~ msgid "Cleveland"
+#~ msgstr "Cleveland"
 
-#: my-evolution/Locations.h:1357
-msgid "McCook"
-msgstr "McCook"
+#~ msgid "Cleveland/Cuyahoga"
+#~ msgstr "Cleveland/Cuyahoga"
 
-#: my-evolution/Locations.h:1358
-msgid "McGrath"
-msgstr "McGrath"
+#~ msgid "Cleveland-Lakefront"
+#~ msgstr "Cleveland-Lakefront"
 
-#: my-evolution/Locations.h:1359
-msgid "Mc Gregor"
-msgstr "Mc Gregor"
+#~ msgid "Clinton"
+#~ msgstr "Clinton"
 
-#: my-evolution/Locations.h:1360
-msgid "Meacham"
-msgstr "Meacham"
+#~ msgid "Clovis-Cannon AFB"
+#~ msgstr "Clovis-Cannon AFB"
 
-#: my-evolution/Locations.h:1361
-msgid "Medford"
-msgstr "Medford"
+#~ msgid "Cobija"
+#~ msgstr "Cobija"
 
-#: my-evolution/Locations.h:1362
-msgid "Medicine Lodge"
-msgstr "Medicine Lodge"
+#~ msgid "Cochabamba"
+#~ msgstr "Cochabamba"
 
-#: my-evolution/Locations.h:1363
-msgid "Mehamn"
-msgstr "Mehamn"
+#~ msgid "Cocoa Beach"
+#~ msgstr "Cocoa Beach"
 
-#: my-evolution/Locations.h:1364
-msgid "Mekoryuk"
-msgstr "Mekoryuk"
+#~ msgid "Cocos Island"
+#~ msgstr "Cocos Island"
 
-#: my-evolution/Locations.h:1365
-msgid "Melbourne"
-msgstr "Melbourne"
+#~ msgid "Cody"
+#~ msgstr "Cody"
 
-#: my-evolution/Locations.h:1366
-msgid "Melfa"
-msgstr "Melfa"
+#~ msgid "Coeur d'Alene"
+#~ msgstr "Coeur d'Alene"
 
-#: my-evolution/Locations.h:1367
-msgid "Melilla"
-msgstr "Melilla"
+#~ msgid "Cold Bay"
+#~ msgstr "Cold Bay"
 
-#: my-evolution/Locations.h:1368
-msgid "Memambetsu Airport"
-msgstr "Memambetsu Airport"
+#~ msgid "Colima"
+#~ msgstr "Colima"
 
-#: my-evolution/Locations.h:1369
-msgid "Memphis"
-msgstr "Memphis"
+#~ msgid "College Station"
+#~ msgstr "College Station"
 
-#: my-evolution/Locations.h:1370
-msgid "Memphis-NAS"
-msgstr "Memphis-NAS"
+#~ msgid "Colmar-Meyenheim"
+#~ msgstr "Colmar-Meyenheim"
 
-#: my-evolution/Locations.h:1371
-msgid "Mendoza"
-msgstr "Mendoza"
+#~ msgid "Colonia"
+#~ msgstr "Colonia"
 
-#: my-evolution/Locations.h:1372
-msgid "Mene Grande"
-msgstr "Mene Grande"
+#~ msgid "Colorado"
+#~ msgstr "Colorado"
 
-#: my-evolution/Locations.h:1373
-msgid "Menominee"
-msgstr "Menominee"
+#~ msgid "Colorado Springs"
+#~ msgstr "Colorado Springs"
 
-#: my-evolution/Locations.h:1374
-msgid "Menorca"
-msgstr "Menorca"
+#~ msgid "Columbia"
+#~ msgstr "Columbia"
 
-#: my-evolution/Locations.h:1375
-msgid "Merced"
-msgstr "Merced"
+#~ msgid "Columbia-McEntire"
+#~ msgstr "Columbia-McEntire"
 
-#: my-evolution/Locations.h:1376
-msgid "Merida"
-msgstr "Merida"
+#~ msgid "Columbus"
+#~ msgstr "Columbus"
 
-#: my-evolution/Locations.h:1377
-msgid "Meridian"
-msgstr "Meridian"
+#~ msgid "Columbus-Fort Benning"
+#~ msgstr "Columbus-Fort Benning"
 
-#: my-evolution/Locations.h:1378
-msgid "Meridian-Lauderdale"
-msgstr "Meridian-Lauderdale"
+#~ msgid "Columbus-Gahanna"
+#~ msgstr "Columbus-Gahanna"
 
-#: my-evolution/Locations.h:1379
-msgid "Merril Field"
-msgstr "Merril Field"
+#~ msgid "Columbus-OSU"
+#~ msgstr "Columbus-OSU"
 
-#: my-evolution/Locations.h:1380
-msgid "Mersa Matruh"
-msgstr "Mersa Matruh"
+#~ msgid "Columbus-W Point-Starkville"
+#~ msgstr "Columbus-W Point-Starkville"
 
-#: my-evolution/Locations.h:1381
-msgid "Mesa-Falcon Field"
-msgstr "Mesa-Falcon Field"
+#~ msgid "Colville"
+#~ msgstr "Colville"
 
-#: my-evolution/Locations.h:1382
-msgid "Metabaru Ab"
-msgstr "Metabaru Ab"
+#~ msgid "Comodoro Rivadavia"
+#~ msgstr "Comodoro Rivadavia"
 
-#: my-evolution/Locations.h:1383
-msgid "Metz-Frescaty"
-msgstr "Metz-Frescaty"
+#~ msgid "Comox"
+#~ msgstr "Comox"
 
-#: my-evolution/Locations.h:1384
-msgid "Mexicali"
-msgstr "Mexicali"
+#~ msgid "Conceicao Do Araguaia"
+#~ msgstr "Conceicao Do Araguaia"
 
-#: my-evolution/Locations.h:1386
-msgid "Miami"
-msgstr "Miami"
+#~ msgid "Concepcion"
+#~ msgstr "Concepcion"
 
-#: my-evolution/Locations.h:1387
-msgid "Miami-Kendall"
-msgstr "Miami-Kendall"
+#~ msgid "Concord"
+#~ msgstr "Concord"
 
-#: my-evolution/Locations.h:1388
-msgid "Miami-Opa Locka"
-msgstr "Miami-Opa Locka"
+#~ msgid "Concordia"
+#~ msgstr "Concordia"
 
-#: my-evolution/Locations.h:1389
-msgid "Michigan"
-msgstr "Michigan"
+#~ msgid "Connaught"
+#~ msgstr "Connaught"
 
-#: my-evolution/Locations.h:1390
-msgid "Middle East"
-msgstr "Orta Şərq"
+#~ msgid "Connecticut"
+#~ msgstr "Connecticut"
 
-#: my-evolution/Locations.h:1391
-msgid "Middleton Island"
-msgstr "Middleton Island"
+#~ msgid "Conroe"
+#~ msgstr "Conroe"
 
-#: my-evolution/Locations.h:1392
-msgid "Middletown"
-msgstr "Middletown"
+#~ msgid "Constantine"
+#~ msgstr "Constantine"
 
-#: my-evolution/Locations.h:1393
-msgid "Midland"
-msgstr "Midland"
+#~ msgid "Copper Harbor"
+#~ msgstr "Copper Harbor"
 
-#: my-evolution/Locations.h:1394
-msgid "Miho Ab"
-msgstr "Miho Ab"
+#~ msgid "Cordoba"
+#~ msgstr "Cordoba"
 
-#: my-evolution/Locations.h:1395
-msgid "Milano/Linate"
-msgstr "Milano/Linate"
+#~ msgid "Cordova"
+#~ msgstr "Cordova"
 
-#: my-evolution/Locations.h:1396
-msgid "Milano/Malpensa"
-msgstr "Milano/Malpensa"
+#~ msgid "Cork"
+#~ msgstr "Cork"
 
-#: my-evolution/Locations.h:1397
-msgid "Miles City"
-msgstr "Miles City"
+#~ msgid "Coro"
+#~ msgstr "Coro"
 
-#: my-evolution/Locations.h:1398
-msgid "Milford"
-msgstr "Milford"
+#~ msgid "Corona"
+#~ msgstr "Corona"
 
-#: my-evolution/Locations.h:1399
-msgid "Millinocket"
-msgstr "Millinocket"
+#~ msgid "Corpus Christi"
+#~ msgstr "Corpus Christi"
 
-#: my-evolution/Locations.h:1400
-msgid "Millville"
-msgstr "Millville"
+#~ msgid "Corpus Christi NAS"
+#~ msgstr "Corpus Christi NAS"
 
-#: my-evolution/Locations.h:1401
-msgid "Milton"
-msgstr "Milton"
+#~ msgid "Corrientes"
+#~ msgstr "Corrientes"
 
-#: my-evolution/Locations.h:1402
-msgid "Milwaukee"
-msgstr "Milwaukee"
+#~ msgid "Corsicana"
+#~ msgstr "Corsicana"
 
-#: my-evolution/Locations.h:1403
-msgid "Milwaukee-Timmerman"
-msgstr "Milwaukee-Timmerman"
+#~ msgid "Cortez"
+#~ msgstr "Cortez"
 
-#: my-evolution/Locations.h:1404
-msgid "Minamitorishima"
-msgstr "Minamitorishima"
+#~ msgid "Corumba"
+#~ msgstr "Corumba"
 
-#: my-evolution/Locations.h:1405
-msgid "Minatitlan"
-msgstr "Minatitlan"
+#~ msgid "Cotulla"
+#~ msgstr "Cotulla"
 
-#: my-evolution/Locations.h:1406
-msgid "Minchumina"
-msgstr "Minchumina"
+#~ msgid "Council Bluffs"
+#~ msgstr "Council Bluffs"
 
-#: my-evolution/Locations.h:1407
-msgid "Mineralnye Vody"
-msgstr "Mineralnye Vody"
+#~ msgid "Coventry"
+#~ msgstr "Coventry"
 
-#: my-evolution/Locations.h:1408
-msgid "Mineral Wells"
-msgstr "Mineral Wells"
+#~ msgid "Covington"
+#~ msgstr "Covington"
 
-#: my-evolution/Locations.h:1409
-msgid "Minneapolis"
-msgstr "Minneapolis"
+#~ msgid "Cozumel"
+#~ msgstr "Cozumel"
 
-#: my-evolution/Locations.h:1410
-msgid "Minneapolis [2]"
-msgstr "Minneapolis [2]"
+#~ msgid "Craig"
+#~ msgstr "Craig"
 
-#: my-evolution/Locations.h:1411
-msgid "Minneapolis [3]"
-msgstr "Minneapolis [3]"
+#~ msgid "Cranfield"
+#~ msgstr "Cranfield"
 
-#: my-evolution/Locations.h:1412
-msgid "Minnesota"
-msgstr "Minnesota"
+#~ msgid "Crescent City"
+#~ msgstr "Crescent City"
 
-#: my-evolution/Locations.h:1413
-msgid "Minocqua"
-msgstr "Minocqua"
+#~ msgid "Creston"
+#~ msgstr "Creston"
 
-#: my-evolution/Locations.h:1414
-msgid "Minot"
-msgstr "Minot"
+#~ msgid "Crestview"
+#~ msgstr "Crestview"
 
-#: my-evolution/Locations.h:1415
-msgid "Minot AFB"
-msgstr "Minot AFB"
+#~ msgid "Cross City"
+#~ msgstr "Cross City"
 
-#: my-evolution/Locations.h:1416
-msgid "Misawa Ab"
-msgstr "Misawa Ab"
+#~ msgid "Crossville"
+#~ msgstr "Crossville"
 
-#: my-evolution/Locations.h:1417
-msgid "Mississippi"
-msgstr "Mississippi"
+#~ msgid "Crotone"
+#~ msgstr "Crotone"
 
-#: my-evolution/Locations.h:1418
-msgid "Missoula"
-msgstr "Missoula"
+#~ msgid "Cuba Awrs"
+#~ msgstr "Cuba Awrs"
 
-#: my-evolution/Locations.h:1419
-msgid "Missouri"
-msgstr "Missouri"
+#~ msgid "Cuernavaca"
+#~ msgstr "Cuernavaca"
 
-#: my-evolution/Locations.h:1420
-msgid "Mitchell"
-msgstr "Mitchell"
+#~ msgid "Cuiaba"
+#~ msgstr "Cuiaba"
 
-#: my-evolution/Locations.h:1421
-msgid "Mitilini"
-msgstr "Mitilini"
+#~ msgid "Culdrose"
+#~ msgstr "Culdrose"
 
-#: my-evolution/Locations.h:1422
-msgid "Miyakejima Airport"
-msgstr "Miyakejima Airport"
+#~ msgid "Culiacan"
+#~ msgstr "Culiacan"
 
-#: my-evolution/Locations.h:1423
-msgid "Miyazaki Airport"
-msgstr "Miyazaki Airport"
+#~ msgid "Cumana"
+#~ msgstr "Cumana"
 
-#: my-evolution/Locations.h:1424
-msgid "Moa"
-msgstr "Moa"
+#~ msgid "Cumberland"
+#~ msgstr "Cumberland"
 
-#: my-evolution/Locations.h:1425
-msgid "Mobile Downtown"
-msgstr "Mobile Downtown"
+#~ msgid "Curitiba Apt"
+#~ msgstr "Curitiba Apt"
 
-#: my-evolution/Locations.h:1426
-msgid "Mobile Regional Airport"
-msgstr "Mobile Regional Airport"
+#~ msgid "Custer"
+#~ msgstr "Custer"
 
-#: my-evolution/Locations.h:1427
-msgid "Mobridge"
-msgstr "Mobridge"
+#~ msgid "Cut Bank"
+#~ msgstr "Cut Bank"
 
-#: my-evolution/Locations.h:1428
-msgid "Modesto"
-msgstr "Modesto"
+#~ msgid "Cuzco"
+#~ msgstr "Cuzco"
 
-#: my-evolution/Locations.h:1429
-msgid "Mo I Rana"
-msgstr "Mo I Rana"
+#~ msgid "Dagali"
+#~ msgstr "Dagali"
 
-#: my-evolution/Locations.h:1430
-msgid "Mojave"
-msgstr "Mojave"
+#~ msgid "Daggett"
+#~ msgstr "Daggett"
 
-#: my-evolution/Locations.h:1431
-msgid "Molde"
-msgstr "Molde"
+#~ msgid "Dalhart"
+#~ msgstr "Dalhart"
 
-#: my-evolution/Locations.h:1432
-msgid "Moldova"
-msgstr "Moldova"
+#~ msgid "Dalian"
+#~ msgstr "Dalian"
 
-#: my-evolution/Locations.h:1433
-msgid "Moline-Quad Cities"
-msgstr "Moline-Quad Cities"
+#~ msgid "Dallas-Addison"
+#~ msgstr "Dallas-Addison"
 
-#: my-evolution/Locations.h:1434
-msgid "Molokai"
-msgstr "Molokai"
+#~ msgid "Dallas-Fort Worth"
+#~ msgstr "Dallas-Fort Worth"
 
-#: my-evolution/Locations.h:1435
-msgid "Mombetsu Airport"
-msgstr "Mombetsu Airport"
+#~ msgid "Dallas-Love Field"
+#~ msgstr "Dallas-Love Field"
 
-#: my-evolution/Locations.h:1436
-msgid "Monchengladbach"
-msgstr "Monchengladbach"
+#~ msgid "Dallas-Redbird"
+#~ msgstr "Dallas-Redbird"
 
-#: my-evolution/Locations.h:1437
-msgid "Monclova"
-msgstr "Monclova"
+#~ msgid "Da Nang"
+#~ msgstr "Da Nang"
 
-#: my-evolution/Locations.h:1438
-msgid "Moncton"
-msgstr "Moncton"
+#~ msgid "Danbury"
+#~ msgstr "Danbury"
 
-#: my-evolution/Locations.h:1439
-msgid "Monida"
-msgstr "Monida"
+#~ msgid "Danville"
+#~ msgstr "Danville"
 
-#: my-evolution/Locations.h:1440
-msgid "Monpellier-Mediterrannee"
-msgstr "Monpellier-Mediterrannee"
+#~ msgid "Dar-El-Beida"
+#~ msgstr "Dar-El-Beida"
 
-#: my-evolution/Locations.h:1441
-msgid "Monroe"
-msgstr "Monroe"
+#~ msgid "Davenport"
+#~ msgstr "Davenport"
 
-#: my-evolution/Locations.h:1442
-msgid "Montague"
-msgstr "Montague"
+#~ msgid "David"
+#~ msgstr "David"
 
-#: my-evolution/Locations.h:1443
-msgid "Montana"
-msgstr "Montana"
+#~ msgid "Dawadmi"
+#~ msgstr "Dawadmi"
 
-#: my-evolution/Locations.h:1444
-msgid "Mont-de-Marsan"
-msgstr "Mont-de-Marsan"
+#~ msgid "Dayton"
+#~ msgstr "Dayton"
 
-#: my-evolution/Locations.h:1445
-msgid "Monte Argentario"
-msgstr "Monte Argentario"
+#~ msgid "Daytona Beach"
+#~ msgstr "Daytona Beach"
 
-#: my-evolution/Locations.h:1446
-msgid "Monte Bisbino"
-msgstr "Monte Bisbino"
+#~ msgid "Dayton-Fairborn"
+#~ msgstr "Dayton-Fairborn"
 
-#: my-evolution/Locations.h:1447
-msgid "Monte Calamita"
-msgstr "Monte Calamita"
+#~ msgid "Dayton-South Airport"
+#~ msgstr "Dayton-South Airport"
 
-#: my-evolution/Locations.h:1448
-msgid "Monte Cimone"
-msgstr "Monte Cimone"
+#~ msgid "Dead Horse"
+#~ msgstr "Dead Horse"
 
-#: my-evolution/Locations.h:1449
-msgid "Montego Bay"
-msgstr "Montego Bay"
+#~ msgid "Deauville-Saint-Gatien"
+#~ msgstr "Deauville-Saint-Gatien"
 
-#: my-evolution/Locations.h:1450
-msgid "Monte Malanotte"
-msgstr "Monte Malanotte"
+#~ msgid "Decatur"
+#~ msgstr "Decatur"
 
-#: my-evolution/Locations.h:1451
-msgid "Monterey"
-msgstr "Monterey"
+#~ msgid "Decimomannu"
+#~ msgstr "Decimomannu"
 
-#: my-evolution/Locations.h:1452
-msgid "Monterrey"
-msgstr "Monterrey"
+#~ msgid "Decorah"
+#~ msgstr "Decorah"
 
-#: my-evolution/Locations.h:1453
-msgid "Monte Scuro"
-msgstr "Monte Scuro"
+#~ msgid "Deelen"
+#~ msgstr "Deelen"
 
-#: my-evolution/Locations.h:1454
-msgid "Monte Terminillo"
-msgstr "Monte Terminillo"
+#~ msgid "Dekalb/Peachtree"
+#~ msgstr "Dekalb/Peachtree"
 
-#: my-evolution/Locations.h:1455
-msgid "Montevideo/Carrasco"
-msgstr "Montevideo/Carrasco"
+#~ msgid "Delaware"
+#~ msgstr "Delaware"
 
-#: my-evolution/Locations.h:1456
-msgid "Montgomery"
-msgstr "Montgomery"
+#~ msgid "Del Bajio"
+#~ msgstr "Del Bajio"
 
-#: my-evolution/Locations.h:1457
-msgid "Montgomery-Maxwell AFB"
-msgstr "Montgomery-Maxwell AFB"
+#~ msgid "Del Rio"
+#~ msgstr "Del Rio"
 
-#: my-evolution/Locations.h:1458
-msgid "Monticello"
-msgstr "Monticello"
+#~ msgid "Delta"
+#~ msgstr "Delta"
 
-#: my-evolution/Locations.h:1459
-msgid "Montpelier"
-msgstr "Montpelier"
+#~ msgid "Deming"
+#~ msgstr "Deming"
 
-#: my-evolution/Locations.h:1460
-msgid "Montreal Dorval"
-msgstr "Montreal Dorval"
+#~ msgid "Den Helder/De Kooy"
+#~ msgstr "Den Helder/De Kooy"
 
-#: my-evolution/Locations.h:1461
-msgid "Montreal Mirabel"
-msgstr "Montreal Mirabel"
+#~ msgid "Denison"
+#~ msgstr "Denison"
 
-#: my-evolution/Locations.h:1462
-msgid "Montreal Saint-Hubert"
-msgstr "Montreal Saint-Hubert"
+#~ msgid "Denton"
+#~ msgstr "Denton"
 
-#: my-evolution/Locations.h:1463
-msgid "Montrose"
-msgstr "Montrose"
+#~ msgid "Denver"
+#~ msgstr "Denver"
 
-#: my-evolution/Locations.h:1464
-msgid "Montrose (2)"
-msgstr "Montrose (2)"
+#~ msgid "Denver-Aurora"
+#~ msgstr "Denver-Aurora"
 
-#: my-evolution/Locations.h:1465
-msgid "Morelia"
-msgstr "Morelia"
+#~ msgid "Denver-Broomfield"
+#~ msgstr "Denver-Broomfield"
 
-#: my-evolution/Locations.h:1466
-msgid "Morgantown"
-msgstr "Morgantown"
+#~ msgid "Denver-Cherry Knolls"
+#~ msgstr "Denver-Cherry Knolls"
 
-#: my-evolution/Locations.h:1467
-msgid "Moriarty"
-msgstr "Moriarty"
+#~ msgid "Desert Rock"
+#~ msgstr "Desert Rock"
 
-#: my-evolution/Locations.h:1469
-msgid "Morristown"
-msgstr "Morristown"
+#~ msgid "Des Moines"
+#~ msgstr "Des Moines"
 
-#: my-evolution/Locations.h:1470
-msgid "Moscow Domodedovo"
-msgstr "Moscow Domodedovo"
+#~ msgid "Destin"
+#~ msgstr "Destin"
 
-#: my-evolution/Locations.h:1471
-msgid "Moscow Sheremetyevo"
-msgstr "Moscow Sheremetyevo"
+#~ msgid "Detroit"
+#~ msgstr "Detroit"
 
-#: my-evolution/Locations.h:1472
-msgid "Moses Lake"
-msgstr "Moses Lake"
+#~ msgid "Detroit Lakes"
+#~ msgstr "Detroit Lakes"
 
-#: my-evolution/Locations.h:1473
-msgid "Mosinee"
-msgstr "Mosinee"
+#~ msgid "Detroit-Taylor"
+#~ msgstr "Detroit-Taylor"
 
-#: my-evolution/Locations.h:1474
-msgid "Mosjoen"
-msgstr "Mosjoen"
+#~ msgid "Detroit/Ypsilanti"
+#~ msgstr "Detroit/Ypsilanti"
 
-#: my-evolution/Locations.h:1475
-msgid "Moultrie"
-msgstr "Moultrie"
+#~ msgid "Devils Lake"
+#~ msgstr "Devils Lake"
 
-#: my-evolution/Locations.h:1476
-msgid "Mountain Home"
-msgstr "Mountain Home"
+#~ msgid "Devils Lake (2)"
+#~ msgstr "Devils Lake (2)"
 
-#: my-evolution/Locations.h:1477
-msgid "Mountain View"
-msgstr "Mountain View"
+#~ msgid "Dhahran"
+#~ msgstr "Dhahran"
 
-#: my-evolution/Locations.h:1478
-msgid "Mount Clemens"
-msgstr "Mount Clemens"
+#~ msgid "Dickinson"
+#~ msgstr "Dickinson"
 
-#: my-evolution/Locations.h:1479
-msgid "Mount Holly"
-msgstr "Mount Holly"
+#~ msgid "Dijon"
+#~ msgstr "Dijon"
 
-#: my-evolution/Locations.h:1480
-msgid "Mount Shasta"
-msgstr "Mount Shasta"
+#~ msgid "Dillingham"
+#~ msgstr "Dillingham"
 
-#: my-evolution/Locations.h:1481
-msgid "Mount Vernon"
-msgstr "Mount Vernon"
+#~ msgid "Dillon"
+#~ msgstr "Dillon"
 
-#: my-evolution/Locations.h:1482
-msgid "Mount Wilson"
-msgstr "Mount Wilson"
+#~ msgid "Dinard"
+#~ msgstr "Dinard"
 
-#: my-evolution/Locations.h:1483
-msgid "Mt Washington"
-msgstr "Mt Washington"
+#~ msgid "District of Columbia"
+#~ msgstr "District of Columbia"
 
-#: my-evolution/Locations.h:1484
-msgid "Mugla/Dalaman"
-msgstr "Mugla/Dalaman"
+#~ msgid "Diyarbakir"
+#~ msgstr "Diyarbakir"
 
-#: my-evolution/Locations.h:1485
-msgid "Muir"
-msgstr "Muir"
+#~ msgid "Dnipropetrovsk"
+#~ msgstr "Dnipropetrovsk"
 
-#: my-evolution/Locations.h:1486
-msgid "Mullan"
-msgstr "Mullan"
+#~ msgid "Dobbiaco"
+#~ msgstr "Dobbiaco"
 
-#: my-evolution/Locations.h:1487
-msgid "Mullen"
-msgstr "Mullen"
+#~ msgid "Dodge City"
+#~ msgstr "Dodge City"
 
-#: my-evolution/Locations.h:1488
-msgid "Munchen"
-msgstr "Munchen"
+#~ msgid "Doha"
+#~ msgstr "Doha"
 
-#: my-evolution/Locations.h:1489
-msgid "Muncie"
-msgstr "Muncie"
+#~ msgid "Dole"
+#~ msgstr "Dole"
 
-#: my-evolution/Locations.h:1490
-msgid "Munster/Osnabruck"
-msgstr "Munster/Osnabruck"
+#~ msgid "Donetsk"
+#~ msgstr "Donetsk"
 
-#: my-evolution/Locations.h:1491
-msgid "Murcia"
-msgstr "Murcia"
+#~ msgid "Dongsha"
+#~ msgstr "Dongsha"
 
-#: my-evolution/Locations.h:1492
-msgid "Murmansk"
-msgstr "Murmansk"
+#~ msgid "Dongshi"
+#~ msgstr "Dongshi"
 
-#: my-evolution/Locations.h:1493
-msgid "Mus"
-msgstr "Mus"
+#~ msgid "Don Torcuato"
+#~ msgstr "Don Torcuato"
 
-#: my-evolution/Locations.h:1494
-msgid "Muscatine"
-msgstr "Muscatine"
+#~ msgid "Dortmund-Wickede"
+#~ msgstr "Dortmund-Wickede"
 
-#: my-evolution/Locations.h:1495
-msgid "Muscle Shoals"
-msgstr "Muscle Shoals"
+#~ msgid "Dothan"
+#~ msgstr "Dothan"
 
-#: my-evolution/Locations.h:1496
-msgid "Muskegon"
-msgstr "Muskegon"
+#~ msgid "Douglas"
+#~ msgstr "Douglas"
 
-#: my-evolution/Locations.h:1497
-msgid "Mykonos"
-msgstr "Mykonos"
+#~ msgid "Dover"
+#~ msgstr "Dover"
 
-#: my-evolution/Locations.h:1498
-msgid "Myrtle Beach"
-msgstr "Myrtle Beach"
+#~ msgid "Dresden-Klotzsche"
+#~ msgstr "Dresden-Klotzsche"
 
-#: my-evolution/Locations.h:1499
-msgid "Nabesna/Devil Mt."
-msgstr "Nabesna/Devil Mt."
+#~ msgid "Drummond"
+#~ msgstr "Drummond"
 
-#: my-evolution/Locations.h:1500
-msgid "Nacogdoches"
-msgstr "Nacogdoches"
+#~ msgid "Dubai"
+#~ msgstr "Dubai"
 
-#: my-evolution/Locations.h:1501
-msgid "Nagasaki Airport"
-msgstr "Nagasaki Airport"
+#~ msgid "Dubbo"
+#~ msgstr "Dubbo"
 
-#: my-evolution/Locations.h:1502
-msgid "Nagoya Airport"
-msgstr "Nagoya Airport"
+#~ msgid "Dublin"
+#~ msgstr "Dublin"
 
-#: my-evolution/Locations.h:1503
-msgid "Nagpur Sonegaon"
-msgstr "Nagpur Sonegaon"
+#~ msgid "Du Bois"
+#~ msgstr "Du Bois"
 
-#: my-evolution/Locations.h:1504
-msgid "Naha Airport"
-msgstr "Naha Airport"
+#~ msgid "Dubrovnik"
+#~ msgstr "Dubrovnik"
 
-#: my-evolution/Locations.h:1505
-msgid "Najran"
-msgstr "Najran"
+#~ msgid "Dubuque"
+#~ msgstr "Dubuque"
 
-#: my-evolution/Locations.h:1506
-msgid "Nakashibetsu Airport"
-msgstr "Nakashibetsu Airport"
+#~ msgid "Dugway"
+#~ msgstr "Dugway"
 
-#: my-evolution/Locations.h:1507
-msgid "Nalchik"
-msgstr "Nalchik"
+#~ msgid "Duluth"
+#~ msgstr "Duluth"
 
-#: my-evolution/Locations.h:1508
-msgid "Namsos"
-msgstr "Namsos"
+#~ msgid "Dundee"
+#~ msgstr "Dundee"
 
-#: my-evolution/Locations.h:1509
-msgid "Nancy-Essey"
-msgstr "Nancy-Essey"
+#~ msgid "Durango"
+#~ msgstr "Durango"
 
-#: my-evolution/Locations.h:1510
-msgid "Nancy-Ochey"
-msgstr "Nancy-Ochey"
+#~ msgid "Durango Awrs"
+#~ msgstr "Durango Awrs"
 
-#: my-evolution/Locations.h:1511
-msgid "Nankishirahama Airport"
-msgstr "Nankishirahama Airport"
+#~ msgid "Durazno"
+#~ msgstr "Durazno"
 
-#: my-evolution/Locations.h:1512
-msgid "Nanning"
-msgstr "Nanning"
+#~ msgid "Durban Louis Botha "
+#~ msgstr "Durban Louis Botha "
 
-#: my-evolution/Locations.h:1513
-msgid "Nantes Adlantique"
-msgstr "Nantes Adlantique"
+#~ msgid "Dusseldorf"
+#~ msgstr "Dusseldorf"
 
-#: my-evolution/Locations.h:1514
-msgid "Nantucket"
-msgstr "Nantucket"
+#~ msgid "Dutch Harbor"
+#~ msgstr "Dutch Harbor"
 
-#: my-evolution/Locations.h:1515
-msgid "Napa"
-msgstr "Napa"
+#~ msgid "Dyersburg"
+#~ msgstr "Dyersburg"
 
-#: my-evolution/Locations.h:1516
-msgid "Naples"
-msgstr "Naples"
+#~ msgid "Eagle"
+#~ msgstr "Eagle"
 
-#: my-evolution/Locations.h:1517
-msgid "Napoli"
-msgstr "Napoli"
+#~ msgid "Eagle Range"
+#~ msgstr "Eagle Range"
 
-#: my-evolution/Locations.h:1518
-msgid "Narvik"
-msgstr "Narvik"
+#~ msgid "East London"
+#~ msgstr "East London"
 
-#: my-evolution/Locations.h:1519
-msgid "Nasa Shuttle"
-msgstr "Nasa Shuttle"
+#~ msgid "East Midlands"
+#~ msgstr "East Midlands"
 
-#: my-evolution/Locations.h:1520
-msgid "Nashua"
-msgstr "Nashua"
+#~ msgid "East St Louis"
+#~ msgstr "East St Louis"
 
-#: my-evolution/Locations.h:1521
-msgid "Nashville"
-msgstr "Nashville"
+#~ msgid "Eau Claire"
+#~ msgstr "Eau Claire"
 
-#: my-evolution/Locations.h:1522
-msgid "Nassau"
-msgstr "Nassau"
+#~ msgid "Edinburgh"
+#~ msgstr "Edinburgh"
 
-#: my-evolution/Locations.h:1523
-msgid "Natal"
-msgstr "Natal"
+#~ msgid "Edmonton"
+#~ msgstr "Edmonton"
 
-#: my-evolution/Locations.h:1524
-msgid "Natchez"
-msgstr "Natchez"
+#~ msgid "Edmonton/Villeneuve"
+#~ msgstr "Edmonton/Villeneuve"
 
-#: my-evolution/Locations.h:1525
-msgid "Nawabshah"
-msgstr "Nawabshah"
+#~ msgid "Eduardo Gomes International"
+#~ msgstr "Eduardo Gomes International"
 
-#: my-evolution/Locations.h:1526
-msgid "Nebraska"
-msgstr "Nebraska"
+#~ msgid "Edwards AFB"
+#~ msgstr "Edwards AFB"
 
-#: my-evolution/Locations.h:1527
-msgid "Needles"
-msgstr "Needles"
+#~ msgid "Egilsstadir"
+#~ msgstr "Egilsstadir"
 
-#: my-evolution/Locations.h:1528
-msgid "Nenana"
-msgstr "Nenana"
+#~ msgid "Eglin"
+#~ msgstr "Eglin"
 
-#: my-evolution/Locations.h:1530
-msgid "Neuquen"
-msgstr "Neuquen"
+#~ msgid "Eglington/Londonderry"
+#~ msgstr "Eglington/Londonderry"
 
-#: my-evolution/Locations.h:1531
-msgid "Nevada"
-msgstr "Nevada"
+#~ msgid "Eindhoven"
+#~ msgstr "Eindhoven"
 
-#: my-evolution/Locations.h:1532
-msgid "Newark"
-msgstr "Newark"
+#~ msgid "Ekofisk"
+#~ msgstr "Ekofisk"
 
-#: my-evolution/Locations.h:1533
-msgid "New Bedford"
-msgstr "New Bedford"
+#~ msgid "Elazig"
+#~ msgstr "Elazig"
 
-#: my-evolution/Locations.h:1534
-msgid "New Bern"
-msgstr "New Bern"
+#~ msgid "El Centro"
+#~ msgstr "El Centro"
 
-#: my-evolution/Locations.h:1535
-msgid "New Braunfels"
-msgstr "New Braunfels"
+#~ msgid "El Dorado"
+#~ msgstr "El Dorado"
 
-#: my-evolution/Locations.h:1536
-msgid "New Brunswick"
-msgstr "New Brunswick"
+#~ msgid "Elefsis"
+#~ msgstr "Elefsis"
 
-#: my-evolution/Locations.h:1537
-msgid "Newburgh"
-msgstr "Newburgh"
+#~ msgid "Elfin Cove"
+#~ msgstr "Elfin Cove"
 
-#: my-evolution/Locations.h:1538
-msgid "Newcastle"
-msgstr "Newcastle"
+#~ msgid "Elizabeth City"
+#~ msgstr "Elizabeth City"
 
-#: my-evolution/Locations.h:1539
-msgid "New Delhi/Palam"
-msgstr "New Delhi/Palam"
+#~ msgid "Elk City"
+#~ msgstr "Elk City"
 
-#: my-evolution/Locations.h:1540
-msgid "Newfoundland"
-msgstr "Newfoundland"
+#~ msgid "Elkhart"
+#~ msgstr "Elkhart"
 
-#: my-evolution/Locations.h:1541
-msgid "New Hampshire"
-msgstr "New Hampshire"
+#~ msgid "Elkins"
+#~ msgstr "Elkins"
 
-#: my-evolution/Locations.h:1542
-msgid "New Haven"
-msgstr "New Haven"
+#~ msgid "Elko"
+#~ msgstr "Elko"
 
-#: my-evolution/Locations.h:1543
-msgid "New Iberia"
-msgstr "New Iberia"
+#~ msgid "Elmira"
+#~ msgstr "Elmira"
 
-#: my-evolution/Locations.h:1544
-msgid "New Jersey"
-msgstr "New Jersey"
+#~ msgid "El Monte"
+#~ msgstr "El Monte"
 
-#: my-evolution/Locations.h:1545
-msgid "New Mexico"
-msgstr "New Mexico"
+#~ msgid "El Paso"
+#~ msgstr "El Paso"
 
-#: my-evolution/Locations.h:1546
-msgid "New Orleans"
-msgstr "New Orleans"
+#~ msgid "El Salvador Int."
+#~ msgstr "El Salvador Int."
 
-#: my-evolution/Locations.h:1547
-msgid "New Orleans-Lakefront"
-msgstr "New Orleans-Lakefront"
+#~ msgid "Elsenborn"
+#~ msgstr "Elsenborn"
 
-#: my-evolution/Locations.h:1548
-msgid "New Orleans NAS"
-msgstr "New Orleans NAS"
+#~ msgid "Ely"
+#~ msgstr "Ely"
 
-#: my-evolution/Locations.h:1549
-msgid "Newport"
-msgstr "Newport"
+#~ msgid "Emmonak"
+#~ msgstr "Emmonak"
 
-#: my-evolution/Locations.h:1550
-msgid "Newport News"
-msgstr "Newport News"
+#~ msgid "Emporia"
+#~ msgstr "Emporia"
 
-#: my-evolution/Locations.h:1551
-msgid "New Port Richey"
-msgstr "New Port Richey"
+#~ msgid "Enid"
+#~ msgstr "Enid"
 
-#: my-evolution/Locations.h:1552
-msgid "New River"
-msgstr "New River"
+#~ msgid "Enid/Woodring"
+#~ msgstr "Enid/Woodring"
 
-#: my-evolution/Locations.h:1553
-msgid "New Tokyo International Airport"
-msgstr "New Tokyo International Airport"
+#~ msgid "Enosburg Falls"
+#~ msgstr "Enosburg Falls"
 
-#: my-evolution/Locations.h:1554
-msgid "Newton"
-msgstr "Newton"
+#~ msgid "Ephrata"
+#~ msgstr "Ephrata"
 
-#: my-evolution/Locations.h:1555
-msgid "New York"
-msgstr "New York"
+#~ msgid "Ercan"
+#~ msgstr "Ercan"
 
-#: my-evolution/Locations.h:1556
-msgid "New York-JFK Arpt"
-msgstr "New York-JFK Arpt"
+#~ msgid "Erie"
+#~ msgstr "Erie"
 
-#: my-evolution/Locations.h:1557
-msgid "New York-La Guardia"
-msgstr "New York-La Guardia"
+#~ msgid "Erzurum"
+#~ msgstr "Erzurum"
 
-#: my-evolution/Locations.h:1559
-msgid "Niagara Falls"
-msgstr "Niagara Falls"
+#~ msgid "Esbjerg"
+#~ msgstr "Esbjerg"
 
-#: my-evolution/Locations.h:1561
-msgid "Nice-Cote d'Azur"
-msgstr "Nice-Cote d'Azur"
+#~ msgid "Escanaba"
+#~ msgstr "Escanaba"
 
-#: my-evolution/Locations.h:1562
-msgid "Niigata Airport"
-msgstr "Niigata Airport"
+#~ msgid "Esfahan"
+#~ msgstr "Esfahan"
 
-#: my-evolution/Locations.h:1563
-msgid "Nimes-Garons"
-msgstr "Nimes-Garons"
+#~ msgid "Eskisehir"
+#~ msgstr "Eskisehir"
 
-#: my-evolution/Locations.h:1564
-msgid "Nipawin"
-msgstr "Nipawin"
+#~ msgid "Estherville"
+#~ msgstr "Estherville"
 
-#: my-evolution/Locations.h:1565
-msgid "Nis"
-msgstr "Nis"
+#~ msgid "Eugene"
+#~ msgstr "Eugene"
 
-#: my-evolution/Locations.h:1566
-msgid "Nizhny Novgorod"
-msgstr "Nizhny Novgorod"
+#~ msgid "Eureka"
+#~ msgstr "Eureka"
 
-#: my-evolution/Locations.h:1567
-msgid "N Las Vegas"
-msgstr "N Las Vegas"
+#~ msgid "Europe"
+#~ msgstr "Europe"
 
-#: my-evolution/Locations.h:1568
-msgid "N Myrtle Beach"
-msgstr "N Myrtle Beach"
+#~ msgid "Evanston"
+#~ msgstr "Evanston"
 
-#: my-evolution/Locations.h:1569
-msgid "Nogales"
-msgstr "Nogales"
+#~ msgid "Evansville"
+#~ msgstr "Evansville"
 
-#: my-evolution/Locations.h:1570
-msgid "Nome"
-msgstr "Nome"
+#~ msgid "Everett"
+#~ msgstr "Everett"
 
-#: my-evolution/Locations.h:1571
-msgid "Norfolk"
-msgstr "Norfolk"
+#~ msgid "Evergreen"
+#~ msgstr "Evergreen"
 
-#: my-evolution/Locations.h:1573
-msgid "Norfolk NAS"
-msgstr "Norfolk NAS"
+#~ msgid "Evreux-Fauville"
+#~ msgstr "Evreux-Fauville"
 
-#: my-evolution/Locations.h:1574
-msgid "Norrkoping"
-msgstr "Norrkoping"
+#~ msgid "Exeter"
+#~ msgstr "Exeter"
 
-#: my-evolution/Locations.h:1575
-msgid "North Adams"
-msgstr "North Adams"
+#~ msgid "Ezeiza"
+#~ msgstr "Ezeiza"
 
-#: my-evolution/Locations.h:1576
-msgid "North Bend"
-msgstr "North Bend"
+#~ msgid "Fagernes"
+#~ msgstr "Fagernes"
 
-#: my-evolution/Locations.h:1577
-msgid "North Carolina"
-msgstr "North Carolina"
+#~ msgid "Fairbanks"
+#~ msgstr "Fairbanks"
 
-#: my-evolution/Locations.h:1578
-msgid "North Conway"
-msgstr "North Conway"
+#~ msgid "Fairchild"
+#~ msgstr "Fairchild"
 
-#: my-evolution/Locations.h:1579
-msgid "North Dakota"
-msgstr "North Dakota"
+#~ msgid "Fairfield"
+#~ msgstr "Fairfield"
 
-#: my-evolution/Locations.h:1580
-msgid "Northeast Philadelphia"
-msgstr "Northeast Philadelphia"
+#~ msgid "Fairmont"
+#~ msgstr "Fairmont"
 
-#: my-evolution/Locations.h:1581
-msgid "North Kingstown"
-msgstr "North Kingstown"
+#~ msgid "Fallon"
+#~ msgstr "Fallon"
 
-#: my-evolution/Locations.h:1582
-msgid "North Platte"
-msgstr "North Platte"
+#~ msgid "Falls City"
+#~ msgstr "Falls City"
 
-#: my-evolution/Locations.h:1583
-msgid "Northway"
-msgstr "Northway"
+#~ msgid "Falmouth-Otis AFB"
+#~ msgstr "Falmouth-Otis AFB"
 
-#: my-evolution/Locations.h:1584
-msgid "Northwest Territories"
-msgstr "Northwest Territories"
+#~ msgid "Farbanks/Eielson AFB"
+#~ msgstr "Farbanks/Eielson AFB"
 
-#: my-evolution/Locations.h:1586
-msgid "Norwich"
-msgstr "Norwich"
+#~ msgid "Fargo"
+#~ msgstr "Fargo"
 
-#: my-evolution/Locations.h:1587
-msgid "Norwood"
-msgstr "Norwood"
+#~ msgid "Farmingdale"
+#~ msgstr "Farmingdale"
 
-#: my-evolution/Locations.h:1588
-msgid "Notodden"
-msgstr "Notodden"
+#~ msgid "Farmington"
+#~ msgstr "Farmington"
 
-#: my-evolution/Locations.h:1589
-msgid "Novara/Cameri"
-msgstr "Novara/Cameri"
+#~ msgid "Farmville"
+#~ msgstr "Farmville"
 
-#: my-evolution/Locations.h:1590
-msgid "Nova Scotia"
-msgstr "Nova Scotia"
+#~ msgid "Faro"
+#~ msgstr "Faro"
 
-#: my-evolution/Locations.h:1591
-msgid "Novosibirsk"
-msgstr "Novosibirsk"
+#~ msgid "Fayetteville"
+#~ msgstr "Fayetteville"
 
-#: my-evolution/Locations.h:1592
-msgid "Nueva Gerona"
-msgstr "Nueva Gerona"
+#~ msgid "Feng Nin"
+#~ msgstr "Feng Nin"
 
-#: my-evolution/Locations.h:1593
-msgid "Nueva Ocotepeque"
-msgstr "Nueva Ocotepeque"
+#~ msgid "Fergus Falls"
+#~ msgstr "Fergus Falls"
 
-#: my-evolution/Locations.h:1594
-msgid "Nuevo Laredo"
-msgstr "Nuevo Laredo"
+#~ msgid "Fernando De Noronha"
+#~ msgstr "Fernando De Noronha"
 
-#: my-evolution/Locations.h:1595
-msgid "Nurnberg"
-msgstr "Nurnberg"
+#~ msgid "Ferrara"
+#~ msgstr "Ferrara"
 
-#: my-evolution/Locations.h:1596
-msgid "Nyutabaru Ab"
-msgstr "Nyutabaru Ab"
+#~ msgid "Figari"
+#~ msgstr "Figari"
 
-#: my-evolution/Locations.h:1597
-msgid "Oahu"
-msgstr "Oahu"
+#~ msgid "Findlay"
+#~ msgstr "Findlay"
 
-#: my-evolution/Locations.h:1598
-msgid "Oak Harbor"
-msgstr "Oak Harbor"
+#~ msgid "Firenze"
+#~ msgstr "Firenze"
 
-#: my-evolution/Locations.h:1599
-msgid "Oakland"
-msgstr "Oakland"
+#~ msgid "Fitchburg"
+#~ msgstr "Fitchburg"
 
-#: my-evolution/Locations.h:1600
-msgid "Oaxaca"
-msgstr "Oaxaca"
+#~ msgid "Flagstaff"
+#~ msgstr "Flagstaff"
 
-#: my-evolution/Locations.h:1601
-msgid "Oberpfaffenhofen"
-msgstr "Oberpfaffenhofen"
+#~ msgid "Flint"
+#~ msgstr "Flint"
 
-#: my-evolution/Locations.h:1602
-msgid "Obihiro Airport"
-msgstr "Obihiro Airport"
+#~ msgid "Flippin"
+#~ msgstr "Flippin"
 
-#: my-evolution/Locations.h:1603
-msgid "Ocala"
-msgstr "Ocala"
+#~ msgid "Florence"
+#~ msgstr "Florence"
 
-#: my-evolution/Locations.h:1604
-msgid "Oceanside"
-msgstr "Oceanside"
+#~ msgid "Florennes"
+#~ msgstr "Florennes"
 
-#: my-evolution/Locations.h:1605
-msgid "Odense"
-msgstr "Odense"
+#~ msgid "Flores"
+#~ msgstr "Flores"
 
-#: my-evolution/Locations.h:1606
-msgid "Odesa"
-msgstr "Odesa"
+#~ msgid "Florianopolis"
+#~ msgstr "Florianopolis"
 
-#: my-evolution/Locations.h:1607
-msgid "Oelwen"
-msgstr "Oelwen"
+#~ msgid "Florida"
+#~ msgstr "Florida"
 
-#: my-evolution/Locations.h:1608
-msgid "Ogden"
-msgstr "Ogden"
+#~ msgid "Floro"
+#~ msgstr "Floro"
 
-#: my-evolution/Locations.h:1609
-msgid "Ogden-Hill AFB"
-msgstr "Ogden-Hill AFB"
+#~ msgid "Fond Du Lac"
+#~ msgstr "Fond Du Lac"
 
-#: my-evolution/Locations.h:1610
-msgid "Ogdensburg"
-msgstr "Ogdensburg"
+#~ msgid "Forde/Bringeland"
+#~ msgstr "Forde/Bringeland"
 
-#: my-evolution/Locations.h:1611
-msgid "Ohio"
-msgstr "Ohio"
+#~ msgid "Forli"
+#~ msgstr "Forli"
 
-#: my-evolution/Locations.h:1612
-msgid "Ohrid"
-msgstr "Ohrid"
+#~ msgid "Formosa"
+#~ msgstr "Formosa"
 
-#: my-evolution/Locations.h:1613
-msgid "Oita Airport"
-msgstr "Oita Airport"
+#~ msgid "Fortaleza"
+#~ msgstr "Fortaleza"
 
-#: my-evolution/Locations.h:1614
-msgid "Ojika Island"
-msgstr "Ojika Island"
+#~ msgid "Fort Belvoir"
+#~ msgstr "Fort Belvoir"
 
-#: my-evolution/Locations.h:1615
-msgid "Okayama Airport"
-msgstr "Okayama Airport"
+#~ msgid "Fort Benning"
+#~ msgstr "Fort Benning"
 
-#: my-evolution/Locations.h:1616
-msgid "Oki Airport"
-msgstr "Oki Airport"
+#~ msgid "Fort Bragg"
+#~ msgstr "Fort Bragg"
 
-#: my-evolution/Locations.h:1617
-msgid "Okinoerabu"
-msgstr "Okinoerabu"
+#~ msgid "Fort Campbell"
+#~ msgstr "Fort Campbell"
 
-#: my-evolution/Locations.h:1618
-msgid "Oklahoma"
-msgstr "Oklahoma"
+#~ msgid "Fort Carson"
+#~ msgstr "Fort Carson"
 
-#: my-evolution/Locations.h:1619
-msgid "Oklahoma City"
-msgstr "Oklahoma City"
+#~ msgid "Fort Collins"
+#~ msgstr "Fort Collins"
 
-#: my-evolution/Locations.h:1620
-msgid "Oklahoma City-Bethany"
-msgstr "Oklahoma City-Bethany"
+#~ msgid "Fort Collins/Lovel"
+#~ msgstr "Fort Collins/Lovel"
 
-#: my-evolution/Locations.h:1621
-msgid "Oklahoma City-Midwest City"
-msgstr "Oklahoma City-Midwest City"
+#~ msgid "Fort Dodge"
+#~ msgstr "Fort Dodge"
 
-#: my-evolution/Locations.h:1622
-msgid "Okushiri Island"
-msgstr "Okushiri Island"
+#~ msgid "Fort Drum"
+#~ msgstr "Fort Drum"
 
-#: my-evolution/Locations.h:1623
-msgid "Olathe"
-msgstr "Olathe"
+#~ msgid "Fort Eustis"
+#~ msgstr "Fort Eustis"
 
-#: my-evolution/Locations.h:1624
-msgid "Olathe/Ind."
-msgstr "Olathe/Ind."
+#~ msgid "Fort Greely/Allen AAF"
+#~ msgstr "Fort Greely/Allen AAF"
 
-#: my-evolution/Locations.h:1625
-msgid "Olbia"
-msgstr "Olbia"
+#~ msgid "Fort Huachuca"
+#~ msgstr "Fort Huachuca"
 
-#: my-evolution/Locations.h:1626
-msgid "Olympia"
-msgstr "Olympia"
+#~ msgid "Fort Knox"
+#~ msgstr "Fort Knox"
 
-#: my-evolution/Locations.h:1627
-msgid "Omaha"
-msgstr "Omaha"
+#~ msgid "Fort Lauderdale"
+#~ msgstr "Fort Lauderdale"
 
-#: my-evolution/Locations.h:1628
-msgid "Omaha-Bellevue"
-msgstr "Omaha-Bellevue"
+#~ msgid "Fort Lauderdale (International)"
+#~ msgstr "Fort Lauderdale (International)"
 
-#: my-evolution/Locations.h:1629
-msgid "Omak"
-msgstr "Omak"
+#~ msgid "Fort Leonard"
+#~ msgstr "Fort Leonard"
 
-#: my-evolution/Locations.h:1631
-msgid "Ominato Ab"
-msgstr "Ominato Ab"
+#~ msgid "Fort Lewis"
+#~ msgstr "Fort Lewis"
 
-#: my-evolution/Locations.h:1632
-msgid "Omsk"
-msgstr "Omsk"
+#~ msgid "Fort Madison"
+#~ msgstr "Fort Madison"
 
-#: my-evolution/Locations.h:1633
-msgid "O'Neill"
-msgstr "O'Neill"
+#~ msgid "Fort Meade"
+#~ msgstr "Fort Meade"
 
-#: my-evolution/Locations.h:1634
-msgid "Ontario"
-msgstr "Ontario"
+#~ msgid "Fort Myers (Page Field)"
+#~ msgstr "Fort Myers (Page Field)"
 
-#: my-evolution/Locations.h:1635
-msgid "Oostende"
-msgstr "Oostende"
+#~ msgid "Fort Myers (Southwest Florida International)"
+#~ msgstr "Fort Myers (Southwest Florida International)"
 
-#: my-evolution/Locations.h:1636
-msgid "Oran"
-msgstr "Oran"
+#~ msgid "Fort Polk-Leesville"
+#~ msgstr "Fort Polk-Leesville"
 
-#: my-evolution/Locations.h:1637
-msgid "Oran/Es Senia"
-msgstr "Oran/Es Senia"
+#~ msgid "Fort Riley"
+#~ msgstr "Fort Riley"
 
-#: my-evolution/Locations.h:1638
-msgid "Orange"
-msgstr "Orange"
+#~ msgid "Fort Sill"
+#~ msgstr "Fort Sill"
 
-#: my-evolution/Locations.h:1639
-msgid "Orange City"
-msgstr "Orange City"
+#~ msgid "Fort Smith"
+#~ msgstr "Fort Smith"
 
-#: my-evolution/Locations.h:1640
-msgid "Ord-Sharp"
-msgstr "Ord-Sharp"
+#~ msgid "Fort Stewart"
+#~ msgstr "Fort Stewart"
 
-#: my-evolution/Locations.h:1641
-msgid "Oregon"
-msgstr "Oregon"
+#~ msgid "Fort Stockton"
+#~ msgstr "Fort Stockton"
 
-#: my-evolution/Locations.h:1642
-msgid "Orenburg"
-msgstr "Orenburg"
+#~ msgid "Fort Wayne"
+#~ msgstr "Fort Wayne"
 
-#: my-evolution/Locations.h:1643
-msgid "Orland"
-msgstr "Orland"
+#~ msgid "Fort Worth-Alliance"
+#~ msgstr "Fort Worth-Alliance"
 
-#: my-evolution/Locations.h:1644
-msgid "Orlando"
-msgstr "Orlando"
+#~ msgid "Fort Worth-Meacham"
+#~ msgstr "Fort Worth-Meacham"
 
-#: my-evolution/Locations.h:1645
-msgid "Orlando (Orlando International)"
-msgstr "Orlando (Orlando International)"
+#~ msgid "Fort Worth NAS"
+#~ msgstr "Fort Worth NAS"
 
-#: my-evolution/Locations.h:1646
-msgid "Orsta-Volda"
-msgstr "Orsta-Volda"
+#~ msgid "Fourchon"
+#~ msgstr "Fourchon"
 
-#: my-evolution/Locations.h:1647
-msgid "Oruro"
-msgstr "Oruro"
+#~ msgid "Foz Do Iguacu"
+#~ msgstr "Foz Do Iguacu"
 
-#: my-evolution/Locations.h:1648
-msgid "Osaka International Airport"
-msgstr "Osaka International Airport"
+#~ msgid "Frankfort"
+#~ msgstr "Frankfort"
 
-#: my-evolution/Locations.h:1649
-msgid "Osan Ab"
-msgstr "Osan Ab"
+#~ msgid "Frankfurt/Main"
+#~ msgstr "Frankfurt/Main"
 
-#: my-evolution/Locations.h:1650
-msgid "Oscoda"
-msgstr "Oscoda"
+#~ msgid "Franklin"
+#~ msgstr "Franklin"
 
-#: my-evolution/Locations.h:1651
-msgid "Oseberg A"
-msgstr "Oseberg A"
+#~ msgid "Fredericton"
+#~ msgstr "Fredericton"
 
-#: my-evolution/Locations.h:1652
-msgid "Oshima Airport"
-msgstr "Oshima Airport"
+#~ msgid "Freeport"
+#~ msgstr "Freeport"
 
-#: my-evolution/Locations.h:1653
-msgid "Oshkosh"
-msgstr "Oshkosh"
+#~ msgid "Frenchville"
+#~ msgstr "Frenchville"
 
-#: my-evolution/Locations.h:1654
-msgid "Oslo/Gardenmoen"
-msgstr "Oslo/Gardenmoen"
+#~ msgid "Fresno"
+#~ msgstr "Fresno"
 
-#: my-evolution/Locations.h:1655
-msgid "Ostrava"
-msgstr "Ostrava"
+#~ msgid "Fresno-Chandler"
+#~ msgstr "Fresno-Chandler"
 
-#: my-evolution/Locations.h:1656
-msgid "Ottawa"
-msgstr "Ottawa"
+#~ msgid "Friday Harbor"
+#~ msgstr "Friday Harbor"
 
-#: my-evolution/Locations.h:1657
-msgid "Ottumwa"
-msgstr "Ottumwa"
+#~ msgid "Friedrichshafen"
+#~ msgstr "Friedrichshafen"
 
-#: my-evolution/Locations.h:1658
-msgid "Owensboro"
-msgstr "Owensboro"
+#~ msgid "Frigg"
+#~ msgstr "Frigg"
 
-#: my-evolution/Locations.h:1659
-msgid "Owyhee"
-msgstr "Owyhee"
+#~ msgid "Frontone"
+#~ msgstr "Frontone"
 
-#: my-evolution/Locations.h:1660
-msgid "Oxford"
-msgstr "Oxford"
+#~ msgid "Frosinone"
+#~ msgstr "Frosinone"
 
-#: my-evolution/Locations.h:1661
-msgid "Oxnard"
-msgstr "Oxnard"
+#~ msgid "Fryeburg"
+#~ msgstr "Fryeburg"
 
-#: my-evolution/Locations.h:1662
-msgid "Ozark"
-msgstr "Ozark"
+#~ msgid "Fujairah"
+#~ msgstr "Fujairah"
 
-#: my-evolution/Locations.h:1663
-msgid "Ozuki Ab"
-msgstr "Ozuki Ab"
+#~ msgid "Fuji Ab"
+#~ msgstr "Fuji Ab"
 
-#: my-evolution/Locations.h:1664
-msgid "Paderborn-Haxterberg"
-msgstr "Paderborn-Haxterberg"
+#~ msgid "Fukue Airport"
+#~ msgstr "Fukue Airport"
 
-#: my-evolution/Locations.h:1665
-msgid "Padova"
-msgstr "Padova"
+#~ msgid "Fukui Airport"
+#~ msgstr "Fukui Airport"
 
-#: my-evolution/Locations.h:1666
-msgid "Paducah"
-msgstr "Paducah"
+#~ msgid "Fukuoka Airport"
+#~ msgstr "Fukuoka Airport"
 
-#: my-evolution/Locations.h:1667
-msgid "Paekado"
-msgstr "Paekado"
+#~ msgid "Fullerton"
+#~ msgstr "Fullerton"
 
-#: my-evolution/Locations.h:1668
-msgid "Paengnyongdo Ab"
-msgstr "Paengnyongdo Ab"
+#~ msgid "Funchal"
+#~ msgstr "Funchal"
 
-#: my-evolution/Locations.h:1669
-msgid "Paganella"
-msgstr "Paganella"
+#~ msgid "FYR Macedonia"
+#~ msgstr "FYR Macedonia"
 
-#: my-evolution/Locations.h:1672
-msgid "Pa Kuei/Bakuai"
-msgstr "Pa Kuei/Bakuai"
+#~ msgid "Gadsden"
+#~ msgstr "Gadsden"
 
-#: my-evolution/Locations.h:1673
-msgid "Palacios"
-msgstr "Palacios"
+#~ msgid "Gage"
+#~ msgstr "Gage"
 
-#: my-evolution/Locations.h:1674
-msgid "Palermo"
-msgstr "Palermo"
+#~ msgid "Gainesville"
+#~ msgstr "Gainesville"
 
-#: my-evolution/Locations.h:1675
-msgid "Palma de Mallorca"
-msgstr "Palma de Mallorca"
+#~ msgid "Galax-Hillsville"
+#~ msgstr "Galax-Hillsville"
 
-#: my-evolution/Locations.h:1676
-msgid "Palmdale"
-msgstr "Palmdale"
+#~ msgid "Galbraith Lake"
+#~ msgstr "Galbraith Lake"
 
-#: my-evolution/Locations.h:1677
-msgid "Palmer"
-msgstr "Palmer"
+#~ msgid "Galeao"
+#~ msgstr "Galeao"
 
-#: my-evolution/Locations.h:1678
-msgid "Palm Springs"
-msgstr "Palm Springs"
+#~ msgid "Galena"
+#~ msgstr "Galena"
 
-#: my-evolution/Locations.h:1679
-msgid "Palo Alto"
-msgstr "Palo Alto"
+#~ msgid "Galesburg"
+#~ msgstr "Galesburg"
 
-#: my-evolution/Locations.h:1680
-msgid "Pamplona"
-msgstr "Pamplona"
+#~ msgid "Gallup"
+#~ msgstr "Gallup"
 
-#: my-evolution/Locations.h:1682
-msgid "Panama City"
-msgstr "Panama City"
+#~ msgid "Galveston"
+#~ msgstr "Galveston"
 
-#: my-evolution/Locations.h:1683
-msgid "Pantelleria"
-msgstr "Pantelleria"
+#~ msgid "Gambell"
+#~ msgstr "Gambell"
 
-#: my-evolution/Locations.h:1684
-msgid "Papa"
-msgstr "Papa"
+#~ msgid "Gander"
+#~ msgstr "Gander"
 
-#: my-evolution/Locations.h:1685
-msgid "Paphos"
-msgstr "Paphos"
+#~ msgid "Garden City"
+#~ msgstr "Garden City"
 
-#: my-evolution/Locations.h:1687
-msgid "Paris"
-msgstr "Paris"
+#~ msgid "Gary"
+#~ msgstr "Gary"
 
-#: my-evolution/Locations.h:1688
-msgid "Paris/Charles De Gaulle"
-msgstr "Paris/Charles De Gaulle"
+#~ msgid "Gassim"
+#~ msgstr "Gassim"
 
-#: my-evolution/Locations.h:1689
-msgid "Paris/Le Bourget"
-msgstr "Paris/Le Bourget"
+#~ msgid "Gatineau"
+#~ msgstr "Gatineau"
 
-#: my-evolution/Locations.h:1690
-msgid "Paris/Orly"
-msgstr "Paris/Orly"
+#~ msgid "Gaziantep"
+#~ msgstr "Gaziantep"
 
-#: my-evolution/Locations.h:1691
-msgid "Parkersburg"
-msgstr "Parkersburg"
+#~ msgid "Gdansk"
+#~ msgstr "Gdansk"
 
-#: my-evolution/Locations.h:1692
-msgid "Pasco"
-msgstr "Pasco"
+#~ msgid "Geneve"
+#~ msgstr "Geneve"
 
-#: my-evolution/Locations.h:1693
-msgid "Paso De Los Libres"
-msgstr "Paso De Los Libres"
+#~ msgid "Genova"
+#~ msgstr "Genova"
 
-#: my-evolution/Locations.h:1694
-msgid "Paso Robles"
-msgstr "Paso Robles"
+#~ msgid "George Airport"
+#~ msgstr "George Airport"
 
-#: my-evolution/Locations.h:1695
-msgid "Passo dei Giovi"
-msgstr "Passo dei Giovi"
+#~ msgid "Georgetown"
+#~ msgstr "Georgetown"
 
-#: my-evolution/Locations.h:1696
-msgid "Passo della Cisa"
-msgstr "Passo della Cisa"
+#~ msgid "Ghardaia"
+#~ msgstr "Ghardaia"
 
-#: my-evolution/Locations.h:1697
-msgid "Passo Resia"
-msgstr "Passo Resia"
+#~ msgid "Ghedi"
+#~ msgstr "Ghedi"
 
-#: my-evolution/Locations.h:1698
-msgid "Passo Rolle"
-msgstr "Passo Rolle"
+#~ msgid "Gifu Ab"
+#~ msgstr "Gifu Ab"
 
-#: my-evolution/Locations.h:1699
-msgid "Patna"
-msgstr "Patna"
+#~ msgid "Gila Bend"
+#~ msgstr "Gila Bend"
 
-#: my-evolution/Locations.h:1700
-msgid "Patterson"
-msgstr "Patterson"
+#~ msgid "Gillette"
+#~ msgstr "Gillette"
 
-#: my-evolution/Locations.h:1701
-msgid "Patuxent River"
-msgstr "Patuxent River"
+#~ msgid "Gilze-Rijen"
+#~ msgstr "Gilze-Rijen"
 
-#: my-evolution/Locations.h:1702
-msgid "Pau/Pyrenees"
-msgstr "Pau/Pyrenees"
+#~ msgid "Gioia del Colle"
+#~ msgstr "Gioia del Colle"
 
-#: my-evolution/Locations.h:1703
-msgid "Paxson"
-msgstr "Paxson"
+#~ msgid "Girona"
+#~ msgstr "Girona"
 
-#: my-evolution/Locations.h:1704
-msgid "Paysandu"
-msgstr "Paysandu"
+#~ msgid "Gizan"
+#~ msgstr "Gizan"
 
-#: my-evolution/Locations.h:1705
-msgid "Payson"
-msgstr "Payson"
+#~ msgid "Glasgow"
+#~ msgstr "Glasgow"
 
-#: my-evolution/Locations.h:1706
-msgid "Pellston"
-msgstr "Pellston"
+#~ msgid "Glendive"
+#~ msgstr "Glendive"
 
-#: my-evolution/Locations.h:1707
-msgid "Pelotas"
-msgstr "Pelotas"
+#~ msgid "Glens Falls"
+#~ msgstr "Glens Falls"
 
-#: my-evolution/Locations.h:1708
-msgid "Pendleton"
-msgstr "Pendleton"
+#~ msgid "Goiania"
+#~ msgstr "Goiania"
 
-#: my-evolution/Locations.h:1709
-msgid "Pennsylvania"
-msgstr "Pennsylvania"
+#~ msgid "Goldsboro"
+#~ msgstr "Goldsboro"
 
-#: my-evolution/Locations.h:1710
-msgid "Penn Yan"
-msgstr "Penn Yan"
+#~ msgid "Goodland"
+#~ msgstr "Goodland"
 
-#: my-evolution/Locations.h:1711
-msgid "Pensacola"
-msgstr "Pensacola"
+#~ msgid "Goose Bay"
+#~ msgstr "Goose Bay"
 
-#: my-evolution/Locations.h:1712
-msgid "Pensacola NAS"
-msgstr "Pensacola NAS"
+#~ msgid "Goteborg (Landvetter)"
+#~ msgstr "Goteborg (Landvetter)"
 
-#: my-evolution/Locations.h:1713
-msgid "People's Republic of China"
-msgstr "People's Republic of China"
+#~ msgid "Goteborg (Save)"
+#~ msgstr "Goteborg (Save)"
 
-#: my-evolution/Locations.h:1714
-msgid "Peoria"
-msgstr "Peoria"
+#~ msgid "Granada"
+#~ msgstr "Granada"
 
-#: my-evolution/Locations.h:1715
-msgid "Pequot Lakes"
-msgstr "Pequot Lakes"
+#~ msgid "Grand Canyon"
+#~ msgstr "Grand Canyon"
 
-#: my-evolution/Locations.h:1716
-msgid "Pereira/Matecana"
-msgstr "Pereira/Matecana"
+#~ msgid "Grand Cayman"
+#~ msgstr "Grand Cayman"
 
-#: my-evolution/Locations.h:1717
-msgid "Perm"
-msgstr "Perm"
+#~ msgid "Grand Forks"
+#~ msgstr "Grand Forks"
 
-#: my-evolution/Locations.h:1718
-msgid "Perpignan-Rivesaltes"
-msgstr "Perpignan-Rivesaltes"
+#~ msgid "Grand Island"
+#~ msgstr "Grand Island"
 
-#: my-evolution/Locations.h:1719
-msgid "Perry-Foley"
-msgstr "Perry-Foley"
+#~ msgid "Grand Isle"
+#~ msgstr "Grand Isle"
 
-#: my-evolution/Locations.h:1720
-msgid "Perth"
-msgstr "Perth"
+#~ msgid "Grand Junction"
+#~ msgstr "Grand Junction"
 
-#: my-evolution/Locations.h:1722
-msgid "Perugia"
-msgstr "Perugia"
+#~ msgid "Grand Marais"
+#~ msgstr "Grand Marais"
 
-#: my-evolution/Locations.h:1723
-msgid "Pescara"
-msgstr "Pescara"
+#~ msgid "Grand Rapids"
+#~ msgstr "Grand Rapids"
 
-#: my-evolution/Locations.h:1724
-msgid "Petersburg"
-msgstr "Petersburg"
+#~ msgid "Grandview"
+#~ msgstr "Grandview"
 
-#: my-evolution/Locations.h:1725
-msgid "Petropavlovsk-Kamchatsky"
-msgstr "Petropavlovsk-Kamchatsky"
+#~ msgid "Grangeville"
+#~ msgstr "Grangeville"
 
-#: my-evolution/Locations.h:1726
-msgid "Petrozavodsk"
-msgstr "Petrozavodsk"
+#~ msgid "Grants"
+#~ msgstr "Grants"
 
-#: my-evolution/Locations.h:1727
-msgid "Philadelphia"
-msgstr "Philadelphia"
+#~ msgid "Graz"
+#~ msgstr "Graz"
 
-#: my-evolution/Locations.h:1728
-msgid "Philip"
-msgstr "Philip"
+#~ msgid "Great Falls"
+#~ msgstr "Great Falls"
 
-#: my-evolution/Locations.h:1729
-msgid "Philipsburg"
-msgstr "Philipsburg"
+#~ msgid "Greeley"
+#~ msgstr "Greeley"
 
-#: my-evolution/Locations.h:1730
-msgid "Phillips"
-msgstr "Phillips"
+#~ msgid "Green Bay"
+#~ msgstr "Green Bay"
 
-#: my-evolution/Locations.h:1731
-msgid "Phoenix"
-msgstr "Phoenix"
+#~ msgid "Green River"
+#~ msgstr "Green River"
 
-#: my-evolution/Locations.h:1732
-msgid "Phoenix-Deer Valley"
-msgstr "Phoenix-Deer Valley"
+#~ msgid "Greensboro"
+#~ msgstr "Greensboro"
 
-#: my-evolution/Locations.h:1733
-msgid "Phoenix-Goodyear"
-msgstr "Phoenix-Goodyear"
+#~ msgid "Greenville"
+#~ msgstr "Greenville"
 
-#: my-evolution/Locations.h:1734
-msgid "Phoenix-Luke AFB"
-msgstr "Phoenix-Luke AFB"
+#~ msgid "Greenville-Spartanburg"
+#~ msgstr "Greenville-Spartanburg"
 
-#: my-evolution/Locations.h:1735
-msgid "Piacenza"
-msgstr "Piacenza"
+#~ msgid "Greenwood"
+#~ msgstr "Greenwood"
 
-#: my-evolution/Locations.h:1736
-msgid "Pian Rosa"
-msgstr "Pian Rosa"
+#~ msgid "Grenoble-Saint-Geoirs"
+#~ msgstr "Grenoble-Saint-Geoirs"
 
-#: my-evolution/Locations.h:1737
-msgid "Piedras Negras"
-msgstr "Piedras Negras"
+#~ msgid "Griffiss AFB"
+#~ msgstr "Griffiss AFB"
 
-#: my-evolution/Locations.h:1738
-msgid "Pierre"
-msgstr "Pierre"
+#~ msgid "Groningen"
+#~ msgstr "Groningen"
 
-#: my-evolution/Locations.h:1739
-msgid "Pietersburg"
-msgstr "Pietersburg"
+#~ msgid "Grosseto"
+#~ msgstr "Grosseto"
 
-#: my-evolution/Locations.h:1740
-msgid "Pikeville"
-msgstr "Pikeville"
+#~ msgid "Groton"
+#~ msgstr "Groton"
 
-#: my-evolution/Locations.h:1741
-msgid "Pine Bluff"
-msgstr "Pine Bluff"
+#~ msgid "Guadalajara"
+#~ msgstr "Guadalajara"
 
-#: my-evolution/Locations.h:1742
-msgid "Pingtung North"
-msgstr "Pingtung North"
+#~ msgid "Guadalupe Pass"
+#~ msgstr "Guadalupe Pass"
 
-#: my-evolution/Locations.h:1743
-msgid "Pingtung South"
-msgstr "Pingtung South"
+#~ msgid "Guanare"
+#~ msgstr "Guanare"
 
-#: my-evolution/Locations.h:1744
-msgid "Pirassununga"
-msgstr "Pirassununga"
+#~ msgid "Guangzhou"
+#~ msgstr "Guangzhou"
 
-#: my-evolution/Locations.h:1745
-msgid "Pisa"
-msgstr "Pisa"
+#~ msgid "Guantanamo"
+#~ msgstr "Guantanamo"
 
-#: my-evolution/Locations.h:1746
-msgid "Pisco"
-msgstr "Pisco"
+#~ msgid "Guarany"
+#~ msgstr "Guarany"
 
-#: my-evolution/Locations.h:1747
-msgid "Pittsburgh"
-msgstr "Pittsburgh"
+#~ msgid "Guaratingueta"
+#~ msgstr "Guaratingueta"
 
-#: my-evolution/Locations.h:1748
-msgid "Pittsburgh-West Mifflin"
-msgstr "Pittsburgh-West Mifflin"
+#~ msgid "Guarulhos"
+#~ msgstr "Guarulhos"
 
-#: my-evolution/Locations.h:1749
-msgid "Plattsburg"
-msgstr "Plattsburg"
+#~ msgid "Guayaquil/Simon Bolivar"
+#~ msgstr "Guayaquil/Simon Bolivar"
 
-#: my-evolution/Locations.h:1750
-msgid "Plovdiv"
-msgstr "Plovdiv"
+#~ msgid "Guaymas"
+#~ msgstr "Guaymas"
 
-#: my-evolution/Locations.h:1751
-msgid "Plymouth"
-msgstr "Plymouth"
+#~ msgid "Guernsey"
+#~ msgstr "Guernsey"
 
-#: my-evolution/Locations.h:1752
-msgid "Pocatello"
-msgstr "Pocatello"
+#~ msgid "Guidonia"
+#~ msgstr "Guidonia"
 
-#: my-evolution/Locations.h:1753
-msgid "Pocos De Caldas"
-msgstr "Pocos De Caldas"
+#~ msgid "Gulfport"
+#~ msgstr "Gulfport"
 
-#: my-evolution/Locations.h:1754
-msgid "Podgorica"
-msgstr "Podgorica"
+#~ msgid "Gulkana"
+#~ msgstr "Gulkana"
 
-#: my-evolution/Locations.h:1755
-msgid "Podgorica Titograd"
-msgstr "Podgorica Titograd"
+#~ msgid "Gullfax C"
+#~ msgstr "Gullfax C"
 
-#: my-evolution/Locations.h:1756
-msgid "Pohang Ab"
-msgstr "Pohang Ab"
+#~ msgid "Gunnison"
+#~ msgstr "Gunnison"
 
-#: my-evolution/Locations.h:1757
-msgid "Point Hope"
-msgstr "Point Hope"
+#~ msgid "Gunnison (2)"
+#~ msgstr "Gunnison (2)"
 
-#: my-evolution/Locations.h:1758
-msgid "Point Lay"
-msgstr "Point Lay"
+#~ msgid "Guriat"
+#~ msgstr "Guriat"
 
-#: my-evolution/Locations.h:1759
-msgid "Point Mugu"
-msgstr "Point Mugu"
+#~ msgid "Gustavus"
+#~ msgstr "Gustavus"
 
-#: my-evolution/Locations.h:1760
-msgid "Point Piedras Blanca"
-msgstr "Point Piedras Blanca"
+#~ msgid "Guymon"
+#~ msgstr "Guymon"
 
-#: my-evolution/Locations.h:1761
-msgid "Poitiers"
-msgstr "Poitiers"
+#~ msgid "Habana"
+#~ msgstr "Habana"
 
-#: my-evolution/Locations.h:1763
-msgid "Pompano Beach"
-msgstr "Pompano Beach"
+#~ msgid "Hachijojima Airport"
+#~ msgstr "Hachijojima Airport"
 
-#: my-evolution/Locations.h:1764
-msgid "Ponca City"
-msgstr "Ponca City"
+#~ msgid "Hachinohe Ab"
+#~ msgstr "Hachinohe Ab"
 
-#: my-evolution/Locations.h:1765
-msgid "Ponce"
-msgstr "Ponce"
+#~ msgid "Hafr Al-Batin"
+#~ msgstr "Hafr Al-Batin"
 
-#: my-evolution/Locations.h:1766
-msgid "Ponta Pora"
-msgstr "Ponta Pora"
+#~ msgid "Hagerstown"
+#~ msgstr "Hagerstown"
 
-#: my-evolution/Locations.h:1767
-msgid "Pontiac"
-msgstr "Pontiac"
+#~ msgid "Hail"
+#~ msgstr "Dolu"
 
-#: my-evolution/Locations.h:1768
-msgid "Pope AFB"
-msgstr "Pope AFB"
+#~ msgid "Hailey-Sun Valley"
+#~ msgstr "Hailey-Sun Valley"
 
-#: my-evolution/Locations.h:1769
-msgid "Poplar Bluff"
-msgstr "Poplar Bluff"
+#~ msgid "Haines"
+#~ msgstr "Haines"
 
-#: my-evolution/Locations.h:1770
-msgid "Poprad"
-msgstr "Poprad"
+#~ msgid "Hakodate Airport"
+#~ msgstr "Hakodate Airport"
 
-#: my-evolution/Locations.h:1771
-msgid "Port Alexander"
-msgstr "Port Alexander"
+#~ msgid "Halifax"
+#~ msgstr "Halifax"
 
-#: my-evolution/Locations.h:1772
-msgid "Port Alsworth"
-msgstr "Port Alsworth"
+#~ msgid "Hamamatsu Ab"
+#~ msgstr "Hamamatsu Ab"
 
-#: my-evolution/Locations.h:1773
-msgid "Port Angeles"
-msgstr "Port Angeles"
+#~ msgid "Hamburg"
+#~ msgstr "Hamburg"
 
-#: my-evolution/Locations.h:1774
-msgid "Port-Au-Prince"
-msgstr "Port-Au-Prince"
+#~ msgid "Hamburg-Finkenwerder"
+#~ msgstr "Hamburg-Finkenwerder"
 
-#: my-evolution/Locations.h:1775
-msgid "Port Elizabeth"
-msgstr "Port Elizabeth"
+#~ msgid "Hamilton"
+#~ msgstr "Hamilton"
 
-#: my-evolution/Locations.h:1776
-msgid "Porterville"
-msgstr "Porterville"
+#~ msgid "Hammerfest"
+#~ msgstr "Hammerfest"
 
-#: my-evolution/Locations.h:1777
-msgid "Port Hardy"
-msgstr "Port Hardy"
+#~ msgid "Hampton"
+#~ msgstr "Hampton"
 
-#: my-evolution/Locations.h:1778
-msgid "Port Hedland"
-msgstr "Port Hedland"
+#~ msgid "Hanamaki Airport"
+#~ msgstr "Hanamaki Airport"
 
-#: my-evolution/Locations.h:1779
-msgid "Port Heiden"
-msgstr "Port Heiden"
+#~ msgid "Hancock"
+#~ msgstr "Hancock"
 
-#: my-evolution/Locations.h:1780
-msgid "Portland"
-msgstr "Portland"
+#~ msgid "Hangzhou"
+#~ msgstr "Hangzhou"
 
-#: my-evolution/Locations.h:1781
-msgid "Porto"
-msgstr "Porto"
+#~ msgid "Hanksville"
+#~ msgstr "Hanksville"
 
-#: my-evolution/Locations.h:1782
-msgid "Porto Alegre"
-msgstr "Porto Alegre"
+#~ msgid "Hannover"
+#~ msgstr "Hannover"
 
-#: my-evolution/Locations.h:1783
-msgid "Porto Alegre Apt"
-msgstr "Porto Alegre Apt"
+#~ msgid "Ha Noi"
+#~ msgstr "Ha Noi"
 
-#: my-evolution/Locations.h:1784
-msgid "Portoroz"
-msgstr "Portoroz"
+#~ msgid "Harbor Beach"
+#~ msgstr "Harbor Beach"
 
-#: my-evolution/Locations.h:1785
-msgid "Porto Santo"
-msgstr "Porto Santo"
+#~ msgid "Harlingen"
+#~ msgstr "Harlingen"
 
-#: my-evolution/Locations.h:1786
-msgid "Porto Velho"
-msgstr "Porto Velho"
+#~ msgid "Harlowton"
+#~ msgstr "Harlowton"
 
-#: my-evolution/Locations.h:1787
-msgid "Port Said"
-msgstr "Port Said"
+#~ msgid "Harrisburg"
+#~ msgstr "Harrisburg"
 
-#: my-evolution/Locations.h:1788
-msgid "Portsmouth"
-msgstr "Portsmouth"
+#~ msgid "Harrison"
+#~ msgstr "Harrison"
 
-#: my-evolution/Locations.h:1790
-msgid "Posadas"
-msgstr "Posadas"
+#~ msgid "Harstad/Narvik/Evenes"
+#~ msgstr "Harstad/Narvik/Evenes"
 
-#: my-evolution/Locations.h:1791
-msgid "Potosi"
-msgstr "Potosi"
+#~ msgid "Hartford"
+#~ msgstr "Hartford"
 
-#: my-evolution/Locations.h:1792
-msgid "Poughkeepsie"
-msgstr "Poughkeepsie"
+#~ msgid "Hassi-Messaoud"
+#~ msgstr "Hassi-Messaoud"
 
-#: my-evolution/Locations.h:1793
-msgid "Pownal"
-msgstr "Pownal"
+#~ msgid "Hastings"
+#~ msgstr "Hastings"
 
-#: my-evolution/Locations.h:1794
-msgid "Poza Rica"
-msgstr "Poza Rica"
+#~ msgid "Haugesund"
+#~ msgstr "Haugesund"
 
-#: my-evolution/Locations.h:1795
-msgid "Poznan"
-msgstr "Poznan"
+#~ msgid "Havre"
+#~ msgstr "Havre"
 
-#: my-evolution/Locations.h:1796
-msgid "Praha"
-msgstr "Praha"
+#~ msgid "Hawaii"
+#~ msgstr "Hawaii"
 
-#: my-evolution/Locations.h:1797
-msgid "Pratica di Mare"
-msgstr "Pratica di Mare"
+#~ msgid "Hawthorne"
+#~ msgstr "Hawthorne"
 
-#: my-evolution/Locations.h:1798
-msgid "Prescott"
-msgstr "Prescott"
+#~ msgid "Hayden"
+#~ msgstr "Hayden"
 
-#: my-evolution/Locations.h:1799
-msgid "Presidente Prudente"
-msgstr "Presidente Prudente"
+#~ msgid "Hayes River"
+#~ msgstr "Hayes River"
 
-#: my-evolution/Locations.h:1800
-msgid "Presque Isle"
-msgstr "Presque Isle"
+#~ msgid "Hays"
+#~ msgstr "Hays"
 
-#: my-evolution/Locations.h:1801
-msgid "Prestwick"
-msgstr "Prestwick"
+#~ msgid "Hayward"
+#~ msgstr "Hayward"
 
-#: my-evolution/Locations.h:1802
-msgid "Pretoria"
-msgstr "Pretoria"
+#~ msgid "Healy River"
+#~ msgstr "Healy River"
 
-#: my-evolution/Locations.h:1803
-msgid "Preveza"
-msgstr "Preveza"
+#~ msgid "Helena"
+#~ msgstr "Helena"
 
-#: my-evolution/Locations.h:1804
-msgid "Price-Carbon"
-msgstr "Price-Carbon"
+#~ msgid "Helsinki"
+#~ msgstr "Helsinki"
 
-#: my-evolution/Locations.h:1805
-msgid "Pristina"
-msgstr "Pristina"
+#~ msgid "Henderson"
+#~ msgstr "Henderson"
 
-#: my-evolution/Locations.h:1806
-msgid "Providence"
-msgstr "Providence"
+#~ msgid "Hengchun"
+#~ msgstr "Hengchun"
 
-#: my-evolution/Locations.h:1807
-msgid "Provincetown"
-msgstr "Provincetown"
+#~ msgid "Hermosillo"
+#~ msgstr "Hermosillo"
 
-#: my-evolution/Locations.h:1808
-msgid "Provo"
-msgstr "Provo"
+#~ msgid "Hibbing"
+#~ msgstr "Hibbing"
 
-#: my-evolution/Locations.h:1809
-msgid "Pskov"
-msgstr "Pskov"
+#~ msgid "Hickory"
+#~ msgstr "Hickory"
 
-#: my-evolution/Locations.h:1810
-msgid "Pucallpa"
-msgstr "Pucallpa"
+#~ msgid "Hill City"
+#~ msgstr "Hill City"
 
-#: my-evolution/Locations.h:1811
-msgid "Pudahuel"
-msgstr "Pudahuel"
+#~ msgid "Hillsboro"
+#~ msgstr "Hillsboro"
 
-#: my-evolution/Locations.h:1812
-msgid "Puebla"
-msgstr "Puebla"
+#~ msgid "Hilo"
+#~ msgstr "Hilo"
 
-#: my-evolution/Locations.h:1813
-msgid "Pueblo"
-msgstr "Pueblo"
+#~ msgid "Hinesville"
+#~ msgstr "Hinesville"
 
-#: my-evolution/Locations.h:1814
-msgid "Puerto Barrios"
-msgstr "Puerto Barrios"
+#~ msgid "Hiroshima Airport"
+#~ msgstr "Hiroshima Airport"
 
-#: my-evolution/Locations.h:1815
-msgid "Puerto Cabezas"
-msgstr "Puerto Cabezas"
+#~ msgid "Hobart"
+#~ msgstr "Hobart"
 
-#: my-evolution/Locations.h:1816
-msgid "Puerto Escondido"
-msgstr "Puerto Escondido"
+#~ msgid "Hobbs"
+#~ msgstr "Hobbs"
 
-#: my-evolution/Locations.h:1817
-msgid "Puerto Lempira"
-msgstr "Puerto Lempira"
+#~ msgid "Ho Chi Minh"
+#~ msgstr "Ho Chi Minh"
 
-#: my-evolution/Locations.h:1818
-msgid "Puerto Limon"
-msgstr "Puerto Limon"
+#~ msgid "Hodeidah"
+#~ msgstr "Hodeidah"
 
-#: my-evolution/Locations.h:1819
-msgid "Puerto Maldonado"
-msgstr "Puerto Maldonado"
+#~ msgid "Hof"
+#~ msgstr "Hof"
 
-#: my-evolution/Locations.h:1820
-msgid "Puerto Montt"
-msgstr "Puerto Montt"
+#~ msgid "Hoffman"
+#~ msgstr "Hoffman"
 
-#: my-evolution/Locations.h:1821
-msgid "Puerto Plata"
-msgstr "Puerto Plata"
+#~ msgid "Hofu Ab"
+#~ msgstr "Hofu Ab"
 
-#: my-evolution/Locations.h:1823
-msgid "Puerto Suarez"
-msgstr "Puerto Suarez"
+#~ msgid "Hohenems"
+#~ msgstr "Hohenems"
 
-#: my-evolution/Locations.h:1824
-msgid "Puerto Vallarta"
-msgstr "Puerto Vallarta"
+#~ msgid "Holguin"
+#~ msgstr "Holguin"
 
-#: my-evolution/Locations.h:1825
-msgid "Pula"
-msgstr "Pula"
+#~ msgid "Homer"
+#~ msgstr "Homer"
 
-#: my-evolution/Locations.h:1826
-msgid "Pullman"
-msgstr "Pullman"
+#~ msgid "Homestead AFB"
+#~ msgstr "Homestead AFB"
 
-#: my-evolution/Locations.h:1827
-msgid "Punta Arenas"
-msgstr "Punta Arenas"
+#~ msgid "Hondo"
+#~ msgstr "Hondo"
 
-#: my-evolution/Locations.h:1828
-msgid "Punta Cana"
-msgstr "Punta Cana"
+#~ msgid "Honningsvag"
+#~ msgstr "Honningsvag"
 
-#: my-evolution/Locations.h:1829
-msgid "Punta Gorda"
-msgstr "Punta Gorda"
+#~ msgid "Honolulu"
+#~ msgstr "Honolulu"
 
-#: my-evolution/Locations.h:1830
-msgid "Puntilla Lake"
-msgstr "Puntilla Lake"
+#~ msgid "Hoonah"
+#~ msgstr "Hoonah"
 
-#: my-evolution/Locations.h:1831
-msgid "Pusan/Kimhae"
-msgstr "Pusan/Kimhae"
+#~ msgid "Hoquiam"
+#~ msgstr "Hoquiam"
 
-#: my-evolution/Locations.h:1832
-msgid "Pyongtaek Ab"
-msgstr "Pyongtaek Ab"
+#~ msgid "Hot Springs"
+#~ msgstr "Hot Springs"
 
-#: my-evolution/Locations.h:1833
-msgid "Pyongyang"
-msgstr "Pyongyang"
+#~ msgid "Houghton Lake"
+#~ msgstr "Houghton Lake"
 
-#: my-evolution/Locations.h:1835
-msgid "Quantico"
-msgstr "Quantico"
+#~ msgid "Houlton"
+#~ msgstr "Houlton"
 
-#: my-evolution/Locations.h:1836
-msgid "Quebec"
-msgstr "Quebec"
+#~ msgid "Houma"
+#~ msgstr "Houma"
 
-#: my-evolution/Locations.h:1837
-msgid "Quebec City"
-msgstr "Quebec City"
+#~ msgid "Houston-Bush"
+#~ msgstr "Houston-Bush"
 
-#: my-evolution/Locations.h:1838
-msgid "Queretaro"
-msgstr "Queretaro"
+#~ msgid "Houston-Clover"
+#~ msgstr "Houston-Clover"
 
-#: my-evolution/Locations.h:1839
-msgid "Quillayute"
-msgstr "Quillayute"
+#~ msgid "Houston-Ellington Field"
+#~ msgstr "Houston-Ellington Field"
 
-#: my-evolution/Locations.h:1840
-msgid "Quimper"
-msgstr "Quimper"
+#~ msgid "Houston-Hobby"
+#~ msgstr "Houston-Hobby"
 
-#: my-evolution/Locations.h:1841
-msgid "Quincy"
-msgstr "Quincy"
+#~ msgid "Houston-Hooks"
+#~ msgstr "Houston-Hooks"
 
-#: my-evolution/Locations.h:1842
-msgid "Quito/Mariscal Sucre"
-msgstr "Quito/Mariscal Sucre"
+#~ msgid "Howard AFB"
+#~ msgstr "Howard AFB"
 
-#: my-evolution/Locations.h:1843
-msgid "Rabat"
-msgstr "Rabat"
+#~ msgid "Hsinchu"
+#~ msgstr "Hsinchu"
 
-#: my-evolution/Locations.h:1844
-msgid "Raduzhny"
-msgstr "Raduzhny"
+#~ msgid "Huanuco"
+#~ msgstr "Huanuco"
 
-#: my-evolution/Locations.h:1845
-msgid "Rafha"
-msgstr "Rafha"
+#~ msgid "Huehuetenango"
+#~ msgstr "Huehuetenango"
 
-#: my-evolution/Locations.h:1846
-msgid "Raleigh-Durham"
-msgstr "Raleigh-Durham"
+#~ msgid "Hulien"
+#~ msgstr "Hulien"
 
-#: my-evolution/Locations.h:1847
-msgid "Randolph AFB"
-msgstr "Randolph AFB"
+#~ msgid "Humberside"
+#~ msgstr "Humberside"
 
-#: my-evolution/Locations.h:1848
-msgid "Rapid City"
-msgstr "Rapid City"
+#~ msgid "Huntington"
+#~ msgstr "Huntington"
 
-#: my-evolution/Locations.h:1849
-msgid "Rapid City-Ellsworth AFB"
-msgstr "Rapid City-Ellsworth AFB"
+#~ msgid "Huntsville"
+#~ msgstr "Huntsville"
 
-#: my-evolution/Locations.h:1850
-msgid "Ras Al Khaimah"
-msgstr "Ras Al Khaimah"
+#~ msgid "Hurlburt"
+#~ msgstr "Hurlburt"
 
-#: my-evolution/Locations.h:1851
-msgid "Rawlins"
-msgstr "Rawlins"
+#~ msgid "Huron"
+#~ msgstr "Huron"
 
-#: my-evolution/Locations.h:1852
-msgid "Reading"
-msgstr "Reading"
+#~ msgid "Hutchinson"
+#~ msgstr "Hutchinson"
 
-#: my-evolution/Locations.h:1853
-msgid "Rebun Island"
-msgstr "Rebun Island"
+#~ msgid "Hyakuri Ab"
+#~ msgstr "Hyakuri Ab"
 
-#: my-evolution/Locations.h:1854
-msgid "Recife"
-msgstr "Recife"
+#~ msgid "Hyannis"
+#~ msgstr "Hyannis"
 
-#: my-evolution/Locations.h:1855
-msgid "Red Bluff"
-msgstr "Red Bluff"
+#~ msgid "Hyderabad"
+#~ msgstr "Hyderabad"
 
-#: my-evolution/Locations.h:1856
-msgid "Redding"
-msgstr "Redding"
+#~ msgid "Hyeres-Le Palyvestre"
+#~ msgstr "Hyeres-Le Palyvestre"
 
-#: my-evolution/Locations.h:1857
-msgid "Redig"
-msgstr "Redig"
+#~ msgid "Iasi"
+#~ msgstr "Iasi"
 
-#: my-evolution/Locations.h:1858
-msgid "Redmond"
-msgstr "Redmond"
+#~ msgid "Ibiza"
+#~ msgstr "Ibiza"
 
-#: my-evolution/Locations.h:1859
-msgid "Red Oak"
-msgstr "Red Oak"
+#~ msgid "Ichikawa"
+#~ msgstr "Ichikawa"
 
-#: my-evolution/Locations.h:1860
-msgid "Redwood Falls"
-msgstr "Redwood Falls"
+#~ msgid "Idaho"
+#~ msgstr "Idaho"
 
-#: my-evolution/Locations.h:1861
-msgid "Reggio Calabria"
-msgstr "Reggio Calabria"
+#~ msgid "Idaho Falls"
+#~ msgstr "Idaho Falls"
 
-#: my-evolution/Locations.h:1862
-msgid "Regina"
-msgstr "Regina"
+#~ msgid "Iguazu"
+#~ msgstr "Iguazu"
 
-#: my-evolution/Locations.h:1863
-msgid "Reims-Champagne"
-msgstr "Reims-Champagne"
+#~ msgid "Iki Airport"
+#~ msgstr "Iki Airport"
 
-#: my-evolution/Locations.h:1864
-msgid "Rennes"
-msgstr "Rennes"
+#~ msgid "Ilan"
+#~ msgstr "Ilan"
 
-#: my-evolution/Locations.h:1865
-msgid "Reno"
-msgstr "Reno"
+#~ msgid "Iliamna"
+#~ msgstr "Iliamna"
 
-#: my-evolution/Locations.h:1866
-msgid "Renton"
-msgstr "Renton"
+#~ msgid "Illinois"
+#~ msgstr "Illinois"
 
-#: my-evolution/Locations.h:1867
-msgid "Resistencia"
-msgstr "Resistencia"
+#~ msgid "Imperial"
+#~ msgstr "Imperial"
 
-#: my-evolution/Locations.h:1868
-msgid "Reus"
-msgstr "Reus"
+#~ msgid "Imperial (2)"
+#~ msgstr "Imperial (2)"
 
-#: my-evolution/Locations.h:1869
-msgid "Reyes"
-msgstr "Reyes"
+#~ msgid "Imperial Beach"
+#~ msgstr "Imperial Beach"
 
-#: my-evolution/Locations.h:1870
-msgid "Reykjavik"
-msgstr "Reykjavik"
+#~ msgid "In Amenas"
+#~ msgstr "In Amenas"
 
-#: my-evolution/Locations.h:1871
-msgid "Reynosa"
-msgstr "Reynosa"
+#~ msgid "Indiana"
+#~ msgstr "Indiana"
 
-#: my-evolution/Locations.h:1872
-msgid "Rhinelander"
-msgstr "Rhinelander"
+#~ msgid "Indianapolis"
+#~ msgstr "Indianapolis"
 
-#: my-evolution/Locations.h:1873
-msgid "Rhode Island"
-msgstr "Rhode Island"
+#~ msgid "Indian Springs"
+#~ msgstr "Indian Springs"
 
-#: my-evolution/Locations.h:1874
-msgid "Riberalta"
-msgstr "Riberalta"
+#~ msgid "Innsbruck"
+#~ msgstr "Innsbruck"
 
-#: my-evolution/Locations.h:1875
-msgid "Richmond"
-msgstr "Richmond"
+#~ msgid "International Falls"
+#~ msgstr "International Falls"
 
-#: my-evolution/Locations.h:1876
-msgid "Rickenbacker"
-msgstr "Rickenbacker"
+#~ msgid "Intracoastal"
+#~ msgstr "Intracoastal"
 
-#: my-evolution/Locations.h:1877
-msgid "Rieti"
-msgstr "Rieti"
+#~ msgid "Inverness"
+#~ msgstr "Inverness"
 
-#: my-evolution/Locations.h:1878
-msgid "Rifle"
-msgstr "Rifle"
+#~ msgid "Inyokern"
+#~ msgstr "Inyokern"
 
-#: my-evolution/Locations.h:1879
-msgid "Rijeka"
-msgstr "Rijeka"
+#~ msgid "Iowa"
+#~ msgstr "Iowa"
 
-#: my-evolution/Locations.h:1880
-msgid "Rimini"
-msgstr "Rimini"
+#~ msgid "Iowa City"
+#~ msgstr "Iowa City"
 
-#: my-evolution/Locations.h:1881
-msgid "Rio De Janeiro"
-msgstr "Rio De Janeiro"
+#~ msgid "Iqaluit"
+#~ msgstr "Iqaluit"
 
-#: my-evolution/Locations.h:1882
-msgid "Rio Gallegos"
-msgstr "Rio Gallegos"
+#~ msgid "Iquique/Diego Arac"
+#~ msgstr "Iquique/Diego Arac"
 
-#: my-evolution/Locations.h:1883
-msgid "Rio Grande"
-msgstr "Rio Grande"
+#~ msgid "Iquitos"
+#~ msgstr "Iquitos"
 
-#: my-evolution/Locations.h:1884
-msgid "Rioja"
-msgstr "Rioja"
+#~ msgid "Iraklion"
+#~ msgstr "Iraklion"
 
-#: my-evolution/Locations.h:1885
-msgid "Rio / Jacarepagua"
-msgstr "Rio / Jacarepagua"
+#~ msgid "Iran, Islamic Republic of"
+#~ msgstr "İran, İslam Respublikası"
 
-#: my-evolution/Locations.h:1886
-msgid "Rionegro/J.M.Cordova"
-msgstr "Rionegro/J.M.Cordova"
+#~ msgid "Iron Mountain"
+#~ msgstr "Iron Mountain"
 
-#: my-evolution/Locations.h:1887
-msgid "Rishiri Island"
-msgstr "Rishiri Island"
+#~ msgid "Ironwood"
+#~ msgstr "Ironwood"
 
-#: my-evolution/Locations.h:1888
-msgid "Rivas"
-msgstr "Rivas"
+#~ msgid "Iruma Ab"
+#~ msgstr "Iruma Ab"
 
-#: my-evolution/Locations.h:1889
-msgid "Rivera"
-msgstr "Rivera"
+#~ msgid "Islamabad"
+#~ msgstr "İslamabad"
 
-#: my-evolution/Locations.h:1890
-msgid "Riverside"
-msgstr "Riverside"
+#~ msgid "Isle of Man"
+#~ msgstr "Isle of Man"
 
-#: my-evolution/Locations.h:1891
-msgid "Riverside/March AFB"
-msgstr "Riverside/March AFB"
+#~ msgid "Islip"
+#~ msgstr "Islip"
 
-#: my-evolution/Locations.h:1892
-msgid "Riverton"
-msgstr "Riverton"
+#~ msgid "Istanbul"
+#~ msgstr "İstanbul"
 
-#: my-evolution/Locations.h:1893
-msgid "Rivne"
-msgstr "Rivne"
+#~ msgid "Itaituba"
+#~ msgstr "Itaituba"
 
-#: my-evolution/Locations.h:1894
-msgid "Rivolto"
-msgstr "Rivolto"
+#~ msgid "Ithaca"
+#~ msgstr "Ithaca"
 
-#: my-evolution/Locations.h:1895
-msgid "Riyadh"
-msgstr "Riyadh"
+#~ msgid "Ivano-Frankivsk"
+#~ msgstr "Ivano-Frankivsk"
 
-#: my-evolution/Locations.h:1896
-msgid "Roanoke"
-msgstr "Roanoke"
+#~ msgid "Iwakuni MCAS"
+#~ msgstr "Iwakuni MCAS"
 
-#: my-evolution/Locations.h:1897
-msgid "Roatan"
-msgstr "Roatan"
+#~ msgid "Iwojima"
+#~ msgstr "Iwojima"
 
-#: my-evolution/Locations.h:1898
-msgid "Robore"
-msgstr "Robore"
+#~ msgid "Ixtapa"
+#~ msgstr "Ixtapa"
 
-#: my-evolution/Locations.h:1899
-msgid "Rochester"
-msgstr "Rochester"
+#~ msgid "Izmir/Adnan Menderes"
+#~ msgstr "İzmir/Adnan Menderes"
 
-#: my-evolution/Locations.h:1900
-msgid "Rockford"
-msgstr "Rockford"
+#~ msgid "Izmir/Cigli"
+#~ msgstr "İzmir/Cigli"
 
-#: my-evolution/Locations.h:1901
-msgid "Rockland"
-msgstr "Rockland"
+#~ msgid "Izmit"
+#~ msgstr "İzmit"
 
-#: my-evolution/Locations.h:1902
-msgid "Rockport"
-msgstr "Rockport"
+#~ msgid "Izumo Airport"
+#~ msgstr "Izumo Airport"
 
-#: my-evolution/Locations.h:1903
-msgid "Rock Springs"
-msgstr "Rock Springs"
+#~ msgid "Jackson"
+#~ msgstr "Jackson"
 
-#: my-evolution/Locations.h:1904
-msgid "Rocky Mount"
-msgstr "Rocky Mount"
+#~ msgid "Jacksonville"
+#~ msgstr "Jacksonville"
 
-#: my-evolution/Locations.h:1905
-msgid "Rodos"
-msgstr "Rodos"
+#~ msgid "Jacksonville-Craig Airport"
+#~ msgstr "Jacksonville-Craig Airport"
 
-#: my-evolution/Locations.h:1906
-msgid "Rogers"
-msgstr "Rogers"
+#~ msgid "Jacksonville NAS"
+#~ msgstr "Jacksonville NAS"
 
-#: my-evolution/Locations.h:1907
-msgid "Roma/Ciampino"
-msgstr "Roma/Ciampino"
+#~ msgid "Jaffrey"
+#~ msgstr "Jaffrey"
 
-#: my-evolution/Locations.h:1908
-msgid "Roma/Fiumicino"
-msgstr "Roma/Fiumicino"
+#~ msgid "Jamestown"
+#~ msgstr "Jamestown"
 
-#: my-evolution/Locations.h:1910
-msgid "Roma/Urbe"
-msgstr "Roma/Urbe"
+#~ msgid "Janesville"
+#~ msgstr "Janesville"
 
-#: my-evolution/Locations.h:1911
-msgid "Rome-Russell"
-msgstr "Rome-Russell"
+#~ msgid "Jan Smuts"
+#~ msgstr "Jan Smuts"
 
-#: my-evolution/Locations.h:1912
-msgid "Ronchi de' Legionari"
-msgstr "Ronchi de' Legionari"
+#~ msgid "Jeddah King Abdul Aziz International Airport"
+#~ msgstr "Jeddah King Abdul Aziz International Airport"
 
-#: my-evolution/Locations.h:1913
-msgid "Ronneby"
-msgstr "Ronneby"
+#~ msgid "Jefferson City"
+#~ msgstr "Jefferson City"
 
-#: my-evolution/Locations.h:1914
-msgid "Roosevelt"
-msgstr "Roosevelt"
+#~ msgid "Jerez"
+#~ msgstr "Jerez"
 
-#: my-evolution/Locations.h:1915
-msgid "Roros"
-msgstr "Roros"
+#~ msgid "Jersey"
+#~ msgstr "Jersey"
 
-#: my-evolution/Locations.h:1916
-msgid "Rorvik/Ryum"
-msgstr "Rorvik/Ryum"
+#~ msgid "Jinotega"
+#~ msgstr "Jinotega"
 
-#: my-evolution/Locations.h:1917
-msgid "Rosario"
-msgstr "Rosario"
+#~ msgid "Johan A. Pengel"
+#~ msgstr "Johan A. Pengel"
 
-#: my-evolution/Locations.h:1918
-msgid "Roseburg"
-msgstr "Roseburg"
+#~ msgid "Johnstown"
+#~ msgstr "Johnstown"
 
-#: my-evolution/Locations.h:1919
-msgid "Roseglen"
-msgstr "Roseglen"
+#~ msgid "Jonesboro"
+#~ msgstr "Jonesboro"
 
-#: my-evolution/Locations.h:1920
-msgid "Rost"
-msgstr "Rost"
+#~ msgid "Jonkoping"
+#~ msgstr "Jonkoping"
 
-#: my-evolution/Locations.h:1921
-msgid "Rostov-Na-Donu"
-msgstr "Rostov-Na-Donu"
+#~ msgid "Joplin"
+#~ msgstr "Joplin"
 
-#: my-evolution/Locations.h:1922
-msgid "Roswell"
-msgstr "Roswell"
+#~ msgid "Juanjui"
+#~ msgstr "Juanjui"
 
-#: my-evolution/Locations.h:1923
-msgid "Rotterdam"
-msgstr "Rotterdam"
+#~ msgid "Juan Santamaria"
+#~ msgstr "Juan Santamaria"
 
-#: my-evolution/Locations.h:1924
-msgid "Rouen-Valle de Seine"
-msgstr "Rouen-Valle de Seine"
+#~ msgid "Juigalpa"
+#~ msgstr "Juigalpa"
 
-#: my-evolution/Locations.h:1925
-msgid "Ruidoso-Sierra Blanca"
-msgstr "Ruidoso-Sierra Blanca"
+#~ msgid "Jujuy"
+#~ msgstr "Jujuy"
 
-#: my-evolution/Locations.h:1926
-msgid "Rurrenabaque"
-msgstr "Rurrenabaque"
+#~ msgid "Juliaca"
+#~ msgstr "Juliaca"
 
-#: my-evolution/Locations.h:1927
-msgid "Russell"
-msgstr "Russell"
+#~ msgid "Junction"
+#~ msgstr "Junction"
 
-#: my-evolution/Locations.h:1928
-msgid "Russia"
-msgstr "Rusya"
+#~ msgid "Juneau"
+#~ msgstr "Juneau"
 
-#: my-evolution/Locations.h:1929
-msgid "Rutland"
-msgstr "Rutland"
+#~ msgid "Kadena Ab"
+#~ msgstr "Kadena Ab"
 
-#: my-evolution/Locations.h:1930
-msgid "Rygge"
-msgstr "Rygge"
+#~ msgid "Kagoshima Airport"
+#~ msgstr "Kagoshima Airport"
 
-#: my-evolution/Locations.h:1931
-msgid "Rzeszow"
-msgstr "Rzeszow"
+#~ msgid "Kahului"
+#~ msgstr "Kahului"
 
-#: my-evolution/Locations.h:1932
-msgid "Saarbrucken"
-msgstr "Saarbrucken"
+#~ msgid "Kailua-Kona"
+#~ msgstr "Kailua-Kona"
 
-#: my-evolution/Locations.h:1933
-msgid "Sabine Pass"
-msgstr "Sabine Pass"
+#~ msgid "Kake"
+#~ msgstr "Kake"
 
-#: my-evolution/Locations.h:1934
-msgid "Sacramento"
-msgstr "Sacramento"
+#~ msgid "Kalamata"
+#~ msgstr "Kalamata"
 
-#: my-evolution/Locations.h:1935
-msgid "Sacramento-Woodland"
-msgstr "Sacramento-Woodland"
+#~ msgid "Kalamazoo"
+#~ msgstr "Kalamazoo"
 
-#: my-evolution/Locations.h:1936
-msgid "Safford-Municipal Airport"
-msgstr "Safford-Municipal Airport"
+#~ msgid "Kalispell"
+#~ msgstr "Kalispell"
 
-#: my-evolution/Locations.h:1937
-msgid "Saginaw"
-msgstr "Saginaw"
+#~ msgid "Kamigoto"
+#~ msgstr "Kamigoto"
 
-#: my-evolution/Locations.h:1938
-msgid "Saint Anthony"
-msgstr "Saint Anthony"
+#~ msgid "Kaneohe"
+#~ msgstr "Kaneohe"
 
-#: my-evolution/Locations.h:1939
-msgid "Saint-Brieuc-Armor"
-msgstr "Saint-Brieuc-Armor"
+#~ msgid "Kangshan"
+#~ msgstr "Kangshan"
 
-#: my-evolution/Locations.h:1940
-msgid "Saint-Dizier-Robinson"
-msgstr "Saint-Dizier-Robinson"
+#~ msgid "Kanoya Ab"
+#~ msgstr "Kanoya Ab"
 
-#: my-evolution/Locations.h:1941
-msgid "Saint-Etienne-Boutheon"
-msgstr "Saint-Etienne-Boutheon"
+#~ msgid "Kansai International Airport"
+#~ msgstr "Kansai International Airport"
 
-#: my-evolution/Locations.h:1942
-msgid "Saint Mary's"
-msgstr "Saint Mary's"
+#~ msgid "Kansas"
+#~ msgstr "Kansas"
 
-#: my-evolution/Locations.h:1943
-msgid "Saint Mawgan"
-msgstr "Saint Mawgan"
+#~ msgid "Kansas City"
+#~ msgstr "Kansas City"
 
-#: my-evolution/Locations.h:1944
-msgid "Saint-Nazaire-Montoir"
-msgstr "Saint-Nazaire-Montoir"
+#~ msgid "Kansas City-Gladstone"
+#~ msgstr "Kansas City-Gladstone"
 
-#: my-evolution/Locations.h:1945
-msgid "Saint Paul"
-msgstr "Saint Paul"
+#~ msgid "Kaohsiung"
+#~ msgstr "Kaohsiung"
 
-#: my-evolution/Locations.h:1946
-msgid "Saiq"
-msgstr "Saiq"
+#~ msgid "Karachi"
+#~ msgstr "Karachi"
 
-#: my-evolution/Locations.h:1947
-msgid "Salalah"
-msgstr "Salalah"
+#~ msgid "Karup"
+#~ msgstr "Karup"
 
-#: my-evolution/Locations.h:1948
-msgid "Salem"
-msgstr "Salem"
+#~ msgid "Kassel-Calden"
+#~ msgstr "Kassel-Calden"
 
-#: my-evolution/Locations.h:1949
-msgid "Salida"
-msgstr "Salida"
+#~ msgid "Kasumigaura Ab"
+#~ msgstr "Kasumigaura Ab"
 
-#: my-evolution/Locations.h:1950
-msgid "Salida-Harriet"
-msgstr "Salida-Harriet"
+#~ msgid "Kasuminome Ab"
+#~ msgstr "Kasuminome Ab"
 
-#: my-evolution/Locations.h:1951
-msgid "Salina"
-msgstr "Salina"
+#~ msgid "Katowice"
+#~ msgstr "Katowice"
 
-#: my-evolution/Locations.h:1952
-msgid "Salinas"
-msgstr "Salinas"
+#~ msgid "Kavala"
+#~ msgstr "Kavala"
 
-#: my-evolution/Locations.h:1953
-msgid "Salisbury"
-msgstr "Salisbury"
+#~ msgid "Kayseri"
+#~ msgstr "Kayseri"
 
-#: my-evolution/Locations.h:1954
-msgid "Salmon"
-msgstr "Salmon"
+#~ msgid "Kazan"
+#~ msgstr "Kazan"
 
-#: my-evolution/Locations.h:1955
-msgid "Salmon (2)"
-msgstr "Salmon (2)"
+#~ msgid "Kearney"
+#~ msgstr "Kearney"
 
-#: my-evolution/Locations.h:1956
-msgid "Salta"
-msgstr "Salta"
+#~ msgid "Keene"
+#~ msgstr "Keene"
 
-#: my-evolution/Locations.h:1957
-msgid "Saltillo"
-msgstr "Saltillo"
+#~ msgid "Kefallinia"
+#~ msgstr "Kefallinia"
 
-#: my-evolution/Locations.h:1958
-msgid "Salt Lake City"
-msgstr "Salt Lake City"
+#~ msgid "Keflavik"
+#~ msgstr "Keflavik"
 
-#: my-evolution/Locations.h:1959
-msgid "Salto"
-msgstr "Salto"
+#~ msgid "Kenai"
+#~ msgstr "Kenai"
 
-#: my-evolution/Locations.h:1960
-msgid "Salt point"
-msgstr "Salt point"
+#~ msgid "Kenosha"
+#~ msgstr "Kenosha"
 
-#: my-evolution/Locations.h:1961
-msgid "Salvador"
-msgstr "Salvador"
+#~ msgid "Kentucky"
+#~ msgstr "Kentucky"
 
-#: my-evolution/Locations.h:1962
-msgid "Salzburg"
-msgstr "Salzburg"
+#~ msgid "Keokuk"
+#~ msgstr "Keokuk"
 
-#: my-evolution/Locations.h:1963
-msgid "Samara"
-msgstr "Samara"
+#~ msgid "Kerkira"
+#~ msgstr "Kerkira"
 
-#: my-evolution/Locations.h:1964
-msgid "Samos"
-msgstr "Samos"
+#~ msgid "Kerman"
+#~ msgstr "Kerman"
 
-#: my-evolution/Locations.h:1965
-msgid "Samsun"
-msgstr "Samsun"
+#~ msgid "Ketchikan"
+#~ msgstr "Ketchikan"
 
-#: my-evolution/Locations.h:1966
-msgid "Sana'A"
-msgstr "Sana'A"
+#~ msgid "Key West"
+#~ msgstr "Key West"
 
-#: my-evolution/Locations.h:1967
-msgid "San Andres Isla/Sesquicentenario"
-msgstr "San Andres Isla/Sesquicentenario"
+#~ msgid "Key West NAS"
+#~ msgstr "Key West NAS"
 
-#: my-evolution/Locations.h:1968
-msgid "San Angelo"
-msgstr "San Angelo"
+#~ msgid "Khabarovsk"
+#~ msgstr "Khabarovsk"
 
-#: my-evolution/Locations.h:1969
-msgid "San Antonio"
-msgstr "San Antonio"
+#~ msgid "Khamis Mushait"
+#~ msgstr "Khamis Mushait"
 
-#: my-evolution/Locations.h:1970
-msgid "San Antonio Del Tachira"
-msgstr "San Antonio Del Tachira"
+#~ msgid "Kharkiv"
+#~ msgstr "Kharkiv"
 
-#: my-evolution/Locations.h:1971
-msgid "San Antonio-Kelly AFB"
-msgstr "San Antonio-Kelly AFB"
+#~ msgid "Kikai Island"
+#~ msgstr "Kikai Island"
 
-#: my-evolution/Locations.h:1972
-msgid "San Antonio-Stinson"
-msgstr "San Antonio-Stinson"
+#~ msgid "Killeen"
+#~ msgstr "Killeen"
 
-#: my-evolution/Locations.h:1973
-msgid "San Carlos"
-msgstr "San Carlos"
+#~ msgid "Killeen-Ft Hood"
+#~ msgstr "Killeen-Ft Hood"
 
-#: my-evolution/Locations.h:1974
-msgid "Sandane"
-msgstr "Sandane"
+#~ msgid "Killeen-Gray AAF"
+#~ msgstr "Killeen-Gray AAF"
 
-#: my-evolution/Locations.h:1975
-msgid "Sandberg"
-msgstr "Sandberg"
+#~ msgid "King Khaled International Airport"
+#~ msgstr "King Khaled International Airport"
 
-#: my-evolution/Locations.h:1976
-msgid "Sanderson"
-msgstr "Sanderson"
+#~ msgid "Kingman"
+#~ msgstr "Kingman"
 
-#: my-evolution/Locations.h:1977
-msgid "San Diego"
-msgstr "San Diego"
+#~ msgid "King Salmon"
+#~ msgstr "King Salmon"
 
-#: my-evolution/Locations.h:1978
-msgid "San Diego-Brown"
-msgstr "San Diego-Brown"
+#~ msgid "Kingston"
+#~ msgstr "Kingston"
 
-#: my-evolution/Locations.h:1979
-msgid "San Diego-Miramar"
-msgstr "San Diego-Miramar"
+#~ msgid "Kingsville"
+#~ msgstr "Kingsville"
 
-#: my-evolution/Locations.h:1980
-msgid "San Diego-Montgomery"
-msgstr "San Diego-Montgomery"
+#~ msgid "Kinloss"
+#~ msgstr "Kinloss"
 
-#: my-evolution/Locations.h:1981
-msgid "San Diego-North Island"
-msgstr "San Diego-North Island"
+#~ msgid "Kinston"
+#~ msgstr "Kinston"
 
-#: my-evolution/Locations.h:1982
-msgid "San Diego-Santee"
-msgstr "San Diego-Santee"
+#~ msgid "Kirkenes"
+#~ msgstr "Kirkenes"
 
-#: my-evolution/Locations.h:1983
-msgid "Sandnessjoen/Stokka"
-msgstr "Sandnessjoen/Stokka"
+#~ msgid "Kirksville"
+#~ msgstr "Kirksville"
 
-#: my-evolution/Locations.h:1984
-msgid "Sand Point"
-msgstr "Sand Point"
+#~ msgid "Kiruna"
+#~ msgstr "Kiruna"
 
-#: my-evolution/Locations.h:1985
-msgid "San Fernando De Apure"
-msgstr "San Fernando De Apure"
+#~ msgid "Kisarazu Ab"
+#~ msgstr "Kisarazu Ab"
 
-#: my-evolution/Locations.h:1986
-msgid "Sanford"
-msgstr "Sanford"
+#~ msgid "Kishineu"
+#~ msgstr "Kishineu"
 
-#: my-evolution/Locations.h:1987
-msgid "San Francisco"
-msgstr "San Francisco"
+#~ msgid "Kitakyushu Airport"
+#~ msgstr "Kitakyushu Airport"
 
-#: my-evolution/Locations.h:1988
-msgid "Sangju"
-msgstr "Sangju"
+#~ msgid "Klagenfurt"
+#~ msgstr "Klagenfurt"
 
-#: my-evolution/Locations.h:1989
-msgid "San Ignacio De Velasco"
-msgstr "San Ignacio De Velasco"
+#~ msgid "Klamath Falls"
+#~ msgstr "Klamath Falls"
 
-#: my-evolution/Locations.h:1990
-msgid "San Joaquin"
-msgstr "San Joaquin"
+#~ msgid "Klawock"
+#~ msgstr "Klawock"
 
-#: my-evolution/Locations.h:1991
-msgid "San Jose"
-msgstr "San Jose"
+#~ msgid "Kleine Brogel"
+#~ msgstr "Kleine Brogel"
 
-#: my-evolution/Locations.h:1992
-msgid "San Jose De Chiquitos"
-msgstr "San Jose De Chiquitos"
+#~ msgid "Kliningrad"
+#~ msgstr "Kliningrad"
 
-#: my-evolution/Locations.h:1993
-msgid "San Jose del Cabo"
-msgstr "San Jose del Cabo"
+#~ msgid "Knoxville"
+#~ msgstr "Knoxville"
 
-#: my-evolution/Locations.h:1994
-msgid "San Jose-Santa Clara"
-msgstr "San Jose-Santa Clara"
+#~ msgid "Knoxville-Downtown"
+#~ msgstr "Knoxville-Downtown"
 
-#: my-evolution/Locations.h:1995
-msgid "San Juan"
-msgstr "San Juan"
+#~ msgid "Kobenhavn/Kastrup"
+#~ msgstr "Kobenhavn/Kastrup"
 
-#: my-evolution/Locations.h:1996
-msgid "Sankt-Peterburg"
-msgstr "Sankt-Peterburg"
+#~ msgid "Kobenhavn/Roskilde"
+#~ msgstr "Kobenhavn/Roskilde"
 
-#: my-evolution/Locations.h:1997
-msgid "Sanliurfa"
-msgstr "Sanliurfa"
+#~ msgid "Kochi Airport"
+#~ msgstr "Kochi Airport"
 
-#: my-evolution/Locations.h:1998
-msgid "San Luis Obispo"
-msgstr "San Luis Obispo"
+#~ msgid "Kodiak"
+#~ msgstr "Kodiak"
 
-#: my-evolution/Locations.h:1999
-msgid "San Luis Potosi"
-msgstr "San Luis Potosi"
+#~ msgid "Kogalniceanu"
+#~ msgstr "Kogalniceanu"
 
-#: my-evolution/Locations.h:2000
-msgid "San Miguel"
-msgstr "San Miguel"
+#~ msgid "Kogalym"
+#~ msgstr "Kogalym"
 
-#: my-evolution/Locations.h:2001
-msgid "San Nicholas Island"
-msgstr "San Nicholas Island"
+#~ msgid "Koksijde"
+#~ msgstr "Koksijde"
 
-#: my-evolution/Locations.h:2002
-msgid "San Salvador"
-msgstr "San Salvador"
+#~ msgid "Kolding/Vandrup"
+#~ msgstr "Kolding/Vandrup"
 
-#: my-evolution/Locations.h:2003
-msgid "San Sebastian"
-msgstr "San Sebastian"
+#~ msgid "Koln/Bonn"
+#~ msgstr "Koln/Bonn"
 
-#: my-evolution/Locations.h:2004
-msgid "Santa Ana"
-msgstr "Santa Ana"
+#~ msgid "Komatsu Ab"
+#~ msgstr "Komatsu Ab"
 
-#: my-evolution/Locations.h:2005
-msgid "Santa Barbara"
-msgstr "Santa Barbara"
+#~ msgid "Komatsujima Ab"
+#~ msgstr "Komatsujima Ab"
 
-#: my-evolution/Locations.h:2006
-msgid "Santa Cruz"
-msgstr "Santa Cruz"
+#~ msgid "Konya"
+#~ msgstr "Konya"
 
-#: my-evolution/Locations.h:2007
-msgid "Santa Fe"
-msgstr "Santa Fe"
+#~ msgid "Korea, Democratic People's Republic of"
+#~ msgstr "Korea, Democratic People's Republic of"
 
-#: my-evolution/Locations.h:2008
-msgid "Santa Maria"
-msgstr "Santa Maria"
+#~ msgid "Korea, Republic of"
+#~ msgstr "Korea, Republic of"
 
-#: my-evolution/Locations.h:2009
-msgid "Santa Marta/Simon Bolivar"
-msgstr "Santa Marta/Simon Bolivar"
+#~ msgid "Kos"
+#~ msgstr "Kos"
 
-#: my-evolution/Locations.h:2010
-msgid "Santa Monica"
-msgstr "Santa Monica"
+#~ msgid "Kotzebue"
+#~ msgstr "Kotzebue"
 
-#: my-evolution/Locations.h:2011
-msgid "Santander"
-msgstr "Santander"
+#~ msgid "Kozani"
+#~ msgstr "Kozani"
 
-#: my-evolution/Locations.h:2012
-msgid "Santarem"
-msgstr "Santarem"
+#~ msgid "Krakow"
+#~ msgstr "Krakow"
 
-#: my-evolution/Locations.h:2013
-msgid "Santa Rosa"
-msgstr "Santa Rosa"
+#~ msgid "Krasnodar"
+#~ msgstr "Krasnodar"
 
-#: my-evolution/Locations.h:2014
-msgid "Santa Rosa de Copan"
-msgstr "Santa Rosa de Copan"
+#~ msgid "Krasnoyarsk"
+#~ msgstr "Krasnoyarsk"
 
-#: my-evolution/Locations.h:2015
-msgid "Santiago"
-msgstr "Santiago"
+#~ msgid "Kristiansand/Kjevik"
+#~ msgstr "Kristiansand/Kjevik"
 
-#: my-evolution/Locations.h:2016
-msgid "Santiago de Cuba"
-msgstr "Santiago de Cuba"
+#~ msgid "Kristiansund/Kvernberget"
+#~ msgstr "Kristiansund/Kvernberget"
 
-#: my-evolution/Locations.h:2017
-msgid "Santiago Del Estero"
-msgstr "Santiago Del Estero"
+#~ msgid "Kryviy Rig/Lozovatka"
+#~ msgstr "Kryviy Rig/Lozovatka"
 
-#: my-evolution/Locations.h:2018
-msgid "Santorini"
-msgstr "Santorini"
+#~ msgid "Kumamoto Airport"
+#~ msgstr "Kumamoto Airport"
 
-#: my-evolution/Locations.h:2019
-msgid "Santos"
-msgstr "Santos"
+#~ msgid "Kunming"
+#~ msgstr "Kunming"
 
-#: my-evolution/Locations.h:2020
-msgid "Sao Jose Dos Campo"
-msgstr "Sao Jose Dos Campo"
+#~ msgid "Kushiro Airport"
+#~ msgstr "Kushiro Airport"
 
-#: my-evolution/Locations.h:2021
-msgid "Sao Luiz"
-msgstr "Sao Luiz"
+#~ msgid "Kyiv/Boryspil"
+#~ msgstr "Kyiv/Boryspil"
 
-#: my-evolution/Locations.h:2022
-msgid "Sao Paulo"
-msgstr "Sao Paulo"
+#~ msgid "Kyiv/Zhulyany"
+#~ msgstr "Kyiv/Zhulyany"
 
-#: my-evolution/Locations.h:2023
-msgid "Sapporo Ab"
-msgstr "Sapporo Ab"
+#~ msgid "La Ceiba"
+#~ msgstr "La Ceiba"
 
-#: my-evolution/Locations.h:2024
-msgid "Sarajevo"
-msgstr "Sarajevo"
+#~ msgid "Laconia"
+#~ msgstr "Laconia"
 
-#: my-evolution/Locations.h:2025
-msgid "Saranac Lake"
-msgstr "Saranac Lake"
+#~ msgid "La Coruna"
+#~ msgstr "La Coruna"
 
-#: my-evolution/Locations.h:2026
-msgid "Sarasota"
-msgstr "Sarasota"
+#~ msgid "La Crosse"
+#~ msgstr "La Crosse"
 
-#: my-evolution/Locations.h:2027
-msgid "Saratov"
-msgstr "Saratov"
+#~ msgid "La Esperanza"
+#~ msgstr "La Esperanza"
 
-#: my-evolution/Locations.h:2028
-msgid "Sarzana"
-msgstr "Sarzana"
+#~ msgid "Lafayette"
+#~ msgstr "Lafayette"
 
-#: my-evolution/Locations.h:2029
-msgid "Saskatchewan"
-msgstr "Saskatchewan"
+#~ msgid "La Grande"
+#~ msgstr "La Grande"
 
-#: my-evolution/Locations.h:2030
-msgid "Saskatoon"
-msgstr "Saskatoon"
+#~ msgid "Lahaina"
+#~ msgstr "Lahaina"
 
-#: my-evolution/Locations.h:2031
-msgid "Sauce Viejo"
-msgstr "Sauce Viejo"
+#~ msgid "Lahore"
+#~ msgstr "Lahore"
 
-#: my-evolution/Locations.h:2033
-msgid "Sault Ste Marie"
-msgstr "Sault Ste Marie"
+#~ msgid "Lajes"
+#~ msgstr "Lajes"
 
-#: my-evolution/Locations.h:2034
-msgid "Savannah"
-msgstr "Savannah"
+#~ msgid "La Junta"
+#~ msgstr "La Junta"
 
-#: my-evolution/Locations.h:2035
-msgid "Savannah-Hunter AAF"
-msgstr "Savannah-Hunter AAF"
+#~ msgid "Lake Charles"
+#~ msgstr "Lake Charles"
 
-#: my-evolution/Locations.h:2036
-msgid "Sawyer AFB"
-msgstr "Sawyer AFB"
+#~ msgid "Lake Hood"
+#~ msgstr "Lake Hood"
 
-#: my-evolution/Locations.h:2037
-msgid "Sayun"
-msgstr "Sayun"
+#~ msgid "Lakehurst"
+#~ msgstr "Lakehurst"
 
-#: my-evolution/Locations.h:2038
-msgid "Scatsta"
-msgstr "Scatsta"
+#~ msgid "Lakeland"
+#~ msgstr "Lakeland"
 
-#: my-evolution/Locations.h:2039
-msgid "Schaffen"
-msgstr "Schaffen"
+#~ msgid "Lake Tahoe"
+#~ msgstr "Lake Tahoe"
 
-#: my-evolution/Locations.h:2040
-msgid "Schenectady"
-msgstr "Schenectady"
+#~ msgid "Lakeview"
+#~ msgstr "Lakeview"
 
-#: my-evolution/Locations.h:2041
-msgid "Scilly Isles"
-msgstr "Scilly Isles"
+#~ msgid "Lamar"
+#~ msgstr "Lamar"
 
-#: my-evolution/Locations.h:2042
-msgid "Scottsbluff"
-msgstr "Scottsbluff"
+#~ msgid "La Mesa"
+#~ msgstr "La Mesa"
 
-#: my-evolution/Locations.h:2043
-msgid "Scottsdale"
-msgstr "Scottsdale"
+#~ msgid "Lamezia"
+#~ msgstr "Lamezia"
 
-#: my-evolution/Locations.h:2044
-msgid "Scranton"
-msgstr "Scranton"
+#~ msgid "Lamoni"
+#~ msgstr "Lamoni"
 
-#: my-evolution/Locations.h:2045
-msgid "Seattle"
-msgstr "Seattle"
+#~ msgid "Lampedusa"
+#~ msgstr "Lampedusa"
 
-#: my-evolution/Locations.h:2046
-msgid "Seattle-Boeing"
-msgstr "Seattle-Boeing"
+#~ msgid "Lanai"
+#~ msgstr "Lanai"
 
-#: my-evolution/Locations.h:2047
-msgid "Sedalia"
-msgstr "Sedalia"
+#~ msgid "Lancaster"
+#~ msgstr "Lancaster"
 
-#: my-evolution/Locations.h:2048
-msgid "Seeb"
-msgstr "Seeb"
+#~ msgid "Lander"
+#~ msgstr "Lander"
 
-#: my-evolution/Locations.h:2049
-msgid "Selanik"
-msgstr "Selanik"
+#~ msgid "Langebaanweg"
+#~ msgstr "Langebaanweg"
 
-#: my-evolution/Locations.h:2050
-msgid "Sendai Airport"
-msgstr "Sendai Airport"
+#~ msgid "Langley AFB"
+#~ msgstr "Langley AFB"
 
-#: my-evolution/Locations.h:2051
-msgid "Seoul E Ab"
-msgstr "Seoul E Ab"
+#~ msgid "Lannion"
+#~ msgstr "Lannion"
 
-#: my-evolution/Locations.h:2052
-msgid "Seoul/Kimp'O International Airport"
-msgstr "Seoul/Kimp'O International Airport"
+#~ msgid "Lansing"
+#~ msgstr "Lansing"
 
-#: my-evolution/Locations.h:2053
-msgid "Seoul/Yongdungp'O Rokaf Wc"
-msgstr "Seoul/Yongdungp'O Rokaf Wc"
+#~ msgid "Lanzhou"
+#~ msgstr "Lanzhou"
 
-#: my-evolution/Locations.h:2054
-msgid "Sept-Iles"
-msgstr "Sept-Iles"
+#~ msgid "La Paz"
+#~ msgstr "La Paz"
 
-#: my-evolution/Locations.h:2055
-msgid "Seul Choix Pt"
-msgstr "Seul Choix Pt"
+#~ msgid "La Paz/Alto"
+#~ msgstr "La Paz/Alto"
 
-#: my-evolution/Locations.h:2056
-msgid "Sevilla"
-msgstr "Sevilla"
+#~ msgid "Laramie"
+#~ msgstr "Laramie"
 
-#: my-evolution/Locations.h:2057
-msgid "Seward"
-msgstr "Seward"
+#~ msgid "Laredo"
+#~ msgstr "Laredo"
 
-#: my-evolution/Locations.h:2058
-msgid "Sexton Summit"
-msgstr "Sexton Summit"
+#~ msgid "Larnaka"
+#~ msgstr "Larnaka"
 
-#: my-evolution/Locations.h:2059
-msgid "Shanghai"
-msgstr "Shanghai"
+#~ msgid "La Romana"
+#~ msgstr "La Romana"
 
-#: my-evolution/Locations.h:2060
-msgid "Shannon"
-msgstr "Shannon"
+#~ msgid "Las Americas"
+#~ msgstr "Las Americas"
 
-#: my-evolution/Locations.h:2061
-msgid "Sharjah"
-msgstr "Sharjah"
+#~ msgid "Las Tunas"
+#~ msgstr "Las Tunas"
 
-#: my-evolution/Locations.h:2062
-msgid "Sharm El Sheikhintl"
-msgstr "Sharm El Sheikhintl"
+#~ msgid "Las Vegas"
+#~ msgstr "Las Vegas"
 
-#: my-evolution/Locations.h:2063
-msgid "Sharurah"
-msgstr "Sharurah"
+#~ msgid "Latina"
+#~ msgstr "Latina"
 
-#: my-evolution/Locations.h:2064
-msgid "Shawbury"
-msgstr "Shawbury"
+#~ msgid "Latrobe"
+#~ msgstr "Latrobe"
 
-#: my-evolution/Locations.h:2065
-msgid "Shearwater"
-msgstr "Shearwater"
+#~ msgid "Laughlin"
+#~ msgstr "Laughlin"
 
-#: my-evolution/Locations.h:2066
-msgid "Sheboygan"
-msgstr "Sheboygan"
+#~ msgid "Laurel"
+#~ msgstr "Laurel"
 
-#: my-evolution/Locations.h:2067
-msgid "Sheldon"
-msgstr "Sheldon"
+#~ msgid "La Verne"
+#~ msgstr "La Verne"
 
-#: my-evolution/Locations.h:2068
-msgid "Shelter Cove"
-msgstr "Shelter Cove"
+#~ msgid "Lawrence"
+#~ msgstr "Lawrence"
 
-#: my-evolution/Locations.h:2069
-msgid "Shelton"
-msgstr "Shelton"
+#~ msgid "Lawton"
+#~ msgstr "Lawton"
 
-#: my-evolution/Locations.h:2070
-msgid "Shenandoah"
-msgstr "Shenandoah"
+#~ msgid "Leadville"
+#~ msgstr "Leadville"
 
-#: my-evolution/Locations.h:2071
-msgid "Sheridan"
-msgstr "Sheridan"
+#~ msgid "Learmouth"
+#~ msgstr "Learmouth"
 
-#: my-evolution/Locations.h:2072
-msgid "Sherman-Denison"
-msgstr "Sherman-Denison"
+#~ msgid "Lecce"
+#~ msgstr "Lecce"
 
-#: my-evolution/Locations.h:2073
-msgid "Shimofusa Ab"
-msgstr "Shimofusa Ab"
+#~ msgid "Leeds and Bradford"
+#~ msgstr "Leeds and Bradford"
 
-#: my-evolution/Locations.h:2074
-msgid "Shingle Point"
-msgstr "Shingle Point"
+#~ msgid "Leesburg"
+#~ msgstr "Leesburg"
 
-#: my-evolution/Locations.h:2075
-msgid "Shiraz"
-msgstr "Shiraz"
+#~ msgid "Leeuwarden"
+#~ msgstr "Leeuwarden"
 
-#: my-evolution/Locations.h:2076
-msgid "Shishmaref"
-msgstr "Shishmaref"
+#~ msgid "Le Havre-Octeville"
+#~ msgstr "Le Havre-Octeville"
 
-#: my-evolution/Locations.h:2077
-msgid "Shizuhama Ab"
-msgstr "Shizuhama Ab"
+#~ msgid "Leipzig-Schkeuditz"
+#~ msgstr "Leipzig-Schkeuditz"
 
-#: my-evolution/Locations.h:2078
-msgid "Shoreham"
-msgstr "Shoreham"
+#~ msgid "Leknes"
+#~ msgstr "Leknes"
 
-#: my-evolution/Locations.h:2079
-msgid "Show Low"
-msgstr "Show Low"
+#~ msgid "Le Mans"
+#~ msgstr "Le Mans"
 
-#: my-evolution/Locations.h:2080
-msgid "Shreveport Downtown"
-msgstr "Shreveport Downtown"
+#~ msgid "Le Marine"
+#~ msgstr "Le Marine"
 
-#: my-evolution/Locations.h:2081
-msgid "Shreveport Regional"
-msgstr "Shreveport Regional"
+#~ msgid "Lemmon"
+#~ msgstr "Lemmon"
 
-#: my-evolution/Locations.h:2082
-msgid "Sidney"
-msgstr "Sidney"
+#~ msgid "Lemoore"
+#~ msgstr "Lemoore"
 
-#: my-evolution/Locations.h:2083
-msgid "Sigonella"
-msgstr "Sigonella"
+#~ msgid "Leticia/Vasquez Cobo"
+#~ msgstr "Leticia/Vasquez Cobo"
 
-#: my-evolution/Locations.h:2084
-msgid "Siloam Springs"
-msgstr "Siloam Springs"
+#~ msgid "Le Touquet"
+#~ msgstr "Le Touquet"
 
-#: my-evolution/Locations.h:2085
-msgid "Silver City"
-msgstr "Silver City"
+#~ msgid "Leuchars"
+#~ msgstr "Leuchars"
 
-#: my-evolution/Locations.h:2086
-msgid "Sindal"
-msgstr "Sindal"
+#~ msgid "Lewisburg"
+#~ msgstr "Lewisburg"
 
-#: my-evolution/Locations.h:2088
-msgid "Sioux City"
-msgstr "Sioux City"
+#~ msgid "Lewiston"
+#~ msgstr "Lewiston"
 
-#: my-evolution/Locations.h:2089
-msgid "Sioux Falls"
-msgstr "Sioux Falls"
+#~ msgid "Lewistown"
+#~ msgstr "Lewistown"
 
-#: my-evolution/Locations.h:2090
-msgid "Sitka"
-msgstr "Sitka"
+#~ msgid "Lexington"
+#~ msgstr "Lexington"
 
-#: my-evolution/Locations.h:2091
-msgid "Sivas"
-msgstr "Sivas"
+#~ msgid "Liberal"
+#~ msgstr "Liberal"
 
-#: my-evolution/Locations.h:2092
-msgid "Sivrihisar"
-msgstr "Sivrihisar"
+#~ msgid "Libya"
+#~ msgstr "Libya"
 
-#: my-evolution/Locations.h:2093
-msgid "Skagway"
-msgstr "Skagway"
+#~ msgid "Lichtenburg"
+#~ msgstr "Lichtenburg"
 
-#: my-evolution/Locations.h:2094
-msgid "Skiathos"
-msgstr "Skiathos"
+#~ msgid "Lidgerwood"
+#~ msgstr "Lidgerwood"
 
-#: my-evolution/Locations.h:2095
-msgid "Skien/Geiteryggen"
-msgstr "Skien/Geiteryggen"
+#~ msgid "Liege"
+#~ msgstr "Liege"
 
-#: my-evolution/Locations.h:2096
-msgid "Skive"
-msgstr "Skive"
+#~ msgid "Lihue"
+#~ msgstr "Lihue"
 
-#: my-evolution/Locations.h:2097
-msgid "Skopje"
-msgstr "Skopje"
+#~ msgid "Lille-Lesquin"
+#~ msgstr "Lille-Lesquin"
 
-#: my-evolution/Locations.h:2098
-msgid "Skwentna"
-msgstr "Skwentna"
+#~ msgid "Lima-Callao"
+#~ msgstr "Lima-Callao"
 
-#: my-evolution/Locations.h:2099
-msgid "Slana"
-msgstr "Slana"
+#~ msgid "Limnos"
+#~ msgstr "Limnos"
 
-#: my-evolution/Locations.h:2102
-msgid "Smithers"
-msgstr "Smithers"
+#~ msgid "Limoges"
+#~ msgstr "Limoges"
 
-#: my-evolution/Locations.h:2103
-msgid "Smyrna"
-msgstr "Smyrna"
+#~ msgid "Limon"
+#~ msgstr "Limon"
 
-#: my-evolution/Locations.h:2104
-msgid "Snowshoe Lake"
-msgstr "Snowshoe Lake"
+#~ msgid "Lincoln"
+#~ msgstr "Lincoln"
 
-#: my-evolution/Locations.h:2105
-msgid "Sochi"
-msgstr "Sochi"
+#~ msgid "Linz"
+#~ msgstr "Linz"
 
-#: my-evolution/Locations.h:2106
-msgid "Socorro"
-msgstr "Socorro"
+#~ msgid "Lisboa"
+#~ msgstr "Lisboa"
 
-#: my-evolution/Locations.h:2107
-msgid "Socotra"
-msgstr "Socotra"
+#~ msgid "Lista"
+#~ msgstr "Lista"
 
-#: my-evolution/Locations.h:2108
-msgid "Soda Springs"
-msgstr "Soda Springs"
+#~ msgid "Litchfield"
+#~ msgstr "Litchfield"
 
-#: my-evolution/Locations.h:2109
-msgid "Sofia"
-msgstr "Sofia"
+#~ msgid "Little Rock"
+#~ msgstr "Little Rock"
 
-#: my-evolution/Locations.h:2110
-msgid "Sogndal"
-msgstr "Sogndal"
+#~ msgid "Little Rock AFB"
+#~ msgstr "Little Rock AFB"
 
-#: my-evolution/Locations.h:2111
-msgid "Soldotna"
-msgstr "Soldotna"
+#~ msgid "Livermore"
+#~ msgstr "Livermore"
 
-#: my-evolution/Locations.h:2112
-msgid "Somerset"
-msgstr "Somerset"
+#~ msgid "Liverpool"
+#~ msgstr "Liverpool"
 
-#: my-evolution/Locations.h:2113
-msgid "Sonderborg"
-msgstr "Sonderborg"
+#~ msgid "Livingston"
+#~ msgstr "Livingston"
 
-#: my-evolution/Locations.h:2114
-msgid "Songmu Ab"
-msgstr "Songmu Ab"
+#~ msgid "Ljubljana"
+#~ msgstr "Ljubljana"
 
-#: my-evolution/Locations.h:2115
-msgid "Sorkjosen"
-msgstr "Sorkjosen"
+#~ msgid "Logan"
+#~ msgstr "Logan"
 
-#: my-evolution/Locations.h:2117
-msgid "Southampton"
-msgstr "Southampton"
+#~ msgid "Lolland Falster"
+#~ msgstr "Lolland Falster"
 
-#: my-evolution/Locations.h:2118
-msgid "South Bend"
-msgstr "South Bend"
+#~ msgid "Lompoc"
+#~ msgstr "Lompoc"
 
-#: my-evolution/Locations.h:2119
-msgid "South Carolina"
-msgstr "South Carolina"
+#~ msgid "London"
+#~ msgstr "London"
 
-#: my-evolution/Locations.h:2120
-msgid "South Dakota"
-msgstr "South Dakota"
+#~ msgid "London/City"
+#~ msgstr "London/City"
 
-#: my-evolution/Locations.h:2121
-msgid "Southend"
-msgstr "Southend"
+#~ msgid "London/Gatwick"
+#~ msgstr "London/Gatwick"
 
-#: my-evolution/Locations.h:2122
-msgid "South Marsh Island"
-msgstr "South Marsh Island"
+#~ msgid "London/Heathrow"
+#~ msgstr "London/Heathrow"
 
-#: my-evolution/Locations.h:2123
-msgid "South Timbalier"
-msgstr "South Timbalier"
+#~ msgid "London/Stansted"
+#~ msgstr "London/Stansted"
 
-#: my-evolution/Locations.h:2125
-msgid "Sparrevohn"
-msgstr "Sparrevohn"
+#~ msgid "Londrina"
+#~ msgstr "Londrina"
 
-#: my-evolution/Locations.h:2126
-msgid "Spencer"
-msgstr "Spencer"
+#~ msgid "Lone Rock"
+#~ msgstr "Lone Rock"
 
-#: my-evolution/Locations.h:2127
-msgid "Spickard"
-msgstr "Spickard"
+#~ msgid "Long Beach"
+#~ msgstr "Long Beach"
 
-#: my-evolution/Locations.h:2128
-msgid "Split"
-msgstr "Split"
+#~ msgid "Longview"
+#~ msgstr "Longview"
 
-#: my-evolution/Locations.h:2129
-msgid "Spokane"
-msgstr "Spokane"
+#~ msgid "Lorient-Lann-Bihoue"
+#~ msgstr "Lorient-Lann-Bihoue"
 
-#: my-evolution/Locations.h:2130
-msgid "Spokane-Parkwater"
-msgstr "Spokane-Parkwater"
+#~ msgid "Los Alamos"
+#~ msgstr "Los Alamos"
 
-#: my-evolution/Locations.h:2131
-msgid "Springbok"
-msgstr "Springbok"
+#~ msgid "Los Angeles"
+#~ msgstr "Los Angeles"
 
-#: my-evolution/Locations.h:2132
-msgid "Springfield"
-msgstr "Springfield"
+#~ msgid "Los Mochis"
+#~ msgstr "Los Mochis"
 
-#: my-evolution/Locations.h:2133
-msgid "Stampede Pass"
-msgstr "Stampede Pass"
+#~ msgid "Lossiemouth"
+#~ msgstr "Lossiemouth"
 
-#: my-evolution/Locations.h:2134
-msgid "State College"
-msgstr "State College"
+#~ msgid "Louisville"
+#~ msgstr "Louisville"
 
-#: my-evolution/Locations.h:2135
-msgid "Stauning"
-msgstr "Stauning"
+#~ msgid "Louisville-Standiford Field"
+#~ msgstr "Louisville-Standiford Field"
 
-#: my-evolution/Locations.h:2136
-msgid "Staunton"
-msgstr "Staunton"
+#~ msgid "Lousiana"
+#~ msgstr "Lousiana"
 
-#: my-evolution/Locations.h:2137
-msgid "Stavanger/Sola"
-msgstr "Stavanger/Sola"
+#~ msgid "Lovelock"
+#~ msgstr "Lovelock"
 
-#: my-evolution/Locations.h:2138
-msgid "Staverton"
-msgstr "Staverton"
+#~ msgid "Lubbock"
+#~ msgstr "Lubbock"
 
-#: my-evolution/Locations.h:2139
-msgid "Stavropol"
-msgstr "Stavropol"
+#~ msgid "Lubeck-Blankensee"
+#~ msgstr "Lubeck-Blankensee"
 
-#: my-evolution/Locations.h:2140
-msgid "St Cloud"
-msgstr "St Cloud"
+#~ msgid "Lufkin"
+#~ msgstr "Lufkin"
 
-#: my-evolution/Locations.h:2141
-msgid "Steamboat Springs"
-msgstr "Steamboat Springs"
+#~ msgid "Lugano"
+#~ msgstr "Lugano"
 
-#: my-evolution/Locations.h:2142
-msgid "Stephenville"
-msgstr "Stephenville"
+#~ msgid "Luqa"
+#~ msgstr "Luqa"
 
-#: my-evolution/Locations.h:2143
-msgid "St. George"
-msgstr "St. George"
+#~ msgid "Luton"
+#~ msgstr "Luton"
 
-#: my-evolution/Locations.h:2144
-msgid "Stillwater"
-msgstr "Stillwater"
+#~ msgid "Luxeuil"
+#~ msgstr "Luxeuil"
 
-#: my-evolution/Locations.h:2145
-msgid "St. John's"
-msgstr "St. John's"
+#~ msgid "Luxor"
+#~ msgstr "Luxor"
 
-#: my-evolution/Locations.h:2146
-msgid "St Johnsbury"
-msgstr "St Johnsbury"
+#~ msgid "Lviv"
+#~ msgstr "Lviv"
 
-#: my-evolution/Locations.h:2147
-msgid "St Joseph"
-msgstr "St Joseph"
+#~ msgid "Lynchburg"
+#~ msgstr "Lynchburg"
 
-#: my-evolution/Locations.h:2148
-msgid "St Louis"
-msgstr "St Louis"
+#~ msgid "Lyneham"
+#~ msgstr "Lyneham"
 
-#: my-evolution/Locations.h:2149
-msgid "St Louis-Spirit"
-msgstr "St Louis-Spirit"
+#~ msgid "Lyon-Bron"
+#~ msgstr "Lyon-Bron"
 
-#: my-evolution/Locations.h:2150
-msgid "Stockholm (Arlanda)"
-msgstr "Stockholm (Arlanda)"
+#~ msgid "Lyon-Satolas"
+#~ msgstr "Lyon-Satolas"
 
-#: my-evolution/Locations.h:2151
-msgid "Stockholm (Bromma)"
-msgstr "Stockholm (Bromma)"
+#~ msgid "Maastricht"
+#~ msgstr "Maastricht"
 
-#: my-evolution/Locations.h:2152
-msgid "Stockton"
-msgstr "Stockton"
+#~ msgid "Macae"
+#~ msgstr "Macae"
 
-#: my-evolution/Locations.h:2153
-msgid "Stokmarknes/Skagen"
-msgstr "Stokmarknes/Skagen"
+#~ msgid "Macapa"
+#~ msgstr "Macapa"
 
-#: my-evolution/Locations.h:2154
-msgid "Stord/Sorstokken"
-msgstr "Stord/Sorstokken"
+#~ msgid "Maceio"
+#~ msgstr "Maceio"
 
-#: my-evolution/Locations.h:2155
-msgid "Storm Lake"
-msgstr "Storm Lake"
+#~ msgid "Macon"
+#~ msgstr "Macon"
 
-#: my-evolution/Locations.h:2156
-msgid "Stornoway"
-msgstr "Stornoway"
+#~ msgid "Madinah"
+#~ msgstr "Madinah"
 
-#: my-evolution/Locations.h:2157
-msgid "St Paul"
-msgstr "St Paul"
+#~ msgid "Madison"
+#~ msgstr "Madison"
 
-#: my-evolution/Locations.h:2158
-msgid "St Petersburg"
-msgstr "St Petersburg"
+#~ msgid "Madras/Minambakkam"
+#~ msgstr "Madras/Minambakkam"
 
-#: my-evolution/Locations.h:2159
-msgid "St Petersburg / Clearwater"
-msgstr "St Petersburg / Clearwater"
+#~ msgid "Madrid (Barajas)"
+#~ msgstr "Madrid (Barajas)"
 
-#: my-evolution/Locations.h:2160
-msgid "Strasbourg"
-msgstr "Strasbourg"
+#~ msgid "Madrid (Cuatro Vientos)"
+#~ msgstr "Madrid (Cuatro Vientos)"
 
-#: my-evolution/Locations.h:2161
-msgid "Strevell"
-msgstr "Strevell"
+#~ msgid "Magadan"
+#~ msgstr "Magadan"
 
-#: my-evolution/Locations.h:2162
-msgid "St Simon's Island"
-msgstr "St Simon's Island"
+#~ msgid "Magdalena"
+#~ msgstr "Magdalena"
 
-#: my-evolution/Locations.h:2163
-msgid "Stumpy Point"
-msgstr "Stumpy Point"
+#~ msgid "Maine"
+#~ msgstr "Maine"
 
-#: my-evolution/Locations.h:2164
-msgid "Sturgeon Bay"
-msgstr "Sturgeon Bay"
+#~ msgid "Makhachkala"
+#~ msgstr "Makhachkala"
 
-#: my-evolution/Locations.h:2165
-msgid "Stuttgart"
-msgstr "Stuttgart"
+#~ msgid "Makkah"
+#~ msgstr "Makkah"
 
-#: my-evolution/Locations.h:2166
-msgid "Sucre"
-msgstr "Sucre"
+#~ msgid "Makung"
+#~ msgstr "Makung"
 
-#: my-evolution/Locations.h:2167
-msgid "Sumburgh"
-msgstr "Sumburgh"
+#~ msgid "Malad City"
+#~ msgstr "Malad City"
 
-#: my-evolution/Locations.h:2168
-msgid "Sumter"
-msgstr "Sumter"
+#~ msgid "Malaga"
+#~ msgstr "Malaga"
 
-#: my-evolution/Locations.h:2169
-msgid "Sumter (2)"
-msgstr "Sumter (2)"
+#~ msgid "Malatya"
+#~ msgstr "Malatya"
 
-#: my-evolution/Locations.h:2170
-msgid "Sundsvall-Harnosand"
-msgstr "Sundsvall-Harnosand"
+#~ msgid "Maldonado/Punta Est"
+#~ msgstr "Maldonado/Punta Est"
 
-#: my-evolution/Locations.h:2171
-msgid "Sungshan/Taipei"
-msgstr "Sungshan/Taipei"
+#~ msgid "Malmo/Sturup"
+#~ msgstr "Malmo/Sturup"
 
-#: my-evolution/Locations.h:2172
-msgid "Superior"
-msgstr "Superior"
+#~ msgid "Mammoth Lakes"
+#~ msgstr "Mammoth Lakes"
 
-#: my-evolution/Locations.h:2174
-msgid "Sutton"
-msgstr "Sutton"
+#~ msgid "Managua"
+#~ msgstr "Managua"
 
-#: my-evolution/Locations.h:2175
-msgid "Suwon Ab"
-msgstr "Suwon Ab"
+#~ msgid "Manassas"
+#~ msgstr "Manassas"
 
-#: my-evolution/Locations.h:2176
-msgid "Svalbard"
-msgstr "Svalbard"
+#~ msgid "Manaus"
+#~ msgstr "Manaus"
 
-#: my-evolution/Locations.h:2177
-msgid "Svolvaer/Helle"
-msgstr "Svolvaer/Helle"
+#~ msgid "Manchester"
+#~ msgstr "Manchester"
 
-#: my-evolution/Locations.h:2179
-msgid "Swift Current"
-msgstr "Swift Current"
+#~ msgid "Mangilsan Ab"
+#~ msgstr "Mangilsan Ab"
 
-#: my-evolution/Locations.h:2181
-msgid "Sydney"
-msgstr "Sydney"
+#~ msgid "Manhattan"
+#~ msgstr "Manhattan"
 
-#: my-evolution/Locations.h:2182
-msgid "Syktyvkar"
-msgstr "Syktyvkar"
+#~ msgid "Manisa"
+#~ msgstr "Manisa"
 
-#: my-evolution/Locations.h:2183
-msgid "Sympheropol"
-msgstr "Sympheropol"
+#~ msgid "Manistee"
+#~ msgstr "Manistee"
 
-#: my-evolution/Locations.h:2184
-msgid "Syracuse"
-msgstr "Syracuse"
+#~ msgid "Manitoba"
+#~ msgstr "Manitoba"
 
-#: my-evolution/Locations.h:2185
-msgid "Szczecin"
-msgstr "Szczecin"
+#~ msgid "Manitowoc"
+#~ msgstr "Manitowoc"
 
-#: my-evolution/Locations.h:2186
-msgid "Szombathely"
-msgstr "Szombathely"
+#~ msgid "Mankato"
+#~ msgstr "Mankato"
 
-#: my-evolution/Locations.h:2187
-msgid "Tabatinga"
-msgstr "Tabatinga"
+#~ msgid "Mansfield"
+#~ msgstr "Mansfield"
 
-#: my-evolution/Locations.h:2188
-msgid "Tabriz"
-msgstr "Tabriz"
+#~ msgid "Manta"
+#~ msgstr "Manta"
 
-#: my-evolution/Locations.h:2189
-msgid "Tabuk"
-msgstr "Tabuk"
+#~ msgid "Manzanillo"
+#~ msgstr "Manzanillo"
 
-#: my-evolution/Locations.h:2190
-msgid "Tachikawa Ab"
-msgstr "Tachikawa Ab"
+#~ msgid "Maraba"
+#~ msgstr "Maraba"
 
-#: my-evolution/Locations.h:2191
-msgid "Tacna"
-msgstr "Tacna"
+#~ msgid "Maracaibo-La Chinita"
+#~ msgstr "Maracaibo-La Chinita"
 
-#: my-evolution/Locations.h:2192
-msgid "Tacoma"
-msgstr "Tacoma"
+#~ msgid "Maracay-B.A.Sucre"
+#~ msgstr "Maracay-B.A.Sucre"
 
-#: my-evolution/Locations.h:2193
-msgid "Tacoma-Lakewood"
-msgstr "Tacoma-Lakewood"
+#~ msgid "Marathon"
+#~ msgstr "Marathon"
 
-#: my-evolution/Locations.h:2194
-msgid "Tacuarembo"
-msgstr "Tacuarembo"
+#~ msgid "Mar Del Plata"
+#~ msgstr "Mar Del Plata"
 
-#: my-evolution/Locations.h:2195
-msgid "Taegu"
-msgstr "Taegu"
+#~ msgid "Margarita"
+#~ msgstr "Margarita"
 
-#: my-evolution/Locations.h:2196
-msgid "Taegu Ab"
-msgstr "Taegu Ab"
+#~ msgid "Marianna"
+#~ msgstr "Marianna"
 
-#: my-evolution/Locations.h:2197
-msgid "Taejon"
-msgstr "Taejon"
+#~ msgid "Marib"
+#~ msgstr "Marib"
 
-#: my-evolution/Locations.h:2198
-msgid "Tahoe Valley"
-msgstr "Tahoe Valley"
+#~ msgid "Maribor"
+#~ msgstr "Maribor"
 
-#: my-evolution/Locations.h:2199
-msgid "Taichung"
-msgstr "Taichung"
+#~ msgid "Marietta"
+#~ msgstr "Marietta"
 
-#: my-evolution/Locations.h:2200
-msgid "Taif"
-msgstr "Taif"
+#~ msgid "Marino di Ravenna"
+#~ msgstr "Marino di Ravenna"
 
-#: my-evolution/Locations.h:2201
-msgid "Tainan"
-msgstr "Tainan"
+#~ msgid "Marion"
+#~ msgstr "Marion"
 
-#: my-evolution/Locations.h:2203
-msgid "Taiyuan"
-msgstr "Taiyuan"
+#~ msgid "Marion-Wytheville"
+#~ msgstr "Marion-Wytheville"
 
-#: my-evolution/Locations.h:2204
-msgid "Taiz"
-msgstr "Taiz"
+#~ msgid "Marseille-Provence"
+#~ msgstr "Marseille-Provence"
 
-#: my-evolution/Locations.h:2205
-msgid "Tajima"
-msgstr "Tajima"
+#~ msgid "Marseilles"
+#~ msgstr "Marseilles"
 
-#: my-evolution/Locations.h:2206
-msgid "Takamatsu Airport"
-msgstr "Takamatsu Airport"
+#~ msgid "Marshall"
+#~ msgstr "Marshall"
 
-#: my-evolution/Locations.h:2207
-msgid "Talara"
-msgstr "Talara"
+#~ msgid "Marshalltown"
+#~ msgstr "Marshalltown"
 
-#: my-evolution/Locations.h:2208
-msgid "Talkeetna"
-msgstr "Talkeetna"
+#~ msgid "Marshfield"
+#~ msgstr "Marshfield"
 
-#: my-evolution/Locations.h:2209
-msgid "Tallahassee"
-msgstr "Tallahassee"
+#~ msgid "Marte"
+#~ msgstr "Marte"
 
-#: my-evolution/Locations.h:2210
-msgid "Tallinn"
-msgstr "Tallinn"
+#~ msgid "Marthas Vineyard"
+#~ msgstr "Marthas Vineyard"
 
-#: my-evolution/Locations.h:2211
-msgid "Tamanrasset"
-msgstr "Tamanrasset"
+#~ msgid "Martinsburg"
+#~ msgstr "Martinsburg"
 
-#: my-evolution/Locations.h:2212
-msgid "Tamanrasset/Aguenna"
-msgstr "Tamanrasset/Aguenna"
+#~ msgid "Martinsville"
+#~ msgstr "Martinsville"
 
-#: my-evolution/Locations.h:2213
-msgid "Tampa"
-msgstr "Tampa"
+#~ msgid "Maryland"
+#~ msgstr "Maryland"
 
-#: my-evolution/Locations.h:2214
-msgid "Tampa-Macdill AFB"
-msgstr "Tampa-Macdill AFB"
+#~ msgid "Marysville"
+#~ msgstr "Marysville"
 
-#: my-evolution/Locations.h:2215
-msgid "Tampere"
-msgstr "Tampere"
+#~ msgid "Marysville-Beale AFB"
+#~ msgstr "Marysville-Beale AFB"
 
-#: my-evolution/Locations.h:2216
-msgid "Tampico"
-msgstr "Tampico"
+#~ msgid "Mashhad"
+#~ msgstr "Mashhad"
 
-#: my-evolution/Locations.h:2217
-msgid "Tanana"
-msgstr "Tanana"
+#~ msgid "Masirah"
+#~ msgstr "Masirah"
 
-#: my-evolution/Locations.h:2218
-msgid "Tanegashima Airport"
-msgstr "Tanegashima Airport"
+#~ msgid "Mason City"
+#~ msgstr "Mason City"
 
-#: my-evolution/Locations.h:2219
-msgid "Taos"
-msgstr "Taos"
+#~ msgid "Massachusetts"
+#~ msgstr "Massachusetts"
 
-#: my-evolution/Locations.h:2220
-msgid "Taoyuan"
-msgstr "Taoyuan"
+#~ msgid "Massena"
+#~ msgstr "Massena"
 
-#: my-evolution/Locations.h:2221
-msgid "Tapachula"
-msgstr "Tapachula"
+#~ msgid "Matamoros"
+#~ msgstr "Matamoros"
 
-#: my-evolution/Locations.h:2222
-msgid "Taranto"
-msgstr "Taranto"
+#~ msgid "Matsumoto Airport"
+#~ msgstr "Matsumoto Airport"
 
-#: my-evolution/Locations.h:2223
-msgid "Tarbes"
-msgstr "Tarbes"
+#~ msgid "Matsushima Ab"
+#~ msgstr "Matsushima Ab"
 
-#: my-evolution/Locations.h:2224
-msgid "Tarija"
-msgstr "Tarija"
+#~ msgid "Matsuyama Airport"
+#~ msgstr "Matsuyama Airport"
 
-#: my-evolution/Locations.h:2225
-msgid "Tarvisio"
-msgstr "Tarvisio"
+#~ msgid "Mattoon"
+#~ msgstr "Mattoon"
 
-#: my-evolution/Locations.h:2226
-msgid "Tatalina"
-msgstr "Tatalina"
+#~ msgid "Mayaguez"
+#~ msgstr "Mayaguez"
 
-#: my-evolution/Locations.h:2227
-msgid "Tateyama Ab"
-msgstr "Tateyama Ab"
+#~ msgid "Mazatlan"
+#~ msgstr "Mazatlan"
 
-#: my-evolution/Locations.h:2228
-msgid "Taunton"
-msgstr "Taunton"
+#~ msgid "Mazu"
+#~ msgstr "Mazu"
 
-#: my-evolution/Locations.h:2229
-msgid "Tebessa"
-msgstr "Tebessa"
+#~ msgid "McAlester"
+#~ msgstr "McAlester"
 
-#: my-evolution/Locations.h:2230
-msgid "Tees-Side"
-msgstr "Tees-Side"
+#~ msgid "McAllen"
+#~ msgstr "McAllen"
 
-#: my-evolution/Locations.h:2231
-msgid "Tegucigalpa"
-msgstr "Tegucigalpa"
+#~ msgid "McCall"
+#~ msgstr "McCall"
 
-#: my-evolution/Locations.h:2232
-msgid "Tehran-Mehrabad"
-msgstr "Tehran-Mehrabad"
+#~ msgid "McCarthy"
+#~ msgstr "McCarthy"
 
-#: my-evolution/Locations.h:2233
-msgid "Tela"
-msgstr "Tela"
+#~ msgid "McClellan"
+#~ msgstr "McClellan"
 
-#: my-evolution/Locations.h:2234
-msgid "Temple"
-msgstr "Temple"
+#~ msgid "McComb"
+#~ msgstr "McComb"
 
-#: my-evolution/Locations.h:2235
-msgid "Tennessee"
-msgstr "Tennessee"
+#~ msgid "McCook"
+#~ msgstr "McCook"
 
-#: my-evolution/Locations.h:2236
-msgid "Tepic"
-msgstr "Tepic"
+#~ msgid "McGrath"
+#~ msgstr "McGrath"
 
-#: my-evolution/Locations.h:2237
-msgid "Teresina"
-msgstr "Teresina"
+#~ msgid "Mc Gregor"
+#~ msgstr "Mc Gregor"
 
-#: my-evolution/Locations.h:2238
-msgid "Terre Haute"
-msgstr "Terre Haute"
+#~ msgid "Meacham"
+#~ msgstr "Meacham"
 
-#: my-evolution/Locations.h:2239
-msgid "Terrell"
-msgstr "Terrell"
+#~ msgid "Medford"
+#~ msgstr "Medford"
 
-#: my-evolution/Locations.h:2240
-msgid "Teterboro"
-msgstr "Teterboro"
+#~ msgid "Medicine Lodge"
+#~ msgstr "Medicine Lodge"
 
-#: my-evolution/Locations.h:2241
-msgid "Texarkana"
-msgstr "Texarkana"
+#~ msgid "Mehamn"
+#~ msgstr "Mehamn"
 
-#: my-evolution/Locations.h:2242
-msgid "Texas"
-msgstr "Texas"
+#~ msgid "Mekoryuk"
+#~ msgstr "Mekoryuk"
 
-#: my-evolution/Locations.h:2243
-msgid "The Dalles"
-msgstr "The Dalles"
+#~ msgid "Melbourne"
+#~ msgstr "Melbourne"
 
-#: my-evolution/Locations.h:2244
-msgid "Thessaloniki"
-msgstr "Thessaloniki"
+#~ msgid "Melfa"
+#~ msgstr "Melfa"
 
-#: my-evolution/Locations.h:2245
-msgid "Thief River Falls"
-msgstr "Thief River Falls"
+#~ msgid "Melilla"
+#~ msgstr "Melilla"
 
-#: my-evolution/Locations.h:2246
-msgid "Thiruvananthapuram"
-msgstr "Thiruvananthapuram"
+#~ msgid "Memambetsu Airport"
+#~ msgstr "Memambetsu Airport"
 
-#: my-evolution/Locations.h:2247
-msgid "Thisted"
-msgstr "Thisted"
+#~ msgid "Memphis"
+#~ msgstr "Memphis"
 
-#: my-evolution/Locations.h:2248
-msgid "Thompson Falls"
-msgstr "Thompson Falls"
+#~ msgid "Memphis-NAS"
+#~ msgstr "Memphis-NAS"
 
-#: my-evolution/Locations.h:2249
-msgid "Thumrait"
-msgstr "Thumrait"
+#~ msgid "Mendoza"
+#~ msgstr "Mendoza"
 
-#: my-evolution/Locations.h:2250
-msgid "Tianjin"
-msgstr "Tianjin"
+#~ msgid "Mene Grande"
+#~ msgstr "Mene Grande"
 
-#: my-evolution/Locations.h:2251
-msgid "Tijuana"
-msgstr "Tijuana"
+#~ msgid "Menominee"
+#~ msgstr "Menominee"
 
-#: my-evolution/Locations.h:2252
-msgid "Timisoara"
-msgstr "Timisoara"
+#~ msgid "Menorca"
+#~ msgstr "Menorca"
 
-#: my-evolution/Locations.h:2253
-msgid "Tin City"
-msgstr "Tin City"
+#~ msgid "Merced"
+#~ msgstr "Merced"
 
-#: my-evolution/Locations.h:2254
-msgid "Tirana"
-msgstr "Tirana"
+#~ msgid "Merida"
+#~ msgstr "Merida"
 
-#: my-evolution/Locations.h:2255
-msgid "Tiree"
-msgstr "Tiree"
+#~ msgid "Meridian"
+#~ msgstr "Meridian"
 
-#: my-evolution/Locations.h:2256
-msgid "Tirgu Mures"
-msgstr "Tirgu Mures"
+#~ msgid "Meridian-Lauderdale"
+#~ msgstr "Meridian-Lauderdale"
 
-#: my-evolution/Locations.h:2257
-msgid "Tiruchchirapalli"
-msgstr "Tiruchchirapalli"
+#~ msgid "Merril Field"
+#~ msgstr "Merril Field"
 
-#: my-evolution/Locations.h:2258
-msgid "Titusville"
-msgstr "Titusville"
+#~ msgid "Mersa Matruh"
+#~ msgstr "Mersa Matruh"
 
-#: my-evolution/Locations.h:2259
-msgid "Tivat"
-msgstr "Tivat"
+#~ msgid "Mesa-Falcon Field"
+#~ msgstr "Mesa-Falcon Field"
 
-#: my-evolution/Locations.h:2260
-msgid "Tlemcen Zenata"
-msgstr "Tlemcen Zenata"
+#~ msgid "Metabaru Ab"
+#~ msgstr "Metabaru Ab"
 
-#: my-evolution/Locations.h:2261
-msgid "Tobias Bolanos"
-msgstr "Tobias Bolanos"
+#~ msgid "Metz-Frescaty"
+#~ msgstr "Metz-Frescaty"
 
-#: my-evolution/Locations.h:2262
-msgid "Tocumen"
-msgstr "Tocumen"
+#~ msgid "Mexicali"
+#~ msgstr "Mexicali"
 
-#: my-evolution/Locations.h:2263
-msgid "Togiak Village"
-msgstr "Togiak Village"
+#~ msgid "Miami"
+#~ msgstr "Miami"
 
-#: my-evolution/Locations.h:2264
-msgid "Tokachi GSDF"
-msgstr "Tokachi GSDF"
+#~ msgid "Miami-Kendall"
+#~ msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:2265
-msgid "Tokunoshima Island"
-msgstr "Tokunoshima Island"
+#~ msgid "Miami-Opa Locka"
+#~ msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:2266
-msgid "Tokushima Ab"
-msgstr "Tokushima Ab"
+#~ msgid "Michigan"
+#~ msgstr "Michigan"
 
-#: my-evolution/Locations.h:2267
-msgid "Tokyo Heliport"
-msgstr "Tokyo Heliport"
+#~ msgid "Middle East"
+#~ msgstr "Orta Şərq"
 
-#: my-evolution/Locations.h:2268
-msgid "Tokyo International Airport"
-msgstr "Tokyo International Airport"
+#~ msgid "Middleton Island"
+#~ msgstr "Middleton Island"
 
-#: my-evolution/Locations.h:2269
-msgid "Tokyo New International Airport"
-msgstr "Tokyo New International Airport"
+#~ msgid "Middletown"
+#~ msgstr "Middletown"
 
-#: my-evolution/Locations.h:2270
-msgid "Toledo"
-msgstr "Toledo"
+#~ msgid "Midland"
+#~ msgstr "Midland"
 
-#: my-evolution/Locations.h:2271
-msgid "Toluca"
-msgstr "Toluca"
+#~ msgid "Miho Ab"
+#~ msgstr "Miho Ab"
 
-#: my-evolution/Locations.h:2272
-msgid "Tonopah"
-msgstr "Tonopah"
+#~ msgid "Milano/Linate"
+#~ msgstr "Milano/Linate"
 
-#: my-evolution/Locations.h:2273
-msgid "Topeka"
-msgstr "Topeka"
+#~ msgid "Milano/Malpensa"
+#~ msgstr "Milano/Malpensa"
 
-#: my-evolution/Locations.h:2274
-msgid "Topeka-Forbes Field"
-msgstr "Topeka-Forbes Field"
+#~ msgid "Miles City"
+#~ msgstr "Miles City"
 
-#: my-evolution/Locations.h:2275
-msgid "Torino/Bric Della Croce"
-msgstr "Torino/Bric Della Croce"
+#~ msgid "Milford"
+#~ msgstr "Milford"
 
-#: my-evolution/Locations.h:2276
-msgid "Torino/Caselle"
-msgstr "Torino/Caselle"
+#~ msgid "Millinocket"
+#~ msgstr "Millinocket"
 
-#: my-evolution/Locations.h:2277
-msgid "Toronto"
-msgstr "Toronto"
+#~ msgid "Millville"
+#~ msgstr "Millville"
 
-#: my-evolution/Locations.h:2278
-msgid "Torp"
-msgstr "Torp"
+#~ msgid "Milton"
+#~ msgstr "Milton"
 
-#: my-evolution/Locations.h:2279
-msgid "Torrance"
-msgstr "Torrance"
+#~ msgid "Milwaukee"
+#~ msgstr "Milwaukee"
 
-#: my-evolution/Locations.h:2280
-msgid "Torreon"
-msgstr "Torreon"
+#~ msgid "Milwaukee-Timmerman"
+#~ msgstr "Milwaukee-Timmerman"
 
-#: my-evolution/Locations.h:2281
-msgid "Tottori Airport"
-msgstr "Tottori Airport"
+#~ msgid "Minamitorishima"
+#~ msgstr "Minamitorishima"
 
-#: my-evolution/Locations.h:2282
-msgid "Toulouse"
-msgstr "Toulouse"
+#~ msgid "Minatitlan"
+#~ msgstr "Minatitlan"
 
-#: my-evolution/Locations.h:2283
-msgid "Toul-Rosieres"
-msgstr "Toul-Rosieres"
+#~ msgid "Minchumina"
+#~ msgstr "Minchumina"
 
-#: my-evolution/Locations.h:2284
-msgid "Tours-St-Symphorien"
-msgstr "Tours-St-Symphorien"
+#~ msgid "Mineralnye Vody"
+#~ msgstr "Mineralnye Vody"
 
-#: my-evolution/Locations.h:2285
-msgid "Toussus-Le Noble"
-msgstr "Toussus-Le Noble"
+#~ msgid "Mineral Wells"
+#~ msgstr "Mineral Wells"
 
-#: my-evolution/Locations.h:2286
-msgid "Townsville"
-msgstr "Townsville"
+#~ msgid "Minneapolis"
+#~ msgstr "Minneapolis"
 
-#: my-evolution/Locations.h:2287
-msgid "Toyama Airport"
-msgstr "Toyama Airport"
+#~ msgid "Minneapolis [2]"
+#~ msgstr "Minneapolis [2]"
 
-#: my-evolution/Locations.h:2288
-msgid "Trabzon"
-msgstr "Trabzon"
+#~ msgid "Minneapolis [3]"
+#~ msgstr "Minneapolis [3]"
 
-#: my-evolution/Locations.h:2289
-msgid "Trapani"
-msgstr "Trapani"
+#~ msgid "Minnesota"
+#~ msgstr "Minnesota"
 
-#: my-evolution/Locations.h:2290
-msgid "Traverse City"
-msgstr "Traverse City"
+#~ msgid "Minocqua"
+#~ msgstr "Minocqua"
 
-#: my-evolution/Locations.h:2291
-msgid "Trelew"
-msgstr "Trelew"
+#~ msgid "Minot"
+#~ msgstr "Minot"
 
-#: my-evolution/Locations.h:2292
-msgid "Trenton"
-msgstr "Trenton"
+#~ msgid "Minot AFB"
+#~ msgstr "Minot AFB"
 
-#: my-evolution/Locations.h:2293
-msgid "Trevico"
-msgstr "Trevico"
+#~ msgid "Misawa Ab"
+#~ msgstr "Misawa Ab"
 
-#: my-evolution/Locations.h:2294
-msgid "Treviso/Istrana"
-msgstr "Treviso/Istrana"
+#~ msgid "Mississippi"
+#~ msgstr "Mississippi"
 
-#: my-evolution/Locations.h:2295
-msgid "Treviso/S.Angelo"
-msgstr "Treviso/S.Angelo"
+#~ msgid "Missoula"
+#~ msgstr "Missoula"
 
-#: my-evolution/Locations.h:2296
-msgid "Trieste"
-msgstr "Trieste"
+#~ msgid "Missouri"
+#~ msgstr "Missouri"
 
-#: my-evolution/Locations.h:2297
-msgid "Trinidad"
-msgstr "Trinidad"
+#~ msgid "Mitchell"
+#~ msgstr "Mitchell"
 
-#: my-evolution/Locations.h:2298
-msgid "Tripoli"
-msgstr "Tripoli"
+#~ msgid "Mitilini"
+#~ msgstr "Mitilini"
 
-#: my-evolution/Locations.h:2299
-msgid "Tromso/Langnes"
-msgstr "Tromso/Langnes"
+#~ msgid "Miyakejima Airport"
+#~ msgstr "Miyakejima Airport"
 
-#: my-evolution/Locations.h:2300
-msgid "Trondheim/Vaernes"
-msgstr "Trondheim/Vaernes"
+#~ msgid "Miyazaki Airport"
+#~ msgstr "Miyazaki Airport"
 
-#: my-evolution/Locations.h:2301
-msgid "Troutdale"
-msgstr "Troutdale"
+#~ msgid "Moa"
+#~ msgstr "Moa"
 
-#: my-evolution/Locations.h:2302
-msgid "Troyes/Barberey"
-msgstr "Troyes/Barberey"
+#~ msgid "Mobile Downtown"
+#~ msgstr "Mobile Downtown"
 
-#: my-evolution/Locations.h:2303
-msgid "Truckee"
-msgstr "Truckee"
+#~ msgid "Mobile Regional Airport"
+#~ msgstr "Mobile Regional Airport"
 
-#: my-evolution/Locations.h:2304
-msgid "Truth or Consequences"
-msgstr "Truth or Consequences"
+#~ msgid "Mobridge"
+#~ msgstr "Mobridge"
 
-#: my-evolution/Locations.h:2305
-msgid "Tsuiki Ab"
-msgstr "Tsuiki Ab"
+#~ msgid "Modesto"
+#~ msgstr "Modesto"
 
-#: my-evolution/Locations.h:2306
-msgid "Tsushima Airport"
-msgstr "Tsushima Airport"
+#~ msgid "Mo I Rana"
+#~ msgstr "Mo I Rana"
 
-#: my-evolution/Locations.h:2307
-msgid "Tucson"
-msgstr "Tucson"
+#~ msgid "Mojave"
+#~ msgstr "Mojave"
 
-#: my-evolution/Locations.h:2308
-msgid "Tucson-Davis AFB"
-msgstr "Tucson-Davis AFB"
+#~ msgid "Molde"
+#~ msgstr "Molde"
 
-#: my-evolution/Locations.h:2309
-msgid "Tucuman"
-msgstr "Tucuman"
+#~ msgid "Moldova"
+#~ msgstr "Moldova"
 
-#: my-evolution/Locations.h:2310
-msgid "Tucumcari"
-msgstr "Tucumcari"
+#~ msgid "Moline-Quad Cities"
+#~ msgstr "Moline-Quad Cities"
 
-#: my-evolution/Locations.h:2311
-msgid "Tucurui"
-msgstr "Tucurui"
+#~ msgid "Molokai"
+#~ msgstr "Molokai"
 
-#: my-evolution/Locations.h:2312
-msgid "Tulancingo"
-msgstr "Tulancingo"
+#~ msgid "Mombetsu Airport"
+#~ msgstr "Mombetsu Airport"
 
-#: my-evolution/Locations.h:2313
-msgid "Tulcea"
-msgstr "Tulcea"
+#~ msgid "Monchengladbach"
+#~ msgstr "Monchengladbach"
 
-#: my-evolution/Locations.h:2314
-msgid "Tulsa"
-msgstr "Tulsa"
+#~ msgid "Monclova"
+#~ msgstr "Monclova"
 
-#: my-evolution/Locations.h:2315
-msgid "Tupelo"
-msgstr "Tupelo"
+#~ msgid "Moncton"
+#~ msgstr "Moncton"
 
-#: my-evolution/Locations.h:2316
-msgid "Turaif"
-msgstr "Turaif"
+#~ msgid "Monida"
+#~ msgstr "Monida"
 
-#: my-evolution/Locations.h:2317
-msgid "Turin"
-msgstr "Turin"
+#~ msgid "Monpellier-Mediterrannee"
+#~ msgstr "Monpellier-Mediterrannee"
 
-#: my-evolution/Locations.h:2319
-msgid "Turku"
-msgstr "Turku"
+#~ msgid "Monroe"
+#~ msgstr "Monroe"
 
-#: my-evolution/Locations.h:2320
-msgid "Tuscaloosa"
-msgstr "Tuscaloosa"
+#~ msgid "Montague"
+#~ msgstr "Montague"
 
-#: my-evolution/Locations.h:2321
-msgid "Tuxtla Gutierrez"
-msgstr "Tuxtla Gutierrez"
+#~ msgid "Montana"
+#~ msgstr "Montana"
 
-#: my-evolution/Locations.h:2322
-msgid "Twenthe"
-msgstr "Twenthe"
+#~ msgid "Mont-de-Marsan"
+#~ msgstr "Mont-de-Marsan"
 
-#: my-evolution/Locations.h:2323
-msgid "Twentynine Palms"
-msgstr "Twentynine Palms"
+#~ msgid "Monte Argentario"
+#~ msgstr "Monte Argentario"
 
-#: my-evolution/Locations.h:2324
-msgid "Twin Falls"
-msgstr "Twin Falls"
+#~ msgid "Monte Bisbino"
+#~ msgstr "Monte Bisbino"
 
-#: my-evolution/Locations.h:2325
-msgid "Tyler"
-msgstr "Tyler"
+#~ msgid "Monte Calamita"
+#~ msgstr "Monte Calamita"
 
-#: my-evolution/Locations.h:2326
-msgid "Tyndall AFB"
-msgstr "Tyndall AFB"
+#~ msgid "Monte Cimone"
+#~ msgstr "Monte Cimone"
 
-#: my-evolution/Locations.h:2327
-msgid "Tyumen"
-msgstr "Tyumen"
+#~ msgid "Montego Bay"
+#~ msgstr "Montego Bay"
 
-#: my-evolution/Locations.h:2328
-msgid "Uberaba"
-msgstr "Uberaba"
+#~ msgid "Monte Malanotte"
+#~ msgstr "Monte Malanotte"
 
-#: my-evolution/Locations.h:2329
-msgid "Ufa"
-msgstr "Ufa"
+#~ msgid "Monterey"
+#~ msgstr "Monterey"
 
-#: my-evolution/Locations.h:2330
-msgid "Ukiah"
-msgstr "Ukiah"
+#~ msgid "Monterrey"
+#~ msgstr "Monterrey"
 
-#: my-evolution/Locations.h:2332
-msgid "Ulan-Ude"
-msgstr "Ulan-Ude"
+#~ msgid "Monte Scuro"
+#~ msgstr "Monte Scuro"
 
-#: my-evolution/Locations.h:2333
-msgid "Ulsan"
-msgstr "Ulsan"
+#~ msgid "Monte Terminillo"
+#~ msgstr "Monte Terminillo"
 
-#: my-evolution/Locations.h:2334
-msgid "Ulyanovsk"
-msgstr "Ulyanovsk"
+#~ msgid "Montevideo/Carrasco"
+#~ msgstr "Montevideo/Carrasco"
 
-#: my-evolution/Locations.h:2335
-msgid "Umea"
-msgstr "Umea"
+#~ msgid "Montgomery"
+#~ msgstr "Montgomery"
 
-#: my-evolution/Locations.h:2336
-msgid "Umiat"
-msgstr "Umiat"
+#~ msgid "Montgomery-Maxwell AFB"
+#~ msgstr "Montgomery-Maxwell AFB"
 
-#: my-evolution/Locations.h:2337
-msgid "Unalakleet"
-msgstr "Unalakleet"
+#~ msgid "Monticello"
+#~ msgstr "Monticello"
 
-#: my-evolution/Locations.h:2338
-msgid "United Arab Emirates "
-msgstr "Birləşmiş Ərəb Əmirlikləri"
+#~ msgid "Montpelier"
+#~ msgstr "Montpelier"
 
-#: my-evolution/Locations.h:2341
-msgid "Unst"
-msgstr "Unst"
+#~ msgid "Montreal Dorval"
+#~ msgstr "Montreal Dorval"
 
-#: my-evolution/Locations.h:2342
-msgid "Upington"
-msgstr "Upington"
+#~ msgid "Montreal Mirabel"
+#~ msgstr "Montreal Mirabel"
 
-#: my-evolution/Locations.h:2343
-msgid "Uruapan"
-msgstr "Uruapan"
+#~ msgid "Montreal Saint-Hubert"
+#~ msgstr "Montreal Saint-Hubert"
 
-#: my-evolution/Locations.h:2344
-msgid "Uruguaiana"
-msgstr "Uruguaiana"
+#~ msgid "Montrose"
+#~ msgstr "Montrose"
 
-#: my-evolution/Locations.h:2346
-msgid "Urumqi"
-msgstr "Urumqi"
+#~ msgid "Montrose (2)"
+#~ msgstr "Montrose (2)"
 
-#: my-evolution/Locations.h:2347
-msgid "Utah"
-msgstr "Utah"
+#~ msgid "Morelia"
+#~ msgstr "Morelia"
 
-#: my-evolution/Locations.h:2348
-msgid "Utica"
-msgstr "Utica"
+#~ msgid "Morgantown"
+#~ msgstr "Morgantown"
 
-#: my-evolution/Locations.h:2349
-msgid "Utrecht/Soesterberg"
-msgstr "Utrecht/Soesterberg"
+#~ msgid "Moriarty"
+#~ msgstr "Moriarty"
 
-#: my-evolution/Locations.h:2350
-msgid "Utsunomiya Ab"
-msgstr "Utsunomiya Ab"
+#~ msgid "Morristown"
+#~ msgstr "Morristown"
 
-#: my-evolution/Locations.h:2351
-msgid "Uzhgorod"
-msgstr "Uzhgorod"
+#~ msgid "Moscow Domodedovo"
+#~ msgstr "Moscow Domodedovo"
 
-#: my-evolution/Locations.h:2352
-msgid "Vadso"
-msgstr "Vadso"
+#~ msgid "Moscow Sheremetyevo"
+#~ msgstr "Moscow Sheremetyevo"
 
-#: my-evolution/Locations.h:2353
-msgid "Vaerlose"
-msgstr "Vaerlose"
+#~ msgid "Moses Lake"
+#~ msgstr "Moses Lake"
 
-#: my-evolution/Locations.h:2354
-msgid "Vagar"
-msgstr "Vagar"
+#~ msgid "Mosinee"
+#~ msgstr "Mosinee"
 
-#: my-evolution/Locations.h:2355
-msgid "Valdez 2"
-msgstr "Valdez 2"
+#~ msgid "Mosjoen"
+#~ msgstr "Mosjoen"
 
-#: my-evolution/Locations.h:2356
-msgid "Valdosta"
-msgstr "Valdosta"
+#~ msgid "Moultrie"
+#~ msgstr "Moultrie"
 
-#: my-evolution/Locations.h:2357
-msgid "Valdosta-Moody AFB"
-msgstr "Valdosta-Moody AFB"
+#~ msgid "Mountain Home"
+#~ msgstr "Mountain Home"
 
-#: my-evolution/Locations.h:2358
-msgid "Valencia"
-msgstr "Valencia"
+#~ msgid "Mountain View"
+#~ msgstr "Mountain View"
 
-#: my-evolution/Locations.h:2359
-msgid "Valentine"
-msgstr "Valentine"
+#~ msgid "Mount Clemens"
+#~ msgstr "Mount Clemens"
 
-#: my-evolution/Locations.h:2360
-msgid "Valera*"
-msgstr "Valera*"
+#~ msgid "Mount Holly"
+#~ msgstr "Mount Holly"
 
-#: my-evolution/Locations.h:2361
-msgid "Valkenburg"
-msgstr "Valkenburg"
+#~ msgid "Mount Shasta"
+#~ msgstr "Mount Shasta"
 
-#: my-evolution/Locations.h:2362
-msgid "Valley"
-msgstr "Valley"
+#~ msgid "Mount Vernon"
+#~ msgstr "Mount Vernon"
 
-#: my-evolution/Locations.h:2363
-msgid "Valparaiso"
-msgstr "Valparaiso"
+#~ msgid "Mount Wilson"
+#~ msgstr "Mount Wilson"
 
-#: my-evolution/Locations.h:2364
-msgid "Valparaiso-Eglin AFB"
-msgstr "Valparaiso-Eglin AFB"
+#~ msgid "Mt Washington"
+#~ msgstr "Mt Washington"
 
-#: my-evolution/Locations.h:2365
-msgid "Van"
-msgstr "Van"
+#~ msgid "Mugla/Dalaman"
+#~ msgstr "Mugla/Dalaman"
 
-#: my-evolution/Locations.h:2366
-msgid "Vancouver"
-msgstr "Vancouver"
+#~ msgid "Muir"
+#~ msgstr "Muir"
 
-#: my-evolution/Locations.h:2367
-msgid "Vandel"
-msgstr "Vandel"
+#~ msgid "Mullan"
+#~ msgstr "Mullan"
 
-#: my-evolution/Locations.h:2368
-msgid "Vandenberg AFB"
-msgstr "Vandenberg AFB"
+#~ msgid "Mullen"
+#~ msgstr "Mullen"
 
-#: my-evolution/Locations.h:2369
-msgid "Vandenberg Range"
-msgstr "Vandenberg Range"
+#~ msgid "Munchen"
+#~ msgstr "Munchen"
 
-#: my-evolution/Locations.h:2370
-msgid "Van Nuys"
-msgstr "Van Nuys"
+#~ msgid "Muncie"
+#~ msgstr "Muncie"
 
-#: my-evolution/Locations.h:2371
-msgid "Varadero"
-msgstr "Varadero"
+#~ msgid "Munster/Osnabruck"
+#~ msgstr "Munster/Osnabruck"
 
-#: my-evolution/Locations.h:2372
-msgid "Varanasi/Babatpur"
-msgstr "Varanasi/Babatpur"
+#~ msgid "Murcia"
+#~ msgstr "Murcia"
 
-#: my-evolution/Locations.h:2373
-msgid "Varna"
-msgstr "Varna"
+#~ msgid "Murmansk"
+#~ msgstr "Murmansk"
 
-#: my-evolution/Locations.h:2374
-msgid "Vasteras"
-msgstr "Vasteras"
+#~ msgid "Mus"
+#~ msgstr "Mus"
 
-#: my-evolution/Locations.h:2375
-msgid "Vaxjo"
-msgstr "Vaxjo"
+#~ msgid "Muscatine"
+#~ msgstr "Muscatine"
 
-#: my-evolution/Locations.h:2376
-msgid "Venezia"
-msgstr "Venezia"
+#~ msgid "Muscle Shoals"
+#~ msgstr "Muscle Shoals"
 
-#: my-evolution/Locations.h:2378
-msgid "Venice"
-msgstr "Venice"
+#~ msgid "Muskegon"
+#~ msgstr "Muskegon"
 
-#: my-evolution/Locations.h:2379
-msgid "Veracruz"
-msgstr "Veracruz"
+#~ msgid "Mykonos"
+#~ msgstr "Mykonos"
 
-#: my-evolution/Locations.h:2380
-msgid "Vermillion"
-msgstr "Vermillion"
+#~ msgid "Myrtle Beach"
+#~ msgstr "Myrtle Beach"
 
-#: my-evolution/Locations.h:2381
-msgid "Vermont"
-msgstr "Vermont"
+#~ msgid "Nabesna/Devil Mt."
+#~ msgstr "Nabesna/Devil Mt."
 
-#: my-evolution/Locations.h:2382
-msgid "Vernal"
-msgstr "Vernal"
+#~ msgid "Nacogdoches"
+#~ msgstr "Nacogdoches"
 
-#: my-evolution/Locations.h:2383
-msgid "Vero Beach"
-msgstr "Vero Beach"
+#~ msgid "Nagasaki Airport"
+#~ msgstr "Nagasaki Airport"
 
-#: my-evolution/Locations.h:2384
-msgid "Vicenza"
-msgstr "Vicenza"
+#~ msgid "Nagoya Airport"
+#~ msgstr "Nagoya Airport"
 
-#: my-evolution/Locations.h:2385
-msgid "Vichy-Charmeil"
-msgstr "Vichy-Charmeil"
+#~ msgid "Nagpur Sonegaon"
+#~ msgstr "Nagpur Sonegaon"
 
-#: my-evolution/Locations.h:2386
-msgid "Vichy-Rolla"
-msgstr "Vichy-Rolla"
+#~ msgid "Naha Airport"
+#~ msgstr "Naha Airport"
 
-#: my-evolution/Locations.h:2387
-msgid "Vicksburg"
-msgstr "Vicksburg"
+#~ msgid "Najran"
+#~ msgstr "Najran"
 
-#: my-evolution/Locations.h:2388
-msgid "Victoria"
-msgstr "Victoria"
+#~ msgid "Nakashibetsu Airport"
+#~ msgstr "Nakashibetsu Airport"
 
-#: my-evolution/Locations.h:2390
-msgid "Vigo"
-msgstr "Vigo"
+#~ msgid "Nalchik"
+#~ msgstr "Nalchik"
 
-#: my-evolution/Locations.h:2391
-msgid "Vilhena"
-msgstr "Vilhena"
+#~ msgid "Namsos"
+#~ msgstr "Namsos"
 
-#: my-evolution/Locations.h:2392
-msgid "Villacoublay"
-msgstr "Villacoublay"
+#~ msgid "Nancy-Essey"
+#~ msgstr "Nancy-Essey"
 
-#: my-evolution/Locations.h:2393
-msgid "Villafranca"
-msgstr "Villafranca"
+#~ msgid "Nancy-Ochey"
+#~ msgstr "Nancy-Ochey"
 
-#: my-evolution/Locations.h:2394
-msgid "Villahermosa"
-msgstr "Villahermosa"
+#~ msgid "Nankishirahama Airport"
+#~ msgstr "Nankishirahama Airport"
 
-#: my-evolution/Locations.h:2395
-msgid "Villamontes"
-msgstr "Villamontes"
+#~ msgid "Nanning"
+#~ msgstr "Nanning"
 
-#: my-evolution/Locations.h:2396
-msgid "Villa Reynolds"
-msgstr "Villa Reynolds"
+#~ msgid "Nantes Adlantique"
+#~ msgstr "Nantes Adlantique"
 
-#: my-evolution/Locations.h:2397
-msgid "Vilnius"
-msgstr "Vilnius"
+#~ msgid "Nantucket"
+#~ msgstr "Nantucket"
 
-#: my-evolution/Locations.h:2398
-msgid "Virginia"
-msgstr "Virginia"
+#~ msgid "Napa"
+#~ msgstr "Napa"
 
-#: my-evolution/Locations.h:2399
-msgid "Virginia Beach"
-msgstr "Virginia Beach"
+#~ msgid "Naples"
+#~ msgstr "Naples"
 
-#: my-evolution/Locations.h:2400
-msgid "Virginia Tech Airport"
-msgstr "Virginia Tech Airport"
+#~ msgid "Napoli"
+#~ msgstr "Napoli"
 
-#: my-evolution/Locations.h:2401
-msgid "Viru-Viru"
-msgstr "Viru-Viru"
+#~ msgid "Narvik"
+#~ msgstr "Narvik"
 
-#: my-evolution/Locations.h:2402
-msgid "Visalia"
-msgstr "Visalia"
+#~ msgid "Nasa Shuttle"
+#~ msgstr "Nasa Shuttle"
 
-#: my-evolution/Locations.h:2403
-msgid "Visby"
-msgstr "Visby"
+#~ msgid "Nashua"
+#~ msgstr "Nashua"
 
-#: my-evolution/Locations.h:2404
-msgid "Viterbo"
-msgstr "Viterbo"
+#~ msgid "Nashville"
+#~ msgstr "Nashville"
 
-#: my-evolution/Locations.h:2405
-msgid "Vitoria"
-msgstr "Vitoria"
+#~ msgid "Nassau"
+#~ msgstr "Nassau"
 
-#: my-evolution/Locations.h:2406
-msgid "Vladikavkaz"
-msgstr "Vladikavkaz"
+#~ msgid "Natal"
+#~ msgstr "Natal"
 
-#: my-evolution/Locations.h:2407
-msgid "Vladivostok"
-msgstr "Vladivostok"
+#~ msgid "Natchez"
+#~ msgstr "Natchez"
 
-#: my-evolution/Locations.h:2408
-msgid "Vlieland"
-msgstr "Vlieland"
+#~ msgid "Nawabshah"
+#~ msgstr "Nawabshah"
 
-#: my-evolution/Locations.h:2409
-msgid "Vojens/Skrydstrup"
-msgstr "Vojens/Skrydstrup"
+#~ msgid "Nebraska"
+#~ msgstr "Nebraska"
 
-#: my-evolution/Locations.h:2410
-msgid "Volgograd"
-msgstr "Volgograd"
+#~ msgid "Needles"
+#~ msgstr "Needles"
 
-#: my-evolution/Locations.h:2411
-msgid "Volkel"
-msgstr "Volkel"
+#~ msgid "Nenana"
+#~ msgstr "Nenana"
 
-#: my-evolution/Locations.h:2412
-msgid "Volk Field"
-msgstr "Volk Field"
+#~ msgid "Neuquen"
+#~ msgstr "Neuquen"
 
-#: my-evolution/Locations.h:2413
-msgid "Voronezh"
-msgstr "Voronezh"
+#~ msgid "Nevada"
+#~ msgstr "Nevada"
 
-#: my-evolution/Locations.h:2414
-msgid "Voslau"
-msgstr "Voslau"
+#~ msgid "Newark"
+#~ msgstr "Newark"
 
-#: my-evolution/Locations.h:2415
-msgid "Waco"
-msgstr "Waco"
+#~ msgid "New Bedford"
+#~ msgstr "New Bedford"
 
-#: my-evolution/Locations.h:2416
-msgid "Wadi Al Dawasser Airport"
-msgstr "Wadi Al Dawasser Airport"
+#~ msgid "New Bern"
+#~ msgstr "New Bern"
 
-#: my-evolution/Locations.h:2417
-msgid "Wainwright"
-msgstr "Wainwright"
+#~ msgid "New Braunfels"
+#~ msgstr "New Braunfels"
 
-#: my-evolution/Locations.h:2418
-msgid "Wakefield"
-msgstr "Wakefield"
+#~ msgid "New Brunswick"
+#~ msgstr "New Brunswick"
 
-#: my-evolution/Locations.h:2419
-msgid "Wakkanai Airport"
-msgstr "Wakkanai Airport"
+#~ msgid "Newburgh"
+#~ msgstr "Newburgh"
 
-#: my-evolution/Locations.h:2420
-msgid "Walla Walla"
-msgstr "Walla Walla"
+#~ msgid "Newcastle"
+#~ msgstr "Newcastle"
 
-#: my-evolution/Locations.h:2421
-msgid "Wallops Island"
-msgstr "Wallops Island"
+#~ msgid "New Delhi/Palam"
+#~ msgstr "New Delhi/Palam"
 
-#: my-evolution/Locations.h:2422
-msgid "Walnut Ridge"
-msgstr "Walnut Ridge"
+#~ msgid "Newfoundland"
+#~ msgstr "Newfoundland"
 
-#: my-evolution/Locations.h:2423
-msgid "Warner Robins"
-msgstr "Warner Robins"
+#~ msgid "New Hampshire"
+#~ msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:2424
-msgid "Warroad"
-msgstr "Warroad"
+#~ msgid "New Haven"
+#~ msgstr "New Haven"
 
-#: my-evolution/Locations.h:2425
-msgid "Warszawa"
-msgstr "Warszawa"
+#~ msgid "New Iberia"
+#~ msgstr "New Iberia"
 
-#: my-evolution/Locations.h:2426
-msgid "Washington"
-msgstr "Washington"
+#~ msgid "New Jersey"
+#~ msgstr "New Jersey"
 
-#: my-evolution/Locations.h:2427
-msgid "Washington/Dulles"
-msgstr "Washington/Dulles"
+#~ msgid "New Mexico"
+#~ msgstr "New Mexico"
 
-#: my-evolution/Locations.h:2428
-msgid "Waterbury"
-msgstr "Waterbury"
+#~ msgid "New Orleans"
+#~ msgstr "New Orleans"
 
-#: my-evolution/Locations.h:2429
-msgid "Waterloo"
-msgstr "Waterloo"
+#~ msgid "New Orleans-Lakefront"
+#~ msgstr "New Orleans-Lakefront"
 
-#: my-evolution/Locations.h:2430
-msgid "Watertown"
-msgstr "Watertown"
+#~ msgid "New Orleans NAS"
+#~ msgstr "New Orleans NAS"
 
-#: my-evolution/Locations.h:2431
-msgid "Waterville"
-msgstr "Waterville"
+#~ msgid "Newport"
+#~ msgstr "Newport"
 
-#: my-evolution/Locations.h:2432
-msgid "Waukesha"
-msgstr "Waukesha"
+#~ msgid "Newport News"
+#~ msgstr "Newport News"
 
-#: my-evolution/Locations.h:2433
-msgid "Wausau"
-msgstr "Wausau"
+#~ msgid "New Port Richey"
+#~ msgstr "New Port Richey"
 
-#: my-evolution/Locations.h:2434
-msgid "Waycross"
-msgstr "Waycross"
+#~ msgid "New River"
+#~ msgstr "New River"
 
-#: my-evolution/Locations.h:2435
-msgid "Waynesboro"
-msgstr "Waynesboro"
+#~ msgid "New Tokyo International Airport"
+#~ msgstr "New Tokyo International Airport"
 
-#: my-evolution/Locations.h:2436
-msgid "Webster City"
-msgstr "Webster City"
+#~ msgid "Newton"
+#~ msgstr "Newton"
 
-#: my-evolution/Locations.h:2437
-msgid "Wejh"
-msgstr "Wejh"
+#~ msgid "New York"
+#~ msgstr "New York"
 
-#: my-evolution/Locations.h:2438
-msgid "Wellington"
-msgstr "Wellington"
+#~ msgid "New York-JFK Arpt"
+#~ msgstr "New York-JFK Arpt"
 
-#: my-evolution/Locations.h:2439
-msgid "Wenatchee"
-msgstr "Wenatchee"
+#~ msgid "New York-La Guardia"
+#~ msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:2440
-msgid "Wendover"
-msgstr "Wendover"
+#~ msgid "Niagara Falls"
+#~ msgstr "Niagara Falls"
 
-#: my-evolution/Locations.h:2441
-msgid "West Atlanta"
-msgstr "West Atlanta"
+#~ msgid "Nice-Cote d'Azur"
+#~ msgstr "Nice-Cote d'Azur"
 
-#: my-evolution/Locations.h:2442
-msgid "West Burke"
-msgstr "West Burke"
+#~ msgid "Niigata Airport"
+#~ msgstr "Niigata Airport"
 
-#: my-evolution/Locations.h:2443
-msgid "Westerland"
-msgstr "Westerland"
+#~ msgid "Nimes-Garons"
+#~ msgstr "Nimes-Garons"
 
-#: my-evolution/Locations.h:2444
-msgid "Westfield"
-msgstr "Westfield"
+#~ msgid "Nipawin"
+#~ msgstr "Nipawin"
 
-#: my-evolution/Locations.h:2445
-msgid "Westhampton"
-msgstr "Westhampton"
+#~ msgid "Nis"
+#~ msgstr "Nis"
 
-#: my-evolution/Locations.h:2446
-msgid "West Palm Beach"
-msgstr "West Palm Beach"
+#~ msgid "Nizhny Novgorod"
+#~ msgstr "Nizhny Novgorod"
 
-#: my-evolution/Locations.h:2447
-msgid "West Virginia"
-msgstr "West Virginia"
+#~ msgid "N Las Vegas"
+#~ msgstr "N Las Vegas"
 
-#: my-evolution/Locations.h:2448
-msgid "West Yellowstone"
-msgstr "West Yellowstone"
+#~ msgid "N Myrtle Beach"
+#~ msgstr "N Myrtle Beach"
 
-#: my-evolution/Locations.h:2449
-msgid "West Yellowstone (2)"
-msgstr "West Yellowstone (2)"
+#~ msgid "Nogales"
+#~ msgstr "Nogales"
 
-#: my-evolution/Locations.h:2450
-msgid "Wheeling"
-msgstr "Wheeling"
+#~ msgid "Nome"
+#~ msgstr "Nome"
 
-#: my-evolution/Locations.h:2451
-msgid "Whidbey Island"
-msgstr "Whidbey Island"
+#~ msgid "Norfolk"
+#~ msgstr "Norfolk"
 
-#: my-evolution/Locations.h:2452
-msgid "Whitefield"
-msgstr "Whitefield"
+#~ msgid "Norfolk NAS"
+#~ msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:2453
-msgid "White Plains"
-msgstr "White Plains"
+#~ msgid "Norrkoping"
+#~ msgstr "Norrkoping"
 
-#: my-evolution/Locations.h:2454
-msgid "White Sulphur"
-msgstr "White Sulphur"
+#~ msgid "North Adams"
+#~ msgstr "North Adams"
 
-#: my-evolution/Locations.h:2455
-msgid "Whittier"
-msgstr "Whittier"
+#~ msgid "North Bend"
+#~ msgstr "North Bend"
 
-#: my-evolution/Locations.h:2456
-msgid "Wichita"
-msgstr "Wichita"
+#~ msgid "North Conway"
+#~ msgstr "North Conway"
 
-#: my-evolution/Locations.h:2457
-msgid "Wichita Falls"
-msgstr "Wichita Falls"
+#~ msgid "North Dakota"
+#~ msgstr "North Dakota"
 
-#: my-evolution/Locations.h:2458
-msgid "Wichita-Jabara"
-msgstr "Wichita-Jabara"
+#~ msgid "Northeast Philadelphia"
+#~ msgstr "Northeast Philadelphia"
 
-#: my-evolution/Locations.h:2459
-msgid "Wichita-McConnell AFB"
-msgstr "Wichita-McConnell AFB"
+#~ msgid "North Kingstown"
+#~ msgstr "North Kingstown"
 
-#: my-evolution/Locations.h:2460
-msgid "Wick"
-msgstr "Wick"
+#~ msgid "North Platte"
+#~ msgstr "North Platte"
 
-#: my-evolution/Locations.h:2461
-msgid "Wien"
-msgstr "Wien"
+#~ msgid "Northway"
+#~ msgstr "Northway"
 
-#: my-evolution/Locations.h:2462
-msgid "Wildwood"
-msgstr "Wildwood"
+#~ msgid "Northwest Territories"
+#~ msgstr "Northwest Territories"
 
-#: my-evolution/Locations.h:2463
-msgid "Wilkes - Barre"
-msgstr "Wilkes - Barre"
+#~ msgid "Norwich"
+#~ msgstr "Norwich"
 
-#: my-evolution/Locations.h:2464
-msgid "Williams Field"
-msgstr ""
+#~ msgid "Norwood"
+#~ msgstr "Norwood"
 
-#: my-evolution/Locations.h:2465
-msgid "Williamsport"
-msgstr "Williamsport"
+#~ msgid "Notodden"
+#~ msgstr "Notodden"
 
-#: my-evolution/Locations.h:2466
-msgid "Williston"
-msgstr "Williston"
+#~ msgid "Novara/Cameri"
+#~ msgstr "Novara/Cameri"
 
-#: my-evolution/Locations.h:2467
-msgid "Willoughby"
-msgstr "Willoughby"
+#~ msgid "Nova Scotia"
+#~ msgstr "Nova Scotia"
 
-#: my-evolution/Locations.h:2468
-msgid "Willow Airport"
-msgstr "Willow Airport"
+#~ msgid "Novosibirsk"
+#~ msgstr "Novosibirsk"
 
-#: my-evolution/Locations.h:2469
-msgid "Wilmington"
-msgstr "Wilmington"
+#~ msgid "Nueva Gerona"
+#~ msgstr "Nueva Gerona"
 
-#: my-evolution/Locations.h:2470
-msgid "Winchester"
-msgstr "Winchester"
+#~ msgid "Nueva Ocotepeque"
+#~ msgstr "Nueva Ocotepeque"
 
-#: my-evolution/Locations.h:2471
-msgid "Windsor"
-msgstr "Windsor"
+#~ msgid "Nuevo Laredo"
+#~ msgstr "Nuevo Laredo"
 
-#: my-evolution/Locations.h:2472
-msgid "Windsor Locks"
-msgstr "Windsor Locks"
+#~ msgid "Nurnberg"
+#~ msgstr "Nurnberg"
 
-#: my-evolution/Locations.h:2473
-msgid "Wink"
-msgstr "Wink"
+#~ msgid "Nyutabaru Ab"
+#~ msgstr "Nyutabaru Ab"
 
-#: my-evolution/Locations.h:2474
-msgid "Winnemucca"
-msgstr "Winnemucca"
+#~ msgid "Oahu"
+#~ msgstr "Oahu"
 
-#: my-evolution/Locations.h:2475
-msgid "Winnipeg"
-msgstr "Winnipeg"
+#~ msgid "Oak Harbor"
+#~ msgstr "Oak Harbor"
 
-#: my-evolution/Locations.h:2476
-msgid "Winslow"
-msgstr "Winslow"
+#~ msgid "Oakland"
+#~ msgstr "Oakland"
 
-#: my-evolution/Locations.h:2477
-msgid "Winston-Salem"
-msgstr "Winston-Salem"
+#~ msgid "Oaxaca"
+#~ msgstr "Oaxaca"
 
-#: my-evolution/Locations.h:2478
-msgid "Winter Haven"
-msgstr "Winter Haven"
+#~ msgid "Oberpfaffenhofen"
+#~ msgstr "Oberpfaffenhofen"
 
-#: my-evolution/Locations.h:2479
-msgid "Winter Park"
-msgstr "Winter Park"
+#~ msgid "Obihiro Airport"
+#~ msgstr "Obihiro Airport"
 
-#: my-evolution/Locations.h:2480
-msgid "Wiscasset"
-msgstr "Wiscasset"
+#~ msgid "Ocala"
+#~ msgstr "Ocala"
 
-#: my-evolution/Locations.h:2481
-msgid "Wisconsin"
-msgstr "Wisconsin"
+#~ msgid "Oceanside"
+#~ msgstr "Oceanside"
 
-#: my-evolution/Locations.h:2482
-msgid "Wisconsin Rapids"
-msgstr "Wisconsin Rapids"
+#~ msgid "Odense"
+#~ msgstr "Odense"
 
-#: my-evolution/Locations.h:2483
-msgid "Wise"
-msgstr "Wise"
+#~ msgid "Odesa"
+#~ msgstr "Odesa"
 
-#: my-evolution/Locations.h:2484
-msgid "Woensdrecht"
-msgstr "Woensdrecht"
+#~ msgid "Oelwen"
+#~ msgstr "Oelwen"
 
-#: my-evolution/Locations.h:2485
-msgid "Wolf Point"
-msgstr "Wolf Point"
+#~ msgid "Ogden"
+#~ msgstr "Ogden"
 
-#: my-evolution/Locations.h:2486
-msgid "Woong Cheon"
-msgstr "Woong Cheon"
+#~ msgid "Ogden-Hill AFB"
+#~ msgstr "Ogden-Hill AFB"
 
-#: my-evolution/Locations.h:2487
-msgid "Wooster"
-msgstr "Wooster"
+#~ msgid "Ogdensburg"
+#~ msgstr "Ogdensburg"
 
-#: my-evolution/Locations.h:2488
-msgid "Worcester"
-msgstr "Worcester"
+#~ msgid "Ohio"
+#~ msgstr "Ohio"
 
-#: my-evolution/Locations.h:2489
-msgid "Worland"
-msgstr "Worland"
+#~ msgid "Ohrid"
+#~ msgstr "Ohrid"
 
-#: my-evolution/Locations.h:2490
-msgid "Worthington"
-msgstr "Worthington"
+#~ msgid "Oita Airport"
+#~ msgstr "Oita Airport"
 
-#: my-evolution/Locations.h:2491
-msgid "Wrangell"
-msgstr "Wrangell"
+#~ msgid "Ojika Island"
+#~ msgstr "Ojika Island"
 
-#: my-evolution/Locations.h:2492
-msgid "Wrightstown / Mcguire AFB"
-msgstr "Wrightstown / Mcguire AFB"
+#~ msgid "Okayama Airport"
+#~ msgstr "Okayama Airport"
 
-#: my-evolution/Locations.h:2493
-msgid "Wuchia Observatory"
-msgstr "Wuchia Observatory"
+#~ msgid "Oki Airport"
+#~ msgstr "Oki Airport"
 
-#: my-evolution/Locations.h:2494
-msgid "Wyoming"
-msgstr "Wyoming"
+#~ msgid "Okinoerabu"
+#~ msgstr "Okinoerabu"
 
-#: my-evolution/Locations.h:2495
-msgid "Xiamen"
-msgstr "Xiamen"
+#~ msgid "Oklahoma"
+#~ msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:2496
-msgid "Yacuiba"
-msgstr "Yacuiba"
+#~ msgid "Oklahoma City"
+#~ msgstr "Oklahoma City"
 
-#: my-evolution/Locations.h:2497
-msgid "Yakima"
-msgstr "Yakima"
+#~ msgid "Oklahoma City-Bethany"
+#~ msgstr "Oklahoma City-Bethany"
 
-#: my-evolution/Locations.h:2498
-msgid "Yakushima"
-msgstr "Yakushima"
+#~ msgid "Oklahoma City-Midwest City"
+#~ msgstr "Oklahoma City-Midwest City"
 
-#: my-evolution/Locations.h:2499
-msgid "Yakutat"
-msgstr "Yakutat"
+#~ msgid "Okushiri Island"
+#~ msgstr "Okushiri Island"
 
-#: my-evolution/Locations.h:2500
-msgid "Yakutsk"
-msgstr "Yakutsk"
+#~ msgid "Olathe"
+#~ msgstr "Olathe"
 
-#: my-evolution/Locations.h:2501
-msgid "Yamagata Airport"
-msgstr "Yamagata Airport"
+#~ msgid "Olathe/Ind."
+#~ msgstr "Olathe/Ind."
 
-#: my-evolution/Locations.h:2502
-msgid "Yamaguchi Ube Airport"
-msgstr "Yamaguchi Ube Airport"
+#~ msgid "Olbia"
+#~ msgstr "Olbia"
 
-#: my-evolution/Locations.h:2503
-msgid "Yankton"
-msgstr "Yankton"
+#~ msgid "Olympia"
+#~ msgstr "Olympia"
 
-#: my-evolution/Locations.h:2504
-msgid "Yao Airport"
-msgstr "Yao Airport"
+#~ msgid "Omaha"
+#~ msgstr "Omaha"
 
-#: my-evolution/Locations.h:2505
-msgid "Yechon Ab"
-msgstr "Yechon Ab"
+#~ msgid "Omaha-Bellevue"
+#~ msgstr "Omaha-Bellevue"
 
-#: my-evolution/Locations.h:2506
-msgid "Yekaterinburg"
-msgstr "Yekaterinburg"
+#~ msgid "Omak"
+#~ msgstr "Omak"
 
-#: my-evolution/Locations.h:2507
-msgid "Yellowknife"
-msgstr "Yellowknife"
+#~ msgid "Ominato Ab"
+#~ msgstr "Ominato Ab"
 
-#: my-evolution/Locations.h:2508
-msgid "Yellowstone"
-msgstr "Yellowstone"
+#~ msgid "Omsk"
+#~ msgstr "Omsk"
 
-#: my-evolution/Locations.h:2510
-msgid "Yenbo"
-msgstr "Yenbo"
+#~ msgid "O'Neill"
+#~ msgstr "O'Neill"
 
-#: my-evolution/Locations.h:2511
-msgid "Yeoju Range"
-msgstr "Yeoju Range"
+#~ msgid "Ontario"
+#~ msgstr "Ontario"
 
-#: my-evolution/Locations.h:2512
-msgid "Yeonpyeungdo"
-msgstr "Yeonpyeungdo"
+#~ msgid "Oostende"
+#~ msgstr "Oostende"
 
-#: my-evolution/Locations.h:2513
-msgid "Yeovilton"
-msgstr "Yeovilton"
+#~ msgid "Oran"
+#~ msgstr "Oran"
 
-#: my-evolution/Locations.h:2514
-msgid "Yokosuka Fwf"
-msgstr "Yokosuka Fwf"
+#~ msgid "Oran/Es Senia"
+#~ msgstr "Oran/Es Senia"
 
-#: my-evolution/Locations.h:2515
-msgid "Yokota Ab"
-msgstr "Yokota Ab"
+#~ msgid "Orange"
+#~ msgstr "Orange"
 
-#: my-evolution/Locations.h:2516
-msgid "Yongsan/H-208 Hp"
-msgstr "Yongsan/H-208 Hp"
+#~ msgid "Orange City"
+#~ msgstr "Orange City"
 
-#: my-evolution/Locations.h:2517
-msgid "Yoro"
-msgstr "Yoro"
+#~ msgid "Ord-Sharp"
+#~ msgstr "Ord-Sharp"
 
-#: my-evolution/Locations.h:2518
-msgid "Yosu"
-msgstr "Yosu"
+#~ msgid "Oregon"
+#~ msgstr "Oregon"
 
-#: my-evolution/Locations.h:2519
-msgid "Youngstown"
-msgstr "Youngstown"
+#~ msgid "Orenburg"
+#~ msgstr "Orenburg"
 
-#: my-evolution/Locations.h:2520
-msgid "Ypsilanti"
-msgstr "Ypsilanti"
+#~ msgid "Orland"
+#~ msgstr "Orland"
 
-#: my-evolution/Locations.h:2522
-msgid "Yukon"
-msgstr "Yukon"
+#~ msgid "Orlando"
+#~ msgstr "Orlando"
 
-#: my-evolution/Locations.h:2523
-msgid "Yuma MCAS"
-msgstr "Yuma MCAS"
+#~ msgid "Orlando (Orlando International)"
+#~ msgstr "Orlando (Orlando International)"
 
-#: my-evolution/Locations.h:2524
-msgid "Yurimaguas"
-msgstr "Yurimaguas"
+#~ msgid "Orsta-Volda"
+#~ msgstr "Orsta-Volda"
 
-#: my-evolution/Locations.h:2525
-msgid "Yuzhno-Sakhalinsk"
-msgstr "Yuzhno-Sakhalinsk"
+#~ msgid "Oruro"
+#~ msgstr "Oruro"
 
-#: my-evolution/Locations.h:2526
-msgid "Zacatecas"
-msgstr "Zacatecas"
+#~ msgid "Osaka International Airport"
+#~ msgstr "Osaka International Airport"
 
-#: my-evolution/Locations.h:2527
-msgid "Zadar"
-msgstr "Zadar"
+#~ msgid "Osan Ab"
+#~ msgstr "Osan Ab"
 
-#: my-evolution/Locations.h:2528
-msgid "Zagreb"
-msgstr "Zagreb"
+#~ msgid "Oscoda"
+#~ msgstr "Oscoda"
 
-#: my-evolution/Locations.h:2529
-msgid "Zakinthos"
-msgstr "Zakinthos"
+#~ msgid "Oseberg A"
+#~ msgstr "Oseberg A"
 
-#: my-evolution/Locations.h:2530
-msgid "Zama Airfield"
-msgstr "Zama Airfield"
+#~ msgid "Oshima Airport"
+#~ msgstr "Oshima Airport"
 
-#: my-evolution/Locations.h:2531
-msgid "Zanesville"
-msgstr "Zanesville"
+#~ msgid "Oshkosh"
+#~ msgstr "Oshkosh"
 
-#: my-evolution/Locations.h:2532
-msgid "Zaragoza"
-msgstr "Zaragoza"
+#~ msgid "Oslo/Gardenmoen"
+#~ msgstr "Oslo/Gardenmoen"
 
-#: my-evolution/Locations.h:2533
-msgid "Zell Am See"
-msgstr "Zell Am See"
+#~ msgid "Ostrava"
+#~ msgstr "Ostrava"
 
-#: my-evolution/Locations.h:2534
-msgid "Zuni Pueblo"
-msgstr "Zuni Pueblo"
+#~ msgid "Ottawa"
+#~ msgstr "Ottawa"
 
-#: my-evolution/Locations.h:2535
-msgid "Zurich"
-msgstr "Zurich"
+#~ msgid "Ottumwa"
+#~ msgstr "Ottumwa"
 
-#: my-evolution/component-factory.c:56
-msgid "Folder containing the Evolution Summary"
-msgstr "Evolution İcmalını daxil edən qovluqlar"
+#~ msgid "Owensboro"
+#~ msgstr "Owensboro"
 
-#: my-evolution/e-summary-calendar.c:381
-msgid "Appointments"
-msgstr "Görüşlər"
+#~ msgid "Owyhee"
+#~ msgstr "Owyhee"
 
-#: my-evolution/e-summary-calendar.c:389
-msgid "No appointments."
-msgstr "Görüş yoxdur."
+#~ msgid "Oxford"
+#~ msgstr "Oxford"
 
-#: my-evolution/e-summary-calendar.c:406
-msgid "%k:%M %d %B"
-msgstr "%k:%M %d %B"
+#~ msgid "Oxnard"
+#~ msgstr "Oxnard"
 
-#: my-evolution/e-summary-calendar.c:408
-msgid "%l:%M%p %d %B"
-msgstr "%l:%M%p %d %B"
+#~ msgid "Ozark"
+#~ msgstr "Ozark"
 
-#: my-evolution/e-summary-calendar.c:426
-msgid "No description"
-msgstr "İzahat yoxdur"
+#~ msgid "Ozuki Ab"
+#~ msgstr "Ozuki Ab"
 
-#: my-evolution/e-summary-mail.c:189
-msgid "Mail summary"
-msgstr "Poçt icmalı"
+#~ msgid "Paderborn-Haxterberg"
+#~ msgstr "Paderborn-Haxterberg"
 
-#: my-evolution/e-summary-preferences.c:355
-msgid "Dictionary.com Word of the Day"
-msgstr "Dictionary.com Word of the Day"
+#~ msgid "Padova"
+#~ msgstr "Padova"
 
-#: my-evolution/e-summary-preferences.c:373
-msgid "Quotes of the Day"
-msgstr "Günün Sitatları"
+#~ msgid "Paducah"
+#~ msgstr "Paducah"
 
-#: my-evolution/e-summary-preferences.c:565
-msgid "New News Feed"
-msgstr "Yeni Xəbər İsmarışı"
+#~ msgid "Paekado"
+#~ msgstr "Paekado"
 
-#: my-evolution/e-summary-preferences.c:581
-msgid "_URL:"
-msgstr "_URL:"
+#~ msgid "Paengnyongdo Ab"
+#~ msgstr "Paengnyongdo Ab"
 
-#: my-evolution/e-summary-rdf.c:315
-msgid "Error downloading RDF"
-msgstr "RDF endirmə xətası"
+#~ msgid "Paganella"
+#~ msgstr "Paganella"
 
-#: my-evolution/e-summary-rdf.c:453
-msgid "News Feed"
-msgstr "Yeni Bəsləmə"
+#~ msgid "Pa Kuei/Bakuai"
+#~ msgstr "Pa Kuei/Bakuai"
 
-#: my-evolution/e-summary-shown.c:496
-msgid "All"
-msgstr "Hamısı"
+#~ msgid "Palacios"
+#~ msgstr "Palacios"
 
-#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
-msgid "Shown"
-msgstr "Göstərilən"
+#~ msgid "Palermo"
+#~ msgstr "Palermo"
 
-#: my-evolution/e-summary-tasks.c:330
-msgid "No tasks"
-msgstr "Vəzifə yoxdur"
+#~ msgid "Palma de Mallorca"
+#~ msgstr "Palma de Mallorca"
 
-#: my-evolution/e-summary-tasks.c:364
-msgid "(No Description)"
-msgstr "(İzahsız)"
+#~ msgid "Palmdale"
+#~ msgstr "Palmdale"
 
-#: my-evolution/e-summary-weather.c:73
-msgid "My Weather"
-msgstr "Mənim Hava Vəziyyətim"
+#~ msgid "Palmer"
+#~ msgstr "Palmer"
 
-#: my-evolution/e-summary-weather.c:262
-msgid "There was an error downloading data for"
-msgstr ""
+#~ msgid "Palm Springs"
+#~ msgstr "Palm Springs"
 
-#: my-evolution/e-summary-weather.c:479 my-evolution/my-evolution.glade.h:16
-msgid "Weather"
-msgstr "Hava"
+#~ msgid "Palo Alto"
+#~ msgstr "Palo Alto"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:583
-msgid "KBOS"
-msgstr "KBOS"
+#~ msgid "Pamplona"
+#~ msgstr "Pamplona"
 
-#: my-evolution/e-summary.c:204
-msgid "%A, %B %e %Y"
-msgstr "%A, %B %e %Y"
+#~ msgid "Panama City"
+#~ msgstr "Panama City"
 
-#: my-evolution/e-summary.c:533
-msgid "Please wait..."
-msgstr "Xahiş edirik gözləyin..."
+#~ msgid "Pantelleria"
+#~ msgstr "Pantelleria"
 
-#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "İcmalı Çap Et"
+#~ msgid "Papa"
+#~ msgstr "Papa"
 
-#: my-evolution/e-summary.c:655
-msgid "Printing of Summary failed"
-msgstr "İcmal Çapı bacarılmadı"
+#~ msgid "Paphos"
+#~ msgstr "Paphos"
 
-#: my-evolution/metar.c:30
-msgid " F"
-msgstr " F"
+#~ msgid "Paris"
+#~ msgstr "Paris"
 
-#: my-evolution/metar.c:30
-msgid " C"
-msgstr " C"
+#~ msgid "Paris/Charles De Gaulle"
+#~ msgstr "Paris/Charles De Gaulle"
 
-#: my-evolution/metar.c:34
-msgid "knots"
-msgstr "knot"
+#~ msgid "Paris/Le Bourget"
+#~ msgstr "Paris/Le Bourget"
 
-#: my-evolution/metar.c:34
-msgid "kph"
-msgstr "kph"
+#~ msgid "Paris/Orly"
+#~ msgstr "Paris/Orly"
 
-#: my-evolution/metar.c:39
-msgid "inHg"
-msgstr "inHg"
+#~ msgid "Parkersburg"
+#~ msgstr "Parkersburg"
 
-#: my-evolution/metar.c:39
-msgid "mmHg"
-msgstr "mmHg"
+#~ msgid "Pasco"
+#~ msgstr "Pasco"
 
-#: my-evolution/metar.c:42
-msgid "miles"
-msgstr "mil"
+#~ msgid "Paso De Los Libres"
+#~ msgstr "Paso De Los Libres"
 
-#: my-evolution/metar.c:42
-msgid "kilometers"
-msgstr "kilometr"
+#~ msgid "Paso Robles"
+#~ msgstr "Paso Robles"
 
-#: my-evolution/metar.c:45
-msgid "Clear sky"
-msgstr "Təmizlə"
+#~ msgid "Passo dei Giovi"
+#~ msgstr "Passo dei Giovi"
 
-#: my-evolution/metar.c:46
-msgid "Broken clouds"
-msgstr "Parçalı buludlu"
+#~ msgid "Passo della Cisa"
+#~ msgstr "Passo della Cisa"
 
-#: my-evolution/metar.c:47
-msgid "Scattered clouds"
-msgstr "Qarışıq buludlu"
+#~ msgid "Passo Resia"
+#~ msgstr "Passo Resia"
 
-#: my-evolution/metar.c:48
-msgid "Few clouds"
-msgstr "Az buludlu"
+#~ msgid "Passo Rolle"
+#~ msgstr "Passo Rolle"
 
-#: my-evolution/metar.c:49
-msgid "Overcast"
-msgstr "Buludlu"
+#~ msgid "Patna"
+#~ msgstr "Patna"
 
-#: my-evolution/metar.c:57 my-evolution/metar.c:75 my-evolution/metar.c:486
-msgid "Invalid"
-msgstr "Hökmsüz"
+#~ msgid "Patterson"
+#~ msgstr "Patterson"
 
-#: my-evolution/metar.c:64
-msgid "Variable"
-msgstr "Dəyişən"
+#~ msgid "Patuxent River"
+#~ msgstr "Patuxent River"
 
-#: my-evolution/metar.c:65
-msgid "North"
-msgstr "Şimal"
+#~ msgid "Pau/Pyrenees"
+#~ msgstr "Pau/Pyrenees"
 
-#: my-evolution/metar.c:65
-msgid "North - NorthEast"
-msgstr "Şimal - Şimali Şərq"
+#~ msgid "Paxson"
+#~ msgstr "Paxson"
 
-#: my-evolution/metar.c:65
-msgid "Northeast"
-msgstr "Şimali Şərq"
+#~ msgid "Paysandu"
+#~ msgstr "Paysandu"
 
-#: my-evolution/metar.c:65
-msgid "East - NorthEast"
-msgstr "Şərq - Şimali Şərq"
+#~ msgid "Payson"
+#~ msgstr "Payson"
 
-#: my-evolution/metar.c:66
-msgid "East"
-msgstr "Şərq"
+#~ msgid "Pellston"
+#~ msgstr "Pellston"
 
-#: my-evolution/metar.c:66
-msgid "East - Southeast"
-msgstr "Şərq - Cənubi Şərq"
+#~ msgid "Pelotas"
+#~ msgstr "Pelotas"
 
-#: my-evolution/metar.c:66
-msgid "Southeast"
-msgstr "Cənubi Şərq"
+#~ msgid "Pendleton"
+#~ msgstr "Pendleton"
 
-#: my-evolution/metar.c:66
-msgid "South - Southeast"
-msgstr "Cənub - Cənubi Şərq"
+#~ msgid "Pennsylvania"
+#~ msgstr "Pennsylvania"
 
-#: my-evolution/metar.c:67
-msgid "South"
-msgstr "Cənub"
+#~ msgid "Penn Yan"
+#~ msgstr "Penn Yan"
 
-#: my-evolution/metar.c:67
-msgid "South - Southwest"
-msgstr "Cənub - Cənubi Qərb"
+#~ msgid "Pensacola"
+#~ msgstr "Pensacola"
 
-#: my-evolution/metar.c:67
-msgid "Southwest"
-msgstr "Cənubi Qərb"
+#~ msgid "Pensacola NAS"
+#~ msgstr "Pensacola NAS"
 
-#: my-evolution/metar.c:67
-msgid "West - Southwest"
-msgstr "Qərb - Cənubi Qərb"
+#~ msgid "People's Republic of China"
+#~ msgstr "People's Republic of China"
 
-#: my-evolution/metar.c:68
-msgid "West"
-msgstr "Qərb"
+#~ msgid "Peoria"
+#~ msgstr "Peoria"
 
-#: my-evolution/metar.c:68
-msgid "West - Northwest"
-msgstr "Qərb - Şimali Qərb"
+#~ msgid "Pequot Lakes"
+#~ msgstr "Pequot Lakes"
 
-#: my-evolution/metar.c:68
-msgid "Northwest"
-msgstr "Şimali Qərb"
+#~ msgid "Pereira/Matecana"
+#~ msgstr "Pereira/Matecana"
 
-#: my-evolution/metar.c:68
-msgid "North - Northwest"
-msgstr "Şimal - Şimali Qərb"
+#~ msgid "Perm"
+#~ msgstr "Perm"
 
-#. DRIZZLE
-#: my-evolution/metar.c:128
-msgid "Drizzle"
-msgstr "Çisələmə"
+#~ msgid "Perpignan-Rivesaltes"
+#~ msgstr "Perpignan-Rivesaltes"
 
-#: my-evolution/metar.c:129
-msgid "Drizzle in the vicinity"
-msgstr "Yaxın çevrədə çisələmə var"
+#~ msgid "Perry-Foley"
+#~ msgstr "Perry-Foley"
 
-#: my-evolution/metar.c:130
-msgid "Light drizzle"
-msgstr "Yüngül çisələmə"
+#~ msgid "Perth"
+#~ msgstr "Perth"
 
-#: my-evolution/metar.c:131
-msgid "Moderate drizzle"
-msgstr "Orta çisələmə"
+#~ msgid "Perugia"
+#~ msgstr "Perugia"
 
-#: my-evolution/metar.c:132
-msgid "Heavy drizzle"
-msgstr "Ağır çisələmə"
+#~ msgid "Pescara"
+#~ msgstr "Pescara"
 
-#: my-evolution/metar.c:133
-msgid "Shallow drizzle"
-msgstr "Alçaq çisələmə"
+#~ msgid "Petersburg"
+#~ msgstr "Petersburg"
 
-#: my-evolution/metar.c:134
-msgid "Patches of drizzle"
-msgstr "Çisələmə izləri vardır"
+#~ msgid "Petropavlovsk-Kamchatsky"
+#~ msgstr "Petropavlovsk-Kamchatsky"
 
-#: my-evolution/metar.c:135
-msgid "Partial drizzle"
-msgstr "Qismi çisələmə"
+#~ msgid "Petrozavodsk"
+#~ msgstr "Petrozavodsk"
 
-#: my-evolution/metar.c:136 my-evolution/metar.c:151
-msgid "Thunderstorm"
-msgstr "İldırımlı Fırtına"
+#~ msgid "Philadelphia"
+#~ msgstr "Philadelphia"
 
-#: my-evolution/metar.c:137
-msgid "Windy drizzle"
-msgstr "Küləkli çisələmə"
+#~ msgid "Philip"
+#~ msgstr "Philip"
 
-#: my-evolution/metar.c:138
-msgid "Showers"
-msgstr "Yağış"
+#~ msgid "Philipsburg"
+#~ msgstr "Philipsburg"
 
-#: my-evolution/metar.c:139
-msgid "Drifting drizzle"
-msgstr "Sürüşgən çisələmə"
+#~ msgid "Phillips"
+#~ msgstr "Phillips"
 
-#: my-evolution/metar.c:140
-msgid "Freezing drizzle"
-msgstr "Şaxtalı çisələmə"
+#~ msgid "Phoenix"
+#~ msgstr "Phoenix"
 
-#. RAIN
-#: my-evolution/metar.c:143
-msgid "Rain"
-msgstr "Yağış "
+#~ msgid "Phoenix-Deer Valley"
+#~ msgstr "Phoenix-Deer Valley"
 
-#: my-evolution/metar.c:144
-msgid "Rain in the vicinity"
-msgstr "Çevrədə yağış var"
+#~ msgid "Phoenix-Goodyear"
+#~ msgstr "Phoenix-Goodyear"
 
-#: my-evolution/metar.c:145
-msgid "Light rain"
-msgstr "Yüngül yağış"
+#~ msgid "Phoenix-Luke AFB"
+#~ msgstr "Phoenix-Luke AFB"
 
-#: my-evolution/metar.c:146
-msgid "Moderate rain"
-msgstr "Orta yağış"
+#~ msgid "Piacenza"
+#~ msgstr "Piacenza"
 
-#: my-evolution/metar.c:147
-msgid "Heavy rain"
-msgstr "Şıdırğı Yağış"
+#~ msgid "Pian Rosa"
+#~ msgstr "Pian Rosa"
 
-#: my-evolution/metar.c:148
-msgid "Shallow rain"
-msgstr "Alçaq yağış"
+#~ msgid "Piedras Negras"
+#~ msgstr "Piedras Negras"
 
-#: my-evolution/metar.c:149
-msgid "Patches of rain"
-msgstr "Yağışın izləri var"
+#~ msgid "Pierre"
+#~ msgstr "Pierre"
 
-#: my-evolution/metar.c:150
-msgid "Partial rainfall"
-msgstr "Qismi yağış var"
+#~ msgid "Pietersburg"
+#~ msgstr "Pietersburg"
 
-#: my-evolution/metar.c:152
-msgid "Blowing rainfall"
-msgstr "Küləkli yağış"
+#~ msgid "Pikeville"
+#~ msgstr "Pikeville"
 
-#: my-evolution/metar.c:153
-msgid "Rain showers"
-msgstr "Leysan"
+#~ msgid "Pine Bluff"
+#~ msgstr "Pine Bluff"
 
-#: my-evolution/metar.c:154
-msgid "Drifting rain"
-msgstr "Sürüşgən yağış"
+#~ msgid "Pingtung North"
+#~ msgstr "Pingtung North"
 
-#: my-evolution/metar.c:155
-msgid "Freezing rain"
-msgstr "Şaxtalı yağış"
+#~ msgid "Pingtung South"
+#~ msgstr "Pingtung South"
 
-#. SNOW
-#: my-evolution/metar.c:158
-msgid "Snow"
-msgstr "Qar"
-
-#: my-evolution/metar.c:159
-msgid "Snow in the vicinity"
-msgstr "Çevrədə qar var"
-
-#: my-evolution/metar.c:160
-msgid "Light snow"
-msgstr "Yüngül qar yağışı"
-
-#: my-evolution/metar.c:161
-msgid "Moderate snow"
-msgstr "Orta qar yadışı"
-
-#: my-evolution/metar.c:162
-msgid "Heavy snow"
-msgstr "Ağır qar yağışı"
-
-#: my-evolution/metar.c:163
-msgid "Shallow snow"
-msgstr "Alçaq qar yağışı"
-
-#: my-evolution/metar.c:164
-msgid "Patches of snow"
-msgstr "Qar yağışının izləri var"
-
-#: my-evolution/metar.c:165
-msgid "Partial snowfall"
-msgstr "Qismi qar yağışı"
-
-#: my-evolution/metar.c:166 my-evolution/metar.c:181
-msgid "Snowstorm"
-msgstr "Qar fırtınası"
-
-#: my-evolution/metar.c:167
-msgid "Blowing snowfall"
-msgstr "Küləkli qar fırtınası"
-
-#: my-evolution/metar.c:168
-msgid "Snow showers"
-msgstr "Qar yağışları"
-
-#: my-evolution/metar.c:169
-msgid "Drifting snow"
-msgstr "Sürüşgən qar"
-
-#: my-evolution/metar.c:170
-msgid "Freezing snow"
-msgstr "Şaxta"
-
-#. SNOW_GRAINS
-#: my-evolution/metar.c:173
-msgid "Snow grains"
-msgstr "Qar dənələri"
-
-#: my-evolution/metar.c:174
-msgid "Snow grains in the vicinity"
-msgstr "Çevrədə qar dənələri var"
-
-#: my-evolution/metar.c:175
-msgid "Light snow grains"
-msgstr "Yüngül qar dənələri var"
-
-#: my-evolution/metar.c:176
-msgid "Moderate snow grains"
-msgstr "Orta qar dənələri var"
-
-#: my-evolution/metar.c:177
-msgid "Heavy snow grains"
-msgstr "Ağır qar dənələri"
-
-#: my-evolution/metar.c:178
-msgid "Shallow snow grains"
-msgstr "Alçaq qar dənələri"
-
-#: my-evolution/metar.c:179
-msgid "Patches of snow grains"
-msgstr "Qar dənələrinin izləri var"
-
-#: my-evolution/metar.c:180
-msgid "Partial snow grains"
-msgstr "Qismi qar dənələri"
-
-#: my-evolution/metar.c:182
-msgid "Blowing snow grains"
-msgstr "Küləkli qar dənələri"
-
-#: my-evolution/metar.c:183
-msgid "Snow grain showers"
-msgstr "Qar dənələri yağışı"
-
-#: my-evolution/metar.c:184
-msgid "Drifting snow grains"
-msgstr "Sürüşgən qar dənələri"
-
-#: my-evolution/metar.c:185
-msgid "Freezing snow grains"
-msgstr "Şaxtalı qar dənələri"
-
-#. ICE_CRYSTALS
-#: my-evolution/metar.c:188
-msgid "Ice crystals"
-msgstr "Buz"
-
-#: my-evolution/metar.c:189
-msgid "Ice crystals in the vicinity"
-msgstr "Çevrədə buz var"
-
-#: my-evolution/metar.c:190
-msgid "Few ice crystals"
-msgstr "Az buz"
-
-#: my-evolution/metar.c:191
-msgid "Moderate ice crystals"
-msgstr "Orta buz"
-
-#: my-evolution/metar.c:192
-msgid "Heavy ice crystals"
-msgstr "Ağır buz"
-
-#: my-evolution/metar.c:194
-msgid "Patches of ice crystals"
-msgstr "Buzun izləri var"
-
-#: my-evolution/metar.c:195
-msgid "Partial ice crystals"
-msgstr "Qismən buz"
-
-#: my-evolution/metar.c:196
-msgid "Ice crystal storm"
-msgstr "Buz fırtınası"
-
-#: my-evolution/metar.c:197
-msgid "Blowing ice crystals"
-msgstr "Küləkli buzlanma"
-
-#: my-evolution/metar.c:198
-msgid "Showers of ice crystals"
-msgstr "Buzlu yağışı"
-
-#: my-evolution/metar.c:199
-msgid "Drifting ice crystals"
-msgstr "Sürüşgən buzlanma"
-
-#: my-evolution/metar.c:200
-msgid "Freezing ice crystals"
-msgstr "Şaxta və buzlanma"
-
-#. ICE_PELLETS
-#: my-evolution/metar.c:203
-msgid "Ice pellets"
-msgstr "Buz dənəcikləri"
-
-#: my-evolution/metar.c:204
-msgid "Ice pellets in the vicinity"
-msgstr "Çevrədə buz dənəcikləri var"
-
-#: my-evolution/metar.c:205
-msgid "Few ice pellets"
-msgstr "Az buz dənəcəkləri"
-
-#: my-evolution/metar.c:206
-msgid "Moderate ice pellets"
-msgstr "Orta buz dənəcəkləri"
-
-#: my-evolution/metar.c:207
-msgid "Heavy ice pellets"
-msgstr "Ağır buz dənəcəkləri"
-
-#: my-evolution/metar.c:208
-msgid "Shallow ice pellets"
-msgstr "Alçaq buz dənəcəkləri"
-
-#: my-evolution/metar.c:209
-msgid "Patches of ice pellets"
-msgstr "Buz dənəcəklərinin izləri var"
-
-#: my-evolution/metar.c:210
-msgid "Partial ice pellets"
-msgstr "Qismən buz dənəcəkləri"
-
-#: my-evolution/metar.c:211
-msgid "Ice pellet storm"
-msgstr "Buz dənəcəkləri fırtınası"
-
-#: my-evolution/metar.c:212
-msgid "Blowing ice pellets"
-msgstr "Küləkli buz dənəcəkləri"
-
-#: my-evolution/metar.c:213
-msgid "Showers of ice pellets"
-msgstr "Buz dənəcəkləri yağışı"
-
-#: my-evolution/metar.c:214
-msgid "Drifting ice pellets"
-msgstr "Sürüşgən buz dənəcəkləri"
-
-#: my-evolution/metar.c:215
-msgid "Freezing ice pellets"
-msgstr "Şaxta və buz dənəcəkləri"
-
-#: my-evolution/metar.c:219
-msgid "Hail in the vicinity"
-msgstr "Çevrədə dolu yağışı var"
-
-#: my-evolution/metar.c:220 my-evolution/metar.c:235
-msgid "Light hail"
-msgstr "Yüngül dolu yağışı"
-
-#: my-evolution/metar.c:221
-msgid "Moderate hail"
-msgstr "Orta dolu yağışı"
-
-#: my-evolution/metar.c:222
-msgid "Heavy hail"
-msgstr "Ağır dolu yağışı"
-
-#: my-evolution/metar.c:223
-msgid "Shallow hail"
-msgstr "Alçaq dolu yağışı"
-
-#: my-evolution/metar.c:224
-msgid "Patches of hail"
-msgstr "Dolu yağışının izləri var"
-
-#: my-evolution/metar.c:225
-msgid "Partial hail"
-msgstr "Qismi dolu yağışı"
-
-#: my-evolution/metar.c:226
-msgid "Hailstorm"
-msgstr "Dolu fırtınası"
-
-#: my-evolution/metar.c:227
-msgid "Blowing hail"
-msgstr "Küləkli dolu yağışı"
-
-#: my-evolution/metar.c:228
-msgid "Hail showers"
-msgstr "Dolu yağışı"
-
-#: my-evolution/metar.c:229
-msgid "Drifting hail"
-msgstr "Sürüşgən dolu yağışı"
-
-#: my-evolution/metar.c:230
-msgid "Freezing hail"
-msgstr "Şaxtalı dolu yağışı"
-
-#. SMALL_HAIL
-#: my-evolution/metar.c:233
-msgid "Small hail"
-msgstr "Kiçik dolu dənələri"
-
-#: my-evolution/metar.c:234
-msgid "Small hail in the vicinity"
-msgstr "Çevrədə kiçik dolu dənələri"
-
-#: my-evolution/metar.c:236
-msgid "Moderate small hail"
-msgstr "Orta kiçik dolu dənələri"
-
-#: my-evolution/metar.c:237
-msgid "Heavy small hail"
-msgstr "Ağır kiçik dolu dənələri"
-
-#: my-evolution/metar.c:238
-msgid "Shallow small hail"
-msgstr "Alçaq kiçik dolu dənələri"
-
-#: my-evolution/metar.c:239
-msgid "Patches of small hail"
-msgstr "Kiçik dolu dənələrinin izləri var"
-
-#: my-evolution/metar.c:240
-msgid "Partial small hail"
-msgstr "Qismi kiçik dolu dənələri"
-
-#: my-evolution/metar.c:241
-msgid "Small hailstorm"
-msgstr "Kiçik dolu dənələri fırtınası"
-
-#: my-evolution/metar.c:242
-msgid "Blowing small hail"
-msgstr "Küləkli kiçik dolu dənələri"
-
-#: my-evolution/metar.c:243
-msgid "Showers of small hail"
-msgstr "Kiçik dolu dənələri yağışı"
-
-#: my-evolution/metar.c:244
-msgid "Drifting small hail"
-msgstr "Sürüşgən kiçik dolu dənələri"
-
-#: my-evolution/metar.c:245
-msgid "Freezing small hail"
-msgstr "Dondurucu kiçik dolu dənələriu"
-
-#. PRECIPITATION
-#: my-evolution/metar.c:248
-msgid "Unknown precipitation"
-msgstr "Naməlum yağmur"
-
-#: my-evolution/metar.c:249
-msgid "Precipitation in the vicinity"
-msgstr "Çevrədə yağış var"
-
-#: my-evolution/metar.c:250
-msgid "Light precipitation"
-msgstr "Yüngül yağış"
-
-#: my-evolution/metar.c:251
-msgid "Moderate precipitation"
-msgstr "Orta yağış"
-
-#: my-evolution/metar.c:252
-msgid "Heavy precipitation"
-msgstr "Ağır yağış"
-
-#: my-evolution/metar.c:253
-msgid "Shallow precipitation"
-msgstr "Alçaq yağış"
-
-#: my-evolution/metar.c:254
-msgid "Patches of precipitation"
-msgstr "Yağışın izləri var"
-
-#: my-evolution/metar.c:255
-msgid "Partial precipitation"
-msgstr "Qismi yağış"
-
-#: my-evolution/metar.c:256
-msgid "Unknown thunderstorm"
-msgstr "Naməlum leysan yağış"
-
-#: my-evolution/metar.c:257
-msgid "Blowing precipitation"
-msgstr "Küləkli yağış"
-
-#: my-evolution/metar.c:258
-msgid "Showers, type unknown"
-msgstr "Naməlum növdə yağış"
-
-#: my-evolution/metar.c:259
-msgid "Drifting precipitation"
-msgstr "Sürüşgən yağış"
-
-#: my-evolution/metar.c:260
-msgid "Freezing precipitation"
-msgstr "Şaxtalı yağış"
-
-#. MIST
-#: my-evolution/metar.c:263
-msgid "Mist"
-msgstr "Çən"
-
-#: my-evolution/metar.c:264
-msgid "Mist in the vicinity"
-msgstr "Çevrədə çən var"
-
-#: my-evolution/metar.c:265
-msgid "Light mist"
-msgstr "Yüngül çən"
-
-#: my-evolution/metar.c:266
-msgid "Moderate mist"
-msgstr "Orta çən"
-
-#: my-evolution/metar.c:267
-msgid "Thick mist"
-msgstr "Sıx çən"
-
-#: my-evolution/metar.c:268
-msgid "Shallow mist"
-msgstr "Seyrək çən"
-
-#: my-evolution/metar.c:269
-msgid "Patches of mist"
-msgstr "Çən izləri var"
-
-#: my-evolution/metar.c:270
-msgid "Partial mist"
-msgstr "Qismi çən"
-
-#: my-evolution/metar.c:272
-msgid "Mist with wind"
-msgstr "Küləkli çən"
-
-#: my-evolution/metar.c:274
-msgid "Drifting mist"
-msgstr "Sürüşgən çən"
-
-#: my-evolution/metar.c:275
-msgid "Freezing mist"
-msgstr "Şaxtalı çən"
-
-#. FOG
-#: my-evolution/metar.c:278
-msgid "Fog"
-msgstr "Çən"
-
-#: my-evolution/metar.c:279
-msgid "Fog in the vicinity"
-msgstr "Çevrədə çən var"
-
-#: my-evolution/metar.c:280
-msgid "Light fog"
-msgstr "Yüngül çən"
-
-#: my-evolution/metar.c:281
-msgid "Moderate fog"
-msgstr "Orta çən"
-
-#: my-evolution/metar.c:282
-msgid "Thick fog"
-msgstr "Qalın çən"
-
-#: my-evolution/metar.c:283
-msgid "Shallow fog"
-msgstr "Alçaq çən"
-
-#: my-evolution/metar.c:284
-msgid "Patches of fog"
-msgstr "Çənin izləri var"
-
-#: my-evolution/metar.c:285
-msgid "Partial fog"
-msgstr "Qismi çən var"
-
-#: my-evolution/metar.c:287
-msgid "Fog with wind"
-msgstr "Küləkli çən"
-
-#: my-evolution/metar.c:289
-msgid "Drifting fog"
-msgstr "Sürüşgən çən"
-
-#: my-evolution/metar.c:290
-msgid "Freezing fog"
-msgstr "Şaxtalı çən"
-
-#. SMOKE
-#: my-evolution/metar.c:293
-msgid "Smoke"
-msgstr "Duman"
-
-#: my-evolution/metar.c:294
-msgid "Smoke in the vicinity"
-msgstr "Çevrədə duman var"
-
-#: my-evolution/metar.c:295
-msgid "Thin smoke"
-msgstr "Incə duman"
-
-#: my-evolution/metar.c:296
-msgid "Moderate smoke"
-msgstr "Orta duman"
-
-#: my-evolution/metar.c:297
-msgid "Thick smoke"
-msgstr "Qalın duman"
-
-#: my-evolution/metar.c:298
-msgid "Shallow smoke"
-msgstr "Alçaq duman"
-
-#: my-evolution/metar.c:299
-msgid "Patches of smoke"
-msgstr "Duman izləri var"
-
-#: my-evolution/metar.c:300
-msgid "Partial smoke"
-msgstr "Qismi duman"
-
-#: my-evolution/metar.c:301
-msgid "Thunderous smoke"
-msgstr "Gur duman"
-
-#: my-evolution/metar.c:302
-msgid "Smoke with wind"
-msgstr "Küləkli duman"
-
-#: my-evolution/metar.c:304
-msgid "Drifting smoke"
-msgstr "Sürüşgən dumanlı"
-
-#. VOLCANIC_ASH
-#: my-evolution/metar.c:308
-msgid "Volcanic ash"
-msgstr "Vulkan külü"
-
-#: my-evolution/metar.c:309
-msgid "Volcanic ash in the vicinity"
-msgstr "Çevrədə vulkanik kül var"
-
-#: my-evolution/metar.c:311
-msgid "Moderate volcanic ash"
-msgstr "Orta vulkanik kül"
-
-#: my-evolution/metar.c:312
-msgid "Thick volcanic ash"
-msgstr "Qalın vulkanik kül"
-
-#: my-evolution/metar.c:313
-msgid "Shallow volcanic ash"
-msgstr "Alçaq vulkanik kül"
-
-#: my-evolution/metar.c:314
-msgid "Patches of volcanic ash"
-msgstr "uVulkanik külün izləri var"
-
-#: my-evolution/metar.c:315
-msgid "Partial volcanic ash"
-msgstr "Qismi vulkanik kül"
-
-#: my-evolution/metar.c:316
-msgid "Thunderous volcanic ash"
-msgstr "Gürləyən vulkanık kül"
-
-#: my-evolution/metar.c:317
-msgid "Blowing volcanic ash"
-msgstr "Küləkli vulkanik kül"
-
-#: my-evolution/metar.c:318
-msgid "Showers of volcanic ash"
-msgstr "Hamısını Göstər"
-
-#: my-evolution/metar.c:319
-msgid "Drifting volcanic ash"
-msgstr "Sürüşgən vulkanik kül"
-
-#: my-evolution/metar.c:320
-msgid "Freezing volcanic ash"
-msgstr "Dondurucu vulkanik kül"
-
-#. SAND
-#: my-evolution/metar.c:323
-msgid "Sand"
-msgstr "Qum"
-
-#: my-evolution/metar.c:324
-msgid "Sand in the vicinity"
-msgstr "Çevrədə qum var"
-
-#: my-evolution/metar.c:325
-msgid "Light sand"
-msgstr "Yüngül qum"
-
-#: my-evolution/metar.c:326
-msgid "Moderate sand"
-msgstr "Orta qum"
-
-#: my-evolution/metar.c:327
-msgid "Heavy sand"
-msgstr "Ağır qum"
-
-#: my-evolution/metar.c:329
-msgid "Patches of sand"
-msgstr "Qumun izləri var"
-
-#: my-evolution/metar.c:330
-msgid "Partial sand"
-msgstr "Qismi qum"
-
-#: my-evolution/metar.c:332
-msgid "Blowing sand"
-msgstr "Küləkli qum"
-
-#: my-evolution/metar.c:334
-msgid "Drifting sand"
-msgstr "Sürüşgən qum"
-
-#. HAZE
-#: my-evolution/metar.c:338
-msgid "Haze"
-msgstr "Yüngül pus"
-
-#: my-evolution/metar.c:339
-msgid "Haze in the vicinity"
-msgstr "Çevrədə yüngül pus var"
-
-#: my-evolution/metar.c:340
-msgid "Light haze"
-msgstr "Yüngül pus"
-
-#: my-evolution/metar.c:341
-msgid "Moderate haze"
-msgstr "Orta pus"
-
-#: my-evolution/metar.c:342
-msgid "Thick haze"
-msgstr "Qalın pus"
-
-#: my-evolution/metar.c:343
-msgid "Shallow haze"
-msgstr "Alçaq pus"
-
-#: my-evolution/metar.c:344
-msgid "Patches of haze"
-msgstr "Pusun izləri var"
-
-#: my-evolution/metar.c:345
-msgid "Partial haze"
-msgstr "Qismi pus"
-
-#: my-evolution/metar.c:347
-msgid "Haze with wind"
-msgstr "Küləkli pus"
-
-#: my-evolution/metar.c:349
-msgid "Drifting haze"
-msgstr "Sürüşgən pus"
-
-#: my-evolution/metar.c:350
-msgid "Freezing haze"
-msgstr "Dondurucu pus"
-
-#. SPRAY
-#: my-evolution/metar.c:353
-msgid "Spray"
-msgstr "Çisələmə"
+#~ msgid "Pirassununga"
+#~ msgstr "Pirassununga"
 
-#: my-evolution/metar.c:354
-msgid "Spray in the vicinity"
-msgstr "Çevrədə çisələmə var"
+#~ msgid "Pisa"
+#~ msgstr "Pisa"
 
-#: my-evolution/metar.c:355
-msgid "Light spray"
-msgstr "Yüngül çisələmə"
+#~ msgid "Pisco"
+#~ msgstr "Pisco"
 
-#: my-evolution/metar.c:356
-msgid "Moderate spray"
-msgstr "Orta çisələmə"
+#~ msgid "Pittsburgh"
+#~ msgstr "Pittsburgh"
 
-#: my-evolution/metar.c:357
-msgid "Heavy spray"
-msgstr "Ağır çisələmə"
+#~ msgid "Pittsburgh-West Mifflin"
+#~ msgstr "Pittsburgh-West Mifflin"
 
-#: my-evolution/metar.c:358
-msgid "Shallow spray"
-msgstr "Alçaq çisələmə"
+#~ msgid "Plattsburg"
+#~ msgstr "Plattsburg"
 
-#: my-evolution/metar.c:359
-msgid "Patches of spray"
-msgstr "Çisələmə izləri var"
+#~ msgid "Plovdiv"
+#~ msgstr "Plovdiv"
 
-#: my-evolution/metar.c:360
-msgid "Partial spray"
-msgstr "Qismi çisələmə"
+#~ msgid "Plymouth"
+#~ msgstr "Plymouth"
 
-#: my-evolution/metar.c:362
-msgid "Blowing spray"
-msgstr "Köləkli çisələmə"
+#~ msgid "Pocatello"
+#~ msgstr "Pocatello"
 
-#: my-evolution/metar.c:364
-msgid "Drifting spray"
-msgstr "Sürüklənən çisələmə"
+#~ msgid "Pocos De Caldas"
+#~ msgstr "Pocos De Caldas"
 
-#: my-evolution/metar.c:365
-msgid "Freezing spray"
-msgstr "Dondurucu çisələmə"
+#~ msgid "Podgorica"
+#~ msgstr "Podgorica"
 
-#. DUST
-#: my-evolution/metar.c:368
-msgid "Dust"
-msgstr "Toz"
+#~ msgid "Podgorica Titograd"
+#~ msgstr "Podgorica Titograd"
 
-#: my-evolution/metar.c:369
-msgid "Dust in the vicinity"
-msgstr "Çevrədə toz var"
+#~ msgid "Pohang Ab"
+#~ msgstr "Pohang Ab"
 
-#: my-evolution/metar.c:370
-msgid "Light dust"
-msgstr "Yüngül toz"
+#~ msgid "Point Hope"
+#~ msgstr "Point Hope"
 
-#: my-evolution/metar.c:371
-msgid "Moderate dust"
-msgstr "Orta toz"
+#~ msgid "Point Lay"
+#~ msgstr "Point Lay"
 
-#: my-evolution/metar.c:372
-msgid "Heavy dust"
-msgstr "Ağır toz"
+#~ msgid "Point Mugu"
+#~ msgstr "Point Mugu"
 
-#: my-evolution/metar.c:374
-msgid "Patches of dust"
-msgstr "Tozun izləri var"
+#~ msgid "Point Piedras Blanca"
+#~ msgstr "Point Piedras Blanca"
 
-#: my-evolution/metar.c:375
-msgid "Partial dust"
-msgstr "Qismi toz"
+#~ msgid "Pompano Beach"
+#~ msgstr "Pompano Beach"
 
-#: my-evolution/metar.c:377
-msgid "Blowing dust"
-msgstr "Küləkli toz"
+#~ msgid "Ponca City"
+#~ msgstr "Ponca City"
 
-#: my-evolution/metar.c:379
-msgid "Drifting dust"
-msgstr "Sürüşgən toz"
+#~ msgid "Ponce"
+#~ msgstr "Ponce"
 
-#. SQUALL
-#: my-evolution/metar.c:383
-msgid "Squall"
-msgstr "Kir"
+#~ msgid "Ponta Pora"
+#~ msgstr "Ponta Pora"
 
-#: my-evolution/metar.c:384
-msgid "Squall in the vicinity"
-msgstr "Çevrədə kir var"
+#~ msgid "Pontiac"
+#~ msgstr "Pontiac"
 
-#: my-evolution/metar.c:385
-msgid "Light squall"
-msgstr "Yüngül kir"
+#~ msgid "Pope AFB"
+#~ msgstr "Pope AFB"
 
-#: my-evolution/metar.c:386
-msgid "Moderate squall"
-msgstr "Orta kir"
+#~ msgid "Poplar Bluff"
+#~ msgstr "Poplar Bluff"
 
-#: my-evolution/metar.c:387
-msgid "Heavy squall"
-msgstr "Ağır kir"
+#~ msgid "Poprad"
+#~ msgstr "Poprad"
 
-#: my-evolution/metar.c:390
-msgid "Partial squall"
-msgstr "Qismi kir"
-
-#: my-evolution/metar.c:391
-msgid "Thunderous squall"
-msgstr "Fırtınalı kir"
-
-#: my-evolution/metar.c:392
-msgid "Blowing squall"
-msgstr "Küləkli kir"
-
-#: my-evolution/metar.c:394
-msgid "Drifting squall"
-msgstr "Sürüşgən kir"
-
-#: my-evolution/metar.c:395
-msgid "Freezing squall"
-msgstr "Dondurucu kir"
-
-#. SANDSTORM
-#: my-evolution/metar.c:398
-msgid "Sandstorm"
-msgstr "Qum fırtınası"
-
-#: my-evolution/metar.c:399
-msgid "Sandstorm in the vicinity"
-msgstr "Çevrədə qum fırtınası var"
-
-#: my-evolution/metar.c:400
-msgid "Light standstorm"
-msgstr "Yüngül qum fırtınası"
-
-#: my-evolution/metar.c:401
-msgid "Moderate sandstorm"
-msgstr "Orta qum fırtınası"
-
-#: my-evolution/metar.c:402
-msgid "Heavy sandstorm"
-msgstr "Ağır qum fırtınası"
-
-#: my-evolution/metar.c:403
-msgid "Shallow sandstorm"
-msgstr "Alçaq qum fırtınası"
-
-#: my-evolution/metar.c:405
-msgid "Partial sandstorm"
-msgstr "Qismi qum fırtınası"
-
-#: my-evolution/metar.c:406
-msgid "Thunderous sandstorm"
-msgstr "Leysan yağışlı qum fırtınası"
-
-#: my-evolution/metar.c:407
-msgid "Blowing sandstorm"
-msgstr "Küləkli qum fırtınası"
-
-#: my-evolution/metar.c:409
-msgid "Drifting sandstorm"
-msgstr "Sürüşgən qum fırtınası"
-
-#: my-evolution/metar.c:410
-msgid "Freezing sandstorm"
-msgstr "Dondurucu qum fırtınası"
-
-#. DUSTSTORM
-#: my-evolution/metar.c:413
-msgid "Duststorm"
-msgstr "Toz fırtınası"
-
-#: my-evolution/metar.c:414
-msgid "Duststorm in the vicinity"
-msgstr "Çevrədə toz fırtınası var"
-
-#: my-evolution/metar.c:415
-msgid "Light duststorm"
-msgstr "Yüngül toz fırtınası"
-
-#: my-evolution/metar.c:416
-msgid "Moderate duststorm"
-msgstr "Orta toz fırtınası"
-
-#: my-evolution/metar.c:417
-msgid "Heavy duststorm"
-msgstr "Ağır toz fırtınası"
-
-#: my-evolution/metar.c:418
-msgid "Shallow duststorm"
-msgstr "Alçaq toz fırtınası"
-
-#: my-evolution/metar.c:420
-msgid "Partial duststorm"
-msgstr "Qismi toz fırtınası"
-
-#: my-evolution/metar.c:421
-msgid "Thunderous duststorm"
-msgstr "Leysan yağışlı toz fırtınası"
-
-#: my-evolution/metar.c:422
-msgid "Blowing duststorm"
-msgstr "Küləkli toz fırtınası"
-
-#: my-evolution/metar.c:424
-msgid "Drifting duststorm"
-msgstr "Sürüşgən toz fırtınası"
-
-#: my-evolution/metar.c:425
-msgid "Freezing duststorm"
-msgstr "Dondurucu toz fırtınası"
-
-#. FUNNEL_CLOUD
-#: my-evolution/metar.c:428
-msgid "Funnel cloud"
-msgstr "Parçalı buludlu"
-
-#: my-evolution/metar.c:429
-msgid "Funnel cloud in the vicinity"
-msgstr "Çevrədə parçalı buludlu var"
-
-#: my-evolution/metar.c:430
-msgid "Light funnel cloud"
-msgstr "Yüngül parçalı buludlu"
-
-#: my-evolution/metar.c:431
-msgid "Moderate funnel cloud"
-msgstr "Orta parçalı buludlu"
-
-#: my-evolution/metar.c:432
-msgid "Thick funnel cloud"
-msgstr "Qalın parçalı buludlu"
-
-#: my-evolution/metar.c:433
-msgid "Shallow funnel cloud"
-msgstr "Alçaq parçalı buludlu"
-
-#: my-evolution/metar.c:434
-msgid "Patches of funnel clouds"
-msgstr "Parçalı buludların izləri var"
-
-#: my-evolution/metar.c:435
-msgid "Partial funnel clouds"
-msgstr "Qismi parçalı buludlu"
-
-#: my-evolution/metar.c:437
-msgid "Funnel cloud w/ wind"
-msgstr "Küləkli parçalı buludlu"
-
-#: my-evolution/metar.c:439
-msgid "Drifting funnel cloud"
-msgstr "Sürüşgən parçalı buludlu"
-
-#. TORNADO
-#: my-evolution/metar.c:443 my-evolution/metar.c:452
-msgid "Tornado"
-msgstr "Tornado"
-
-#: my-evolution/metar.c:444
-msgid "Tornado in the vicinity"
-msgstr "Çevrədə tornado var"
-
-#: my-evolution/metar.c:446
-msgid "Moderate tornado"
-msgstr "Orta dərəcədə bir tornado"
-
-#: my-evolution/metar.c:447
-msgid "Raging tornado"
-msgstr "Qasıb qovuran tornado"
-
-#: my-evolution/metar.c:450
-msgid "Partial tornado"
-msgstr "Qismi tornado"
-
-#: my-evolution/metar.c:451
-msgid "Thunderous tornado"
-msgstr "Leysan və göygurultulu tornado"
-
-#: my-evolution/metar.c:454
-msgid "Drifting tornado"
-msgstr "Sürüşgən tornado"
-
-#: my-evolution/metar.c:455
-msgid "Freezing tornado"
-msgstr "Dondurucu tornado"
-
-#. DUST_WHIRLS
-#: my-evolution/metar.c:458
-msgid "Dust whirls"
-msgstr "Toz qasırğaları"
+#~ msgid "Port Alexander"
+#~ msgstr "Port Alexander"
 
-#: my-evolution/metar.c:459
-msgid "Dust whirls in the vicinity"
-msgstr "Çevrədə toz qasırğaları var"
+#~ msgid "Port Alsworth"
+#~ msgstr "Port Alsworth"
 
-#: my-evolution/metar.c:460
-msgid "Light dust whirls"
-msgstr "Yüngül toz qasırğaları"
+#~ msgid "Port Angeles"
+#~ msgstr "Port Angeles"
 
-#: my-evolution/metar.c:461
-msgid "Moderate dust whirls"
-msgstr "Orta toz qasırğaları"
+#~ msgid "Port-Au-Prince"
+#~ msgstr "Port-Au-Prince"
 
-#: my-evolution/metar.c:462
-msgid "Heavy dust whirls"
-msgstr "Ağır toz qasırğaları"
+#~ msgid "Port Elizabeth"
+#~ msgstr "Port Elizabeth"
 
-#: my-evolution/metar.c:463
-msgid "Shallow dust whirls"
-msgstr "Alçaq toz qasırğaları"
+#~ msgid "Porterville"
+#~ msgstr "Porterville"
 
-#: my-evolution/metar.c:464
-msgid "Patches of dust whirls"
-msgstr "Toz qasırğalarının izləri var"
+#~ msgid "Port Hardy"
+#~ msgstr "Port Hardy"
 
-#: my-evolution/metar.c:465
-msgid "Partial dust whirls"
-msgstr "Qismi toz qasırğaları"
+#~ msgid "Port Hedland"
+#~ msgstr "Port Hedland"
 
-#: my-evolution/metar.c:467
-msgid "Blowing dust whirls"
-msgstr "Ağır küləkli toz qasırğaları"
+#~ msgid "Port Heiden"
+#~ msgstr "Port Heiden"
 
-#: my-evolution/metar.c:469
-msgid "Drifting dust whirls"
-msgstr "Sürüşgən toz qasırğaları"
+#~ msgid "Portland"
+#~ msgstr "Portland"
 
-#: my-evolution/my-evolution.glade.h:1
-msgid "C_elsius"
-msgstr "S_elsius"
+#~ msgid "Porto"
+#~ msgstr "Porto"
 
-#: my-evolution/my-evolution.glade.h:3
-msgid "How many days should the calendar display at once?"
-msgstr "Təqvim bir dəfədə ən çox neçə gün göstərsin?"
+#~ msgid "Porto Alegre"
+#~ msgstr "Porto Alegre"
 
-#: my-evolution/my-evolution.glade.h:5
-msgid "News Feed Settings"
-msgstr "Xəbərlər Qurğuları"
+#~ msgid "Porto Alegre Apt"
+#~ msgstr "Porto Alegre Apt"
 
-#: my-evolution/my-evolution.glade.h:6
-msgid "News Feeds"
-msgstr "Yeni Xəbərlər"
+#~ msgid "Portoroz"
+#~ msgstr "Portoroz"
 
-#: my-evolution/my-evolution.glade.h:7
-msgid "One mont_h"
-msgstr "Bir a_y"
+#~ msgid "Porto Santo"
+#~ msgstr "Porto Santo"
 
-#: my-evolution/my-evolution.glade.h:8
-msgid "One w_eek"
-msgstr "Bir hə_ftə"
+#~ msgid "Porto Velho"
+#~ msgstr "Porto Velho"
 
-#: my-evolution/my-evolution.glade.h:9
-msgid "R_efresh time (seconds):"
-msgstr "Y_enilə vaxtı (saniyələrlə):"
+#~ msgid "Port Said"
+#~ msgstr "Port Said"
 
-#: my-evolution/my-evolution.glade.h:10
-msgid "Refresh _time (seconds):"
-msgstr "Yeniləma vax_tı (saniyələrlə):"
+#~ msgid "Portsmouth"
+#~ msgstr "Portsmouth"
 
-#: my-evolution/my-evolution.glade.h:11
-msgid "Schedule"
-msgstr "Vaxtlaşdır"
+#~ msgid "Posadas"
+#~ msgstr "Posadas"
 
-#: my-evolution/my-evolution.glade.h:12
-msgid "Show _all tasks"
-msgstr "B_ütün vəzifələri göstər"
+#~ msgid "Potosi"
+#~ msgstr "Potosi"
 
-#: my-evolution/my-evolution.glade.h:13
-msgid "Show _today's tasks"
-msgstr "_Bugünku vəzifələri göstər"
+#~ msgid "Poughkeepsie"
+#~ msgstr "Poughkeepsie"
 
-#: my-evolution/my-evolution.glade.h:14
-msgid "Show temperatures in:"
-msgstr "İstiliklərini göstər:"
+#~ msgid "Pownal"
+#~ msgstr "Pownal"
 
-#: my-evolution/my-evolution.glade.h:15
-msgid "Tasks "
-msgstr "Vəzifələr"
+#~ msgid "Poza Rica"
+#~ msgstr "Poza Rica"
 
-#: my-evolution/my-evolution.glade.h:17
-msgid "Weather Settings"
-msgstr "Hava Qurğuları"
+#~ msgid "Poznan"
+#~ msgstr "Poznan"
 
-#: my-evolution/my-evolution.glade.h:18
-msgid "_Delete Feed"
-msgstr "Xəbəri _Sil"
+#~ msgid "Praha"
+#~ msgstr "Praha"
 
-#: my-evolution/my-evolution.glade.h:19
-msgid "_Fahrenheit"
-msgstr "_Fahrenayt"
+#~ msgid "Pratica di Mare"
+#~ msgstr "Pratica di Mare"
 
-#: my-evolution/my-evolution.glade.h:20
-msgid "_Five days"
-msgstr "_Beş gün"
+#~ msgid "Prescott"
+#~ msgstr "Prescott"
 
-#: my-evolution/my-evolution.glade.h:21
-msgid "_Max number of items shown:"
-msgstr "Göstəriləcək ma_ksimal üzv ədədi:"
+#~ msgid "Presidente Prudente"
+#~ msgstr "Presidente Prudente"
 
-#: my-evolution/my-evolution.glade.h:22
-msgid "_New Feed"
-msgstr "_Yeni Xəbər"
+#~ msgid "Presque Isle"
+#~ msgstr "Presque Isle"
 
-#: my-evolution/my-evolution.glade.h:23
-msgid "_One day"
-msgstr "_Bur Gün"
+#~ msgid "Prestwick"
+#~ msgstr "Prestwick"
 
-#: my-evolution/my-evolution.glade.h:24
-msgid "_Show full path for folders"
-msgstr "Qovluqların tam cığırını g_östər"
+#~ msgid "Pretoria"
+#~ msgstr "Pretoria"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
+#~ msgid "Preveza"
+#~ msgstr "Preveza"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Evolution Qabığı"
+#~ msgid "Price-Carbon"
+#~ msgstr "Price-Carbon"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Evolutionun qovluq qurğularını quraşdırma idarəsi"
+#~ msgid "Pristina"
+#~ msgstr "Pristina"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Qovluq Qurğuları"
+#~ msgid "Providence"
+#~ msgstr "Providence"
 
-#: shell/e-activity-handler.c:164
-msgid "Show Details"
-msgstr "Təfsilatı Göstər"
+#~ msgid "Provincetown"
+#~ msgstr "Provincetown"
 
-#: shell/e-activity-handler.c:166
-msgid "Cancel Operation"
-msgstr "Əməliyyatı Ləğv Et"
+#~ msgid "Provo"
+#~ msgstr "Provo"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"Qovluğu daşıya bilmirəm:\n"
-"%s"
+#~ msgid "Pskov"
+#~ msgstr "Pskov"
 
-#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%2$s\" içində \"%1$s\""
+#~ msgid "Pucallpa"
+#~ msgstr "Pucallpa"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Qovluq Əlavə Et"
+#~ msgid "Pudahuel"
+#~ msgstr "Pudahuel"
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Layihələr"
+#~ msgid "Puebla"
+#~ msgstr "Puebla"
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Gələnlər qutusu"
+#~ msgid "Pueblo"
+#~ msgstr "Pueblo"
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Gedənlər qutusu"
+#~ msgid "Puerto Barrios"
+#~ msgstr "Puerto Barrios"
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Göndərilənlər"
+#~ msgid "Puerto Cabezas"
+#~ msgstr "Puerto Cabezas"
 
-#: shell/e-setup.c:146
-msgid "Could not update files correctly"
-msgstr "Fayllar düzgün güncəllənə bilmədi"
+#~ msgid "Puerto Escondido"
+#~ msgstr "Puerto Escondido"
 
-#: shell/e-setup.c:167
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"%s qovluğunu yarada bilmədim\n"
-"\n"
-"Xəta : %s"
+#~ msgid "Puerto Lempira"
+#~ msgstr "Puerto Lempira"
 
-#: shell/e-setup.c:178
-#, c-format
-msgid ""
-"An error occurred in copying files into\n"
-"`%s'."
-msgstr ""
-"`%s' işinə fayllar köçürülürkən xəta\n"
-"baş verdi."
+#~ msgid "Puerto Limon"
+#~ msgstr "Puerto Limon"
 
-#: shell/e-setup.c:244
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-"`%s' bir qovluq deyildir.\n"
-"\"Evolution\" istifadəçi fayllarınin qurulması\n"
-"üçün onu sil."
+#~ msgid "Puerto Maldonado"
+#~ msgstr "Puerto Maldonado"
 
-#: shell/e-setup.c:253
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-"`%s' qovluğu mövcuddur, amma\n"
-"\"Evolution\" qovluğunda yerləşmir. \"Evolution\" \n"
-"istifadəçi fayllarınin qurulması üçün onu sil."
+#~ msgid "Puerto Montt"
+#~ msgstr "Puerto Montt"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "İnkişafçılar"
+#~ msgid "Puerto Plata"
+#~ msgstr "Puerto Plata"
 
-#: shell/e-shell-config-autocompletion.c:110
-msgid "Extra Completion folders"
-msgstr "Əlavə Tamamlama qovluqalrı"
+#~ msgid "Puerto Suarez"
+#~ msgstr "Puerto Suarez"
 
-#: shell/e-shell-config-default-folders.c:149
-msgid "Select Default Folder"
-msgstr "Ön Qurğulu Qovluğu Seç"
+#~ msgid "Puerto Vallarta"
+#~ msgstr "Puerto Vallarta"
 
-#: shell/e-shell-config-folder-settings.c:70
-msgid "Default Folders"
-msgstr "Ön Qurğulu Qovluqlar"
+#~ msgid "Pula"
+#~ msgstr "Pula"
 
-#: shell/e-shell-config-folder-settings.c:73
-msgid "Offline Folders"
-msgstr "Xətdən Qopuq Cərgələr"
+#~ msgid "Pullman"
+#~ msgstr "Pullman"
 
-#: shell/e-shell-config-folder-settings.c:76
-msgid "Autocompletion Folders"
-msgstr "Avtomatik Tamamlama Qovluqları"
+#~ msgid "Punta Arenas"
+#~ msgstr "Punta Arenas"
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Qovluq köçürülə bilmir: %s"
+#~ msgid "Punta Cana"
+#~ msgstr "Punta Cana"
 
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr ""
-"Qovluq daşına bilmir:\n"
-"%s"
+#~ msgid "Punta Gorda"
+#~ msgstr "Punta Gorda"
 
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "Qovluq öz üstünə daşına bilməz."
+#~ msgid "Puntilla Lake"
+#~ msgstr "Puntilla Lake"
 
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "Qovluq öz üstünə köçürülə bilməz."
+#~ msgid "Pusan/Kimhae"
+#~ msgstr "Pusan/Kimhae"
 
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "Qovluq içindəkilərdən birinə daçına bilməz."
+#~ msgid "Pyongtaek Ab"
+#~ msgstr "Pyongtaek Ab"
 
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "\"%s\" qovluğunun köçürələcəyi qovluğu bildir:"
+#~ msgid "Pyongyang"
+#~ msgstr "Pyongyang"
 
-#: shell/e-shell-folder-commands.c:323
-msgid "Copy Folder"
-msgstr "Qovluğu Köçür"
+#~ msgid "Quantico"
+#~ msgstr "Quantico"
 
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "\"%s\" qovluğunun daşınacağı qovluğu bildir:"
+#~ msgid "Quebec"
+#~ msgstr "Quebec"
 
-#: shell/e-shell-folder-commands.c:367
-msgid "Move Folder"
-msgstr "Qovluğu Daşı"
+#~ msgid "Quebec City"
+#~ msgstr "Quebec City"
 
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Qovluq silinə bilmir:\n"
-"%s"
+#~ msgid "Queretaro"
+#~ msgstr "Queretaro"
 
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "\"%s\" qovluğu həqiqətən də silinsin?"
+#~ msgid "Quillayute"
+#~ msgstr "Quillayute"
 
-#: shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "\"%s\"-i Sil"
+#~ msgid "Quimper"
+#~ msgstr "Quimper"
 
-#: shell/e-shell-folder-commands.c:489
-#, c-format
-msgid ""
-"Cannot rename folder:\n"
-"%s"
-msgstr ""
-"Qovluaq adı dəyişdirilə bilmir:\n"
-"%s"
+#~ msgid "Quincy"
+#~ msgstr "Quincy"
 
-#: shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "%s qovluğu adını buna dəyişdir:"
+#~ msgid "Quito/Mariscal Sucre"
+#~ msgstr "Quito/Mariscal Sucre"
 
-#: shell/e-shell-folder-commands.c:541
-msgid "Rename Folder"
-msgstr "Qovluğu Yenidən Adlandır"
+#~ msgid "Rabat"
+#~ msgstr "Rabat"
 
-#: shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Bildirilən qovluq adı hökmlü deyildir: %s"
+#~ msgid "Raduzhny"
+#~ msgstr "Raduzhny"
 
-#: shell/e-shell-folder-commands.c:554
-#, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+#~ msgid "Rafha"
+#~ msgstr "Rafha"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr ""
+#~ msgid "Raleigh-Durham"
+#~ msgstr "Raleigh-Durham"
 
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Qovluaq silinə bilmir:\n"
-"%s"
+#~ msgid "Randolph AFB"
+#~ msgstr "Randolph AFB"
 
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Bildirilən qovluq yaradıla bilmədi:\n"
-"%s"
+#~ msgid "Rapid City"
+#~ msgstr "Rapid City"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Yeni Qovluq Yarat"
+#~ msgid "Rapid City-Ellsworth AFB"
+#~ msgstr "Rapid City-Ellsworth AFB"
 
-#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
-msgid "(Untitled)"
-msgstr "( Adsız )"
+#~ msgid "Ras Al Khaimah"
+#~ msgstr "Ras Al Khaimah"
 
-#: shell/e-shell-importer.c:139
-msgid "Choose the type of importer to run:"
-msgstr "İcra ediləcək idxalçı növlərinis seçin:"
+#~ msgid "Rawlins"
+#~ msgstr "Rawlins"
 
-#: shell/e-shell-importer.c:142
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"\"Evolution\" içinə almaq istədiyiniz faylı seçin. Aşağıdakı siyahıdan "
-"alacağınız faylın növünü də seçin.\n"
-"\n"
-"Əgər təsəvvürünüz yoxdursa \"Avtomatik\" seçənəyini seçin, \"Evolution\" özü "
-"bildiyi kimi edər."
+#~ msgid "Reading"
+#~ msgstr "Reading"
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
-msgid "Please select the information that you would like to import:"
-msgstr "Xahiş edirik, idxal etmək istədiyiniz mə'lumatı seçin:"
+#~ msgid "Rebun Island"
+#~ msgstr "Rebun Island"
 
-#: shell/e-shell-importer.c:151
-msgid ""
-"Evolution checked for settings to import from the following\n"
-"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
-"that could be imported where found. If you would like to\n"
-"try again, please click the \"Back\" button.\n"
-msgstr ""
+#~ msgid "Recife"
+#~ msgstr "Recife"
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"%s idxal edilir\n"
-"%d üzvü idxal edilir."
+#~ msgid "Red Bluff"
+#~ msgstr "Red Bluff"
 
-#: shell/e-shell-importer.c:323
-msgid "Select importer"
-msgstr "İdxalçı seçin"
+#~ msgid "Redding"
+#~ msgstr "Redding"
 
-#: shell/e-shell-importer.c:464
-#, c-format
-msgid "File %s does not exist"
-msgstr "`%s' faylı mövcud deyil"
+#~ msgid "Redig"
+#~ msgstr "Redig"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
-msgid "Evolution Error"
-msgstr "Evolution Xətası"
+#~ msgid "Redmond"
+#~ msgstr "Redmond"
 
-#: shell/e-shell-importer.c:481
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"%s növünü \n"
-"idxal edə biləcək idxalçı mövcud deyil"
+#~ msgid "Red Oak"
+#~ msgstr "Red Oak"
 
-#: shell/e-shell-importer.c:490
-msgid "Importing"
-msgstr "İdxal edilir"
+#~ msgid "Redwood Falls"
+#~ msgstr "Redwood Falls"
 
-#: shell/e-shell-importer.c:497
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"%s idxal edilir.\n"
-"%s başladılır"
+#~ msgid "Reggio Calabria"
+#~ msgstr "Reggio Calabria"
 
-#: shell/e-shell-importer.c:509
-#, c-format
-msgid "Error starting %s"
-msgstr "%s başladılırkən xəta"
+#~ msgid "Regina"
+#~ msgstr "Regina"
 
-#: shell/e-shell-importer.c:523
-#, c-format
-msgid "Error loading %s"
-msgstr "%s yüklənirkən xəta"
+#~ msgid "Reims-Champagne"
+#~ msgstr "Reims-Champagne"
 
-#: shell/e-shell-importer.c:540
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"%s idxal edilir\n"
-"İdxal edilən üzv 1."
+#~ msgid "Rennes"
+#~ msgstr "Rennes"
 
-#: shell/e-shell-importer.c:594
-msgid "Automatic"
-msgstr "Avtomatik"
+#~ msgid "Reno"
+#~ msgstr "Reno"
 
-#: shell/e-shell-importer.c:643
-msgid "Filename:"
-msgstr "Fayl adı:"
+#~ msgid "Renton"
+#~ msgstr "Renton"
 
-#: shell/e-shell-importer.c:648
-msgid "Select a file"
-msgstr "Fayl seçin"
+#~ msgid "Resistencia"
+#~ msgstr "Resistencia"
 
-#: shell/e-shell-importer.c:657
-msgid "File type:"
-msgstr "Fayl növü:"
+#~ msgid "Reus"
+#~ msgstr "Reus"
 
-#: shell/e-shell-importer.c:682
-msgid "Import data and settings from older programs"
-msgstr "Başqa proqramlardan verilən və qurğuları idxal et"
+#~ msgid "Reyes"
+#~ msgstr "Reyes"
 
-#: shell/e-shell-importer.c:686
-msgid "Import a single file"
-msgstr "Tək fayl idxal et"
+#~ msgid "Reykjavik"
+#~ msgstr "Reykjavik"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
-msgid ""
-"Please wait...\n"
-"Scanning for existing setups"
-msgstr ""
-"Xahiş edirik gözləyin...\n"
-"Mövcud qurğular axtarılır"
+#~ msgid "Reynosa"
+#~ msgstr "Reynosa"
 
-#: shell/e-shell-importer.c:758
-msgid "Starting Intelligent Importers"
-msgstr "İnternet İdxalçıları Başladılır"
+#~ msgid "Rhinelander"
+#~ msgstr "Rhinelander"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
-#, c-format
-msgid "From %s:"
-msgstr "Göndərən %s:"
+#~ msgid "Rhode Island"
+#~ msgstr "Rhode Island"
 
-#: shell/e-shell-importer.c:1061
-msgid "Select folder"
-msgstr "Qovluq seçin"
+#~ msgid "Riberalta"
+#~ msgstr "Riberalta"
 
-#: shell/e-shell-importer.c:1062
-msgid "Select a destination folder for importing this data"
-msgstr "Bu verilənin idxal ediləcəyi hədəf qovluğu seçin"
+#~ msgid "Richmond"
+#~ msgstr "Richmond"
 
-#: shell/e-shell-importer.c:1192 shell/importer/intelligent.c:191
-msgid "Import"
-msgstr "İdxal Et"
+#~ msgid "Rickenbacker"
+#~ msgstr "Rickenbacker"
 
-#: shell/e-shell-offline-handler.c:592
-msgid "Closing connections..."
-msgstr "Bağlantılar bağlanır..."
+#~ msgid "Rieti"
+#~ msgstr "Rieti"
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"\"%s\" sinxronlaşdırma sırasında xəta:\n"
-"%s"
+#~ msgid "Rifle"
+#~ msgstr "Rifle"
 
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "Qovluq Sinxronlaşdırılır"
+#~ msgid "Rijeka"
+#~ msgstr "Rijeka"
 
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "\"%s\" sinxronlaşdırılır (%d / %d) ..."
+#~ msgid "Rimini"
+#~ msgstr "Rimini"
 
-#: shell/e-shell-settings-dialog.c:346
-msgid "Evolution Settings"
-msgstr "Evolution Qurğuları"
+#~ msgid "Rio De Janeiro"
+#~ msgstr "Rio De Janeiro"
 
-#. It would be nice to insensitivize the OK button appropriately
-#. instead of doing this, but unfortunately we can't do this for the
-#. Bonobo control.
-#: shell/e-shell-shared-folder-picker-dialog.c:281
-msgid "Please select a user."
-msgstr "Xahiş edirik, istifadəçi seçin."
+#~ msgid "Rio Gallegos"
+#~ msgstr "Rio Gallegos"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:387
-msgid "Opening Folder"
-msgstr "Qovluq Açılır"
+#~ msgid "Rio Grande"
+#~ msgstr "Rio Grande"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:393
-#, c-format
-msgid "Opening Folder \"%s\""
-msgstr "\"%s\" qovluğu açılır"
+#~ msgid "Rioja"
+#~ msgstr "Rioja"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:398
-#, c-format
-msgid "in \"%s\" ..."
-msgstr "\"%s\" içində..."
+#~ msgid "Rio / Jacarepagua"
+#~ msgstr "Rio / Jacarepagua"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:482
-#, c-format
-msgid "Could not open shared folder: %s."
-msgstr "Bölüşülmüş qovluq açıla bilmir: %s."
+#~ msgid "Rionegro/J.M.Cordova"
+#~ msgstr "Rionegro/J.M.Cordova"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:535
-msgid "Cannot find the specified shared folder."
-msgstr "Bildirilən bölüşülmüş qovluq tapıla bilmir"
+#~ msgid "Rishiri Island"
+#~ msgstr "Rishiri Island"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Yeni"
+#~ msgid "Rivas"
+#~ msgstr "Rivas"
 
-#: shell/e-shell-utils.c:116
-msgid "No folder name specified."
-msgstr "Qovluq adı bildirilməyib."
+#~ msgid "Rivera"
+#~ msgstr "Rivera"
 
-#: shell/e-shell-utils.c:123
-msgid "Folder name cannot contain the Return character."
-msgstr "Qovluq adı Return hərfini daxil edə bilməz."
+#~ msgid "Riverside"
+#~ msgstr "Riverside"
 
-#: shell/e-shell-utils.c:129
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "Qovluq adı \"/\" hərfini daxil edə bilməz."
+#~ msgid "Riverside/March AFB"
+#~ msgstr "Riverside/March AFB"
 
-#: shell/e-shell-utils.c:135
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "Qovluq adı \"#\" hərfini daxil edə bilməz."
+#~ msgid "Riverton"
+#~ msgstr "Riverton"
 
-#: shell/e-shell-utils.c:141
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' və '..' saxlanmış qovluq adlarıdır."
+#~ msgid "Rivne"
+#~ msgstr "Rivne"
 
-#: shell/e-shell-view-menu.c:89
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "Sisteminizdə GNOME Pilot vasitələri qurulu deyil."
+#~ msgid "Rivolto"
+#~ msgstr "Rivolto"
 
-#: shell/e-shell-view-menu.c:97
-#, c-format
-msgid "Error executing %s."
-msgstr "%s icra xətası."
+#~ msgid "Riyadh"
+#~ msgstr "Riyadh"
 
-#: shell/e-shell-view-menu.c:193
-msgid "Bug buddy is not installed."
-msgstr "Bug buddy qurulu deyil."
+#~ msgid "Roanoke"
+#~ msgstr "Roanoke"
 
-#: shell/e-shell-view-menu.c:201
-msgid "Bug buddy could not be run."
-msgstr "Bug buddy işə salına bilmədi."
+#~ msgid "Roatan"
+#~ msgstr "Roatan"
 
-#: shell/e-shell-view-menu.c:247
-msgid "About Ximian Evolution"
-msgstr "Ximian Evolution Haqqında"
+#~ msgid "Robore"
+#~ msgstr "Robore"
 
-#: shell/e-shell-view-menu.c:502
-msgid "Go to folder..."
-msgstr "Qovluğa get..."
+#~ msgid "Rochester"
+#~ msgstr "Rochester"
 
-#: shell/e-shell-view-menu.c:503
-msgid "Select the folder that you want to open"
-msgstr "Açmaq istədiyiniz qovluğu seçin"
+#~ msgid "Rockford"
+#~ msgstr "Rockford"
 
-#: shell/e-shell-view-menu.c:617
-msgid "Create New Shortcut"
-msgstr "Yeni Qısa Yol Yarat"
+#~ msgid "Rockland"
+#~ msgstr "Rockland"
 
-#: shell/e-shell-view-menu.c:618
-msgid "Select the folder you want the shortcut to point to:"
-msgstr "Qısa yolun nişanlayacağı qovluğu seçin:"
+#~ msgid "Rockport"
+#~ msgstr "Rockport"
 
-#: shell/e-shell-view-menu.c:769
-msgid "_Work Online"
-msgstr "Xətdə _İşlə"
+#~ msgid "Rock Springs"
+#~ msgstr "Rock Springs"
 
-#: shell/e-shell-view-menu.c:782 ui/evolution.xml.h:65
-msgid "_Work Offline"
-msgstr "Xətdən Qopuq _İşlə"
+#~ msgid "Rocky Mount"
+#~ msgstr "Rocky Mount"
 
-#: shell/e-shell-view-menu.c:795 ui/evolution.xml.h:39
-msgid "Work Offline"
-msgstr "Xətdən Qopuq İşlə"
+#~ msgid "Rodos"
+#~ msgstr "Rodos"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Heç bir qovluq göstərilmir)"
+#~ msgid "Rogers"
+#~ msgstr "Rogers"
 
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#~ msgid "Roma/Ciampino"
+#~ msgstr "Roma/Ciampino"
 
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Heç Biri)"
+#~ msgid "Roma/Fiumicino"
+#~ msgstr "Roma/Fiumicino"
 
-#: shell/e-shell-view.c:2083
-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."
+#~ msgid "Roma/Urbe"
+#~ msgstr "Roma/Urbe"
 
-#: shell/e-shell-view.c:2090
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution xətdən çıxma fəaliyyətindədir."
+#~ msgid "Rome-Russell"
+#~ msgstr "Rome-Russell"
 
-#: shell/e-shell-view.c:2096
-msgid "Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr "Ximian Evolution hazırda xətdə deyil. Xətdə girmək üçün bu düyməyə tıqlayın."
+#~ msgid "Ronchi de' Legionari"
+#~ msgstr "Ronchi de' Legionari"
 
-#: shell/e-shell.c:175
-#, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s tərkib hissəsi fəallaşdırıla bilmir:\n"
-"Fəallaşdırma sistemi xətası:\n"
-"%s"
+#~ msgid "Ronneby"
+#~ msgstr "Ronneby"
 
-#: shell/e-shell.c:741
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Yerli qeyd quraşdırıla bilmir -- %s"
+#~ msgid "Roosevelt"
+#~ msgstr "Roosevelt"
 
-#: shell/e-shell.c:1804
-#, c-format
-msgid ""
-"The Evolution component that handles folders of type \"%s\"\n"
-"has unexpectedly quit. You will need to quit Evolution and restart\n"
-"in order to access that data again."
-msgstr ""
-"\"%s\" növündəki qovluqları aça bilən Evolution tərkib hissəsi\n"
-"gözlənilməz şəkildə iflas etdi. Verilənlərə yenidən yetişə bilmək üçün\n"
-"Evolution proqramından çıxıb yenidən başlatmalısınız."
+#~ msgid "Roros"
+#~ msgstr "Roros"
 
-#: shell/e-shell.c:2069
-msgid "Invalid arguments"
-msgstr "Hökmsüz arqumentlər"
+#~ msgid "Rorvik/Ryum"
+#~ msgstr "Rorvik/Ryum"
 
-#: shell/e-shell.c:2071
-msgid "Cannot register on OAF"
-msgstr "OAF-a qeyd edilə bilmir"
+#~ msgid "Rosario"
+#~ msgstr "Rosario"
 
-#: shell/e-shell.c:2073
-msgid "Configuration Database not found"
-msgstr "Quraşdırma Mə'lumat Bazası tapılmadı"
+#~ msgid "Roseburg"
+#~ msgstr "Roseburg"
 
-#: shell/e-shell.c:2075 shell/e-storage.c:568
-msgid "Generic error"
-msgstr "Ümumi xəta"
+#~ msgid "Roseglen"
+#~ msgstr "Roseglen"
 
-#: shell/e-shortcuts-view.c:80
-msgid "Create New Shortcut Group"
-msgstr "Yeni Qısa Yol Qrupu Yarat"
+#~ msgid "Rost"
+#~ msgstr "Rost"
 
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Qrup adı:"
+#~ msgid "Rostov-Na-Donu"
+#~ msgstr "Rostov-Na-Donu"
 
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr "Həqiqətən də \"%s\" qrupunu qısa yol çubuğundan silmək istəyirsiniz?"
+#~ msgid "Roswell"
+#~ msgstr "Roswell"
 
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Qısa Yol Qrupunu Yenidən Adlandır"
+#~ msgid "Rotterdam"
+#~ msgstr "Rotterdam"
 
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Seçili qısa yol qrupunun adını bununla dəyişdir:"
+#~ msgid "Rouen-Valle de Seine"
+#~ msgstr "Rouen-Valle de Seine"
 
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "_Kiçik Timsallar"
+#~ msgid "Ruidoso-Sierra Blanca"
+#~ msgstr "Ruidoso-Sierra Blanca"
 
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Qısa yolları kiçik timsallar olaraq göstər"
+#~ msgid "Rurrenabaque"
+#~ msgstr "Rurrenabaque"
 
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "_Böyük Timsallar"
+#~ msgid "Russell"
+#~ msgstr "Russell"
 
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Qısa yolları böyük timsallar olaraq göstər"
+#~ msgid "Russia"
+#~ msgstr "Rusya"
 
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr "Qrup Ə_lavə Et..."
+#~ msgid "Rutland"
+#~ msgstr "Rutland"
 
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Yeni qısa yol qrupu yarat"
+#~ msgid "Rygge"
+#~ msgstr "Rygge"
 
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "Bu Qrupu _Sil..."
+#~ msgid "Rzeszow"
+#~ msgstr "Rzeszow"
 
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Bu qısa yol qrupunu sil"
+#~ msgid "Saarbrucken"
+#~ msgstr "Saarbrucken"
 
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "Bu Qrupu _Yenidən Adlandır..."
+#~ msgid "Sabine Pass"
+#~ msgstr "Sabine Pass"
 
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Bu qısa yol qrupunu yenidən adlandır"
+#~ msgid "Sacramento"
+#~ msgstr "Sacramento"
 
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "Vəziyyət Çubuğunu _Gizlə"
+#~ msgid "Sacramento-Woodland"
+#~ msgstr "Sacramento-Woodland"
 
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Vəziyyət çubuğunu gizlə"
+#~ msgid "Safford-Municipal Airport"
+#~ msgstr "Safford-Municipal Airport"
 
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "Ön _Qurğulu Qısa Yolları Yarat"
+#~ msgid "Saginaw"
+#~ msgstr "Saginaw"
 
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "Ön Qurğulu Qısa Yolları Yarat"
+#~ msgid "Saint Anthony"
+#~ msgstr "Saint Anthony"
 
-#: shell/e-shortcuts-view.c:408
-msgid "Rename Shortcut"
-msgstr "Qısa Yolu Yenidən Adlandır"
+#~ msgid "Saint-Brieuc-Armor"
+#~ msgstr "Saint-Brieuc-Armor"
 
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Bu qısa yolun adını bununla dəyişdir:"
+#~ msgid "Saint-Dizier-Robinson"
+#~ msgstr "Saint-Dizier-Robinson"
 
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Bu qısa yola bağlanmış qovluğu aç"
+#~ msgid "Saint-Etienne-Boutheon"
+#~ msgstr "Saint-Etienne-Boutheon"
 
-#: shell/e-shortcuts-view.c:424 ui/evolution.xml.h:23
-msgid "Open in New _Window"
-msgstr "Yeni _Pəncərədə Aç"
+#~ msgid "Saint Mary's"
+#~ msgstr "Saint Mary's"
 
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Bu qısa yol ilə bağlanmış qovluğu yeni pəncərədə aç"
+#~ msgid "Saint Mawgan"
+#~ msgstr "Saint Mawgan"
 
-#: shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "_Yenidən Adlandır"
+#~ msgid "Saint-Nazaire-Montoir"
+#~ msgstr "Saint-Nazaire-Montoir"
 
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Bu qısa yolu yenidən adlandır"
+#~ msgid "Saint Paul"
+#~ msgstr "Saint Paul"
 
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "_Sil"
+#~ msgid "Saiq"
+#~ msgstr "Saiq"
 
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Bu qısa yolu qısa yol çubuğundan sil"
+#~ msgid "Salalah"
+#~ msgstr "Salalah"
 
-#: shell/e-shortcuts.c:649
-msgid "Error saving shortcuts."
-msgstr "Qısa yolları qeyd edərkən xəta."
+#~ msgid "Salem"
+#~ msgstr "Salem"
 
-#: shell/e-shortcuts.c:1096
-msgid "Shortcuts"
-msgstr "Qısa yollar"
+#~ msgid "Salida"
+#~ msgstr "Salida"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "İşarələmə qutusu"
+#~ msgid "Salida-Harriet"
+#~ msgstr "Salida-Harriet"
 
-#: shell/e-storage.c:566
-msgid "No error"
-msgstr "Xəta yoxdur"
+#~ msgid "Salina"
+#~ msgstr "Salina"
 
-#: shell/e-storage.c:570
-msgid "A folder with the same name already exists"
-msgstr "Eyni adlı bir qovluq onsuz da mövcuddur"
+#~ msgid "Salinas"
+#~ msgstr "Salinas"
 
-#: shell/e-storage.c:572
-msgid "The specified folder type is not valid"
-msgstr "Bildirilən qovluq növü hökmlü deyil"
+#~ msgid "Salisbury"
+#~ msgstr "Salisbury"
 
-#: shell/e-storage.c:574
-msgid "I/O error"
-msgstr "G/Ç xətası"
+#~ msgid "Salmon"
+#~ msgstr "Salmon"
 
-#: shell/e-storage.c:576
-msgid "Not enough space to create the folder"
-msgstr "Qovluğu yaratmaq üçün lazımi disk sahəsi yoxdur"
+#~ msgid "Salmon (2)"
+#~ msgstr "Salmon (2)"
 
-#: shell/e-storage.c:578
-msgid "The folder is not empty"
-msgstr "Qovluq boş deyil"
+#~ msgid "Salta"
+#~ msgstr "Salta"
 
-#: shell/e-storage.c:580
-msgid "The specified folder was not found"
-msgstr "Bildirilən qovluq tapıla bilmədi"
+#~ msgid "Saltillo"
+#~ msgstr "Saltillo"
 
-#: shell/e-storage.c:582
-msgid "Function not implemented in this storage"
-msgstr "Funksiya bu saxlama növündə yazılmayıb"
+#~ msgid "Salt Lake City"
+#~ msgstr "Salt Lake City"
 
-#: shell/e-storage.c:586
-msgid "Operation not supported"
-msgstr "Əməliyyat dəstəklənmir"
+#~ msgid "Salto"
+#~ msgstr "Salto"
 
-#: shell/e-storage.c:588
-msgid "The specified type is not supported in this storage"
-msgstr "Bu saxlama növündə bildirilən növ dəstəklənmir"
+#~ msgid "Salt point"
+#~ msgstr "Salt point"
 
-#: shell/e-storage.c:590
-msgid "The specified folder cannot be modified or removed"
-msgstr "Bildirilən qovluq təkmilləşdirilə ya da silinə bilməz"
+#~ msgid "Salvador"
+#~ msgstr "Salvador"
 
-#: shell/e-storage.c:592
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "Qovluq, altlarından birinə törəmə olaraq seçilə bilmir"
+#~ msgid "Salzburg"
+#~ msgstr "Salzburg"
 
-#: shell/e-storage.c:594
-msgid "Cannot create a folder with that name"
-msgstr "Bu adda qovluq yaradıla bilmir"
+#~ msgid "Samara"
+#~ msgstr "Samara"
 
-#: shell/e-storage.c:596
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Bu gedişat oflayn modda ikən tədbiq edilə bilməz"
+#~ msgid "Samos"
+#~ msgstr "Samos"
 
-#: shell/e-task-widget.c:211
-#, c-format
-msgid "%s (...)"
-msgstr "%s (...)"
+#~ msgid "Samsun"
+#~ msgstr "Samsun"
 
-#: shell/e-task-widget.c:216
-#, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% başa çatdı)"
+#~ msgid "Sana'A"
+#~ msgstr "Sana'A"
 
-#: shell/evolution-folder-selector-button.c:100
-msgid "<click here to select a folder>"
-msgstr "<qovluq seçmək üçün buraya tıqlayın>"
+#~ msgid "San Andres Isla/Sesquicentenario"
+#~ msgstr "San Andres Isla/Sesquicentenario"
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Namə'lum xəta."
+#~ msgid "San Angelo"
+#~ msgstr "San Angelo"
 
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Tərkib hissəsi sistemi xətası:\n"
-"%s"
+#~ msgid "San Antonio"
+#~ msgstr "San Antonio"
 
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Fəallaşdırma sistemi xətası:\n"
-"%s"
+#~ msgid "San Antonio Del Tachira"
+#~ msgstr "San Antonio Del Tachira"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "CORBA xətası"
+#~ msgid "San Antonio-Kelly AFB"
+#~ msgstr "San Antonio-Kelly AFB"
 
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Kəsildi"
+#~ msgid "San Antonio-Stinson"
+#~ msgstr "San Antonio-Stinson"
 
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Səhv arqument"
+#~ msgid "San Carlos"
+#~ msgstr "San Carlos"
 
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Yiyəsi onsuz da mövcuddur"
+#~ msgid "Sandane"
+#~ msgstr "Sandane"
 
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Yiyəsi yoxdur"
+#~ msgid "Sandberg"
+#~ msgstr "Sandberg"
 
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Tapıla bilmədi"
+#~ msgid "Sanderson"
+#~ msgstr "Sanderson"
 
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Dəstəklənməyən növ"
+#~ msgid "San Diego"
+#~ msgstr "San Diego"
 
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Dəstəklənməyən sxem"
+#~ msgid "San Diego-Brown"
+#~ msgstr "San Diego-Brown"
 
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Dəstəklənməyən gedişat"
+#~ msgid "San Diego-Miramar"
+#~ msgstr "San Diego-Miramar"
 
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Daxili xəta"
+#~ msgid "San Diego-Montgomery"
+#~ msgstr "San Diego-Montgomery"
 
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Mövcuddur"
+#~ msgid "San Diego-North Island"
+#~ msgstr "San Diego-North Island"
 
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "Hökmsüz URI"
+#~ msgid "San Diego-Santee"
+#~ msgstr "San Diego-Santee"
 
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Alt qovluqlara malikdir"
+#~ msgid "Sandnessjoen/Stokka"
+#~ msgstr "Sandnessjoen/Stokka"
 
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Heç yer qalmayıb"
+#~ msgid "Sand Point"
+#~ msgstr "Sand Point"
 
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "Köhnə yiyəsi ölüb"
+#~ msgid "San Fernando De Apure"
+#~ msgstr "San Fernando De Apure"
 
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Sınaq növü"
+#~ msgid "Sanford"
+#~ msgstr "Sanford"
 
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr "Evolution Sınaq Tərkib Hissəsi"
+#~ msgid "San Francisco"
+#~ msgstr "San Francisco"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active Connections"
-msgstr "Fəal Bağlantılar"
+#~ msgid "Sangju"
+#~ msgstr "Sangju"
 
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
-msgstr "Bu bağlantıları kəsərək xətdən qopmaq üçün Oldu-ya tıqlayın"
+#~ msgid "San Ignacio De Velasco"
+#~ msgstr "San Ignacio De Velasco"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
-msgstr "Aıağıdakı bağlantılar hazırda fəaldır:"
+#~ msgid "San Joaquin"
+#~ msgstr "San Joaquin"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "_Təqvim:"
+#~ msgid "San Jose"
+#~ msgstr "San Jose"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:2
-msgid "_Contacts:"
-msgstr "Ə_laqələr:"
+#~ msgid "San Jose De Chiquitos"
+#~ msgstr "San Jose De Chiquitos"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "_Məktub:"
+#~ msgid "San Jose del Cabo"
+#~ msgstr "San Jose del Cabo"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "_Vəzifələr:"
+#~ msgid "San Jose-Santa Clara"
+#~ msgstr "San Jose-Santa Clara"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr "Qovluq _adı:"
+#~ msgid "San Juan"
+#~ msgstr "San Juan"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "Qovluq _növü:"
+#~ msgid "Sankt-Peterburg"
+#~ msgstr "Sankt-Peterburg"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Qovluğun yaradılacağı yeri bildirin:"
+#~ msgid "Sanliurfa"
+#~ msgstr "Sanliurfa"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Başqa İstifadəçinin Qovluğunu Aç"
+#~ msgid "San Luis Obispo"
+#~ msgstr "San Luis Obispo"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Hesab:"
+#~ msgid "San Luis Potosi"
+#~ msgstr "San Luis Potosi"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "_Qovluq Adı:"
+#~ msgid "San Miguel"
+#~ msgstr "San Miguel"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_İstifadəci:"
+#~ msgid "San Nicholas Island"
+#~ msgstr "San Nicholas Island"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
-msgid "Evolution Setup Assistant"
-msgstr "Evolution Sazlama Yardımçısı"
+#~ msgid "San Salvador"
+#~ msgstr "San Salvador"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
-msgid "Importing Files"
-msgstr "Fayllar İdxal Edilir"
+#~ msgid "San Sebastian"
+#~ msgstr "San Sebastian"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Timezone "
-msgstr "Vaxt zolağı"
+#~ msgid "Santa Ana"
+#~ msgstr "Santa Ana"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
-msgid "Welcome"
-msgstr "Xoş Gəldiniz"
+#~ msgid "Santa Barbara"
+#~ msgstr "Santa Barbara"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
-msgid ""
-"Welcome to Evolution. The next few screens will allow\n"
-"Evolution to connect to your email accounts, and to import\n"
-"files from other applications. \n"
-"\n"
-"Please click the \"Forward\" button to continue. "
-msgstr ""
-"Evolution dünyasına xoş gəldiniz. Növbəti ekranlar\n"
-"Evolution proqramına epoçt hesablarınıza bağlanmaq və başqa\n"
-"rpoqramlardan faylları idxal etməyə yardım edəcəklər. \n"
-"\n"
-"Xahiş edirik, davam etmək üçün \"Sonrakı\" düyməsinə basın. "
+#~ msgid "Santa Cruz"
+#~ msgstr "Santa Cruz"
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
-msgid ""
-"You have successfully entered all of the information\n"
-"needed to set up Evolution. \n"
-"\n"
-"Click the \"Apply\" button to save your settings. "
-msgstr ""
-"Evolution proqramını sazlamaq üçün lazımi bütün mə'lumatları bildirdiniz.\n"
-"\n"
-"Qurğularınızı qeyd etmək üçün \"Tədbiq Et\" düyməsinə basın. "
+#~ msgid "Santa Fe"
+#~ msgstr "Santa Fe"
 
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "Faylı Evolution içinə almaq üçün \"İdxal Et\" düyməsini tıqlayın. "
+#~ msgid "Santa Maria"
+#~ msgstr "Santa Maria"
 
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Assistant"
-msgstr "Evolution İdxal Yardımçısı"
+#~ msgid "Santa Marta/Simon Bolivar"
+#~ msgstr "Santa Marta/Simon Bolivar"
 
-#: shell/importer/import.glade.h:3
-msgid "Import File (step 3 of 3)"
-msgstr "Fayl İdxal Et (3 addımın 3-cüsü)"
+#~ msgid "Santa Monica"
+#~ msgstr "Santa Monica"
 
-#: shell/importer/import.glade.h:4
-msgid "Importer Type (step 1 of 3)"
-msgstr "İdxalçı Növü (3 addımın 1-cisi)"
+#~ msgid "Santander"
+#~ msgstr "Santander"
 
-#: shell/importer/import.glade.h:5
-msgid "Select Importers (step 2 of 3)"
-msgstr "İdxalçıları Seçin (3 addımın 2-cisi)"
+#~ msgid "Santarem"
+#~ msgstr "Santarem"
 
-#: shell/importer/import.glade.h:6
-msgid "Select a File (step 2 of 3)"
-msgstr "Faylı Seçin (3 addımın 2-cisi)"
+#~ msgid "Santa Rosa"
+#~ msgstr "Santa Rosa"
 
-#: 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"
-"importing external files into Evolution."
-msgstr ""
-"Evolution İdxal Yardımçısına Xoş Gəldiniz.\n"
-"Bu vasitə ilə xarici fayllarınızı Evolution içinə\n"
-"ala biləcəksiniz."
+#~ msgid "Santa Rosa de Copan"
+#~ msgstr "Santa Rosa de Copan"
 
-#: shell/importer/intelligent.c:189
-msgid "Importers"
-msgstr "İdxalçılar"
+#~ msgid "Santiago"
+#~ msgstr "Santiago"
 
-#: shell/importer/intelligent.c:195
-msgid "Don't import"
-msgstr "İdxal etmə"
+#~ msgid "Santiago de Cuba"
+#~ msgstr "Santiago de Cuba"
 
-#: shell/importer/intelligent.c:199
-msgid "Don't ask me again"
-msgstr "Bir də soruşma"
+#~ msgid "Santiago Del Estero"
+#~ msgstr "Santiago Del Estero"
 
-#: shell/importer/intelligent.c:207
-msgid "Evolution can import data from the following files:"
-msgstr "Evolution aşağıdakı fayllardan verilənləri idxal edə bilər:"
+#~ msgid "Santorini"
+#~ msgstr "Santorini"
 
-#: shell/main.c:112 shell/main.c:574
-msgid "Evolution"
-msgstr "Evolution"
+#~ msgid "Santos"
+#~ msgstr "Santos"
 
-#: shell/main.c:118
-msgid "Evolution is now exiting ..."
-msgstr "Evolution indi bağlanır ..."
+#~ msgid "Sao Jose Dos Campo"
+#~ msgstr "Sao Jose Dos Campo"
 
-#. Preview/Alpha/Beta version warning message
-#: shell/main.c:274
-#, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\n"
-"but some features are either unfinished or do not work properly.\n"
-"\n"
-"If you want a stable version of Evolution, we urge you to uninstall\n"
-"this version, and install version %s instead.\n"
-"\n"
-"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
+#~ msgid "Sao Luiz"
+#~ msgstr "Sao Luiz"
 
-#: shell/main.c:298
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-"Sağolun\n"
-"Ximian Evolution Komandası\n"
+#~ msgid "Sao Paulo"
+#~ msgstr "Sao Paulo"
 
-#: shell/main.c:306
-msgid "Don't tell me again"
-msgstr "Bunu bir daha demə"
+#~ msgid "Sapporo Ab"
+#~ msgstr "Sapporo Ab"
 
-#: shell/main.c:401
-msgid "Cannot access the Ximian Evolution shell."
-msgstr "Ximian Evolution qabığına yetişilə bilmir."
+#~ msgid "Sarajevo"
+#~ msgstr "Sarajevo"
 
-#: shell/main.c:410
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Ximian Evolution qabığı başladıla bilmir: %s"
+#~ msgid "Saranac Lake"
+#~ msgstr "Saranac Lake"
 
-#: shell/main.c:542
-msgid "Disable splash screen"
-msgstr "Açılış ekranını göstərmə"
+#~ msgid "Sarasota"
+#~ msgstr "Sarasota"
 
-#: shell/main.c:544
-msgid "Start in offline mode"
-msgstr "Xətdən qopuq modda başla"
+#~ msgid "Saratov"
+#~ msgstr "Saratov"
 
-#: shell/main.c:546
-msgid "Start in online mode"
-msgstr "Xətdə modunda başla"
+#~ msgid "Sarzana"
+#~ msgstr "Sarzana"
 
-#: shell/main.c:549
-msgid "Forcibly shut down all evolution components"
-msgstr "Bütün evolution tərkib hissələrini bağlanmaya məcbur et"
+#~ msgid "Saskatchewan"
+#~ msgstr "Saskatchewan"
 
-#: shell/main.c:552
-msgid "Send the debugging output of all components to a file."
-msgstr "Bütün tərkib hissələrinin xəta ayırma verilənlərini bir fayla göndər."
+#~ msgid "Saskatoon"
+#~ msgstr "Saskatoon"
 
-#: shell/main.c:578
-#, c-format
-msgid ""
-"%s: --online and --offline cannot be used together.\n"
-"  Use %s --help for more information.\n"
-msgstr ""
+#~ msgid "Sauce Viejo"
+#~ msgstr "Sauce Viejo"
 
-#: tools/evolution-addressbook-abuse.c:81
-#: tools/evolution-addressbook-import.c:46
-msgid "Error loading default addressbook."
-msgstr "Əsas ünvan kitabçasını yükləmə xətası."
+#~ msgid "Sault Ste Marie"
+#~ msgstr "Sault Ste Marie"
 
-#: tools/evolution-addressbook-abuse.c:112
-#: tools/evolution-addressbook-import.c:67
-msgid "Input File"
-msgstr "Giriş Faylı"
+#~ msgid "Savannah"
+#~ msgstr "Savannah"
 
-#: tools/evolution-addressbook-import.c:82
-msgid "No filename provided."
-msgstr "Fayl adı bildirilməyib."
+#~ msgid "Savannah-Hunter AAF"
+#~ msgstr "Savannah-Hunter AAF"
 
-#: tools/evolution-launch-composer.c:324
-msgid "An attachment to add."
-msgstr "İlişdiriləcək əlavə."
+#~ msgid "Sawyer AFB"
+#~ msgstr "Sawyer AFB"
 
-#: tools/evolution-launch-composer.c:325
-msgid "Content type of the attachment."
-msgstr "Əlavənin məzmun növü."
+#~ msgid "Sayun"
+#~ msgstr "Sayun"
 
-#: tools/evolution-launch-composer.c:326
-msgid "The filename to display in the mail."
-msgstr "Poçtda göstəriləcək fayl adı"
+#~ msgid "Scatsta"
+#~ msgstr "Scatsta"
 
-#: tools/evolution-launch-composer.c:327
-msgid "Description of the attachment."
-msgstr "Əlavənin izahatı."
+#~ msgid "Schaffen"
+#~ msgstr "Schaffen"
 
-#: tools/evolution-launch-composer.c:328
-msgid "Mark attachment to be shown inline by default."
-msgstr ""
+#~ msgid "Schenectady"
+#~ msgstr "Schenectady"
 
-#: tools/evolution-launch-composer.c:329
-msgid "Default subject for the message."
-msgstr "İsmarışın ön qurğulu mövzusu."
+#~ msgid "Scilly Isles"
+#~ msgstr "Scilly Isles"
 
-#. This most likely means that KILL_PROCESS_CMD wasn't
-#. * found, so just bail completely.
-#.
-#: tools/killev.c:63
-#, c-format
-msgid "Could not execute '%s': %s\n"
-msgstr "'%s' icra edilə bilmədi: %s\n"
+#~ msgid "Scottsbluff"
+#~ msgstr "Scottsbluff"
 
-#: tools/killev.c:78
-#, c-format
-msgid "Shutting down %s (%s)\n"
-msgstr "%s (%s) bağlanır\n"
+#~ msgid "Scottsdale"
+#~ msgstr "Scottsdale"
 
-#: ui/evolution-addressbook.xml.h:3
-msgid "Copy Contact(s) to Another Folder..."
-msgstr "Əlaqə(lər)ni Başqa Qovluğa Köçür..."
+#~ msgid "Scranton"
+#~ msgstr "Scranton"
 
-#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
-msgid "Copy the selection"
-msgstr "Seçimi köçür"
+#~ msgid "Seattle"
+#~ msgstr "Seattle"
 
-#: ui/evolution-addressbook.xml.h:5
-msgid "Copy to Folder..."
-msgstr "Qovluğa _Köçür..."
+#~ msgid "Seattle-Boeing"
+#~ msgstr "Seattle-Boeing"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
-msgid "Cut the selection"
-msgstr "Seçimi kəs"
+#~ msgid "Sedalia"
+#~ msgstr "Sedalia"
 
-#: ui/evolution-addressbook.xml.h:9
-msgid "Delete selected contacts"
-msgstr "Seçili əlaqələri sil"
+#~ msgid "Seeb"
+#~ msgstr "Seeb"
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Move Contact(s) to Another Folder..."
-msgstr "Əlaqə(lər)ni Başqa Qovluğa Daşı..."
+#~ msgid "Selanik"
+#~ msgstr "Selanik"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "Move to Folder..."
-msgstr "Qovluğa _Daşı..."
+#~ msgid "Sendai Airport"
+#~ msgstr "Sendai Airport"
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:17
-msgid "Paste the clipboard"
-msgstr "Ara yaddaşı yapışdır"
+#~ msgid "Seoul E Ab"
+#~ msgstr "Seoul E Ab"
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "Previews the contacts to be printed"
-msgstr "Çap ediləcək əlaqələri nümayiş etdirər"
+#~ msgid "Seoul/Kimp'O International Airport"
+#~ msgstr "Seoul/Kimp'O International Airport"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
-#: ui/evolution-tasks.xml.h:13
-msgid "Print Pre_view"
-msgstr "Çap Nüma_yişi"
+#~ msgid "Seoul/Yongdungp'O Rokaf Wc"
+#~ msgstr "Seoul/Yongdungp'O Rokaf Wc"
 
-#: ui/evolution-addressbook.xml.h:18
-msgid "Print selected contacts"
-msgstr "Seçili əlaqələri çap et"
+#~ msgid "Sept-Iles"
+#~ msgstr "Sept-Iles"
 
-#: ui/evolution-addressbook.xml.h:20
-msgid "Save selected contacts as a VCard."
-msgstr "Seçili əlaqələri VCard olaraq qeyd et."
+#~ msgid "Seul Choix Pt"
+#~ msgstr "Seul Choix Pt"
 
-#: ui/evolution-addressbook.xml.h:21
-msgid "Select All"
-msgstr "Hamısını Seç"
+#~ msgid "Sevilla"
+#~ msgstr "Sevilla"
 
-#: ui/evolution-addressbook.xml.h:22
-msgid "Select all contacts"
-msgstr "Bütün əlaqələri seç"
+#~ msgid "Seward"
+#~ msgstr "Seward"
 
-#: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
-msgstr "Seçili əlaqələrə ismarış göndər."
+#~ msgid "Sexton Summit"
+#~ msgstr "Sexton Summit"
 
-#: ui/evolution-addressbook.xml.h:24
-msgid "Send message to contact"
-msgstr "Əlaqəyə ismarış göndər"
+#~ msgid "Shanghai"
+#~ msgstr "Shanghai"
 
-#: ui/evolution-addressbook.xml.h:25
-msgid "Send selected contacts to another person."
-msgstr "Seçili əlaqələri başqa şəxsə göndər."
+#~ msgid "Shannon"
+#~ msgstr "Shannon"
 
-#: ui/evolution-addressbook.xml.h:26
-msgid "Stop"
-msgstr "Dayandır"
+#~ msgid "Sharjah"
+#~ msgstr "Sharjah"
 
-#: ui/evolution-addressbook.xml.h:27
-msgid "Stop Loading"
-msgstr "Yükləməni Dayandır"
+#~ msgid "Sharm El Sheikhintl"
+#~ msgstr "Sharm El Sheikhintl"
 
-#: ui/evolution-addressbook.xml.h:28
-msgid "View the current contact"
-msgstr "Hazırkı əlaqəni göstər"
+#~ msgid "Sharurah"
+#~ msgstr "Sharurah"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:28
-#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:42
-msgid "_Actions"
-msgstr "_Gedişatlar"
+#~ msgid "Shawbury"
+#~ msgstr "Shawbury"
 
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
-msgid "_Forward Contact..."
-msgstr "Əlaqənı Ö_tür..."
+#~ msgid "Shearwater"
+#~ msgstr "Shearwater"
 
-#: ui/evolution-addressbook.xml.h:35
-msgid "_Move to Folder..."
-msgstr "Qovluğa _Daşı..."
+#~ msgid "Sheboygan"
+#~ msgstr "Sheboygan"
 
-#: ui/evolution-addressbook.xml.h:39
-msgid "_Save as VCard"
-msgstr "VCard olaraq _Qeyd Et"
+#~ msgid "Sheldon"
+#~ msgstr "Sheldon"
 
-#: ui/evolution-addressbook.xml.h:40
-msgid "_Search for Contacts"
-msgstr "Əlaqə _Axtar"
+#~ msgid "Shelter Cove"
+#~ msgstr "Shelter Cove"
 
-#: ui/evolution-addressbook.xml.h:41
-msgid "_Select All"
-msgstr "Hamısını _Seç"
+#~ msgid "Shelton"
+#~ msgstr "Shelton"
 
-#: ui/evolution-addressbook.xml.h:42
-msgid "_Send Message to Contact..."
-msgstr "Əlaqəyə İsmarış _Göndər..."
+#~ msgid "Shenandoah"
+#~ msgstr "Shenandoah"
 
-#: ui/evolution-calendar.xml.h:4
-msgid "Day"
-msgstr "Gün"
+#~ msgid "Sheridan"
+#~ msgstr "Sheridan"
 
-#: ui/evolution-calendar.xml.h:5
-msgid "Delete All Occurrences"
-msgstr "Bütün Vaqeələri Sil"
+#~ msgid "Sherman-Denison"
+#~ msgstr "Sherman-Denison"
 
-#: ui/evolution-calendar.xml.h:6
-msgid "Delete the appointment"
-msgstr "Görüşü sil"
+#~ msgid "Shimofusa Ab"
+#~ msgstr "Shimofusa Ab"
 
-#: ui/evolution-calendar.xml.h:7
-msgid "Delete this Occurrence"
-msgstr "Bu Vaqeəni Sil"
+#~ msgid "Shingle Point"
+#~ msgstr "Shingle Point"
 
-#: ui/evolution-calendar.xml.h:8
-msgid "Delete this occurrence"
-msgstr "Bu _vaqeəni sil"
+#~ msgid "Shiraz"
+#~ msgstr "Shiraz"
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Go To"
-msgstr "Get"
+#~ msgid "Shishmaref"
+#~ msgstr "Shishmaref"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go back"
-msgstr "Geri get"
+#~ msgid "Shizuhama Ab"
+#~ msgstr "Shizuhama Ab"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go forward"
-msgstr "İrəli get"
+#~ msgid "Shoreham"
+#~ msgstr "Shoreham"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr "_Tarixə Get"
+#~ msgid "Show Low"
+#~ msgstr "Show Low"
 
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr "Xüsusi tarixə get"
+#~ msgid "Shreveport Downtown"
+#~ msgstr "Shreveport Downtown"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
-msgstr "Bugünə get"
+#~ msgid "Shreveport Regional"
+#~ msgstr "Shreveport Regional"
 
-#: ui/evolution-calendar.xml.h:16
-msgid "Month"
-msgstr "Ay"
+#~ msgid "Sidney"
+#~ msgstr "Sidney"
 
-#: ui/evolution-calendar.xml.h:18
-msgid "Previews the calendar to be printed"
-msgstr "Çap ediləcək təqvimi nümayiş etdirər"
+#~ msgid "Sigonella"
+#~ msgstr "Sigonella"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Print this calendar"
-msgstr "Bu təqvimi çap et"
+#~ msgid "Siloam Springs"
+#~ msgstr "Siloam Springs"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "Publish Free/Busy information for this calendar"
-msgstr "Bu təqvim üçün Sərbəst/Məşğul mə'lumatını dərc et"
+#~ msgid "Silver City"
+#~ msgstr "Silver City"
 
-#: ui/evolution-calendar.xml.h:22
-msgid "Show one day"
-msgstr "Bir günü göstər"
+#~ msgid "Sindal"
+#~ msgstr "Sindal"
 
-#: ui/evolution-calendar.xml.h:23
-msgid "Show one month"
-msgstr "Bir ayı göstər"
+#~ msgid "Sioux City"
+#~ msgstr "Sioux City"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Show one week"
-msgstr "Bir həftəni göster"
+#~ msgid "Sioux Falls"
+#~ msgstr "Sioux Falls"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Show the working week"
-msgstr "İş həftəsini göstər"
+#~ msgid "Sitka"
+#~ msgstr "Sitka"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Week"
-msgstr "Həftə"
+#~ msgid "Sivas"
+#~ msgstr "Sivas"
 
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:5
-msgid "Close"
-msgstr "Bağla"
+#~ msgid "Sivrihisar"
+#~ msgstr "Sivrihisar"
 
-#: ui/evolution-comp-editor.xml.h:3
-msgid "Close this item"
-msgstr "Bu üzvü bağla"
+#~ msgid "Skagway"
+#~ msgstr "Skagway"
 
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
-msgid "Delete this item"
-msgstr "Bu üzvü sil"
+#~ msgid "Skiathos"
+#~ msgstr "Skiathos"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:18
-msgid "Main toolbar"
-msgstr "Ana vasitə çubuğu"
+#~ msgid "Skien/Geiteryggen"
+#~ msgstr "Skien/Geiteryggen"
 
-#: ui/evolution-comp-editor.xml.h:7
-msgid "Preview the printed item"
-msgstr "Çap edilən üzvü göstər"
+#~ msgid "Skive"
+#~ msgstr "Skive"
 
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
-msgid "Print this item"
-msgstr "Bu üzvü çap et"
+#~ msgid "Skopje"
+#~ msgstr "Skopje"
 
-#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
-msgstr "_Fərqli Qeyd Et..."
+#~ msgid "Skwentna"
+#~ msgstr "Skwentna"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:6
-msgid "Save and Close"
-msgstr "Qeyd Et və Bağla"
+#~ msgid "Slana"
+#~ msgstr "Slana"
 
-#: ui/evolution-comp-editor.xml.h:13
-msgid "Save and _Close"
-msgstr "Qeyd Et və _Bağla"
+#~ msgid "Smithers"
+#~ msgstr "Smithers"
 
-#: ui/evolution-comp-editor.xml.h:14
-msgid "Save the item and close the dialog box"
-msgstr "Üzvü qeyd et və dialoq qutusunu bağla"
+#~ msgid "Smyrna"
+#~ msgstr "Smyrna"
 
-#: ui/evolution-comp-editor.xml.h:15
-msgid "Save this item to disk"
-msgstr "Bu üzvü diskə qeyd et"
+#~ msgid "Snowshoe Lake"
+#~ msgstr "Snowshoe Lake"
 
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
-#: ui/evolution-contact-list-editor.xml.h:11
-#: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:46
-msgid "_File"
-msgstr "_Fayl"
+#~ msgid "Sochi"
+#~ msgstr "Sochi"
 
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:14
-msgid "_Save"
-msgstr "_Qeyd Et..."
+#~ msgid "Socorro"
+#~ msgstr "Socorro"
 
-#: ui/evolution-composer-entries.xml.h:1
-msgid "Copy selected text to the clipboard"
-msgstr "Seçili mətni ara yaddaşa köçür"
+#~ msgid "Socotra"
+#~ msgstr "Socotra"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-list.xml.h:3
-msgid "Cu_t"
-msgstr "Kə_s"
+#~ msgid "Soda Springs"
+#~ msgstr "Soda Springs"
 
-#: ui/evolution-composer-entries.xml.h:3
-msgid "Cut selected text to the clipboard"
-msgstr "Seçili mətni ara yaddaşa kəs"
+#~ msgid "Sofia"
+#~ msgstr "Sofia"
 
-#: ui/evolution-composer-entries.xml.h:4
-msgid "Paste text from the clipboard"
-msgstr "Mətni ara yaddaşdan yapışdır"
+#~ msgid "Sogndal"
+#~ msgstr "Sogndal"
 
-#: ui/evolution-composer-entries.xml.h:5 ui/evolution-mail-list.xml.h:13
-#: ui/evolution-subscribe.xml.h:6
-msgid "Select _All"
-msgstr "_Hamısını Seç"
+#~ msgid "Soldotna"
+#~ msgstr "Soldotna"
 
-#: ui/evolution-composer-entries.xml.h:6
-msgid "Select all text"
-msgstr "Bütün mətni seç"
+#~ msgid "Somerset"
+#~ msgstr "Somerset"
 
-#: ui/evolution-contact-editor.xml.h:5
-msgid "Print En_velope..."
-msgstr "_Zərfi Çap Et..."
+#~ msgid "Sonderborg"
+#~ msgstr "Sonderborg"
 
-#: ui/evolution-contact-editor.xml.h:9
-msgid "Save the contact and close the dialog box"
-msgstr "Əlaqəni qeyd et və dialoq qutusunu bağla"
+#~ msgid "Songmu Ab"
+#~ msgstr "Songmu Ab"
 
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Send _Message to Contact..."
-msgstr "Əlaqəyə _İsmarış Göndər..."
+#~ msgid "Sorkjosen"
+#~ msgstr "Sorkjosen"
 
-#: ui/evolution-contact-list-editor.xml.h:3
-msgid "Delete this list"
-msgstr "Bu siyahını sil"
+#~ msgid "Southampton"
+#~ msgstr "Southampton"
 
-#: ui/evolution-contact-list-editor.xml.h:4
-msgid "Delete..."
-msgstr "Sil..."
+#~ msgid "South Bend"
+#~ msgstr "South Bend"
 
-#: ui/evolution-contact-list-editor.xml.h:7
-msgid "Save the list and close the dialog box"
-msgstr "Siyahını qeyd et və dialoqu qutusunu bağla"
+#~ msgid "South Carolina"
+#~ msgstr "South Carolina"
 
-#: ui/evolution-contact-list-editor.xml.h:8
-msgid "Se_nd list to other..."
-msgstr "Siyahını başqalarına gö_ndər..."
+#~ msgid "South Dakota"
+#~ msgstr "South Dakota"
 
-#: ui/evolution-contact-list-editor.xml.h:9
-msgid "Send _message to list..."
-msgstr "Qrupa _ismarış göndər..."
+#~ msgid "Southend"
+#~ msgstr "Southend"
 
-#: ui/evolution-event-editor.xml.h:1
-msgid "Cancel Mee_ting"
-msgstr "Görüşü _Ləğv Et"
+#~ msgid "South Marsh Island"
+#~ msgstr "South Marsh Island"
 
-#: ui/evolution-event-editor.xml.h:2
-msgid "Cancel the meeting for this item"
-msgstr "Bu üzv üçün görüşü ləğv et"
+#~ msgid "South Timbalier"
+#~ msgstr "South Timbalier"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
-msgid "Forward as i_Calendar"
-msgstr "i_Calendar şəklində ötür"
+#~ msgid "Sparrevohn"
+#~ msgstr "Sparrevohn"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
-msgid "Forward this item via email"
-msgstr "Bu üzvü məktubla ötür"
+#~ msgid "Spencer"
+#~ msgstr "Spencer"
 
-#: ui/evolution-event-editor.xml.h:7
-msgid "Obtain the latest meeting information"
-msgstr "Ən son görüş mə'lumatını al"
+#~ msgid "Spickard"
+#~ msgstr "Spickard"
 
-#: ui/evolution-event-editor.xml.h:8
-msgid "Re_fresh Meeting"
-msgstr "Görüşü Ye_nilə"
+#~ msgid "Split"
+#~ msgstr "Split"
 
-#: ui/evolution-event-editor.xml.h:9
-msgid "Schedule _Meeting"
-msgstr "_Görüş Planlaşdır"
+#~ msgid "Spokane"
+#~ msgstr "Spokane"
 
-#: ui/evolution-event-editor.xml.h:10
-msgid "Schedule a meeting for this item"
-msgstr "Bu üzv üçün görüş planlaşdır"
+#~ msgid "Spokane-Parkwater"
+#~ msgstr "Spokane-Parkwater"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Customize My Evolution"
-msgstr "Evolution Proqramımı Xüsusiləşdir"
+#~ msgid "Springbok"
+#~ msgstr "Springbok"
 
-#: ui/evolution-mail-global.xml.h:2
-msgid "Cancel the current mail operation"
-msgstr "Hazırkı məktub əməliyyatını ləğv et"
+#~ msgid "Springfield"
+#~ msgstr "Springfield"
 
-#: ui/evolution-mail-global.xml.h:3
-msgid "Compose _New Message"
-msgstr "_Yeni İsmarış Yaz"
+#~ msgid "Stampede Pass"
+#~ msgstr "Stampede Pass"
 
-#: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit rules for filtering new mail"
-msgstr "Yeni məktub filtrlənməsi üçün qaydalar yaradın və ya təkmilləşdirin"
+#~ msgid "State College"
+#~ msgstr "State College"
 
-#: ui/evolution-mail-global.xml.h:5
-msgid "Create or edit virtual folder definitions"
-msgstr "Virtual qovluq izahatları yaradın və ya təkmilləşdirin"
+#~ msgid "Staunton"
+#~ msgstr "Staunton"
 
-#: ui/evolution-mail-global.xml.h:6
-msgid "Empty _Trash"
-msgstr "Zibil Qutusunu _Boşalt"
+#~ msgid "Stavanger/Sola"
+#~ msgstr "Stavanger/Sola"
 
-#: ui/evolution-mail-global.xml.h:7
-msgid "Forget _Passwords"
-msgstr "Ş_ifrələri Unut"
+#~ msgid "Staverton"
+#~ msgstr "Staverton"
 
-#: ui/evolution-mail-global.xml.h:8
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "Yadda saxlanan bütün şifrələri unudaraq onları gələcəkdə yenidən istə"
+#~ msgid "Stavropol"
+#~ msgstr "Stavropol"
 
-#: ui/evolution-mail-global.xml.h:9
-msgid "Open a window for composing a mail message"
-msgstr "Məktub ismarışı yazmaq üçün pəncərə aç"
+#~ msgid "St Cloud"
+#~ msgstr "St Cloud"
 
-#: ui/evolution-mail-global.xml.h:10
-msgid "Permanently remove all deleted messages from all folders"
-msgstr "Bütün qovluqlardaki silinmiş ismarışları həmişəlik sil"
+#~ msgid "Steamboat Springs"
+#~ msgstr "Steamboat Springs"
 
-#: ui/evolution-mail-global.xml.h:11
-msgid "Post New Message"
-msgstr "Yeni İsmarış Göndər"
+#~ msgid "Stephenville"
+#~ msgstr "Stephenville"
 
-#: ui/evolution-mail-global.xml.h:12
-msgid "Post a message to a Public folder"
-msgstr "İctimai qovluğa ismarış göndər"
+#~ msgid "St. George"
+#~ msgstr "St. George"
 
-#: ui/evolution-mail-global.xml.h:13
-msgid "S_ubscribe to Folders..."
-msgstr "Qovluqlarda Qe_ydiyyatdan Keç..."
+#~ msgid "Stillwater"
+#~ msgstr "Stillwater"
 
-#: ui/evolution-mail-global.xml.h:14
-msgid "Show message preview window"
-msgstr "İsmarış nümayiş pəncərəsini göstər"
+#~ msgid "St. John's"
+#~ msgstr "St. John's"
 
-#: ui/evolution-mail-global.xml.h:15
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "Uzaq vericilərdəki qovluqlarda qeydiyyatdan keç ya da qeydiyyatdan çıx"
+#~ msgid "St Johnsbury"
+#~ msgstr "St Johnsbury"
 
-#: ui/evolution-mail-global.xml.h:16
-msgid "Virtual Folder _Editor..."
-msgstr "Virtual Qovluq _Editoru..."
+#~ msgid "St Joseph"
+#~ msgstr "St Joseph"
 
-#: ui/evolution-mail-global.xml.h:18
-msgid "_Filters..."
-msgstr "_Filtrlər..."
+#~ msgid "St Louis"
+#~ msgstr "St Louis"
 
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Preview Pane"
-msgstr "_Nümayiş Paneli"
+#~ msgid "St Louis-Spirit"
+#~ msgstr "St Louis-Spirit"
 
-#: ui/evolution-mail-list.xml.h:1
-msgid "Change the properties of this folder"
-msgstr "Bu qovluğun xassələrini dəyişdir"
+#~ msgid "Stockholm (Arlanda)"
+#~ msgstr "Stockholm (Arlanda)"
 
-#: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected message(s) to the clipboard"
-msgstr "Seçili ismarış(lar)ı ara yaddaşa köçür"
+#~ msgid "Stockholm (Bromma)"
+#~ msgstr "Stockholm (Bromma)"
 
-#: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected message(s) to the clipboard"
-msgstr "Seçili ismarış(lar)ı ara yaddaşa kəs"
+#~ msgid "Stockton"
+#~ msgstr "Stockton"
 
-#: ui/evolution-mail-list.xml.h:5
-msgid "Hide S_elected Messages"
-msgstr "S_eçili İsmarışları Gizlə"
+#~ msgid "Stokmarknes/Skagen"
+#~ msgstr "Stokmarknes/Skagen"
 
-#: ui/evolution-mail-list.xml.h:6
-msgid "Hide _Deleted Messages"
-msgstr "_Silinmiş İsmarışları Gizlə"
+#~ msgid "Stord/Sorstokken"
+#~ msgstr "Stord/Sorstokken"
 
-#: ui/evolution-mail-list.xml.h:7
-msgid "Hide _Read Messages"
-msgstr "_Oxunmuş İsmarışları Gizlə"
+#~ msgid "Storm Lake"
+#~ msgstr "Storm Lake"
 
-#: ui/evolution-mail-list.xml.h:8
-msgid "Hide deleted messages rather than displaying them with a line through them"
-msgstr "Üstünə çızıq çəkmək yerinə silinmiş ismarışları gizlə"
+#~ msgid "Stornoway"
+#~ msgstr "Stornoway"
 
-#: ui/evolution-mail-list.xml.h:9
-msgid "Mark All as _Read"
-msgstr "Hamısını _Oxunmış Olaraq İşarələ"
+#~ msgid "St Paul"
+#~ msgstr "St Paul"
 
-#: ui/evolution-mail-list.xml.h:10
-msgid "Mark all visible messages as read"
-msgstr "Bütün görünən ismarışları oxunmuş olaraq işarələ"
+#~ msgid "St Petersburg"
+#~ msgstr "St Petersburg"
 
-#: ui/evolution-mail-list.xml.h:11
-msgid "Paste message(s) from the clipboard"
-msgstr "Ara yaddaşdakı ismarış(lar)ı yapışdır"
+#~ msgid "St Petersburg / Clearwater"
+#~ msgstr "St Petersburg / Clearwater"
 
-#: ui/evolution-mail-list.xml.h:12
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "Bu qovluqdan silinmiş ismarışları həmişəlik sil"
+#~ msgid "Strasbourg"
+#~ msgstr "Strasbourg"
 
-#: ui/evolution-mail-list.xml.h:14
-msgid "Select _Thread"
-msgstr "İl_gəyi Seç"
+#~ msgid "Strevell"
+#~ msgstr "Strevell"
 
-#: ui/evolution-mail-list.xml.h:15
-msgid "Select all and only the messages that are not currently selected"
-msgstr "Ancaq hazırda seçili olmayan ismarışlar olmaq üzərə bütün ismarışları seç"
+#~ msgid "St Simon's Island"
+#~ msgstr "St Simon's Island"
 
-#: ui/evolution-mail-list.xml.h:16
-msgid "Select all messages in the same thread as the selected message"
-msgstr "Eyni ilgəkdəki bütün ismarışları seçili ismarış olaraq seç"
+#~ msgid "Stumpy Point"
+#~ msgstr "Stumpy Point"
 
-#: ui/evolution-mail-list.xml.h:17
-msgid "Select all visible messages"
-msgstr "Bütün görünən ismarışları seç"
+#~ msgid "Sturgeon Bay"
+#~ msgstr "Sturgeon Bay"
 
-#: ui/evolution-mail-list.xml.h:18
-msgid "Sh_ow Hidden Messages"
-msgstr "_Gizli İsmarışları Göstər"
+#~ msgid "Stuttgart"
+#~ msgstr "Stuttgart"
 
-#: ui/evolution-mail-list.xml.h:19
-msgid "Show messages that have been temporarily hidden"
-msgstr "Müvəqqəti olaraq gizlədilmiş ismarışları göstər"
+#~ msgid "Sucre"
+#~ msgstr "Sucre"
 
-#: ui/evolution-mail-list.xml.h:20
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Oxunmuş bütün ismarışları müvəqqəti olaraq gizlə"
+#~ msgid "Sumburgh"
+#~ msgstr "Sumburgh"
 
-#: ui/evolution-mail-list.xml.h:21
-msgid "Temporarily hide the selected messages"
-msgstr "Seçili ismarışları müvəqqəti olaraq gizlə"
+#~ msgid "Sumter"
+#~ msgstr "Sumter"
 
-#: ui/evolution-mail-list.xml.h:22
-msgid "Threaded Message list"
-msgstr "İlgəklənmiş İsmarış Siyahısı"
+#~ msgid "Sumter (2)"
+#~ msgstr "Sumter (2)"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:19
-msgid "_Expunge"
-msgstr "_Cız"
+#~ msgid "Sundsvall-Harnosand"
+#~ msgstr "Sundsvall-Harnosand"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
-msgid "_Folder"
-msgstr "_Qovluq"
+#~ msgid "Sungshan/Taipei"
+#~ msgstr "Sungshan/Taipei"
 
-#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "Seçimi _Tərs Çevir"
+#~ msgid "Superior"
+#~ msgstr "Superior"
 
-#: ui/evolution-mail-list.xml.h:30
-msgid "_Properties..."
-msgstr "_Xassələr..."
+#~ msgid "Sutton"
+#~ msgstr "Sutton"
 
-#: ui/evolution-mail-list.xml.h:31
-msgid "_Threaded Message List"
-msgstr "İlgək_lənmiş İsmarış Siyahısı"
+#~ msgid "Suwon Ab"
+#~ msgstr "Suwon Ab"
 
-#: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
-msgstr "Yollayanı Ünvan Kitabçasına Ə_lavə Et"
+#~ msgid "Svalbard"
+#~ msgstr "Svalbard"
 
-#: ui/evolution-mail-message.xml.h:2
-msgid "A_pply Filters"
-msgstr "Filtr _Tədbiq Et"
+#~ msgid "Svolvaer/Helle"
+#~ msgstr "Svolvaer/Helle"
 
-#: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
-msgstr "Yollayanı Ünvan Kitabçasına Əlavə Et"
+#~ msgid "Swift Current"
+#~ msgstr "Swift Current"
 
-#: ui/evolution-mail-message.xml.h:4
-msgid "Apply filter rules to the selected messages"
-msgstr "Seçili ismarışlarlara filtr qaydalarını tədbiq et"
+#~ msgid "Sydney"
+#~ msgstr "Sydney"
 
-#: ui/evolution-mail-message.xml.h:5
-msgid "Compose a reply to all of the recipients of the selected message"
-msgstr "Seçili ismarışın bütün alıcılarına cavab yaz"
+#~ msgid "Syktyvkar"
+#~ msgstr "Syktyvkar"
 
-#: ui/evolution-mail-message.xml.h:6
-msgid "Compose a reply to the mailing list of the selected message"
-msgstr "Seçili ismarış göndərən məktublaşma qrupuna cavab yaz"
+#~ msgid "Sympheropol"
+#~ msgstr "Sympheropol"
 
-#: ui/evolution-mail-message.xml.h:7
-msgid "Compose a reply to the sender of the selected message"
-msgstr "Seçili ismarışı göndərənə cavab yaz"
+#~ msgid "Syracuse"
+#~ msgstr "Syracuse"
 
-#: ui/evolution-mail-message.xml.h:9
-msgid "Copy selected messages to another folder"
-msgstr "Seçili ismarışları başqa qovluğa köçür"
+#~ msgid "Szczecin"
+#~ msgstr "Szczecin"
 
-#: ui/evolution-mail-message.xml.h:10
-msgid "Create _Virtual Folder From Message"
-msgstr "İsmarışdan _Virtual Qovluq Yarat"
+#~ msgid "Szombathely"
+#~ msgstr "Szombathely"
 
-#: ui/evolution-mail-message.xml.h:11
-msgid "Create a rule to filter messages from this sender"
-msgstr "Bu yollayanın ismarışlarını filtrləmək üçün qayda yarat"
+#~ msgid "Tabatinga"
+#~ msgstr "Tabatinga"
 
-#: ui/evolution-mail-message.xml.h:12
-msgid "Create a rule to filter messages to these recipients"
-msgstr "Bu alıcıların ismarışlarını filtrləmək üçün qayda yarat"
+#~ msgid "Tabriz"
+#~ msgstr "Tabriz"
 
-#: ui/evolution-mail-message.xml.h:13
-msgid "Create a rule to filter messages to this mailing list"
-msgstr "Bu məktublaşma qrupundakı ismarışları filtrləmək üçün qayda yarat"
+#~ msgid "Tabuk"
+#~ msgstr "Tabuk"
 
-#: ui/evolution-mail-message.xml.h:14
-msgid "Create a rule to filter messages with this subject"
-msgstr "Bu mövzulu ismarışları filtrləmək üçün qayda yarat"
+#~ msgid "Tachikawa Ab"
+#~ msgstr "Tachikawa Ab"
 
-#: ui/evolution-mail-message.xml.h:15
-msgid "Create a virtual folder for these recipients"
-msgstr "Bu alıcılar üçün virtual qovluq yarat"
+#~ msgid "Tacna"
+#~ msgstr "Tacna"
 
-#: ui/evolution-mail-message.xml.h:16
-msgid "Create a virtual folder for this mailing list"
-msgstr "Bu məktublaşma qrupu üçün virtual qovluq yarat"
+#~ msgid "Tacoma"
+#~ msgstr "Tacoma"
 
-#: ui/evolution-mail-message.xml.h:17
-msgid "Create a virtual folder for this sender"
-msgstr "Bu yollayan üçün virtual qovluq yarat"
+#~ msgid "Tacoma-Lakewood"
+#~ msgstr "Tacoma-Lakewood"
 
-#: ui/evolution-mail-message.xml.h:18
-msgid "Create a virtual folder for this subject"
-msgstr "Bu mövzu üçün virtual qovluq yarat"
+#~ msgid "Tacuarembo"
+#~ msgstr "Tacuarembo"
 
-#: ui/evolution-mail-message.xml.h:19
-msgid "Decrease the text size"
-msgstr "Mətn böyüklüyünü azalt"
+#~ msgid "Taegu"
+#~ msgstr "Taegu"
 
-#: ui/evolution-mail-message.xml.h:21
-msgid "Display the next important message"
-msgstr "Sonrakı vacib ismarışı göstər"
+#~ msgid "Taegu Ab"
+#~ msgstr "Taegu Ab"
 
-#: ui/evolution-mail-message.xml.h:22
-msgid "Display the next message"
-msgstr "Sonrakı ismarışı göstər"
+#~ msgid "Taejon"
+#~ msgstr "Taejon"
 
-#: ui/evolution-mail-message.xml.h:23
-msgid "Display the next unread message"
-msgstr "Sonrakı oxunamış ismarışı göstər"
+#~ msgid "Tahoe Valley"
+#~ msgstr "Tahoe Valley"
 
-#: ui/evolution-mail-message.xml.h:24
-msgid "Display the next unread thread"
-msgstr "Sonrakı oxunmamış ilgəyi göstər"
+#~ msgid "Taichung"
+#~ msgstr "Taichung"
 
-#: ui/evolution-mail-message.xml.h:25
-msgid "Display the previous important message"
-msgstr "Əvvəlki vacib ismarışı göstər"
+#~ msgid "Taif"
+#~ msgstr "Taif"
 
-#: ui/evolution-mail-message.xml.h:26
-msgid "Display the previous message"
-msgstr "Əvvəlki ismarışı göstər"
+#~ msgid "Tainan"
+#~ msgstr "Tainan"
 
-#: ui/evolution-mail-message.xml.h:27
-msgid "Display the previous unread message"
-msgstr "Əvvəlki oxunmamış ismarışı göstər"
+#~ msgid "Taiyuan"
+#~ msgstr "Taiyuan"
 
-#: ui/evolution-mail-message.xml.h:28
-msgid "F_orward"
-msgstr "Ö_tür"
+#~ msgid "Taiz"
+#~ msgstr "Taiz"
 
-#: ui/evolution-mail-message.xml.h:29
-msgid "Filter on Mailing _List..."
-msgstr "Məktublaşma _Qrupuna görə filtrlə..."
+#~ msgid "Tajima"
+#~ msgstr "Tajima"
 
-#: ui/evolution-mail-message.xml.h:30
-msgid "Filter on Se_nder..."
-msgstr "_Göndərənə görə filtrlə..."
+#~ msgid "Takamatsu Airport"
+#~ msgstr "Takamatsu Airport"
 
-#: ui/evolution-mail-message.xml.h:31
-msgid "Filter on _Recipients..."
-msgstr "_Alıcılara görə giltrlə..."
+#~ msgid "Talara"
+#~ msgstr "Talara"
 
-#: ui/evolution-mail-message.xml.h:32
-msgid "Filter on _Subject..."
-msgstr "_Mövzuya görə filtrlə..."
+#~ msgid "Talkeetna"
+#~ msgstr "Talkeetna"
 
-#: ui/evolution-mail-message.xml.h:33
-msgid "Flag selected message(s) for follow-up"
-msgstr ""
+#~ msgid "Tallahassee"
+#~ msgstr "Tallahassee"
 
-#: ui/evolution-mail-message.xml.h:34
-msgid "Follow _Up..."
-msgstr ""
+#~ msgid "Tallinn"
+#~ msgstr "Tallinn"
 
-#: ui/evolution-mail-message.xml.h:35
-msgid "Force images in HTML mail to be loaded"
-msgstr "HTML məktublardakı rəsmləri yüklənməyə məcbur et"
+#~ msgid "Tamanrasset"
+#~ msgstr "Tamanrasset"
 
-#: ui/evolution-mail-message.xml.h:37
-msgid "Forward the selected message in the body of a new message"
-msgstr "Seçili ismarışı yeni ismarışın məzmununda ötür"
+#~ msgid "Tamanrasset/Aguenna"
+#~ msgstr "Tamanrasset/Aguenna"
 
-#: ui/evolution-mail-message.xml.h:38
-msgid "Forward the selected message quoted like a reply"
-msgstr "Seçili ismarışı sitatlı cavab olaraq ötür"
+#~ msgid "Tampa"
+#~ msgstr "Tampa"
 
-#: ui/evolution-mail-message.xml.h:39
-msgid "Forward the selected message to someone"
-msgstr "Seçili ismarışı başqasına ötür"
+#~ msgid "Tampa-Macdill AFB"
+#~ msgstr "Tampa-Macdill AFB"
 
-#: ui/evolution-mail-message.xml.h:40
-msgid "Forward the selected message to someone as an attachment"
-msgstr "Seçili ismarışı başqasına ilişdirərək ötür"
+#~ msgid "Tampere"
+#~ msgstr "Tampere"
 
-#: ui/evolution-mail-message.xml.h:41
-msgid "Increase the text size"
-msgstr "Mətn böyüklüyünü artır"
+#~ msgid "Tampico"
+#~ msgstr "Tampico"
 
-#: ui/evolution-mail-message.xml.h:42
-msgid "Load _Images"
-msgstr "_Rəsmləri Yüklə"
+#~ msgid "Tanana"
+#~ msgstr "Tanana"
 
-#: ui/evolution-mail-message.xml.h:44
-msgid "Mark as I_mportant"
-msgstr "_Vacib olaraq işarələ"
+#~ msgid "Tanegashima Airport"
+#~ msgstr "Tanegashima Airport"
 
-#: ui/evolution-mail-message.xml.h:45
-msgid "Mark as U_nread"
-msgstr "Ox_unmamış olaraq işarələ"
+#~ msgid "Taos"
+#~ msgstr "Taos"
 
-#: ui/evolution-mail-message.xml.h:46
-msgid "Mark as Unimp_ortant"
-msgstr "Va_cib olmayan olaraq işarələ"
+#~ msgid "Taoyuan"
+#~ msgstr "Taoyuan"
 
-#: ui/evolution-mail-message.xml.h:47
-msgid "Mark the selected message(s) as having been read"
-msgstr "Seçili ismarışları oxunmuş olaraq işarələ"
+#~ msgid "Tapachula"
+#~ msgstr "Tapachula"
 
-#: ui/evolution-mail-message.xml.h:48
-msgid "Mark the selected message(s) as important"
-msgstr "Seçili ismarışları vacib olaraq işarələ"
+#~ msgid "Taranto"
+#~ msgstr "Taranto"
 
-#: ui/evolution-mail-message.xml.h:49
-msgid "Mark the selected message(s) as not having been read"
-msgstr "İsmarışları oxunmamış olaraq işarələ"
+#~ msgid "Tarbes"
+#~ msgstr "Tarbes"
 
-#: ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected message(s) as unimportant"
-msgstr "Seçili ismarışları vacib olaraq işarələ"
+#~ msgid "Tarija"
+#~ msgstr "Tarija"
 
-#: ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected messages for deletion"
-msgstr "Seçili ismarışları silmə üçün işarələ"
+#~ msgid "Tarvisio"
+#~ msgstr "Tarvisio"
 
-#: ui/evolution-mail-message.xml.h:52
-msgid "Move"
-msgstr "Daşı"
+#~ msgid "Tatalina"
+#~ msgstr "Tatalina"
 
-#: ui/evolution-mail-message.xml.h:53
-msgid "Move selected message(s) to another folder"
-msgstr "Seçili ismarışları başqa qovluğa daşı"
+#~ msgid "Tateyama Ab"
+#~ msgstr "Tateyama Ab"
 
-#: ui/evolution-mail-message.xml.h:54
-msgid "Next"
-msgstr "Sonrakı"
+#~ msgid "Taunton"
+#~ msgstr "Taunton"
 
-#: ui/evolution-mail-message.xml.h:55
-msgid "Next _Important Message"
-msgstr "Sonrakı _Vacib İsmarış"
+#~ msgid "Tebessa"
+#~ msgstr "Tebessa"
 
-#: ui/evolution-mail-message.xml.h:56
-msgid "Next _Thread"
-msgstr "Sonrakı _İlgək"
+#~ msgid "Tees-Side"
+#~ msgstr "Tees-Side"
 
-#: ui/evolution-mail-message.xml.h:57
-msgid "Next _Unread Message"
-msgstr "_Sonrakı Oxunmamış İsmarış"
+#~ msgid "Tegucigalpa"
+#~ msgstr "Tegucigalpa"
 
-#: ui/evolution-mail-message.xml.h:58
-msgid "Open the selected message in a new window"
-msgstr "Seçili ismarışı yeni pəncərədə aç"
+#~ msgid "Tehran-Mehrabad"
+#~ msgstr "Tehran-Mehrabad"
 
-#: ui/evolution-mail-message.xml.h:59
-msgid "Open the selected message in the composer to re-send it"
-msgstr "Seçili ismarışı yenidən göndərmək üçün tərtib edicidə aç"
+#~ msgid "Tela"
+#~ msgstr "Tela"
 
-#: ui/evolution-mail-message.xml.h:60
-msgid "Original Si_ze"
-msgstr "Əsl Bö_yüklük"
+#~ msgid "Temple"
+#~ msgstr "Temple"
 
-#: ui/evolution-mail-message.xml.h:61
-msgid "P_revious Unread Message"
-msgstr "Ə_vvəlki Oxunmamış İsmarış"
+#~ msgid "Tennessee"
+#~ msgstr "Tennessee"
 
-#: ui/evolution-mail-message.xml.h:62
-msgid "Post a Reply"
-msgstr "Cavab Yaz"
+#~ msgid "Tepic"
+#~ msgstr "Tepic"
 
-#: ui/evolution-mail-message.xml.h:63
-msgid "Post a reply to a message in a Public folder"
-msgstr "İctimai qovluqdakı ismarışa cavab yaz"
+#~ msgid "Teresina"
+#~ msgstr "Teresina"
 
-#: ui/evolution-mail-message.xml.h:64
-msgid "Pr_evious Important Message"
-msgstr "Əvvəlki _Vacib İsmarış"
+#~ msgid "Terre Haute"
+#~ msgstr "Terre Haute"
 
-#: ui/evolution-mail-message.xml.h:65
-msgid "Preview the message to be printed"
-msgstr "Çap ediləcək ismarışı göstər"
+#~ msgid "Terrell"
+#~ msgstr "Terrell"
 
-#: ui/evolution-mail-message.xml.h:66
-msgid "Previous"
-msgstr "Əvvəlki"
+#~ msgid "Teterboro"
+#~ msgstr "Teterboro"
 
-#: ui/evolution-mail-message.xml.h:69
-msgid "Print this message"
-msgstr "Bu ismarışı çap et"
+#~ msgid "Texarkana"
+#~ msgstr "Texarkana"
 
-#: ui/evolution-mail-message.xml.h:70
-msgid "Re_direct"
-msgstr "İsti_qamətləndir"
+#~ msgid "Texas"
+#~ msgstr "Texas"
 
-#: ui/evolution-mail-message.xml.h:71
-msgid "Redirect (bounce) the selected message to someone"
-msgstr "Seçili ismarışı başqasına istiqamətləndir"
+#~ msgid "The Dalles"
+#~ msgstr "The Dalles"
 
-#: ui/evolution-mail-message.xml.h:76
-msgid "Reset the text to its original size"
-msgstr "Mətni əsl böyüklüyünə sıfırla"
+#~ msgid "Thessaloniki"
+#~ msgstr "Thessaloniki"
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "S_earch Message..."
-msgstr "İsmarışı A_xtar..."
+#~ msgid "Thief River Falls"
+#~ msgstr "Thief River Falls"
 
-#: ui/evolution-mail-message.xml.h:78
-msgid "S_maller"
-msgstr "Daha Ki_çik"
+#~ msgid "Thiruvananthapuram"
+#~ msgstr "Thiruvananthapuram"
 
-#: ui/evolution-mail-message.xml.h:79
-msgid "Save the message as a text file"
-msgstr "İsmarışı mətn faylı olaraq qeyd et"
+#~ msgid "Thisted"
+#~ msgstr "Thisted"
 
-#: ui/evolution-mail-message.xml.h:80
-msgid "Search for text in the body of the displayed message"
-msgstr "Göstərilən ismarışın məzmununda mətni axtar"
+#~ msgid "Thompson Falls"
+#~ msgstr "Thompson Falls"
 
-#: ui/evolution-mail-message.xml.h:81
-msgid "Set up the page settings for your current printer"
-msgstr "Səhifə qurğularını hazırkı çap edicinizə göra uyğunlaşdırın"
+#~ msgid "Thumrait"
+#~ msgstr "Thumrait"
 
-#: ui/evolution-mail-message.xml.h:82
-msgid "Show Email _Source"
-msgstr "Məktub _Mənbəsini Göstər"
+#~ msgid "Tianjin"
+#~ msgstr "Tianjin"
 
-#: ui/evolution-mail-message.xml.h:83
-msgid "Show Full _Headers"
-msgstr "_Bütün Başlıqları Göstər"
+#~ msgid "Tijuana"
+#~ msgstr "Tijuana"
 
-#: ui/evolution-mail-message.xml.h:84
-msgid "Show message in the normal style"
-msgstr "İsmarışı normal tərzdə göstər"
+#~ msgid "Timisoara"
+#~ msgstr "Timisoara"
 
-#: ui/evolution-mail-message.xml.h:85
-msgid "Show message with all email headers"
-msgstr "İsmarışı bütün poçt başlıqları ilə göstər"
+#~ msgid "Tin City"
+#~ msgstr "Tin City"
 
-#: ui/evolution-mail-message.xml.h:86
-msgid "Show the raw email source of the message"
-msgstr "İsmarışın xam mənbəsini göstər"
+#~ msgid "Tirana"
+#~ msgstr "Tirana"
 
-#: ui/evolution-mail-message.xml.h:87
-msgid "Text Si_ze"
-msgstr "Mətn Bö_yüklüyü"
+#~ msgid "Tiree"
+#~ msgstr "Tiree"
 
-#: ui/evolution-mail-message.xml.h:88
-msgid "Un-delete the selected messages"
-msgstr "Seçili ismarışları geri qətir"
+#~ msgid "Tirgu Mures"
+#~ msgstr "Tirgu Mures"
 
-#: ui/evolution-mail-message.xml.h:89
-msgid "VFolder on Mailing _List..."
-msgstr "Məktublaşma _Qrupuna görə VQovluğa..."
+#~ msgid "Tiruchchirapalli"
+#~ msgstr "Tiruchchirapalli"
 
-#: ui/evolution-mail-message.xml.h:90
-msgid "VFolder on Se_nder..."
-msgstr "_Göndərənə görə VQovluğa..."
+#~ msgid "Titusville"
+#~ msgstr "Titusville"
 
-#: ui/evolution-mail-message.xml.h:91
-msgid "VFolder on _Recipients..."
-msgstr "_Alıcılara görə VQovluğa..."
+#~ msgid "Tivat"
+#~ msgstr "Tivat"
 
-#: ui/evolution-mail-message.xml.h:92
-msgid "VFolder on _Subject..."
-msgstr "_Mövzuya görə VQovluğa..."
+#~ msgid "Tlemcen Zenata"
+#~ msgstr "Tlemcen Zenata"
 
-#: ui/evolution-mail-message.xml.h:94
-msgid "_Attached"
-msgstr "_İlişdirilmiş"
+#~ msgid "Tobias Bolanos"
+#~ msgstr "Tobias Bolanos"
 
-#: ui/evolution-mail-message.xml.h:95
-msgid "_Copy to Folder"
-msgstr "Qovluğa _Köçür"
+#~ msgid "Tocumen"
+#~ msgstr "Tocumen"
 
-#: ui/evolution-mail-message.xml.h:96
-msgid "_Create Filter From Message"
-msgstr "İsmarışdan Filtr _Yarat"
+#~ msgid "Togiak Village"
+#~ msgstr "Togiak Village"
 
-#: ui/evolution-mail-message.xml.h:98
-msgid "_Forward Message"
-msgstr "İsmarışı Ö_tür"
+#~ msgid "Tokachi GSDF"
+#~ msgstr "Tokachi GSDF"
 
-#: ui/evolution-mail-message.xml.h:99
-msgid "_Go To"
-msgstr "_Get"
+#~ msgid "Tokunoshima Island"
+#~ msgstr "Tokunoshima Island"
 
-#: ui/evolution-mail-message.xml.h:100
-msgid "_Inline"
-msgstr "_Daxili"
+#~ msgid "Tokushima Ab"
+#~ msgstr "Tokushima Ab"
 
-#: ui/evolution-mail-message.xml.h:101
-msgid "_Larger"
-msgstr "Daha _Geniş"
+#~ msgid "Tokyo Heliport"
+#~ msgstr "Tokyo Heliport"
 
-#: ui/evolution-mail-message.xml.h:102
-msgid "_Message Display"
-msgstr "_İsmarış Görünüşü"
+#~ msgid "Tokyo International Airport"
+#~ msgstr "Tokyo International Airport"
 
-#: ui/evolution-mail-message.xml.h:103
-msgid "_Move to Folder"
-msgstr "Qovluğa _Daşı"
+#~ msgid "Tokyo New International Airport"
+#~ msgstr "Tokyo New International Airport"
 
-#: ui/evolution-mail-message.xml.h:104
-msgid "_Next Message"
-msgstr "_Sonrakı İsmarış"
+#~ msgid "Toledo"
+#~ msgstr "Toledo"
 
-#: ui/evolution-mail-message.xml.h:105
-msgid "_Normal Display"
-msgstr "_Normal Görünüş"
+#~ msgid "Toluca"
+#~ msgstr "Toluca"
 
-#: ui/evolution-mail-message.xml.h:106
-msgid "_Open Message"
-msgstr "İsmarışı _Aç"
+#~ msgid "Tonopah"
+#~ msgstr "Tonopah"
 
-#: ui/evolution-mail-message.xml.h:107
-msgid "_Previous Message"
-msgstr "Ə_vvəlki İsmarış"
+#~ msgid "Topeka"
+#~ msgstr "Topeka"
 
-#: ui/evolution-mail-message.xml.h:109
-msgid "_Quoted"
-msgstr "_Sitatlandırılmış"
+#~ msgid "Topeka-Forbes Field"
+#~ msgstr "Topeka-Forbes Field"
 
-#: ui/evolution-mail-message.xml.h:111
-msgid "_Resend..."
-msgstr "_Yenidən Göndər..."
+#~ msgid "Torino/Bric Della Croce"
+#~ msgstr "Torino/Bric Della Croce"
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
-msgid "_Tools"
-msgstr "_Vasitələr"
+#~ msgid "Torino/Caselle"
+#~ msgstr "Torino/Caselle"
 
-#: ui/evolution-mail-message.xml.h:114
-msgid "_Undelete"
-msgstr "_Geri Gətir"
+#~ msgid "Toronto"
+#~ msgstr "Toronto"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "Bu pəncərəni bağla"
+#~ msgid "Torp"
+#~ msgstr "Torp"
 
-#: 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
-msgid "_Close"
-msgstr "_Bağla"
+#~ msgid "Torrance"
+#~ msgstr "Torrance"
 
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
-msgid "_View"
-msgstr "_Görünüş"
+#~ msgid "Torreon"
+#~ msgstr "Torreon"
 
-#: ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "İlişdir"
+#~ msgid "Tottori Airport"
+#~ msgstr "Tottori Airport"
 
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Fayl ilişdir"
+#~ msgid "Toulouse"
+#~ msgstr "Toulouse"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
-msgid "Close the current file"
-msgstr "Hazırkı faylı bağla"
+#~ msgid "Toul-Rosieres"
+#~ msgstr "Toul-Rosieres"
 
-#: ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "İmza xaricindəkiləri sil"
+#~ msgid "Tours-St-Symphorien"
+#~ msgstr "Tours-St-Symphorien"
 
-#: ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "Bu ismarışı PGP ilə şifrələ"
+#~ msgid "Toussus-Le Noble"
+#~ msgstr "Toussus-Le Noble"
 
-#: ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Cetificate"
-msgstr "Bu ismarışı şəxsi S/MIME Sertifikatınızla şifrələyin"
+#~ msgid "Townsville"
+#~ msgstr "Townsville"
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
-msgid "For_mat"
-msgstr "Şə_kil"
+#~ msgid "Toyama Airport"
+#~ msgstr "Toyama Airport"
 
-#: ui/evolution-message-composer.xml.h:9
-msgid "HT_ML"
-msgstr "HT_ML"
+#~ msgid "Trabzon"
+#~ msgstr "Trabzon"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Aç"
+#~ msgid "Trapani"
+#~ msgstr "Trapani"
 
-#: ui/evolution-message-composer.xml.h:11
-msgid "Open a file"
-msgstr "Fayl aç"
+#~ msgid "Traverse City"
+#~ msgstr "Traverse City"
 
-#: ui/evolution-message-composer.xml.h:12
-msgid "PGP Encrypt"
-msgstr "PGP Şifrələməsi"
+#~ msgid "Trelew"
+#~ msgstr "Trelew"
 
-#: ui/evolution-message-composer.xml.h:13
-msgid "PGP Sign"
-msgstr "PGP İmzası"
+#~ msgid "Trenton"
+#~ msgstr "Trenton"
 
-#: ui/evolution-message-composer.xml.h:14
-msgid "S/MIME Encrypt"
-msgstr "S/MIME Şifrələməsi"
+#~ msgid "Trevico"
+#~ msgstr "Trevico"
 
-#: ui/evolution-message-composer.xml.h:15
-msgid "S/MIME Sign"
-msgstr "S/MIME İmzası"
+#~ msgid "Treviso/Istrana"
+#~ msgstr "Treviso/Istrana"
 
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5
-msgid "Save"
-msgstr "Qeyd Et"
+#~ msgid "Treviso/S.Angelo"
+#~ msgstr "Treviso/S.Angelo"
 
-#: ui/evolution-message-composer.xml.h:17
-msgid "Save As"
-msgstr "Fərqli Qeyd Et"
+#~ msgid "Trieste"
+#~ msgstr "Trieste"
 
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save _Draft"
-msgstr "_Layihəni Qeyd Et"
+#~ msgid "Trinidad"
+#~ msgstr "Trinidad"
 
-#: ui/evolution-message-composer.xml.h:20
-msgid "Save in folder..."
-msgstr "_Qovluğa qeyd et..."
+#~ msgid "Tripoli"
+#~ msgstr "Tripoli"
 
-#: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:7
-msgid "Save the current file"
-msgstr "Hazırkı faylı qeyd et"
+#~ msgid "Tromso/Langnes"
+#~ msgstr "Tromso/Langnes"
 
-#: ui/evolution-message-composer.xml.h:22
-msgid "Save the current file with a different name"
-msgstr "Hazırkı faylı fərqli ad altında qeyd et"
+#~ msgid "Trondheim/Vaernes"
+#~ msgstr "Trondheim/Vaernes"
 
-#: ui/evolution-message-composer.xml.h:23
-msgid "Save the message in a specified folder"
-msgstr "İsmarışı bildirilən qovluğa qeyd et"
+#~ msgid "Troutdale"
+#~ msgstr "Troutdale"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Göndər"
+#~ msgid "Troyes/Barberey"
+#~ msgstr "Troyes/Barberey"
 
-#: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:9
-msgid "Send the mail in HTML format"
-msgstr "Poçtu HTML şəklində göndər"
+#~ msgid "Truckee"
+#~ msgstr "Truckee"
 
-#: ui/evolution-message-composer.xml.h:26
-msgid "Send this message"
-msgstr "Bu ismarışı göndər"
+#~ msgid "Truth or Consequences"
+#~ msgstr "Truth or Consequences"
 
-#: ui/evolution-message-composer.xml.h:27
-msgid "Show / hide attachments"
-msgstr "Əlavələri göstər / gizlət"
+#~ msgid "Tsuiki Ab"
+#~ msgstr "Tsuiki Ab"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Show _attachments"
-msgstr "Ə_lavələri göstər"
+#~ msgid "Tsushima Airport"
+#~ msgstr "Tsushima Airport"
 
-#: ui/evolution-message-composer.xml.h:29
-msgid "Show attachments"
-msgstr "Əlavələri göstər"
+#~ msgid "Tucson"
+#~ msgstr "Tucson"
 
-#: ui/evolution-message-composer.xml.h:30
-msgid "Sign this message with your PGP key"
-msgstr "Bu ismarışı şəxsi PGP açarınızla imzalayın"
+#~ msgid "Tucson-Davis AFB"
+#~ msgstr "Tucson-Davis AFB"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "Bu ismarışı şəxsi S/MIME İmza Sertifikatınızla imzalayın"
+#~ msgid "Tucuman"
+#~ msgstr "Tucuman"
 
-#: ui/evolution-message-composer.xml.h:32
-msgid "Toggles whether the BCC field is displayed"
-msgstr "BCC girişinin göstərilib göstərilməyəcəyini bildirir"
+#~ msgid "Tucumcari"
+#~ msgstr "Tucumcari"
 
-#: ui/evolution-message-composer.xml.h:33
-msgid "Toggles whether the CC field is displayed"
-msgstr "CC girişinin göstərilib göstərilməyəcəyini bildirir"
+#~ msgid "Tucurui"
+#~ msgstr "Tucurui"
 
-#: ui/evolution-message-composer.xml.h:34
-msgid "Toggles whether the From chooser is displayed"
-msgstr "Göndərən girişinin göstərilib göstərilməyəcəyini bildirir"
+#~ msgid "Tulancingo"
+#~ msgstr "Tulancingo"
 
-#: ui/evolution-message-composer.xml.h:35
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "Cavab-Ünvanı girişinin göstərilib göstərilməyəcəyini bildirir"
+#~ msgid "Tulcea"
+#~ msgstr "Tulcea"
 
-#: ui/evolution-message-composer.xml.h:36
-msgid "_Attachment..."
-msgstr "Ə_lavə..."
+#~ msgid "Tulsa"
+#~ msgstr "Tulsa"
 
-#: ui/evolution-message-composer.xml.h:37
-msgid "_Bcc Field"
-msgstr "_Bcc Girişi"
+#~ msgid "Tupelo"
+#~ msgstr "Tupelo"
 
-#: ui/evolution-message-composer.xml.h:38
-msgid "_Cc Field"
-msgstr "_Cc Girişi"
+#~ msgid "Turaif"
+#~ msgstr "Turaif"
 
-#: ui/evolution-message-composer.xml.h:40
-msgid "_Delete all"
-msgstr "Hamısını _sil"
+#~ msgid "Turku"
+#~ msgstr "Turku"
 
-#: ui/evolution-message-composer.xml.h:43
-msgid "_From Field"
-msgstr "_Göndərən Girişi"
+#~ msgid "Tuscaloosa"
+#~ msgstr "Tuscaloosa"
 
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:13
-msgid "_Insert"
-msgstr "_Daxil Et"
+#~ msgid "Tuxtla Gutierrez"
+#~ msgstr "Tuxtla Gutierrez"
 
-#: ui/evolution-message-composer.xml.h:45
-msgid "_Open..."
-msgstr "_Aç..."
+#~ msgid "Twenthe"
+#~ msgstr "Twenthe"
 
-#: ui/evolution-message-composer.xml.h:46
-msgid "_Reply-To Field"
-msgstr "_Cavab-Ünvanı Girişi"
+#~ msgid "Twentynine Palms"
+#~ msgstr "Twentynine Palms"
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_Təhlükəsizlik"
+#~ msgid "Twin Falls"
+#~ msgstr "Twin Falls"
 
-#: ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
-msgstr "H_TML"
+#~ msgid "Tyler"
+#~ msgstr "Tyler"
 
-#: ui/evolution-signature-editor.xml.h:8
-msgid "Save the current file and close the window"
-msgstr "Hazırkı faylı qeyd et və pəncərəni bağla"
+#~ msgid "Tyndall AFB"
+#~ msgstr "Tyndall AFB"
 
-#: ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Qovluğu qeydiyyatlı qovluqlar siyahısına al"
+#~ msgid "Tyumen"
+#~ msgstr "Tyumen"
 
-#: ui/evolution-subscribe.xml.h:2
-msgid "F_older"
-msgstr "_Qovluq"
+#~ msgid "Uberaba"
+#~ msgstr "Uberaba"
 
-#: ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "Siyahını Yenilə"
+#~ msgid "Ufa"
+#~ msgstr "Ufa"
 
-#: ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "Qovluqlar Siyahısını Yenilə"
+#~ msgid "Ukiah"
+#~ msgstr "Ukiah"
 
-#: ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Qovluğu qeydiyyatlı qovluqlar siyahısından çıxart"
+#~ msgid "Ulan-Ude"
+#~ msgstr "Ulan-Ude"
 
-#: ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "Qeydiyyatdan Keç"
+#~ msgid "Ulsan"
+#~ msgstr "Ulsan"
 
-#: ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "Qeydiyyatdan Çıx"
+#~ msgid "Ulyanovsk"
+#~ msgstr "Ulyanovsk"
 
-#: ui/evolution-task-editor.xml.h:1
-msgid "Assign Task"
-msgstr "Vəzifə Ver"
+#~ msgid "Umea"
+#~ msgstr "Umea"
 
-#: ui/evolution-task-editor.xml.h:2
-msgid "Assign this task to others"
-msgstr "Bu vəzifəni başqalarına ver"
+#~ msgid "Umiat"
+#~ msgstr "Umiat"
 
-#: ui/evolution-task-editor.xml.h:3
-msgid "Cancel Task"
-msgstr "Vəzifəni Ləğv Et"
+#~ msgid "Unalakleet"
+#~ msgstr "Unalakleet"
 
-#: ui/evolution-task-editor.xml.h:4
-msgid "Cancel this task"
-msgstr "Bu vəzifəni ləğv et"
+#~ msgid "United Arab Emirates "
+#~ msgstr "Birləşmiş Ərəb Əmirlikləri"
 
-#: ui/evolution-task-editor.xml.h:7
-msgid "Obtain the latest task information"
-msgstr "Son vəzifə mə'lumatını al"
+#~ msgid "Upington"
+#~ msgstr "Upington"
 
-#: ui/evolution-task-editor.xml.h:8
-msgid "Re_fresh Task"
-msgstr "Vəzifəni Ye_nilə"
+#~ msgid "Uruapan"
+#~ msgstr "Uruapan"
 
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy selected task"
-msgstr "Seçili vəzifəni köçür"
+#~ msgid "Uruguaiana"
+#~ msgstr "Uruguaiana"
 
-#: ui/evolution-tasks.xml.h:5
-msgid "Cut selected task"
-msgstr "Seçili vəzifəni kəs"
+#~ msgid "Urumqi"
+#~ msgstr "Urumqi"
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete completed tasks"
-msgstr "Başa çatmış vəzifələri sil"
+#~ msgid "Utah"
+#~ msgstr "Utah"
 
-#: ui/evolution-tasks.xml.h:7
-msgid "Delete selected tasks"
-msgstr "Seçili vəzifələri sil"
+#~ msgid "Utica"
+#~ msgstr "Utica"
 
-#: ui/evolution-tasks.xml.h:8
-msgid "Mar_k as Complete"
-msgstr "Başa Çatmış Olaraq _İşarələ"
+#~ msgid "Utrecht/Soesterberg"
+#~ msgstr "Utrecht/Soesterberg"
 
-#: ui/evolution-tasks.xml.h:9
-msgid "Mark selected tasks as complete"
-msgstr "Seçili vəzifələri başa çatmış olaraq _işarələ"
+#~ msgid "Utsunomiya Ab"
+#~ msgstr "Utsunomiya Ab"
 
-#: ui/evolution-tasks.xml.h:11
-msgid "Paste task from the clipboard"
-msgstr "Vəzifəni ara yaddaşdan yapışdır"
+#~ msgid "Uzhgorod"
+#~ msgstr "Uzhgorod"
 
-#: ui/evolution-tasks.xml.h:12
-msgid "Previews the list of tasks to be printed"
-msgstr "Çap ediləcək vəzifələr siyahısını göstərir"
+#~ msgid "Vadso"
+#~ msgstr "Vadso"
 
-#: ui/evolution-tasks.xml.h:14
-msgid "Print the list of tasks"
-msgstr "Vəzifələr siyahısını çap et"
+#~ msgid "Vaerlose"
+#~ msgstr "Vaerlose"
 
-#: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Ximian Evolution Haqqında..."
+#~ msgid "Vagar"
+#~ msgstr "Vagar"
 
-#: ui/evolution.xml.h:2
-msgid "Add to _Shortcut Bar"
-msgstr "_Qısa Yol Çubuğuna Əlavə Et"
+#~ msgid "Valdez 2"
+#~ msgstr "Valdez 2"
 
-#: ui/evolution.xml.h:3
-msgid "Change Evolution's settings"
-msgstr "Evolution qurğularını dəyişdir"
+#~ msgid "Valdosta"
+#~ msgstr "Valdosta"
 
-#: ui/evolution.xml.h:4
-msgid "Change the name of this folder"
-msgstr "Bu qovluğun adını dəyişdir"
+#~ msgid "Valdosta-Moody AFB"
+#~ msgstr "Valdosta-Moody AFB"
 
-#: ui/evolution.xml.h:7
-msgid "Copy this folder"
-msgstr "Bu qovluğu köçür"
+#~ msgid "Valencia"
+#~ msgstr "Valencia"
 
-#: ui/evolution.xml.h:8
-msgid "Create a link to this folder in the shortcut bar"
-msgstr "Bu qovluğa qısa yol çubuğunda bir körpü yarat"
+#~ msgid "Valentine"
+#~ msgstr "Valentine"
 
-#: ui/evolution.xml.h:9
-msgid "Create a new folder"
-msgstr "Yeni qovluq yarat"
+#~ msgid "Valera*"
+#~ msgstr "Valera*"
 
-#: ui/evolution.xml.h:10
-msgid "Create a new shortcut"
-msgstr "Yeni qısa yol yarat"
+#~ msgid "Valkenburg"
+#~ msgstr "Valkenburg"
 
-#: ui/evolution.xml.h:11
-msgid "Create a new window displaying this folder"
-msgstr "Bu qovluğu göstərən yeni pəncərə yarat"
+#~ msgid "Valley"
+#~ msgstr "Valley"
 
-#: ui/evolution.xml.h:12
-msgid "Delete this folder"
-msgstr "Bu qovluğu sil"
+#~ msgid "Valparaiso"
+#~ msgstr "Valparaiso"
 
-#: ui/evolution.xml.h:13
-msgid "Display a different folder"
-msgstr "Başqa qovluğu göstər"
+#~ msgid "Valparaiso-Eglin AFB"
+#~ msgstr "Valparaiso-Eglin AFB"
 
-#: ui/evolution.xml.h:14
-msgid "E_xit"
-msgstr "Çı_x"
+#~ msgid "Van"
+#~ msgstr "Van"
 
-#: ui/evolution.xml.h:15
-msgid "Evolution _Window"
-msgstr "Evolution _Pəncərəsi"
+#~ msgid "Vancouver"
+#~ msgstr "Vancouver"
 
-#: ui/evolution.xml.h:16
-msgid "Exit the program"
-msgstr "Proqramdan çıx"
+#~ msgid "Vandel"
+#~ msgstr "Vandel"
 
-#: ui/evolution.xml.h:17
-msgid "Import data from other programs"
-msgstr "Başqa proqramlardan mə'lumatları idxal et"
+#~ msgid "Vandenberg AFB"
+#~ msgstr "Vandenberg AFB"
 
-#: ui/evolution.xml.h:19
-msgid "Move this folder to another place"
-msgstr "Bu qovluğu başqa yerə daşı"
+#~ msgid "Vandenberg Range"
+#~ msgstr "Vandenberg Range"
 
-#: ui/evolution.xml.h:20
-msgid "Open Other _User's Folder..."
-msgstr "Başqa _İstifadəçinin Qovluğunu Aç..."
+#~ msgid "Van Nuys"
+#~ msgstr "Van Nuys"
 
-#: ui/evolution.xml.h:21
-msgid "Open a folder belonging to some other user on the server"
-msgstr ""
+#~ msgid "Varadero"
+#~ msgstr "Varadero"
 
-#: ui/evolution.xml.h:22
-msgid "Open in New Window"
-msgstr "Yeni Pəncərədə Aç"
+#~ msgid "Varanasi/Babatpur"
+#~ msgstr "Varanasi/Babatpur"
 
-#: ui/evolution.xml.h:24
-msgid "Open this folder in an other window"
-msgstr "Bu qovluğu yeni pəncərədə aç"
+#~ msgid "Varna"
+#~ msgstr "Varna"
 
-#: ui/evolution.xml.h:25
-msgid "Pi_lot Settings..."
-msgstr "Pi_lot Qurğuları..."
+#~ msgid "Vasteras"
+#~ msgstr "Vasteras"
 
-#: ui/evolution.xml.h:26
-msgid "Remove a folder added with \"Open Other User's Folder\""
-msgstr "\"Başqa İstifadəçinin Qovluğunu Aç\" ilə əlavə edilmiş qovluğu sil"
+#~ msgid "Vaxjo"
+#~ msgstr "Vaxjo"
 
-#: ui/evolution.xml.h:27
-msgid "Send / Receive"
-msgstr "Göndər / Al"
+#~ msgid "Venezia"
+#~ msgstr "Venezia"
 
-#: ui/evolution.xml.h:28
-msgid "Send queued items and retrieve new items"
-msgstr "Növbədəki məktubları göndər və yenilərini al"
+#~ msgid "Venice"
+#~ msgstr "Venice"
 
-#: ui/evolution.xml.h:29
-msgid "Set up Pilot configuration"
-msgstr "Pilot qurğularını sazla"
+#~ msgid "Veracruz"
+#~ msgstr "Veracruz"
 
-#: ui/evolution.xml.h:30
-msgid "Show information about Ximian Evolution"
-msgstr "Ximian Evolution haqqında mə'lumat göstər"
+#~ msgid "Vernal"
+#~ msgstr "Vernal"
 
-#: ui/evolution.xml.h:31
-msgid "Submit Bug Report"
-msgstr "Xəta Raportu Göndər"
+#~ msgid "Vero Beach"
+#~ msgstr "Vero Beach"
 
-#: ui/evolution.xml.h:32
-msgid "Submit _Bug Report"
-msgstr "_Xəta Raportu Göndər"
+#~ msgid "Vicenza"
+#~ msgstr "Vicenza"
 
-#: ui/evolution.xml.h:33
-msgid "Submit a bug report using Bug Buddy"
-msgstr "Bug Buddy ilə xəta raportu göndər"
+#~ msgid "Vichy-Charmeil"
+#~ msgstr "Vichy-Charmeil"
 
-#: ui/evolution.xml.h:34
-msgid "Toggle"
-msgstr "Gizlə/Göstər"
+#~ msgid "Vichy-Rolla"
+#~ msgstr "Vichy-Rolla"
 
-#: ui/evolution.xml.h:35
-msgid "Toggle whether to show the folder bar"
-msgstr "Qovluq çubuğunun nümayiş etdiriləcəyini bildir"
+#~ msgid "Vicksburg"
+#~ msgstr "Vicksburg"
 
-#: ui/evolution.xml.h:36
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Qısa yol çubuğunun nümayiş etdiriləcəyini bildir"
+#~ msgid "Victoria"
+#~ msgstr "Victoria"
 
-#: ui/evolution.xml.h:37
-msgid "Toggle whether we are working offline."
-msgstr "Xətdən qopuq modda işlədiyimizi bildir."
+#~ msgid "Vigo"
+#~ msgstr "Vigo"
 
-#: ui/evolution.xml.h:38
-msgid "View the selected folder"
-msgstr "Seçili qovluğu göstər"
+#~ msgid "Vilhena"
+#~ msgstr "Vilhena"
 
-#: ui/evolution.xml.h:40
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution _TSS"
+#~ msgid "Villacoublay"
+#~ msgstr "Villacoublay"
 
-#: ui/evolution.xml.h:41
-msgid "_About Ximian Evolution..."
-msgstr "Ximian Evolution _Haqqında..."
+#~ msgid "Villafranca"
+#~ msgstr "Villafranca"
 
-#: ui/evolution.xml.h:44
-msgid "_Copy..."
-msgstr "_Köçür..."
+#~ msgid "Villahermosa"
+#~ msgstr "Villahermosa"
 
-#: ui/evolution.xml.h:48
-msgid "_Folder Bar"
-msgstr "_Qovluq Çubuğu"
+#~ msgid "Villamontes"
+#~ msgstr "Villamontes"
 
-#: ui/evolution.xml.h:49
-msgid "_Folder..."
-msgstr "_Qovluq..."
+#~ msgid "Villa Reynolds"
+#~ msgstr "Villa Reynolds"
 
-#: ui/evolution.xml.h:50
-msgid "_Go to Folder..."
-msgstr "Qovluğa _Get..."
+#~ msgid "Vilnius"
+#~ msgstr "Vilnius"
 
-#: ui/evolution.xml.h:51
-msgid "_Help"
-msgstr "_Yardım"
+#~ msgid "Virginia"
+#~ msgstr "Virginia"
 
-#: ui/evolution.xml.h:52
-msgid "_Import..."
-msgstr "_İdxal Et..."
+#~ msgid "Virginia Beach"
+#~ msgstr "Virginia Beach"
 
-#: ui/evolution.xml.h:53
-msgid "_Move..."
-msgstr "_Daşı..."
+#~ msgid "Virginia Tech Airport"
+#~ msgstr "Virginia Tech Airport"
 
-#: ui/evolution.xml.h:54
-msgid "_New"
-msgstr "_Yeni"
+#~ msgid "Viru-Viru"
+#~ msgstr "Viru-Viru"
 
-#: ui/evolution.xml.h:55
-msgid "_New Folder"
-msgstr "_Yeni Qovluq"
+#~ msgid "Visalia"
+#~ msgstr "Visalia"
 
-#: ui/evolution.xml.h:56
-msgid "_New Folder..."
-msgstr "_Yeni Qovluq..."
+#~ msgid "Visby"
+#~ msgstr "Visby"
 
-#: ui/evolution.xml.h:57
-msgid "_Remove Other User's Folder"
-msgstr "_Başqa İstifadəçilərin Qovluqlarını Çıxart"
+#~ msgid "Viterbo"
+#~ msgstr "Viterbo"
 
-#: ui/evolution.xml.h:58
-msgid "_Rename..."
-msgstr "_Yenidən Adlandır..."
+#~ msgid "Vitoria"
+#~ msgstr "Vitoria"
 
-#: ui/evolution.xml.h:59
-msgid "_Send / Receive"
-msgstr "_Göndər / Al"
+#~ msgid "Vladikavkaz"
+#~ msgstr "Vladikavkaz"
 
-#: ui/evolution.xml.h:61
-msgid "_Shortcut Bar"
-msgstr "_Qısa Yol Çubuğu"
+#~ msgid "Vladivostok"
+#~ msgstr "Vladivostok"
 
-#: ui/evolution.xml.h:62
-msgid "_Shortcut..."
-msgstr "_Qısa Yol..."
+#~ msgid "Vlieland"
+#~ msgstr "Vlieland"
 
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Çap icmalı"
+#~ msgid "Vojens/Skrydstrup"
+#~ msgstr "Vojens/Skrydstrup"
 
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Yenilə"
+#~ msgid "Volgograd"
+#~ msgstr "Volgograd"
 
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Nümayişi yenilə"
+#~ msgid "Volkel"
+#~ msgstr "Volkel"
 
-#: views/addressbook/galview.xml.h:1
-msgid "By _Company"
-msgstr "Ş_irkətə Görə"
+#~ msgid "Volk Field"
+#~ msgstr "Volk Field"
 
-#: views/addressbook/galview.xml.h:2
-msgid "_Address Cards"
-msgstr "Ünvan _Kartları"
+#~ msgid "Voronezh"
+#~ msgstr "Voronezh"
 
-#: views/addressbook/galview.xml.h:3
-msgid "_Phone List"
-msgstr "_Telefon Siyahısı"
+#~ msgid "Voslau"
+#~ msgstr "Voslau"
 
-#: views/calendar/galview.xml.h:1
-msgid "W_eek View"
-msgstr "_Həftəlik Nümayiş"
+#~ msgid "Waco"
+#~ msgstr "Waco"
 
-#: views/calendar/galview.xml.h:2
-msgid "_Day View"
-msgstr "_Gündəlik Nümayiş"
+#~ msgid "Wadi Al Dawasser Airport"
+#~ msgstr "Wadi Al Dawasser Airport"
 
-#: views/calendar/galview.xml.h:3
-msgid "_Month View"
-msgstr "_Aylıq Nümayiş"
+#~ msgid "Wainwright"
+#~ msgstr "Wainwright"
 
-#: views/calendar/galview.xml.h:4
-msgid "_Work Week View"
-msgstr "İş _Həftəsi Nümayişi"
+#~ msgid "Wakefield"
+#~ msgstr "Wakefield"
 
-#: views/mail/galview.xml.h:1
-msgid "As Sent Folder"
-msgstr "Göndərilənlər Qovluğu Olaraq"
+#~ msgid "Wakkanai Airport"
+#~ msgstr "Wakkanai Airport"
 
-#: views/mail/galview.xml.h:2
-msgid "By Follow Up Flag"
-msgstr "Bayrağa Görə"
+#~ msgid "Walla Walla"
+#~ msgstr "Walla Walla"
 
-#: views/mail/galview.xml.h:3
-msgid "By Sender"
-msgstr "Göndərəninə Görə"
+#~ msgid "Wallops Island"
+#~ msgstr "Wallops Island"
 
-#: views/mail/galview.xml.h:4
-msgid "By Status"
-msgstr "Vəziyyətinə Görə"
+#~ msgid "Walnut Ridge"
+#~ msgstr "Walnut Ridge"
 
-#: views/mail/galview.xml.h:5
-msgid "By Subject"
-msgstr "Mövzuya Görə"
+#~ msgid "Warner Robins"
+#~ msgstr "Warner Robins"
 
-#: views/mail/galview.xml.h:6
-msgid "Messages"
-msgstr "İsmarışlar"
+#~ msgid "Warroad"
+#~ msgstr "Warroad"
 
-#: views/tasks/galview.xml.h:1
-msgid "With _Category"
-msgstr "_Kateqoriya İlə"
+#~ msgid "Warszawa"
+#~ msgstr "Warszawa"
 
-#: views/tasks/galview.xml.h:2
-msgid "_Tasks"
-msgstr "_Vəzifələr"
+#~ msgid "Washington"
+#~ msgstr "Washington"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
-msgid "UTC"
-msgstr "UTC"
+#~ msgid "Washington/Dulles"
+#~ msgstr "Washington/Dulles"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-msgid "Select a Time Zone"
-msgstr "Vaxt Zolağı Seçin"
+#~ msgid "Waterbury"
+#~ msgstr "Waterbury"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
-msgid "Time Zones"
-msgstr "Vaxt Zolaqları"
+#~ msgid "Waterloo"
+#~ msgstr "Waterloo"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
-msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-"Use the right mouse button to zoom out."
-msgstr ""
-"Xəritə üstündə sahəni seçib vaxt zolağına qərar vermək üçün siçanın sol "
-"düyməsiylə o qismi böyüdərək seç.\n"
-"Sağ siçan düyməsini isə uzaqlaşdırmaq üçün işlədin."
+#~ msgid "Watertown"
+#~ msgstr "Watertown"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
-msgid "_Selection:"
-msgstr "_Seçim:"
+#~ msgid "Waterville"
+#~ msgstr "Waterville"
 
-#: widgets/menus/gal-view-menus.c:290
-msgid "_Current View"
-msgstr "_Hazırkı Görünüş"
+#~ msgid "Waukesha"
+#~ msgstr "Waukesha"
 
-#. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:349
-msgid "Custom View"
-msgstr "Xüsusi Görünüş"
+#~ msgid "Wausau"
+#~ msgstr "Wausau"
 
-#: widgets/menus/gal-view-menus.c:358
-msgid "Save Custom View..."
-msgstr "Xüsusi Görünüşü Qeyd Et..."
+#~ msgid "Waycross"
+#~ msgstr "Waycross"
 
-#: widgets/menus/gal-view-menus.c:371
-msgid "Define Views..."
-msgstr "Nümayişləri Təyin Et..."
+#~ msgid "Waynesboro"
+#~ msgstr "Waynesboro"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:427
-msgid "MTWTFSS"
-msgstr "MTWTFSS"
+#~ msgid "Webster City"
+#~ msgstr "Webster City"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1127
-msgid "%B %Y"
-msgstr "%B %Y"
+#~ msgid "Wejh"
+#~ msgstr "Wejh"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:428
-msgid "Now"
-msgstr "İndi"
+#~ msgid "Wellington"
+#~ msgstr "Wellington"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:434
-msgid "Today"
-msgstr "Bugün"
+#~ msgid "Wenatchee"
+#~ msgstr "Wenatchee"
 
-#: widgets/misc/e-cell-date-edit.c:805
-#, c-format
-msgid "The time must be in the format: %s"
-msgstr "Vaxt %s şəklində olmalıdır"
+#~ msgid "Wendover"
+#~ msgstr "Wendover"
 
-#: widgets/misc/e-cell-percent.c:77
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Faiz qiyməti ikisi də daxil olam üzərə 0 ilə 100 arasında olmalıdır"
+#~ msgid "West Atlanta"
+#~ msgstr "West Atlanta"
 
-#: widgets/misc/e-charset-picker.c:61
-msgid "Baltic"
-msgstr "Baltik"
+#~ msgid "West Burke"
+#~ msgstr "West Burke"
 
-#: widgets/misc/e-charset-picker.c:62
-msgid "Central European"
-msgstr "Mərkəzi Avropa"
+#~ msgid "Westerland"
+#~ msgstr "Westerland"
 
-#: widgets/misc/e-charset-picker.c:63
-msgid "Chinese"
-msgstr "Çincə"
+#~ msgid "Westfield"
+#~ msgstr "Westfield"
 
-#: widgets/misc/e-charset-picker.c:64
-msgid "Cyrillic"
-msgstr "Kiril"
+#~ msgid "Westhampton"
+#~ msgstr "Westhampton"
 
-#: widgets/misc/e-charset-picker.c:65
-msgid "Greek"
-msgstr "Yunanca"
+#~ msgid "West Palm Beach"
+#~ msgstr "West Palm Beach"
 
-#: widgets/misc/e-charset-picker.c:66
-msgid "Hebrew"
-msgstr "Yəhudicə"
+#~ msgid "West Virginia"
+#~ msgstr "West Virginia"
 
-#: widgets/misc/e-charset-picker.c:67
-msgid "Japanese"
-msgstr "Yaponca"
+#~ msgid "West Yellowstone"
+#~ msgstr "West Yellowstone"
 
-#: widgets/misc/e-charset-picker.c:68
-msgid "Korean"
-msgstr "Koreyaca"
+#~ msgid "West Yellowstone (2)"
+#~ msgstr "West Yellowstone (2)"
 
-#: widgets/misc/e-charset-picker.c:69
-msgid "Turkish"
-msgstr "Türkçə"
+#~ msgid "Wheeling"
+#~ msgstr "Wheeling"
 
-#: widgets/misc/e-charset-picker.c:70
-msgid "Unicode"
-msgstr "Yunikod"
+#~ msgid "Whidbey Island"
+#~ msgstr "Whidbey Island"
 
-#: widgets/misc/e-charset-picker.c:71
-msgid "Western European"
-msgstr "Qərbi Avropa"
+#~ msgid "Whitefield"
+#~ msgstr "Whitefield"
 
-#: widgets/misc/e-charset-picker.c:88 widgets/misc/e-charset-picker.c:89
-#: widgets/misc/e-charset-picker.c:90
-msgid "Traditional"
-msgstr "Ənənəvi"
+#~ msgid "White Plains"
+#~ msgstr "White Plains"
 
-#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
-#: widgets/misc/e-charset-picker.c:93 widgets/misc/e-charset-picker.c:94
-msgid "Simplified"
-msgstr "Bəsitləşdirilmiş"
+#~ msgid "White Sulphur"
+#~ msgstr "White Sulphur"
 
-#: widgets/misc/e-charset-picker.c:97
-msgid "Ukrainian"
-msgstr "Ukraynaca"
+#~ msgid "Whittier"
+#~ msgstr "Whittier"
 
-#: widgets/misc/e-charset-picker.c:100
-msgid "Visual"
-msgstr "Əyani"
+#~ msgid "Wichita"
+#~ msgstr "Wichita"
 
-#: widgets/misc/e-charset-picker.c:168
-#, c-format
-msgid "Unknown character set: %s"
-msgstr "Namə'lum hərf dəstəsi: %s"
+#~ msgid "Wichita Falls"
+#~ msgstr "Wichita Falls"
 
-#: widgets/misc/e-charset-picker.c:213 widgets/misc/e-charset-picker.c:442
-msgid "Character Encoding"
-msgstr "Hərf Kodlaması"
+#~ msgid "Wichita-Jabara"
+#~ msgstr "Wichita-Jabara"
 
-#: widgets/misc/e-charset-picker.c:222
-msgid "Enter the character set to use"
-msgstr "İşlədiləcək hərf dəstəsini bildirin"
+#~ msgid "Wichita-McConnell AFB"
+#~ msgstr "Wichita-McConnell AFB"
 
-#: widgets/misc/e-charset-picker.c:318
-msgid "Other..."
-msgstr "Başqa..."
+#~ msgid "Wick"
+#~ msgstr "Wick"
 
-#: widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr "..."
+#~ msgid "Wien"
+#~ msgstr "Wien"
 
-#: widgets/misc/e-filter-bar.c:185
-msgid "Search Editor"
-msgstr "Axtarış Editoru"
+#~ msgid "Wildwood"
+#~ msgstr "Wildwood"
 
-#. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:206
-msgid "Save Search"
-msgstr "Axtarışı Qeyd Et"
+#~ msgid "Wilkes - Barre"
+#~ msgstr "Wilkes - Barre"
 
-#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
-msgid "_Save Search..."
-msgstr "Axtarışı _Qeyd Et..."
+#~ msgid "Williamsport"
+#~ msgstr "Williamsport"
 
-#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
-msgid "_Edit Saved Searches..."
-msgstr "Qeyd Edilmiş Axtarışları Düzəlt..."
+#~ msgid "Williston"
+#~ msgstr "Williston"
 
-#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
-msgid "_Advanced..."
-msgstr "Ə_traflı..."
+#~ msgid "Willoughby"
+#~ msgstr "Willoughby"
 
-#: widgets/misc/e-messagebox.c:154
-msgid "Information"
-msgstr "Mə'lumat"
+#~ msgid "Willow Airport"
+#~ msgstr "Willow Airport"
 
-#: widgets/misc/e-messagebox.c:168
-msgid "Error"
-msgstr "Xəta"
+#~ msgid "Wilmington"
+#~ msgstr "Wilmington"
 
-#: widgets/misc/e-messagebox.c:175
-msgid "Question"
-msgstr "Sual"
+#~ msgid "Winchester"
+#~ msgstr "Winchester"
 
-#: widgets/misc/e-messagebox.c:182
-msgid "Message"
-msgstr "İsmarış"
+#~ msgid "Windsor"
+#~ msgstr "Windsor"
 
-#: widgets/misc/e-search-bar.c:531
-msgid "_Search"
-msgstr "A_xtar"
+#~ msgid "Windsor Locks"
+#~ msgstr "Windsor Locks"
 
-#: widgets/misc/e-search-bar.c:537
-msgid "_Find Now"
-msgstr "İndi _Tap"
+#~ msgid "Wink"
+#~ msgstr "Wink"
 
-#: widgets/misc/e-search-bar.c:538
-msgid "_Clear"
-msgstr "_Təmizlə"
+#~ msgid "Winnemucca"
+#~ msgstr "Winnemucca"
 
-#: widgets/misc/e-search-bar.c:836
-msgid "Item ID"
-msgstr "Üzv ID-si"
+#~ msgid "Winnipeg"
+#~ msgstr "Winnipeg"
 
-#: widgets/misc/e-search-bar.c:843
-msgid "Subitem ID"
-msgstr "Alt üzv-si ID"
+#~ msgid "Winslow"
+#~ msgstr "Winslow"
 
-#: widgets/misc/e-search-bar.c:850
-msgid "Text"
-msgstr "Mətn"
+#~ msgid "Winston-Salem"
+#~ msgstr "Winston-Salem"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Təmizlə"
+#~ msgid "Winter Haven"
+#~ msgstr "Winter Haven"
 
-#: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
-msgstr "Axtar"
+#~ msgid "Winter Park"
+#~ msgstr "Winter Park"
+
+#~ msgid "Wiscasset"
+#~ msgstr "Wiscasset"
+
+#~ msgid "Wisconsin"
+#~ msgstr "Wisconsin"
+
+#~ msgid "Wisconsin Rapids"
+#~ msgstr "Wisconsin Rapids"
+
+#~ msgid "Wise"
+#~ msgstr "Wise"
+
+#~ msgid "Woensdrecht"
+#~ msgstr "Woensdrecht"
+
+#~ msgid "Wolf Point"
+#~ msgstr "Wolf Point"
+
+#~ msgid "Woong Cheon"
+#~ msgstr "Woong Cheon"
+
+#~ msgid "Wooster"
+#~ msgstr "Wooster"
+
+#~ msgid "Worcester"
+#~ msgstr "Worcester"
+
+#~ msgid "Worland"
+#~ msgstr "Worland"
+
+#~ msgid "Worthington"
+#~ msgstr "Worthington"
+
+#~ msgid "Wrangell"
+#~ msgstr "Wrangell"
+
+#~ msgid "Wrightstown / Mcguire AFB"
+#~ msgstr "Wrightstown / Mcguire AFB"
+
+#~ msgid "Wuchia Observatory"
+#~ msgstr "Wuchia Observatory"
+
+#~ msgid "Wyoming"
+#~ msgstr "Wyoming"
+
+#~ msgid "Xiamen"
+#~ msgstr "Xiamen"
+
+#~ msgid "Yacuiba"
+#~ msgstr "Yacuiba"
+
+#~ msgid "Yakima"
+#~ msgstr "Yakima"
+
+#~ msgid "Yakushima"
+#~ msgstr "Yakushima"
+
+#~ msgid "Yakutat"
+#~ msgstr "Yakutat"
+
+#~ msgid "Yakutsk"
+#~ msgstr "Yakutsk"
+
+#~ msgid "Yamagata Airport"
+#~ msgstr "Yamagata Airport"
+
+#~ msgid "Yamaguchi Ube Airport"
+#~ msgstr "Yamaguchi Ube Airport"
+
+#~ msgid "Yankton"
+#~ msgstr "Yankton"
+
+#~ msgid "Yao Airport"
+#~ msgstr "Yao Airport"
+
+#~ msgid "Yechon Ab"
+#~ msgstr "Yechon Ab"
+
+#~ msgid "Yekaterinburg"
+#~ msgstr "Yekaterinburg"
+
+#~ msgid "Yellowknife"
+#~ msgstr "Yellowknife"
+
+#~ msgid "Yellowstone"
+#~ msgstr "Yellowstone"
+
+#~ msgid "Yenbo"
+#~ msgstr "Yenbo"
+
+#~ msgid "Yeoju Range"
+#~ msgstr "Yeoju Range"
+
+#~ msgid "Yeonpyeungdo"
+#~ msgstr "Yeonpyeungdo"
+
+#~ msgid "Yeovilton"
+#~ msgstr "Yeovilton"
+
+#~ msgid "Yokosuka Fwf"
+#~ msgstr "Yokosuka Fwf"
+
+#~ msgid "Yokota Ab"
+#~ msgstr "Yokota Ab"
+
+#~ msgid "Yongsan/H-208 Hp"
+#~ msgstr "Yongsan/H-208 Hp"
+
+#~ msgid "Yoro"
+#~ msgstr "Yoro"
+
+#~ msgid "Yosu"
+#~ msgstr "Yosu"
+
+#~ msgid "Youngstown"
+#~ msgstr "Youngstown"
+
+#~ msgid "Ypsilanti"
+#~ msgstr "Ypsilanti"
+
+#~ msgid "Yukon"
+#~ msgstr "Yukon"
+
+#~ msgid "Yuma MCAS"
+#~ msgstr "Yuma MCAS"
+
+#~ msgid "Yurimaguas"
+#~ msgstr "Yurimaguas"
+
+#~ msgid "Yuzhno-Sakhalinsk"
+#~ msgstr "Yuzhno-Sakhalinsk"
+
+#~ msgid "Zacatecas"
+#~ msgstr "Zacatecas"
+
+#~ msgid "Zadar"
+#~ msgstr "Zadar"
+
+#~ msgid "Zagreb"
+#~ msgstr "Zagreb"
+
+#~ msgid "Zakinthos"
+#~ msgstr "Zakinthos"
+
+#~ msgid "Zama Airfield"
+#~ msgstr "Zama Airfield"
+
+#~ msgid "Zanesville"
+#~ msgstr "Zanesville"
+
+#~ msgid "Zaragoza"
+#~ msgstr "Zaragoza"
+
+#~ msgid "Zell Am See"
+#~ msgstr "Zell Am See"
+
+#~ msgid "Zuni Pueblo"
+#~ msgstr "Zuni Pueblo"
+
+#~ msgid "Zurich"
+#~ msgstr "Zurich"
+
+#~ msgid "Folder containing the Evolution Summary"
+#~ msgstr "Evolution İcmalını daxil edən qovluqlar"
+
+#~ msgid "Appointments"
+#~ msgstr "Görüşlər"
+
+#~ msgid "No appointments."
+#~ msgstr "Görüş yoxdur."
+
+#~ msgid "%k:%M %d %B"
+#~ msgstr "%k:%M %d %B"
+
+#~ msgid "%l:%M%p %d %B"
+#~ msgstr "%l:%M%p %d %B"
+
+#~ msgid "No description"
+#~ msgstr "İzahat yoxdur"
+
+#~ msgid "Mail summary"
+#~ msgstr "Poçt icmalı"
+
+#~ msgid "Dictionary.com Word of the Day"
+#~ msgstr "Dictionary.com Word of the Day"
+
+#~ msgid "Quotes of the Day"
+#~ msgstr "Günün Sitatları"
+
+#~ msgid "New News Feed"
+#~ msgstr "Yeni Xəbər İsmarışı"
+
+#~ msgid "_URL:"
+#~ msgstr "_URL:"
+
+#~ msgid "Error downloading RDF"
+#~ msgstr "RDF endirmə xətası"
+
+#~ msgid "News Feed"
+#~ msgstr "Yeni Bəsləmə"
+
+#~ msgid "All"
+#~ msgstr "Hamısı"
+
+#~ msgid "Shown"
+#~ msgstr "Göstərilən"
+
+#~ msgid "No tasks"
+#~ msgstr "Vəzifə yoxdur"
+
+#~ msgid "(No Description)"
+#~ msgstr "(İzahsız)"
+
+#~ msgid "My Weather"
+#~ msgstr "Mənim Hava Vəziyyətim"
+
+#~ msgid "Weather"
+#~ msgstr "Hava"
+
+#~ msgid "KBOS"
+#~ msgstr "KBOS"
+
+#~ msgid "%A, %B %e %Y"
+#~ msgstr "%A, %B %e %Y"
+
+#~ msgid "Please wait..."
+#~ msgstr "Xahiş edirik gözləyin..."
+
+#~ msgid "Printing of Summary failed"
+#~ msgstr "İcmal Çapı bacarılmadı"
+
+#~ msgid " F"
+#~ msgstr " F"
+
+#~ msgid "knots"
+#~ msgstr "knot"
+
+#~ msgid "kph"
+#~ msgstr "kph"
+
+#~ msgid "inHg"
+#~ msgstr "inHg"
+
+#~ msgid "mmHg"
+#~ msgstr "mmHg"
+
+#~ msgid "miles"
+#~ msgstr "mil"
+
+#~ msgid "kilometers"
+#~ msgstr "kilometr"
+
+#~ msgid "Clear sky"
+#~ msgstr "Təmizlə"
+
+#~ msgid "Broken clouds"
+#~ msgstr "Parçalı buludlu"
+
+#~ msgid "Scattered clouds"
+#~ msgstr "Qarışıq buludlu"
+
+#~ msgid "Few clouds"
+#~ msgstr "Az buludlu"
+
+#~ msgid "Overcast"
+#~ msgstr "Buludlu"
+
+#~ msgid "Invalid"
+#~ msgstr "Hökmsüz"
+
+#~ msgid "Variable"
+#~ msgstr "Dəyişən"
+
+#~ msgid "North"
+#~ msgstr "Şimal"
+
+#~ msgid "North - NorthEast"
+#~ msgstr "Şimal - Şimali Şərq"
+
+#~ msgid "Northeast"
+#~ msgstr "Şimali Şərq"
+
+#~ msgid "East - NorthEast"
+#~ msgstr "Şərq - Şimali Şərq"
+
+#~ msgid "East"
+#~ msgstr "Şərq"
+
+#~ msgid "East - Southeast"
+#~ msgstr "Şərq - Cənubi Şərq"
+
+#~ msgid "Southeast"
+#~ msgstr "Cənubi Şərq"
+
+#~ msgid "South - Southeast"
+#~ msgstr "Cənub - Cənubi Şərq"
+
+#~ msgid "South"
+#~ msgstr "Cənub"
+
+#~ msgid "South - Southwest"
+#~ msgstr "Cənub - Cənubi Qərb"
+
+#~ msgid "Southwest"
+#~ msgstr "Cənubi Qərb"
+
+#~ msgid "West - Southwest"
+#~ msgstr "Qərb - Cənubi Qərb"
+
+#~ msgid "West"
+#~ msgstr "Qərb"
+
+#~ msgid "West - Northwest"
+#~ msgstr "Qərb - Şimali Qərb"
+
+#~ msgid "Northwest"
+#~ msgstr "Şimali Qərb"
+
+#~ msgid "North - Northwest"
+#~ msgstr "Şimal - Şimali Qərb"
+
+#~ msgid "Drizzle"
+#~ msgstr "Çisələmə"
+
+#~ msgid "Drizzle in the vicinity"
+#~ msgstr "Yaxın çevrədə çisələmə var"
+
+#~ msgid "Light drizzle"
+#~ msgstr "Yüngül çisələmə"
+
+#~ msgid "Moderate drizzle"
+#~ msgstr "Orta çisələmə"
+
+#~ msgid "Heavy drizzle"
+#~ msgstr "Ağır çisələmə"
+
+#~ msgid "Shallow drizzle"
+#~ msgstr "Alçaq çisələmə"
+
+#~ msgid "Patches of drizzle"
+#~ msgstr "Çisələmə izləri vardır"
+
+#~ msgid "Partial drizzle"
+#~ msgstr "Qismi çisələmə"
+
+#~ msgid "Thunderstorm"
+#~ msgstr "İldırımlı Fırtına"
+
+#~ msgid "Windy drizzle"
+#~ msgstr "Küləkli çisələmə"
+
+#~ msgid "Showers"
+#~ msgstr "Yağış"
+
+#~ msgid "Drifting drizzle"
+#~ msgstr "Sürüşgən çisələmə"
+
+#~ msgid "Freezing drizzle"
+#~ msgstr "Şaxtalı çisələmə"
+
+#~ msgid "Rain"
+#~ msgstr "Yağış "
+
+#~ msgid "Rain in the vicinity"
+#~ msgstr "Çevrədə yağış var"
+
+#~ msgid "Light rain"
+#~ msgstr "Yüngül yağış"
+
+#~ msgid "Moderate rain"
+#~ msgstr "Orta yağış"
+
+#~ msgid "Heavy rain"
+#~ msgstr "Şıdırğı Yağış"
+
+#~ msgid "Shallow rain"
+#~ msgstr "Alçaq yağış"
+
+#~ msgid "Patches of rain"
+#~ msgstr "Yağışın izləri var"
+
+#~ msgid "Partial rainfall"
+#~ msgstr "Qismi yağış var"
+
+#~ msgid "Blowing rainfall"
+#~ msgstr "Küləkli yağış"
+
+#~ msgid "Rain showers"
+#~ msgstr "Leysan"
+
+#~ msgid "Drifting rain"
+#~ msgstr "Sürüşgən yağış"
+
+#~ msgid "Freezing rain"
+#~ msgstr "Şaxtalı yağış"
+
+#~ msgid "Snow"
+#~ msgstr "Qar"
+
+#~ msgid "Snow in the vicinity"
+#~ msgstr "Çevrədə qar var"
+
+#~ msgid "Light snow"
+#~ msgstr "Yüngül qar yağışı"
+
+#~ msgid "Moderate snow"
+#~ msgstr "Orta qar yadışı"
+
+#~ msgid "Heavy snow"
+#~ msgstr "Ağır qar yağışı"
+
+#~ msgid "Shallow snow"
+#~ msgstr "Alçaq qar yağışı"
+
+#~ msgid "Patches of snow"
+#~ msgstr "Qar yağışının izləri var"
+
+#~ msgid "Partial snowfall"
+#~ msgstr "Qismi qar yağışı"
+
+#~ msgid "Snowstorm"
+#~ msgstr "Qar fırtınası"
+
+#~ msgid "Blowing snowfall"
+#~ msgstr "Küləkli qar fırtınası"
+
+#~ msgid "Snow showers"
+#~ msgstr "Qar yağışları"
+
+#~ msgid "Drifting snow"
+#~ msgstr "Sürüşgən qar"
+
+#~ msgid "Freezing snow"
+#~ msgstr "Şaxta"
+
+#~ msgid "Snow grains"
+#~ msgstr "Qar dənələri"
+
+#~ msgid "Snow grains in the vicinity"
+#~ msgstr "Çevrədə qar dənələri var"
+
+#~ msgid "Light snow grains"
+#~ msgstr "Yüngül qar dənələri var"
+
+#~ msgid "Moderate snow grains"
+#~ msgstr "Orta qar dənələri var"
+
+#~ msgid "Heavy snow grains"
+#~ msgstr "Ağır qar dənələri"
+
+#~ msgid "Shallow snow grains"
+#~ msgstr "Alçaq qar dənələri"
+
+#~ msgid "Patches of snow grains"
+#~ msgstr "Qar dənələrinin izləri var"
+
+#~ msgid "Partial snow grains"
+#~ msgstr "Qismi qar dənələri"
+
+#~ msgid "Blowing snow grains"
+#~ msgstr "Küləkli qar dənələri"
+
+#~ msgid "Snow grain showers"
+#~ msgstr "Qar dənələri yağışı"
+
+#~ msgid "Drifting snow grains"
+#~ msgstr "Sürüşgən qar dənələri"
+
+#~ msgid "Freezing snow grains"
+#~ msgstr "Şaxtalı qar dənələri"
+
+#~ msgid "Ice crystals"
+#~ msgstr "Buz"
+
+#~ msgid "Ice crystals in the vicinity"
+#~ msgstr "Çevrədə buz var"
+
+#~ msgid "Few ice crystals"
+#~ msgstr "Az buz"
+
+#~ msgid "Moderate ice crystals"
+#~ msgstr "Orta buz"
+
+#~ msgid "Heavy ice crystals"
+#~ msgstr "Ağır buz"
+
+#~ msgid "Patches of ice crystals"
+#~ msgstr "Buzun izləri var"
+
+#~ msgid "Partial ice crystals"
+#~ msgstr "Qismən buz"
+
+#~ msgid "Ice crystal storm"
+#~ msgstr "Buz fırtınası"
+
+#~ msgid "Blowing ice crystals"
+#~ msgstr "Küləkli buzlanma"
+
+#~ msgid "Showers of ice crystals"
+#~ msgstr "Buzlu yağışı"
+
+#~ msgid "Drifting ice crystals"
+#~ msgstr "Sürüşgən buzlanma"
+
+#~ msgid "Freezing ice crystals"
+#~ msgstr "Şaxta və buzlanma"
+
+#~ msgid "Ice pellets"
+#~ msgstr "Buz dənəcikləri"
+
+#~ msgid "Ice pellets in the vicinity"
+#~ msgstr "Çevrədə buz dənəcikləri var"
+
+#~ msgid "Few ice pellets"
+#~ msgstr "Az buz dənəcəkləri"
+
+#~ msgid "Moderate ice pellets"
+#~ msgstr "Orta buz dənəcəkləri"
+
+#~ msgid "Heavy ice pellets"
+#~ msgstr "Ağır buz dənəcəkləri"
+
+#~ msgid "Shallow ice pellets"
+#~ msgstr "Alçaq buz dənəcəkləri"
+
+#~ msgid "Patches of ice pellets"
+#~ msgstr "Buz dənəcəklərinin izləri var"
+
+#~ msgid "Partial ice pellets"
+#~ msgstr "Qismən buz dənəcəkləri"
+
+#~ msgid "Ice pellet storm"
+#~ msgstr "Buz dənəcəkləri fırtınası"
+
+#~ msgid "Blowing ice pellets"
+#~ msgstr "Küləkli buz dənəcəkləri"
+
+#~ msgid "Showers of ice pellets"
+#~ msgstr "Buz dənəcəkləri yağışı"
+
+#~ msgid "Drifting ice pellets"
+#~ msgstr "Sürüşgən buz dənəcəkləri"
+
+#~ msgid "Freezing ice pellets"
+#~ msgstr "Şaxta və buz dənəcəkləri"
+
+#~ msgid "Hail in the vicinity"
+#~ msgstr "Çevrədə dolu yağışı var"
+
+#~ msgid "Light hail"
+#~ msgstr "Yüngül dolu yağışı"
+
+#~ msgid "Moderate hail"
+#~ msgstr "Orta dolu yağışı"
+
+#~ msgid "Heavy hail"
+#~ msgstr "Ağır dolu yağışı"
+
+#~ msgid "Shallow hail"
+#~ msgstr "Alçaq dolu yağışı"
+
+#~ msgid "Patches of hail"
+#~ msgstr "Dolu yağışının izləri var"
+
+#~ msgid "Partial hail"
+#~ msgstr "Qismi dolu yağışı"
+
+#~ msgid "Hailstorm"
+#~ msgstr "Dolu fırtınası"
+
+#~ msgid "Blowing hail"
+#~ msgstr "Küləkli dolu yağışı"
+
+#~ msgid "Hail showers"
+#~ msgstr "Dolu yağışı"
+
+#~ msgid "Drifting hail"
+#~ msgstr "Sürüşgən dolu yağışı"
+
+#~ msgid "Freezing hail"
+#~ msgstr "Şaxtalı dolu yağışı"
+
+#~ msgid "Small hail"
+#~ msgstr "Kiçik dolu dənələri"
+
+#~ msgid "Small hail in the vicinity"
+#~ msgstr "Çevrədə kiçik dolu dənələri"
+
+#~ msgid "Moderate small hail"
+#~ msgstr "Orta kiçik dolu dənələri"
+
+#~ msgid "Heavy small hail"
+#~ msgstr "Ağır kiçik dolu dənələri"
+
+#~ msgid "Shallow small hail"
+#~ msgstr "Alçaq kiçik dolu dənələri"
+
+#~ msgid "Patches of small hail"
+#~ msgstr "Kiçik dolu dənələrinin izləri var"
+
+#~ msgid "Partial small hail"
+#~ msgstr "Qismi kiçik dolu dənələri"
+
+#~ msgid "Small hailstorm"
+#~ msgstr "Kiçik dolu dənələri fırtınası"
+
+#~ msgid "Blowing small hail"
+#~ msgstr "Küləkli kiçik dolu dənələri"
+
+#~ msgid "Showers of small hail"
+#~ msgstr "Kiçik dolu dənələri yağışı"
+
+#~ msgid "Drifting small hail"
+#~ msgstr "Sürüşgən kiçik dolu dənələri"
+
+#~ msgid "Freezing small hail"
+#~ msgstr "Dondurucu kiçik dolu dənələriu"
+
+#~ msgid "Unknown precipitation"
+#~ msgstr "Naməlum yağmur"
+
+#~ msgid "Precipitation in the vicinity"
+#~ msgstr "Çevrədə yağış var"
+
+#~ msgid "Light precipitation"
+#~ msgstr "Yüngül yağış"
+
+#~ msgid "Moderate precipitation"
+#~ msgstr "Orta yağış"
+
+#~ msgid "Heavy precipitation"
+#~ msgstr "Ağır yağış"
+
+#~ msgid "Shallow precipitation"
+#~ msgstr "Alçaq yağış"
+
+#~ msgid "Patches of precipitation"
+#~ msgstr "Yağışın izləri var"
+
+#~ msgid "Partial precipitation"
+#~ msgstr "Qismi yağış"
+
+#~ msgid "Unknown thunderstorm"
+#~ msgstr "Naməlum leysan yağış"
+
+#~ msgid "Blowing precipitation"
+#~ msgstr "Küləkli yağış"
+
+#~ msgid "Showers, type unknown"
+#~ msgstr "Naməlum növdə yağış"
+
+#~ msgid "Drifting precipitation"
+#~ msgstr "Sürüşgən yağış"
+
+#~ msgid "Freezing precipitation"
+#~ msgstr "Şaxtalı yağış"
+
+#~ msgid "Mist"
+#~ msgstr "Çən"
+
+#~ msgid "Mist in the vicinity"
+#~ msgstr "Çevrədə çən var"
+
+#~ msgid "Light mist"
+#~ msgstr "Yüngül çən"
+
+#~ msgid "Moderate mist"
+#~ msgstr "Orta çən"
+
+#~ msgid "Thick mist"
+#~ msgstr "Sıx çən"
+
+#~ msgid "Shallow mist"
+#~ msgstr "Seyrək çən"
+
+#~ msgid "Patches of mist"
+#~ msgstr "Çən izləri var"
+
+#~ msgid "Partial mist"
+#~ msgstr "Qismi çən"
+
+#~ msgid "Mist with wind"
+#~ msgstr "Küləkli çən"
+
+#~ msgid "Drifting mist"
+#~ msgstr "Sürüşgən çən"
+
+#~ msgid "Freezing mist"
+#~ msgstr "Şaxtalı çən"
+
+#~ msgid "Fog"
+#~ msgstr "Çən"
+
+#~ msgid "Fog in the vicinity"
+#~ msgstr "Çevrədə çən var"
+
+#~ msgid "Light fog"
+#~ msgstr "Yüngül çən"
+
+#~ msgid "Moderate fog"
+#~ msgstr "Orta çən"
+
+#~ msgid "Thick fog"
+#~ msgstr "Qalın çən"
+
+#~ msgid "Shallow fog"
+#~ msgstr "Alçaq çən"
+
+#~ msgid "Patches of fog"
+#~ msgstr "Çənin izləri var"
+
+#~ msgid "Partial fog"
+#~ msgstr "Qismi çən var"
+
+#~ msgid "Fog with wind"
+#~ msgstr "Küləkli çən"
+
+#~ msgid "Drifting fog"
+#~ msgstr "Sürüşgən çən"
+
+#~ msgid "Freezing fog"
+#~ msgstr "Şaxtalı çən"
+
+#~ msgid "Smoke"
+#~ msgstr "Duman"
+
+#~ msgid "Smoke in the vicinity"
+#~ msgstr "Çevrədə duman var"
+
+#~ msgid "Thin smoke"
+#~ msgstr "Incə duman"
+
+#~ msgid "Moderate smoke"
+#~ msgstr "Orta duman"
+
+#~ msgid "Thick smoke"
+#~ msgstr "Qalın duman"
+
+#~ msgid "Shallow smoke"
+#~ msgstr "Alçaq duman"
+
+#~ msgid "Patches of smoke"
+#~ msgstr "Duman izləri var"
+
+#~ msgid "Partial smoke"
+#~ msgstr "Qismi duman"
+
+#~ msgid "Thunderous smoke"
+#~ msgstr "Gur duman"
+
+#~ msgid "Smoke with wind"
+#~ msgstr "Küləkli duman"
+
+#~ msgid "Drifting smoke"
+#~ msgstr "Sürüşgən dumanlı"
+
+#~ msgid "Volcanic ash"
+#~ msgstr "Vulkan külü"
+
+#~ msgid "Volcanic ash in the vicinity"
+#~ msgstr "Çevrədə vulkanik kül var"
+
+#~ msgid "Moderate volcanic ash"
+#~ msgstr "Orta vulkanik kül"
+
+#~ msgid "Thick volcanic ash"
+#~ msgstr "Qalın vulkanik kül"
+
+#~ msgid "Shallow volcanic ash"
+#~ msgstr "Alçaq vulkanik kül"
+
+#~ msgid "Patches of volcanic ash"
+#~ msgstr "uVulkanik külün izləri var"
+
+#~ msgid "Partial volcanic ash"
+#~ msgstr "Qismi vulkanik kül"
+
+#~ msgid "Thunderous volcanic ash"
+#~ msgstr "Gürləyən vulkanık kül"
+
+#~ msgid "Blowing volcanic ash"
+#~ msgstr "Küləkli vulkanik kül"
+
+#~ msgid "Showers of volcanic ash"
+#~ msgstr "Hamısını Göstər"
+
+#~ msgid "Drifting volcanic ash"
+#~ msgstr "Sürüşgən vulkanik kül"
+
+#~ msgid "Freezing volcanic ash"
+#~ msgstr "Dondurucu vulkanik kül"
+
+#~ msgid "Sand"
+#~ msgstr "Qum"
+
+#~ msgid "Sand in the vicinity"
+#~ msgstr "Çevrədə qum var"
+
+#~ msgid "Light sand"
+#~ msgstr "Yüngül qum"
+
+#~ msgid "Moderate sand"
+#~ msgstr "Orta qum"
+
+#~ msgid "Heavy sand"
+#~ msgstr "Ağır qum"
+
+#~ msgid "Patches of sand"
+#~ msgstr "Qumun izləri var"
+
+#~ msgid "Partial sand"
+#~ msgstr "Qismi qum"
+
+#~ msgid "Blowing sand"
+#~ msgstr "Küləkli qum"
+
+#~ msgid "Drifting sand"
+#~ msgstr "Sürüşgən qum"
+
+#~ msgid "Haze"
+#~ msgstr "Yüngül pus"
+
+#~ msgid "Haze in the vicinity"
+#~ msgstr "Çevrədə yüngül pus var"
+
+#~ msgid "Light haze"
+#~ msgstr "Yüngül pus"
+
+#~ msgid "Moderate haze"
+#~ msgstr "Orta pus"
+
+#~ msgid "Thick haze"
+#~ msgstr "Qalın pus"
+
+#~ msgid "Shallow haze"
+#~ msgstr "Alçaq pus"
+
+#~ msgid "Patches of haze"
+#~ msgstr "Pusun izləri var"
+
+#~ msgid "Partial haze"
+#~ msgstr "Qismi pus"
+
+#~ msgid "Haze with wind"
+#~ msgstr "Küləkli pus"
+
+#~ msgid "Drifting haze"
+#~ msgstr "Sürüşgən pus"
+
+#~ msgid "Freezing haze"
+#~ msgstr "Dondurucu pus"
+
+#~ msgid "Spray in the vicinity"
+#~ msgstr "Çevrədə çisələmə var"
+
+#~ msgid "Light spray"
+#~ msgstr "Yüngül çisələmə"
+
+#~ msgid "Moderate spray"
+#~ msgstr "Orta çisələmə"
+
+#~ msgid "Heavy spray"
+#~ msgstr "Ağır çisələmə"
+
+#~ msgid "Shallow spray"
+#~ msgstr "Alçaq çisələmə"
+
+#~ msgid "Patches of spray"
+#~ msgstr "Çisələmə izləri var"
+
+#~ msgid "Partial spray"
+#~ msgstr "Qismi çisələmə"
+
+#~ msgid "Blowing spray"
+#~ msgstr "Köləkli çisələmə"
+
+#~ msgid "Drifting spray"
+#~ msgstr "Sürüklənən çisələmə"
+
+#~ msgid "Freezing spray"
+#~ msgstr "Dondurucu çisələmə"
+
+#~ msgid "Dust"
+#~ msgstr "Toz"
+
+#~ msgid "Dust in the vicinity"
+#~ msgstr "Çevrədə toz var"
+
+#~ msgid "Light dust"
+#~ msgstr "Yüngül toz"
+
+#~ msgid "Moderate dust"
+#~ msgstr "Orta toz"
+
+#~ msgid "Heavy dust"
+#~ msgstr "Ağır toz"
+
+#~ msgid "Patches of dust"
+#~ msgstr "Tozun izləri var"
+
+#~ msgid "Partial dust"
+#~ msgstr "Qismi toz"
+
+#~ msgid "Blowing dust"
+#~ msgstr "Küləkli toz"
+
+#~ msgid "Drifting dust"
+#~ msgstr "Sürüşgən toz"
+
+#~ msgid "Squall"
+#~ msgstr "Kir"
+
+#~ msgid "Squall in the vicinity"
+#~ msgstr "Çevrədə kir var"
+
+#~ msgid "Light squall"
+#~ msgstr "Yüngül kir"
+
+#~ msgid "Moderate squall"
+#~ msgstr "Orta kir"
+
+#~ msgid "Heavy squall"
+#~ msgstr "Ağır kir"
+
+#~ msgid "Partial squall"
+#~ msgstr "Qismi kir"
+
+#~ msgid "Thunderous squall"
+#~ msgstr "Fırtınalı kir"
+
+#~ msgid "Blowing squall"
+#~ msgstr "Küləkli kir"
+
+#~ msgid "Drifting squall"
+#~ msgstr "Sürüşgən kir"
+
+#~ msgid "Freezing squall"
+#~ msgstr "Dondurucu kir"
+
+#~ msgid "Sandstorm"
+#~ msgstr "Qum fırtınası"
+
+#~ msgid "Sandstorm in the vicinity"
+#~ msgstr "Çevrədə qum fırtınası var"
+
+#~ msgid "Light standstorm"
+#~ msgstr "Yüngül qum fırtınası"
+
+#~ msgid "Moderate sandstorm"
+#~ msgstr "Orta qum fırtınası"
+
+#~ msgid "Heavy sandstorm"
+#~ msgstr "Ağır qum fırtınası"
+
+#~ msgid "Shallow sandstorm"
+#~ msgstr "Alçaq qum fırtınası"
+
+#~ msgid "Partial sandstorm"
+#~ msgstr "Qismi qum fırtınası"
+
+#~ msgid "Thunderous sandstorm"
+#~ msgstr "Leysan yağışlı qum fırtınası"
+
+#~ msgid "Blowing sandstorm"
+#~ msgstr "Küləkli qum fırtınası"
+
+#~ msgid "Drifting sandstorm"
+#~ msgstr "Sürüşgən qum fırtınası"
+
+#~ msgid "Freezing sandstorm"
+#~ msgstr "Dondurucu qum fırtınası"
+
+#~ msgid "Duststorm"
+#~ msgstr "Toz fırtınası"
+
+#~ msgid "Duststorm in the vicinity"
+#~ msgstr "Çevrədə toz fırtınası var"
+
+#~ msgid "Light duststorm"
+#~ msgstr "Yüngül toz fırtınası"
+
+#~ msgid "Moderate duststorm"
+#~ msgstr "Orta toz fırtınası"
+
+#~ msgid "Heavy duststorm"
+#~ msgstr "Ağır toz fırtınası"
+
+#~ msgid "Shallow duststorm"
+#~ msgstr "Alçaq toz fırtınası"
+
+#~ msgid "Partial duststorm"
+#~ msgstr "Qismi toz fırtınası"
+
+#~ msgid "Thunderous duststorm"
+#~ msgstr "Leysan yağışlı toz fırtınası"
+
+#~ msgid "Blowing duststorm"
+#~ msgstr "Küləkli toz fırtınası"
+
+#~ msgid "Drifting duststorm"
+#~ msgstr "Sürüşgən toz fırtınası"
+
+#~ msgid "Freezing duststorm"
+#~ msgstr "Dondurucu toz fırtınası"
+
+#~ msgid "Funnel cloud"
+#~ msgstr "Parçalı buludlu"
+
+#~ msgid "Funnel cloud in the vicinity"
+#~ msgstr "Çevrədə parçalı buludlu var"
+
+#~ msgid "Light funnel cloud"
+#~ msgstr "Yüngül parçalı buludlu"
+
+#~ msgid "Moderate funnel cloud"
+#~ msgstr "Orta parçalı buludlu"
+
+#~ msgid "Thick funnel cloud"
+#~ msgstr "Qalın parçalı buludlu"
+
+#~ msgid "Shallow funnel cloud"
+#~ msgstr "Alçaq parçalı buludlu"
+
+#~ msgid "Patches of funnel clouds"
+#~ msgstr "Parçalı buludların izləri var"
+
+#~ msgid "Partial funnel clouds"
+#~ msgstr "Qismi parçalı buludlu"
+
+#~ msgid "Funnel cloud w/ wind"
+#~ msgstr "Küləkli parçalı buludlu"
+
+#~ msgid "Drifting funnel cloud"
+#~ msgstr "Sürüşgən parçalı buludlu"
+
+#~ msgid "Tornado"
+#~ msgstr "Tornado"
+
+#~ msgid "Tornado in the vicinity"
+#~ msgstr "Çevrədə tornado var"
+
+#~ msgid "Moderate tornado"
+#~ msgstr "Orta dərəcədə bir tornado"
+
+#~ msgid "Raging tornado"
+#~ msgstr "Qasıb qovuran tornado"
+
+#~ msgid "Partial tornado"
+#~ msgstr "Qismi tornado"
+
+#~ msgid "Thunderous tornado"
+#~ msgstr "Leysan və göygurultulu tornado"
+
+#~ msgid "Drifting tornado"
+#~ msgstr "Sürüşgən tornado"
+
+#~ msgid "Freezing tornado"
+#~ msgstr "Dondurucu tornado"
+
+#~ msgid "Dust whirls"
+#~ msgstr "Toz qasırğaları"
+
+#~ msgid "Dust whirls in the vicinity"
+#~ msgstr "Çevrədə toz qasırğaları var"
+
+#~ msgid "Light dust whirls"
+#~ msgstr "Yüngül toz qasırğaları"
+
+#~ msgid "Moderate dust whirls"
+#~ msgstr "Orta toz qasırğaları"
+
+#~ msgid "Heavy dust whirls"
+#~ msgstr "Ağır toz qasırğaları"
+
+#~ msgid "Shallow dust whirls"
+#~ msgstr "Alçaq toz qasırğaları"
+
+#~ msgid "Patches of dust whirls"
+#~ msgstr "Toz qasırğalarının izləri var"
+
+#~ msgid "Partial dust whirls"
+#~ msgstr "Qismi toz qasırğaları"
+
+#~ msgid "Blowing dust whirls"
+#~ msgstr "Ağır küləkli toz qasırğaları"
+
+#~ msgid "Drifting dust whirls"
+#~ msgstr "Sürüşgən toz qasırğaları"
+
+#~ msgid "C_elsius"
+#~ msgstr "S_elsius"
+
+#~ msgid "How many days should the calendar display at once?"
+#~ msgstr "Təqvim bir dəfədə ən çox neçə gün göstərsin?"
+
+#~ msgid "News Feed Settings"
+#~ msgstr "Xəbərlər Qurğuları"
+
+#~ msgid "News Feeds"
+#~ msgstr "Yeni Xəbərlər"
+
+#~ msgid "One mont_h"
+#~ msgstr "Bir a_y"
+
+#~ msgid "One w_eek"
+#~ msgstr "Bir hə_ftə"
+
+#~ msgid "R_efresh time (seconds):"
+#~ msgstr "Y_enilə vaxtı (saniyələrlə):"
+
+#~ msgid "Refresh _time (seconds):"
+#~ msgstr "Yeniləma vax_tı (saniyələrlə):"
+
+#~ msgid "Schedule"
+#~ msgstr "Vaxtlaşdır"
+
+#~ msgid "Show _all tasks"
+#~ msgstr "B_ütün vəzifələri göstər"
+
+#~ msgid "Show _today's tasks"
+#~ msgstr "_Bugünku vəzifələri göstər"
+
+#~ msgid "Show temperatures in:"
+#~ msgstr "İstiliklərini göstər:"
+
+#~ msgid "Tasks "
+#~ msgstr "Vəzifələr"
+
+#~ msgid "Weather Settings"
+#~ msgstr "Hava Qurğuları"
+
+#~ msgid "_Delete Feed"
+#~ msgstr "Xəbəri _Sil"
+
+#~ msgid "_Fahrenheit"
+#~ msgstr "_Fahrenayt"
+
+#~ msgid "_Five days"
+#~ msgstr "_Beş gün"
+
+#~ msgid "_Max number of items shown:"
+#~ msgstr "Göstəriləcək ma_ksimal üzv ədədi:"
+
+#~ msgid "_New Feed"
+#~ msgstr "_Yeni Xəbər"
+
+#~ msgid "_One day"
+#~ msgstr "_Bur Gün"
+
+#~ msgid "_Show full path for folders"
+#~ msgstr "Qovluqların tam cığırını g_östər"
+
+#~ msgid "Cancel Operation"
+#~ msgstr "Əməliyyatı Ləğv Et"
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Qovluğu daşıya bilmirəm:\n"
+#~ "%s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "Qovluq Əlavə Et"
+
+#~ msgid "Drafts"
+#~ msgstr "Layihələr"
+
+#~ msgid "Outbox"
+#~ msgstr "Gedənlər qutusu"
+
+#~ msgid "Sent"
+#~ msgstr "Göndərilənlər"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "\"%s\" sinxronlaşdırma sırasında xəta:\n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "Qovluq Sinxronlaşdırılır"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "\"%s\" sinxronlaşdırılır (%d / %d) ..."
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Heç bir qovluq göstərilmir)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(Heç Biri)"
+
+#~ msgid ""
+#~ "Cannot activate component %s :\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s tərkib hissəsi fəallaşdırıla bilmir:\n"
+#~ "Fəallaşdırma sistemi xətası:\n"
+#~ "%s"
+
+#~ msgid "Cannot set up local storage -- %s"
+#~ msgstr "Yerli qeyd quraşdırıla bilmir -- %s"
+
+#~ msgid ""
+#~ "The Evolution component that handles folders of type \"%s\"\n"
+#~ "has unexpectedly quit. You will need to quit Evolution and restart\n"
+#~ "in order to access that data again."
+#~ msgstr ""
+#~ "\"%s\" növündəki qovluqları aça bilən Evolution tərkib hissəsi\n"
+#~ "gözlənilməz şəkildə iflas etdi. Verilənlərə yenidən yetişə bilmək üçün\n"
+#~ "Evolution proqramından çıxıb yenidən başlatmalısınız."
+
+#~ msgid "Checkbox"
+#~ msgstr "İşarələmə qutusu"
+
+#~ msgid "No error"
+#~ msgstr "Xəta yoxdur"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Eyni adlı bir qovluq onsuz da mövcuddur"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Bildirilən qovluq növü hökmlü deyil"
+
+#~ msgid "I/O error"
+#~ msgstr "G/Ç xətası"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Qovluğu yaratmaq üçün lazımi disk sahəsi yoxdur"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Qovluq boş deyil"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Bildirilən qovluq tapıla bilmədi"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Funksiya bu saxlama növündə yazılmayıb"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Əməliyyat dəstəklənmir"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Bu saxlama növündə bildirilən növ dəstəklənmir"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Bildirilən qovluq təkmilləşdirilə ya da silinə bilməz"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "Qovluq, altlarından birinə törəmə olaraq seçilə bilmir"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Bu gedişat oflayn modda ikən tədbiq edilə bilməz"
+
+#~ msgid "CORBA error"
+#~ msgstr "CORBA xətası"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Səhv arqument"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Yiyəsi onsuz da mövcuddur"
+
+#~ msgid "No owner"
+#~ msgstr "Yiyəsi yoxdur"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Dəstəklənməyən növ"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Dəstəklənməyən gedişat"
+
+#~ msgid "Exists"
+#~ msgstr "Mövcuddur"
+
+#~ msgid "Invalid URI"
+#~ msgstr "Hökmsüz URI"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Alt qovluqlara malikdir"
+
+#~ msgid "No space left"
+#~ msgstr "Heç yer qalmayıb"
+
+#~ msgid "Old owner has died"
+#~ msgstr "Köhnə yiyəsi ölüb"
+
+#~ msgid "Test type"
+#~ msgstr "Sınaq növü"
+
+#~ msgid "Disable splash screen"
+#~ msgstr "Açılış ekranını göstərmə"
+
+#~ msgid "Add to _Shortcut Bar"
+#~ msgstr "_Qısa Yol Çubuğuna Əlavə Et"
+
+#~ msgid "Change the name of this folder"
+#~ msgstr "Bu qovluğun adını dəyişdir"
+
+#~ msgid "Copy this folder"
+#~ msgstr "Bu qovluğu köçür"
+
+#~ msgid "Create a link to this folder in the shortcut bar"
+#~ msgstr "Bu qovluğa qısa yol çubuğunda bir körpü yarat"
+
+#~ msgid "Create a new shortcut"
+#~ msgstr "Yeni qısa yol yarat"
+
+#~ msgid "Create a new window displaying this folder"
+#~ msgstr "Bu qovluğu göstərən yeni pəncərə yarat"
+
+#~ msgid "Delete this folder"
+#~ msgstr "Bu qovluğu sil"
+
+#~ msgid "Display a different folder"
+#~ msgstr "Başqa qovluğu göstər"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "Evolution _Pəncərəsi"
+
+#~ msgid "Move this folder to another place"
+#~ msgstr "Bu qovluğu başqa yerə daşı"
+
+#~ msgid "Open Other _User's Folder..."
+#~ msgstr "Başqa _İstifadəçinin Qovluğunu Aç..."
+
+#~ msgid "Open this folder in an other window"
+#~ msgstr "Bu qovluğu yeni pəncərədə aç"
+
+#~ msgid "Remove a folder added with \"Open Other User's Folder\""
+#~ msgstr "\"Başqa İstifadəçinin Qovluğunu Aç\" ilə əlavə edilmiş qovluğu sil"
+
+#~ msgid "Toggle"
+#~ msgstr "Gizlə/Göstər"
+
+#~ msgid "View the selected folder"
+#~ msgstr "Seçili qovluğu göstər"
+
+#~ msgid "_Copy..."
+#~ msgstr "_Köçür..."
+
+#~ msgid "_Folder Bar"
+#~ msgstr "_Qovluq Çubuğu"
+
+#~ msgid "_Folder..."
+#~ msgstr "_Qovluq..."
+
+#~ msgid "_Go to Folder..."
+#~ msgstr "Qovluğa _Get..."
+
+#~ msgid "_Move..."
+#~ msgstr "_Daşı..."
+
+#~ msgid "_New Folder"
+#~ msgstr "_Yeni Qovluq"
+
+#~ msgid "_Remove Other User's Folder"
+#~ msgstr "_Başqa İstifadəçilərin Qovluqlarını Çıxart"
+
+#~ msgid "_Rename..."
+#~ msgstr "_Yenidən Adlandır..."
+
+#~ msgid "_Shortcut Bar"
+#~ msgstr "_Qısa Yol Çubuğu"
+
+#~ msgid "_Shortcut..."
+#~ msgstr "_Qısa Yol..."
+
+#~ msgid "Information"
+#~ msgstr "Mə'lumat"
+
+#~ msgid "Error"
+#~ msgstr "Xəta"
+
+#~ msgid "Question"
+#~ msgstr "Sual"
 
-#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
-msgid "Evolution Addressbook local/LDAP backend"
-msgstr "Evolution Ünvan Kitabçası yerli/LDAP backendi"
+#~ msgid "Clear"
+#~ msgstr "Təmizlə"
 
-#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:2
-#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
-msgid "Evolution Calendar local file backend"
-msgstr "Evolutionun Təqvim yerli fayl backendi"
+#~ msgid "Evolution Addressbook local/LDAP backend"
+#~ msgstr "Evolution Ünvan Kitabçası yerli/LDAP backendi"
 
-#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
-msgid "Evolution Addressbook local file backend"
-msgstr "Evolution Ünvan Kitabçası yerli fayl backendi"
+#~ msgid "Evolution Calendar local file backend"
+#~ msgstr "Evolutionun Təqvim yerli fayl backendi"
 
+#~ msgid "Evolution Addressbook local file backend"
+#~ msgstr "Evolution Ünvan Kitabçası yerli fayl backendi"
diff --git a/po/be.po b/po/be.po
index 78ee29169b..ccd8578bb1 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD.be\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-05-25 19:42GMT+2\n"
 "Last-Translator: Vital Khilko <dojlid@mova.org>\n"
 "Language-Team: belarusian <i18n@mova.org>\n"
@@ -28,51 +28,184 @@ msgstr "Немагчыма загрузіць %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Немагчыма прачытаць блёк дастасаваньня адрэсаў Пілёта"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Тэчкі аўтазавяршэньня"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "_Ід сэртыфіката:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Наладка вашых уліковых запісаў пошты робіцца тут"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Кантакты"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
+msgstr "Кніга адрэсаў \"Эвалюцыі\""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address pop-up"
+msgstr "Раптоўнае акенца кнігі адрэсаў \"Эвалюцыі\""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address viewer"
+msgstr "Праглядальнік кнігі адрэсаў \"Эвалюцыі\""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook card viewer"
+msgstr "Праглядальнік візытовак кнігі адрэсаў \"Эвалюцыі\""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook component"
+msgstr "Кампанэнт кнігі адрэсаў \"Эвалюцыі\""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook folder viewer"
+msgstr "Праглядальнік тэчак кнігі адрэсаў \"Эвалюцыі\""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Кіраваньне перавагамі пошты \"Эвалюцыі\""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Сродак кіраваньня наладкамі тэчак \"Эвалюцыі\""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Кніга адрэсаў"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Уласьцівасьці..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Выдаліць"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "Зьмяніць _назву"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Новы кантакт:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Кантакт"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "Стварыць новы кантакт"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Новы сьпіс кантактаў"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "Новы сьпіс кантактаў"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "Стварыць новы сьпіс кантактаў"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Пэрсанальнае"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Праца"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "Паслужнік LDAP"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Немагчыма стварыць каталёг %s: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "Збой далучэньня да паслужніка LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "Збой аўтарызацыі на паслужніку LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "Немагчыма выканаць запыт да карэннага DSE"
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "Паслужнік адказаў: \"адсутнічаюць базы пошуку\""
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Паслужнік не падтрымлівае звесткі схемы LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "Памылка атрыманьня зьвестак схемы"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr "Паслужнік не адказаў з рэчаіснымі зьвесткамі схемы"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Назва уліковага запіса"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Назва паслужніка"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "Падтрымка LDAP не уключана ў гэтае зборцы \"Эвалюцыі\""
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Іншыя кантакты"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -80,7 +213,7 @@ msgstr ""
 "Неатрымалася адкрыць гэтую кнігу адрэсаў. Праверце, што шлях існуе\n"
 "і што у вас ёсьць неабходныя правы доступа."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -89,7 +222,7 @@ msgstr ""
 "Неатрымалася адкрыць гэтую кнігу адрэсаў. Магчыма\n"
 "вы пазначылі нерэчаісны URI, ці паслужнік LDAP не адказвае."
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -101,7 +234,7 @@ msgstr ""
 "перасабрась праграму з зыходнага тэкста ў CVS пасьля\n"
 "усталёўкі OpenLDAP, які можна атрымаць па спасылцы ніжэй.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -114,44 +247,43 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Неатрымалася адкрыць кнігу адрэсаў"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "Далучацца да паслужніка LDAP ананімна"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "Збой аўтарызацыі.\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sУвядзіце пароль для %s (карыстальнік %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "Назва пачынаецца з"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "Э. пошта пачынаецца з"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Катэгорыя"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Любое поле ўтрымлівае"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Адмысловае..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -164,7 +296,7 @@ msgstr ""
 "ці абмяжуйце памер адказу кнігі адрэсаў у\n"
 "перавагах паслужніка каталёгаў."
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -176,88 +308,41 @@ msgstr ""
 "пошук ці зьмяніце абмежаваньне часу для гэтае кнігі адрэсаў у\n"
 "перавагах паслужніка каталёгаў."
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Праграма гэтае кнігі адрэсаў ня здолела разабраць запыт."
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Праграма гэтае кнігі адрэсаў адмовіла ў запыце."
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "Запыт ня быў пасьпяхова выкананы."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Любая катэгорыя"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "URI, які будзе адлюстроўваць каляндар"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "_Ід сэртыфіката:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "Наладжвайце доступ да паслужніка каталёгаў LDAP тутака"
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Кантакты"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "Паслужнікі каталёгаў"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Кніга адрэсаў \"Эвалюцыі\""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Сродак кіраваньня LDAP кнігі адрэсаў \"Эвалюцыі\"."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "Раптоўнае акенца кнігі адрэсаў \"Эвалюцыі\""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "Праглядальнік кнігі адрэсаў \"Эвалюцыі\""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Праглядальнік візытовак кнігі адрэсаў \"Эвалюцыі\""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr "Кампанэнт кнігі адрэсаў \"Эвалюцыі\""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook folder viewer"
-msgstr "Праглядальнік тэчак кнігі адрэсаў \"Эвалюцыі\""
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Кіраваньне перавагамі пошты \"Эвалюцыі\""
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -280,6 +365,7 @@ msgstr "  _Адлюстраваць базы, якія падтрымліваю�
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -313,8 +399,9 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "Дадаць паслужнік LDAP"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "Дапаможнік наладкі LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -330,9 +417,9 @@ msgid "Anonymously"
 msgstr "Ананімна"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -343,50 +430,51 @@ msgstr ""
 "Калі ласка, клікніце кнопку \"Завершыць\", каб захаваць парамэтры\n"
 "пазначаныя тутака."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "Далучэньне"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "_Удакладнёная назва:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr "Рэдагаваць паслужнік LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
 msgstr "Э.пошта:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 "\"Эвалюцыя\" будзе выкарыстоўваць гэтае DN для аўтарызацыі на паслужніку"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "\"Эвалюцыя\" будзе выкарыстоўваць гэтую адрэсу для аўтарызацыі вас на "
 "паслужніку"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "Скончана"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Асноўнае"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "Дапаможнік наладкі LDAP"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "Група"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Ніколі"
 
@@ -414,8 +502,8 @@ msgid "S_earch scope: "
 msgstr "Межы _пошуку:"
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Пошук"
 
@@ -476,27 +564,31 @@ msgstr ""
 "і сварэньня і рэдагаваньня кантактаў. "
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 "Пазначае назву якая была вызначана на апошнім кроку наладкі паслужніка LDAP."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "Крок 1: Зьвесті паслужніка"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "Крок 2 : Далучэньне да паслужніка"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "Крок 1: Зьвесті паслужніка"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "Крок 3: Пошук каталёга"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Крок 2 : Далучэньне да паслужніка"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "Крок 4: Адлюстраваньне назвы"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Крок 3: Пошук каталёга"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -508,18 +600,6 @@ msgstr "Базы пошуку, якія падтрымліваюцца"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"Гэта першы крок у наладцы перадачы вашага імя й зьвестак для уваходу на "
-"паслужнік LDAP.\n"
-"Калі ласка, запытайцеся, вашага сыстэмнага адміністратара, калі вы няпэўныя "
-"у гэтых зьвестках."
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -531,7 +611,7 @@ msgstr ""
 "адміністратара,\n"
 "калі вам патрэбна зьмяніць гэтыя опцыі."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -542,7 +622,7 @@ msgstr ""
 "ваш пошук. Калі вы пакініце гэтае поле пустым, пошук будзе пачаты з карэня \n"
 "дрэва каталёгаў."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -558,14 +638,14 @@ msgstr ""
 "узровень\n"
 " за базу пошуку.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
+#, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "Гэты дапаможнік дапаможавам наладзіць доступ да паслугі\n"
 "каталёгаў выкарыстоўваючы паслужнікі LDAP. \n"
@@ -574,14 +654,14 @@ msgstr ""
 "спэцыялізаваную інфармацыю аб паслужніку. Калі ласка,\n"
 "зьвяжыцеся з вашым адміністратарам каб атрымаць яе."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "Гэта поўная назва вашага паслужніка LDAP. Да прыкладу, \"mova.linux.by\""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -590,7 +670,7 @@ msgstr ""
 "Гэта максымальная колькасьць запісаў для загрузкі. Усталяваньне  гэтае \n"
 "лічбы ў вялікае значэньне запаволіць вашую кнігу адрэсаў."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -600,7 +680,7 @@ msgstr ""
 "Усталёўка значэньня у \"Адрэса пошты\"прадастаўляе ананімны доступ да вашага "
 "паслужніка LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -609,6 +689,15 @@ msgstr ""
 "Гэта назва паслужніка якая будзе адлюстроўвацца ў сьпісе \"Эвалюцыі\".\n"
 "Гэта толькі для адлюстраваньня. "
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Гэта назва паслужніка якая будзе адлюстроўвацца ў сьпісе \"Эвалюцыі\".\n"
+"Гэта толькі для адлюстраваньня. "
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -637,21 +726,34 @@ msgid "Using email address"
 msgstr "Выкарыстоўваць паштовую адрэсу"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Калі магчыма"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+"Гэта першы крок у наладцы перадачы вашага імя й зьвестак для уваходу на "
+"паслужнік LDAP.\n"
+"Калі ласка, запытайцеся, вашага сыстэмнага адміністратара, калі вы няпэўныя "
+"у гэтых зьвестках."
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "_Назва для адлюстраваньня:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "Аб_межаваньне загрузкі:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -659,54 +761,52 @@ msgstr "Аб_межаваньне загрузкі:"
 msgid "_Edit"
 msgstr "_Рэдагаваньне"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "_Мэтад уваходу:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "_Нумар порта:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "_База пошуку:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "_Назва паслужніка:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "_Таймаут (хвіліны):"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "карткі"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr "закладка далучэньня"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr "агульная закладка"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr "закладка пошуку"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Імя"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Інтарфэйс выбару імя з кнігі адрэсаў \"Эвалюцыі\"."
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Выдаліць усё"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Выдаліць"
@@ -733,23 +833,21 @@ msgstr "Дадаць да кантактаў"
 msgid "Unnamed Contact"
 msgstr "Кантакт бяз назвы"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Імя"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Крыніца"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Выбар кантактаў з кнігі адрэсаў"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "Пошук кантактаў у"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Інтарфэйс выбару імя з кнігі адрэсаў \"Эвалюцыі\"."
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Пошук"
@@ -826,7 +924,8 @@ msgid "D_epartment:"
 msgstr "Па_дразьдзяленьне:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Дэталі"
 
@@ -893,12 +992,12 @@ msgid "_Categories..."
 msgstr "_Катэгорыі..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "Вы_даліць"
@@ -2021,7 +2120,7 @@ msgid "Esq."
 msgstr "Эскв."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Поўнае імя"
 
@@ -2114,11 +2213,27 @@ msgstr "Рэдактар сьпісу кантактаў"
 msgid "Save List as VCard"
 msgstr "Захаваць сьпіс як Візытоўку (VCard)"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Зьменены кантакт:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Канфліктны кантакт:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Вызначана дубляваньне кантактаў"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Зьмененая адрэса ці імя гэтае кантактнае асобы ужо\n"
+"прысутнічаюць у гэтае тэчцы. Усё адно жадаеце дадаць?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Новы кантакт:"
@@ -2135,22 +2250,6 @@ msgstr ""
 "Імя ці э. пошта гэтае кантактнае асобы ужо існуюць\n"
 "у гэтае тэчцы. Усё адно жадаеце дадаць?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Зьменены кантакт:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Канфліктны кантакт:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"Зьмененая адрэса ці імя гэтае кантактнае асобы ужо\n"
-"прысутнічаюць у гэтае тэчцы. Усё адно жадаеце дадаць?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2249,9 +2348,9 @@ msgstr "Пераслаць кантакт"
 msgid "Send Message to Contact"
 msgstr "Даслаць паведамленьне кантактанае асобе"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Друк"
@@ -2273,9 +2372,12 @@ msgstr "Перамясьсціць у тэчку..."
 msgid "Cut"
 msgstr "Выразаць"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Капіяваць"
 
@@ -2284,16 +2386,8 @@ msgstr "Капіяваць"
 msgid "Paste"
 msgstr "Уставіць"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Выдаліць"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "Бягучы выгляд"
 
@@ -2310,166 +2404,170 @@ 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:2
 msgid "Assistant"
 msgstr "Памочнік"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Працоўны факс"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Працоўны тэлефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Працоўны тэлефон 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Тэлефон зваротнага выкліку"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Тэлефон у аўтамабіле"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Катэгорыі"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Тэлефон установы"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Падразьдзяленьне"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "Э. пошта"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "Э. пошта 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "Э. пошта 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Прозьвішча"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Файл як"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "Вольны/заняты URL"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Хатняя адрэса"
+#, fuzzy
+msgid "Given Name"
+msgstr "Назва поля"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Хатні факс"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Хатні тэлефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Хатні тэлефон 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Тэлефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Ярдан"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Мэнаджар"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Мабільны тэлефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Мянушка"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Заўвага"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Офіс"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Установа"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Іншыя адрэсы"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Іншы Fax"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Іншыя тэлефоны"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Пэйджар"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Першасны тэлефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Прафэсыя"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Радыё"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Роля"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Супруг(а)"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Тэлекс"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Пасада"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Нечытанае"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "І-нэт пляцоўка"
 
@@ -2562,11 +2660,19 @@ msgstr "Удзельнікі"
 msgid "Job Title"
 msgstr "Паса_да:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Хатняя адрэса"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Хатняя адрэса"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Іншыя адрэсы"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2579,112 +2685,109 @@ msgstr "Хатні факс"
 msgid "Blog"
 msgstr "Більбао"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Пасьпяхова"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Невядомая памылка"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Сховішча знаходзіцца ў адлучаным стане"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Адмоўлена ў доступе"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Картка ня адшукана"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Ід карткі ужо існуе"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Пратакол не падтрымліваецца"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Адменена"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "Збой аўтарызацыі"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "Патрабуе аўтарызацыю"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS адсутнічае"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "Кніга адрэсаў адсутнічае"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Іншая памылка"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Жадаеце захаваць зьмены?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr "_Адмовіць"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Памылка пад час даданьня сьпісу"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Памылка пад час даданьня карткі"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Памылка рэдагаваньня сьпісу"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Памылка пад час зьмены карткі"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Памылка выдаленьня сьпісу"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Памылка выдаленьня карткі"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2693,7 +2796,7 @@ msgstr ""
 "Адкрыцьцё %d картак прывядзе да адкрыцьця %d новых вокнаў.\n"
 "Вы сапраўды жадаеце адлюстраваць усе гэтыя карткі?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2702,49 +2805,49 @@ msgstr ""
 "%s ужо існуе\n"
 "Жадаеце перапісаць?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "Перапісаць"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Памылка захаваньня %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "сьпіс"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Перамясьсціць картку ў"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Капіяваць картку ў"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Перамясьсціць карткі ў"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Капіяваць карткі ў"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Шматлікія VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard для %s"
@@ -2939,7 +3042,7 @@ msgstr "Палі"
 msgid "Number of columns:"
 msgstr "Колькасьць слупкоў:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Парамэтры"
 
@@ -3126,18 +3229,18 @@ msgstr "Сьпіс бяз назвы"
 msgid "Split Multi-Day Events:"
 msgstr "Падзяліць шматдзённыя падзеі:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Неатрымалася запусьціць паслужнік wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Неатрымалася запусьціць wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Немагчыма прачытаць блёк дастасаваньня каляндару \"Пілёта\""
 
@@ -3145,24 +3248,83 @@ msgstr "Немагчыма прачытаць блёк дастасаваньн�
 msgid "Default Priority:"
 msgstr "Дапомны прыярытэт:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Немагчыма прачытаць блёк дастасаваньня заданьняў \"Пілёта\""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Каляндар і заданьні"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Каляндар"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Наладка вашае часавае зоны, каляндара і сьпісу задачаў"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Каляндар і заданьні \"Эвалюцыі\""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Сродак кіраваньня каляндаром \"Эвалюцыі\""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Праглядальнік паведамленьня плянаваньня каляндара \"Эвалюцыі\""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Праглядальнік каляндара \"Эвалюцыі\""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Рэдактар каляндара/заданьня \"Эвалюцыі\""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Праглядальнік заданьняў \"Эвалюцыі\""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Кампанэнт каляндара і заданьняў \"Эвалюцыі\"."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Кампанэнт тэставаньня \"Эвалюцыі\"."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Заданьні"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Паслуга нагадваньня сыгнала каляндара \"Эвалюцыі\""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Запускаецца:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Завяршаецца:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Нагадваньне \"Эвалюцыі\""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Нагадваньне на %s"
@@ -3236,43 +3398,172 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Болей не распавядаць мне пра гэтую праграму."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Паслуга нагадваньня сыгнала каляндара \"Эвалюцыі\""
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Неатрымалася ініцыялізаваць Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Немагчыма ініцыялізаваць gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Немагчыма стварыць вытворчасьць паслугі нагадваньня"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "нерэчаісны час"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "Памылка iCalendar"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Колер для умоўленых на дзень заданьняў "
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Колер для умоўленых на дзень заданьняў "
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "_Адлюстраваць сустрэчу і час у выглядзе тыдняў і месяцаў"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Прагледзіць выгляд каляндара ў друку"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "Запыт на падцьверджаньне выдаленьня элемэнтаў"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "Запыт на падцьверджаньне выдаленьня элемэнтаў"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Выдаліць скончаныя заданьні"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Паказаць нумары тыдняў у навігатары па датах"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Агульныя зьвесткі утрымліваюць"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Апісаньне ўтрымлівае"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Камэнтар утрымлівае"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Іншая пошта"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3284,81 +3575,110 @@ msgstr ""
 "\n"
 "Выдаліць гэтыя заданьні?"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "вяртае менш за"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "дні"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Надрукаваць гэты каляндар"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Новая Калядонія"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "Новая сустрэча"
+
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "_Сустрэча"
+
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Стварыць новую сустрэчу"
+
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "Новая нарада"
+
+#: calendar/gui/calendar-component.c:640
+msgid "M_eeting"
+msgstr "Нарада"
+
+#: calendar/gui/calendar-component.c:641
 #, fuzzy
-msgid "Rename"
-msgstr "Зьмяніць _назву"
+msgid "Create a new meeting request"
+msgstr "Стварыць запыт новае нарады"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Новая сустрэча на увесь дзень"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Пэрсанальнае"
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr "Сустрэча на увесь _дзень"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Праца"
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Стварыць новую сустрэчу"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3475,7 +3795,7 @@ msgstr "Даслаць на:"
 msgid "With these arguments:"
 msgstr "З гэткімі аргумэнтамі:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr "дыялёг1"
 
@@ -3491,6 +3811,10 @@ msgstr "гадзіны"
 msgid "minutes"
 msgstr "хвіліны"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3523,8 +3847,8 @@ msgstr "Даслаць пошту"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Агульныя зьвесткі:"
 
@@ -3553,7 +3877,7 @@ msgstr "канец сустрэчы"
 msgid "hour(s)"
 msgstr "гадзіна (ы)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "хвіліна(ы)"
 
@@ -3607,7 +3931,7 @@ msgstr "Дні"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Пятніца"
 
@@ -3621,7 +3945,7 @@ msgstr "Хвіліны"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Панядзелак"
 
@@ -3631,7 +3955,7 @@ msgstr "Няд"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Субота"
 
@@ -3645,7 +3969,7 @@ msgstr "Паказаць нумары тыдняў у навігатары па
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Нядзеля"
 
@@ -3663,7 +3987,7 @@ msgstr "Зьпіс заданьняў"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Чацьвер"
 
@@ -3681,7 +4005,7 @@ msgstr "Фармат часу:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Аўторак"
 
@@ -3691,12 +4015,12 @@ msgstr "Тыдзень пачынаецца з:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Серада"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Працоўны тыдзень"
 
@@ -3733,7 +4057,7 @@ msgid "_Fri"
 msgstr "_Птн"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Асноўнае"
 
@@ -3773,18 +4097,18 @@ msgstr "Срд"
 msgid "before every appointment"
 msgstr "перад кожнай сустрэчай"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 "Падзея што будзе выдалена гэта сустрэча, ці паведаміць пра яе адмену іншым?"
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Вы упэўненыя у тым, што жадаеце адмяніць і выдаліць гэтую сустрэчу?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
@@ -3792,11 +4116,11 @@ msgstr ""
 "Заданьне якое будзе выдалена \"прызначана\", ці жадаеце вы даслаць "
 "паведамленьне аб адмене?"
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Вы упэўненыя ў тым, што жадаеце адмяніць і выдаліць гэтае заданьне?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -3804,51 +4128,51 @@ msgstr ""
 "Запіс часопіса які будзе выдалены апублікаваны, ці жадаеце даслаць "
 "паведамленьне пра адмену?"
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 "Вы упэўненыя ў тым, што жадаеце адмяніць і выдаліць гэты запіс часопіса?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Гэтая падзея была выдалена."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Гэтае заданьне было выдалена."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Гэты запіс часопіса быў выдалены."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s Вы зрабілі зьмены. Забыца на іх і закрыць рэдактар?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Вы анічога не зьмянілі. Зачыніць рэдактар?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Гэтая падзея была зьменена."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Гэтае заданьне было зьменана."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Гэты запіс часопіса быў зьменены."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Вы ўнесьлі зьмены. Забыцца на іх і абнавіць рэдактар?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Вы ўнесьлі зьмены, абнавіць рэдактар?"
@@ -3858,164 +4182,169 @@ msgstr "%s  Вы ўнесьлі зьмены, абнавіць рэдактар?
 msgid "Validation error: %s"
 msgstr "Памылка зацьверджаньня: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " да "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Выканана "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Выканана "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Патрэба "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Умоўленае"
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "Немагчыма абнавіць аб'ект"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Рэдагаваньне сустрэчы"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Сустрэча - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Заданьне - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Запіс часопіса - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Няма агульных зьвестак"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Захаваць як..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Немагчыма атрымаць бягучую вэрсыю!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Выбярыце мейсца прызначэньня для імпартаваньня гэтых даньняў"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Вы упэўненыя што жадаеце выдаліць сустрэчу \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Вы упэўнены што жадаеце выдаліць гэтую сустрэчу бяз назвы?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Вы упэўненыя што жадаеце выдаліць заданьне \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Вы упэўнены што жадаеце выдаліць гэтае заданьне бяз назвы?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Вы упэўненыя што жадаеце выдаліць запіс часопіса \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Вы упэўненыя што жадаеце выдаліць запіс часопіса бяз назвы?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Вы упэўненыя што жадаеце выдаліць %d сустрэч?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Вы упэўненыя што жадаеце выдаліць %d заданьняў?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Вы упэўненыя што жадаеце выдаліць %d запісаў часопіса?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "Падзея не можа быць выдалена з-за памылкі corba"
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "Заданьне не можа быць выдалена з-за памылкі corba"
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Запіс часопіса не можа быць выдалены з-за памылкі corba"
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Элемэнт не можа быць выдалена з-за памылкі corba"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "Падзея не можа быць выдалена пакуль доступ забаронены"
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "Заданьне не можа быць выдалена пакуль доступ забаронены"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Запіс часопіса не можа быць выдалены пакуль доступ забаронены"
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "Элемэнт не можа быць выдалена пакуль доступ забаронены"
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Падзея не можа быць выдалена з-за памылкі corba"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Заданьне не можа быць выдалена з-за памылкі corba"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Запіс часопіса не можа быць выдалены з-за памылкі corba"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Элемэнт не можа быць выдалена з-за памылкі corba"
@@ -4032,43 +4361,43 @@ msgstr "Дэлегаваць да:"
 msgid "Enter Delegate"
 msgstr "Пазначце дэлегата"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Сустрэча"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Нагадваньне"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Вяртаньне"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Плянаваньне"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Нарада"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "Дата пачатку памылковая"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "Дата завяршэньня памылковая"
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "Час пачатку памылковы"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "Час заканчэньня памылковы"
 
@@ -4138,31 +4467,31 @@ msgid "_Start time:"
 msgstr "_Час пачатку:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Няма"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "Неабходны арганізатар."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "Патрабуе хаця б аднаго удзельніка."
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Дэлегаваць у..."
 
@@ -4203,21 +4532,15 @@ msgid "Member"
 msgstr "Удзельнік"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Роля"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Стан"
@@ -4237,6 +4560,7 @@ msgid "_Invite Others..."
 msgstr "_Запрасіць іншых..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4269,6 +4593,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Немагчыма стварыць каталёг %s: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "Арганізатар мусіць быць пазначаны."
@@ -4298,33 +4623,58 @@ msgstr "Інфармацыя календара"
 msgid "Calendar Name"
 msgstr "Каляндар"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Немагчыма стварыць каталёг %s: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Інфармацыя календара"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Зьпіс заданьняў"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Зьпіс заданьняў"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Зьпіс заданьняў"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr "Толькі гэты экзэмпляр"
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Гэты й будучы экзэмпляры"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr "Гэты й будучы экзэмпляры"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr "Усе экзэмпляры"
 
@@ -4374,10 +4724,15 @@ msgstr "дзень"
 msgid "on the"
 msgstr "на"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "выпадкі"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Дата/Час:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "_Дадаць"
@@ -4442,7 +4797,7 @@ msgstr "тыдзень(і)"
 msgid "year(s)"
 msgstr "год(гады)"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
@@ -4452,31 +4807,31 @@ msgstr ""
 "\n"
 "Вы жадаеце захаваць зьмены?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "_Адкінуць зьмены"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 msgid "Save Event"
 msgstr "Захаваць падзею"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Зьвесткі па нарадзе створаны. Даслаць?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Зьвесткі па нарадзе зьменены. Даслаць і абнавіць вэрсыю?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "Зьвесткі па заданьні створаны. Даслаць?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "Зьвесткі па заданьні зьменены. Даслаць і абнавіць вэрсыю?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Дата заканчэньня выкананьня памылковая"
 
@@ -4486,43 +4841,43 @@ msgid "% _Complete"
 msgstr "% Завершана"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Выканана"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Высокі"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "Выконваецца"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Нізкі"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Нармальны"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Не распачаты"
 
@@ -4531,7 +4886,7 @@ msgid "Progress"
 msgstr "Выкананьне"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Нявызначаны"
 
@@ -4553,21 +4908,21 @@ msgstr "_Стан:"
 msgid "_Web Page:"
 msgstr "Адрэса Web-старонкі:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Асноўнае"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Прызначэньне"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "Умоўленая дата памылковая"
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4575,9 +4930,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "_Сакрэтна"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Апісаньне:"
 
@@ -4682,26 +5037,21 @@ msgstr "%s на %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s для невядомага тыпу трэггера"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Публічнае"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Прыватнае"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Сакрэтнае"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Катэгорыі"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4714,28 +5064,26 @@ msgid "Start Date"
 msgstr "Дата пачатку"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Агульныя зьвесткі"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "колер"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Сустрэча"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Вольны"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Заняты"
 
@@ -4747,7 +5095,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "E"
 
@@ -4755,7 +5103,7 @@ msgstr "E"
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4765,7 +5113,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4773,7 +5121,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Так"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4781,17 +5129,17 @@ msgstr "Не"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Невядома"
 
@@ -4803,181 +5151,179 @@ msgstr "Паўтор"
 msgid "Assigned"
 msgstr "Прызначана"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Абнаўленьне аб'ектаў"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Выдаленьне вылучаных аб'ектаў"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Абнаўленьне аб'ектаў"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Новая _сустрэча..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Новая падзея на ўвесь дзень"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "Новая нарада"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Новае заданьне"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Друкаваць..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Уставіць"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Перайсьці да _сёньня"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "Пера_йсьці да даты..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Апублікаваць інфармацыю \"Вольны/Заняты\""
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "_Усталёўкі..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Адкрыць"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Захаваць _як..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Капіяваць"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "_Заплянаваць нараду..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "_Перадаслаць як iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Выдаліць гэтую зьяву"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Выдаліць _усе зьявы"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "_Усталёўкі..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "Адкрыць паведамленьне"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "_Прызначыць заданьне"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "_Перадаслаць як iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "Пазначыць як выкананае"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Пазначыць вылучаныя заданьні як выкананыя"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "Выдаліць вылучаныя заданьні"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Клікніце каб дадаць заданьне"
@@ -4991,8 +5337,8 @@ msgstr "% Завершана"
 msgid "Alarms"
 msgstr "Сыгналы"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Выкананьне"
 
@@ -5021,18 +5367,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5051,7 +5397,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5064,125 +5410,125 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr "Так (Комплекснае вяртаньне)"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "Штодзённа"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "Кожныя %d дзён"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "Штотыдзень"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "Кожныя %d тыдні"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr "Штотыдзень на "
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Кожныя %d тыдні на"
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " і "
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr "%s дзень "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s"
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "штомесяц"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr "кожныя %d мясацаў"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "Штогод"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "Кожныя %d год"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr " агулам з %d часа"
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ", сканчаецца на "
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>Пачынаецца:</b> "
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Сканчаецца:</b> "
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b> Выканана</b> "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>Умоўлена:</b> "
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "Зьвесткі iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "Памылка iCalendar"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Невядомая пэрсона"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5190,318 +5536,317 @@ msgstr ""
 "<br>Калі ласка, прагледзьце наступную інфармацыю, і выбярыце дзеяньне з мэню "
 "ніжэй."
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Няма</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "Мейсца:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Стан:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Прынята"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Прынята для спробы"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Адхілена"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Выбраць дзеяньне:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Абнавіць"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Так"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Прыняць"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Прыняць для спробы"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Адхіліць"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Даслаць інфармацыю \"Вольны/Заняты\""
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Абнавіць стан удзельнікаў"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Даслаць апошнюю інфармацыю"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Адмяніць"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> разьмясьціў(ла) зьвесткі аб нарадзе."
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Зьвесткі аб нарадзе"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> запытваецца прысутнасьці %s на нарадзе."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> запытваецца вашае прысутнасьці на нарадзе."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Плян нарады"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> жадае далучыць да распачатае нарады."
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Абнаўленьне нарады"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> запытвае апошнюю інфармацыю па нарадзе."
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Запыт на абнаўленьне нарады"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> мае адказ на запыт нарады."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Адказ па нарадзе"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> мае адмяніць нараду."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Адмена нарады"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> мае даслаць неінтэлегентнае паведамленьне."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Дрэннае паведамленьне нарады"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> мае апублікаваць зьвесткі аб заданьні."
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Інфармацыя аб заданьні"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> пытаецца %s аб выкананьні заданьня."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> пытаецца вас аб выкананьні заданьня."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Плян заданьня"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> жадае дадаць да распачатага заданьня."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Абнаўленьне заданьня"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> жадае атрымаць апошнія зьвесткі па заданьні."
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Запыт на абнаўленьне заданьня"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> мае адказ на заданьне."
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Адказ на заданьне"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> мае адмяніць заданьне."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Адмена заданьня"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Дрэннае паведамленьне па заданьні"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> мае апублікаваць інфармацыю \"Вольны/Заняты\"."
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Інфармацыя \"Вольны/Заняты\""
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> патрабуе ад вас інфармацыю \"Вольны/Заняты\"."
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Запыт \"Вольны/Заняты\""
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> мае адказаць на запыт аб інфармацыі \"Заняты/Вольны\"."
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Адказ на \"Заняты/Вольны\""
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Дрэннае паведамленьне \"Вольны /Заняты\""
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr "Падобна што паведамленьне не было правільна сфармавана"
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "Паведамленьне утрымлівае толькі запыты, якія не падтрымліваюцца."
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Укладаньне ня ўтрымлівае рэчаіснага паведамленьня каляндара"
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr "Укладаньне мае элемэнты каляндара, якія нельга адлюстраваць"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "Файл каляндара ня можа быць абноўлены!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Абнаўленьне завершана\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Стан удзельніка ня можа быць абноўлены таму, што элемэнт ужо не існуе"
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Аб'ект нерэчаісны і ня будзе абноўлены\n"
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Адказ не ад бягучага удзельніка. Дадаць як ад яго?"
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Стан удзельніка ня можа быць абноўлены, таму што ён нерэчаісны!\n"
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr "Адбылася памылка ў сыстэме CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr "Аб'ект адсутнічае\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Вы ня маеце правільных правоў для абнаўленьня каляндара\n"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Стан удзельніка абноўлены\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "Стан удзельніка ня можа быць абноўлены!\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Выдаленьне скончана"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Элемэнт дасланы!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Элемэнт ня можа быць дасланы!\n"
 
@@ -5661,7 +6006,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -5725,49 +6070,44 @@ msgstr "Час пачатку нарады:"
 msgid "Meeting _end time:"
 msgstr "Час заканчэньня нарады:"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "Дата пачатку:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "_Умоўленая дата:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "_Прыярытэт:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Старонка"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Адкрыцьцё заданьняў %s"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Немагчыма загрузіць заданьне ў \"%s\""
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Мэтад неабходны для загрузкі \"%s\" не падтрымліваецца"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Вы ня маеце правоў для адкрыцьця тэчкі ў `%s'"
 
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5776,48 +6116,39 @@ msgstr ""
 "Памылка на %s\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "Завяршэньне заданьняў..."
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "Выдаленьне вылучаных аб'ектаў..."
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "Выкрэсьленьне"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Заданьні"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Каляндар"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Немагчыма адчыніць тэчку \"%s\""
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Мэтад неабходны для адкрыцьця \"%s\" не падтрымліваецца"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Даданьне нагадваньня для %s"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5828,7 +6159,7 @@ msgstr ""
 "%s\n"
 "павалілася. Вы мусіце перазагрузіць \"Эвалюцыю\" і паспрабаваць яшчэ раз"
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5839,58 +6170,11 @@ msgstr ""
 "%s\n"
 "павалілася. Вы мусіце перазагрузіць \"Эвалюцыю\" і паспрабаваць яшчэ раз"
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Турэцкае"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Каляндар і заданьні"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Каляндар"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Наладка вашае часавае зоны, каляндара і сьпісу задачаў"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Каляндар і заданьні \"Эвалюцыі\""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Сродак кіраваньня каляндаром \"Эвалюцыі\""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Праглядальнік паведамленьня плянаваньня каляндара \"Эвалюцыі\""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Праглядальнік каляндара \"Эвалюцыі\""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Рэдактар каляндара/заданьня \"Эвалюцыі\""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Праглядальнік заданьняў \"Эвалюцыі\""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Кампанэнт каляндара і заданьняў \"Эвалюцыі\"."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Кампанэнт тэставаньня \"Эвалюцыі\"."
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Красавік"
@@ -5947,296 +6231,332 @@ msgstr "Кастрычнік"
 msgid "September"
 msgstr "Верасень"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Арганізатар мусіць быць пазначаны."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Патрэбны мінімум адзін удзельнік"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Інфармацыя аб падзеі"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Інфармацыя аб заданьні"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Інфармацыя часопіса"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Інфармацыя \"Вольны/Заняты\""
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Інфармацыя календара"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Абноўлена"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Абнавіць"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "Контар-прапанова"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Інфармацыя \"Вольны/Заняты\" (%s да %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "Інфармацыя iCalendar"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Вы мусіце быць удзельнікам падзеі"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1-га"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2-га"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3-га"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4-га"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5-га"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6-га"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7-га"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8-га"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9-га"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10-га"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11-га"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12-га"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13-га"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14-га"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15-га"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16-га"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17-е"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18-е"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19-е"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20-е"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21-га"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22-га"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23-га"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24-га"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25-га"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26-га"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27-га"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28-га"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29-га"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30-га"
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31-га"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Нд"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Пн"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Ат"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Ср"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Чт"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Пт"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Сб"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Вылучаны дзень (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Вылучаны тыдзень (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Вылучаны месяц (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Вылучаны год (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Заданьне"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Стан: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Прыярытэт: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Адсоткі выкананьня: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Катэгорыі: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Кантакты: "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Перадпрагляд друку"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Друк элемэнта"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Наладка друку"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Зьмяніць назву лычкі"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Зьпіс заданьняў"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Новае заданьне"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Заданьне"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Стварыць новае заданьне"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "URI, які будзе паказаны у тэчцы заданьняў"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6248,11 +6568,11 @@ msgstr ""
 "\n"
 "Выдаліць гэтыя заданьні?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Не пытацца наступнага разу."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "Друк заданьняў"
 
@@ -6280,15 +6600,15 @@ msgstr "Файлы каляндара \"iCalendar\" (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "Файлы каляндара \"vCalendar\" (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "Нагаданьне!!!"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "Падзеі каляндара"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6296,7 +6616,7 @@ msgstr ""
 "\"Эвалюцыя\" адшукала файлы каляндара Gnome.\n"
 "Ці жадаеце імпартаваць іх у \"Эвалюцыю\"?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Каляндар GNOME"
 
@@ -7829,27 +8149,27 @@ msgstr "Ціхі акіян/Валі"
 msgid "Pacific/Yap"
 msgstr "Ціхі акіян/Яп"
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "Подпіс не падтрымліваецца гэтым шыфрам"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "Праверка не падтрымліваецца гэтым шыфрам"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Шыфраваньне не падтрымліваецца гэтым шыфрам"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Расшыфроўка не падтрымліваецца гэтым шыфрам"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr "Вы ня можаце імпартаваць ключы з гэтым шыфрам"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr "Вы ня можаце экспартаваць ключы з гэтым шыфрам"
 
@@ -7901,86 +8221,86 @@ msgstr "Падрыхтоўка тэчкі \"%s\" для аўтаномнае п�
 msgid "You must be working online to complete this operation"
 msgstr "Вы мусіце працаваць у далучаным стане для завяршэньня гэтае апэрацыі"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Збой пад час стварэньня канала да \"%s\": %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Збой пад час стварэньня дачэрняга працэса '%s': %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Недапушчальная плыня паведамленьня атрымана ад %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Сынхранізацыя тэчак"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Памылка аналізу фільтра: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Памылка выкананьня фільтра: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Неатрымалася адкрыць тэчку спула"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Неатрымалася апрацаваць тэчку спула"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Атрыманьне паведамленьня %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Немагчыма адкрыць паведамленьне"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Збой на паведамленьні %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Сынхранізацыя тэчкі"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Атрыманьне паведамленьня %d з %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Збой на паведамленьні %d з %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Збой пад час атрыманьня паведамленьня"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr "Недапушчальныя аргумэнты для system-flag"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr "Недапушчальныя аргумэнты для user-tag"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Памылка выкананьня пошуку фільтра: %s: %s"
@@ -8012,36 +8332,36 @@ msgstr "(супадае ўсе) патрабуе адзінага лягічна
 msgid "Performing query on unknown header: %s"
 msgstr "Завяршэньне запыту на невядомым загалоўке: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Апэрацыя, якая не падтрымліваецца: даданьне паведамленьня: для %s"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Апэрацыя не падтрымліваецца: пошук выраза: для %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Апэрацыя не падтрымліваецца: пошук па ідэнтыфікатары карыстальніка: для %s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Перамяшчэньне паведамленьняў"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr "Капіяваньне паведамленьняў"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Атрыманьне %d паведамленьняў"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8052,15 +8372,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr "Памылка пад час апрацоўкі падказкі gpg userid."
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr "Памылка пад час апрацоўкі запыту парольнае фразы gpg."
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8069,34 +8389,34 @@ msgstr ""
 "Вам патрэбны пароль каб разблякаваць ключ для\n"
 "карыстальніка: \"%s\""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Адменена."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Збой пад час разблякаваньня сакрэтнага ключа: пазначана 3 некарэктныя "
 "парольныя фразы."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Нечаканы адказ ад GnuPG: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr "Няма даньняў"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 "Неатрымліваецца зашыфраваць гэтае паведамленьне: Невызначаны карэктныя "
 "атрымоўцы."
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8107,51 +8427,65 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Збой у GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Немагчыма запісаць даньні: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Збой выкананьня gpg: %s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr "Збой выкананьня gpg."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "Гэтая частка паведамленьня падпісана электроным подпісам"
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr ""
+"Неатрымалася праверыць подпіс паведамленьня: ня атрымалася стварыць часовы "
+"файл: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Неатрымалася праверыць подпіс паведамленьня: ня атрымалася стварыць часовы "
 "файл: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Немагчыма запісаць даньні: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Гэтая частка паведамленьня падпісана электроным подпісам"
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Цела індэкса утрымлівае"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Неатрымліваецца атрымаць паведамленьне з рэдактара"
@@ -8252,15 +8586,15 @@ msgstr "Памылка захаваньня часовага паштовага
 msgid "Error copying mail temp file: %s"
 msgstr "Памылка капіяваньня часовага паштовага файла: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Збой пад час дэкадаваньня часткі MIME: памылка пратакола"
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "Збой пад час лэкадаваньня часткі MIME: некарэктная структура"
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "памылка разбору"
 
@@ -8580,12 +8914,12 @@ msgstr "Правайдэр віртуальных тэчак электрона�
 msgid "For reading mail as a query of another set of folders"
 msgstr "Для чытаньня пошты па запыце да іншага збору тэчак"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Правайдэр для пратакола \"%s\" недаступны"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8594,71 +8928,82 @@ msgstr ""
 "Немагчыма стварыць каталёг %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Пазначце пароль для %s"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Нявызначаны"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Рэдагаваць подпіс"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Рэдагаваць подпіс"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Самападпісаны сэртыфікат у ланцужку"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "Сэртыфікат ненадзейны"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Захаваць подпіс"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Памылка разбору"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Паслужнік: %s, Тып: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Неатрымалася атрымаць тэчку: недапушчальная апэрацыя ў гэтым сховішчы"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Неатрымалася стварыць тэчку: недапушчальная апэрацыя ў гэтым сховішчы"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Сьметніца"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "Чэрвень"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "Немагчыма атрымаць сэртыфікат выдаўца"
@@ -8867,7 +9212,7 @@ msgstr ""
 "Сьпіс вяртаньня сэртыфіката састарэў: %s\n"
 "Выдавец: %s"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Немагчыма разабраць URL \"%s\""
@@ -8886,22 +9231,22 @@ msgstr "Паведамленьне %s адсутнічае ў %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Немагчыма капіяваць ці перамясьціць паведамленьні у віртуальную тэчку"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Неатрымалася выдаліць тэчку: %s: недапушчальная апэрацыя"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Неатрымалася выдаліць тэчку: %s: тэчка адсутнічае"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Неатрымалася зьмяніць назву тэчкі: %s: недапушчальная апэрацыя"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Неатрымалася зьмяніць назву тэчкі: %s: тэчка адсутнічае"
@@ -8981,7 +9326,7 @@ msgstr "Немагчыма арымаць паведамленьне: %s"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -8995,7 +9340,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Няма гэткага паведамленьня"
@@ -9033,56 +9378,71 @@ msgid "Failed to cache %s: %s"
 msgstr "Збой у кэшы %s: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Далучэньне да паслужніка..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Збой далучэньня да паслужніка LDAP"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "Прадпрыемства"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Праверка новае пошты"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Check for new messages in all folders"
 msgstr "Праверка новае пошты ўва ўсіх тэчках"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Тэчкі"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Паказываць толькі запытаныя тэчкі"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "Перавызначыць прапанаваную паслужнікам прастору назваў для тэчак"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Прастора назваў"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 "Ужыць фільтры да усіх новых паведамленьняў у тэчцы \"Атрыманыя\" (INBOX) на "
 "гэтым паслужніку"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "Аўтаматычна правяраць пошту кожныя"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Для чытаньня і захаваньня пошты на паслужніках IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Пароль"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9331,7 +9691,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Неатрымалася зьмяніць назву тэчкі %s у %s: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Немагчыма зьмяніць назву '%s': %s"
@@ -9448,29 +9808,29 @@ msgstr "Праверыць наяўнасьць новых паведамлен�
 msgid "Storing folder"
 msgstr "Захаваньне тэчкі"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Не атрымліваецца заблякаваць тэчку %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Неатрымалася адкрыць паштовую скрыню: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "Даданьне пошты адменена"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Немагчыма далучыць паведамленьне да файла mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9479,11 +9839,11 @@ msgstr ""
 "Немагчыма атрымаць паведамленьне: %s з тэчкі %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Магчыма тэчка сапсавана й ня можа быць адноўлена."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Збой у канструкцыі паведамленьня: паштовая скрыня пашкоджана?"
 
@@ -9551,12 +9911,17 @@ msgstr "Немагчыма стварыць каталёг %s: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "Неатрымалася атрымаць тэчку: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "Ід карткі ужо існуе"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Неатрымалася зьмяніць назву тэчкі %s у %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Пазначаная назва тэчкі недапушчальна: %s"
@@ -9600,7 +9965,7 @@ msgstr "Немагчыма закрыць тэчку крыніцы %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Немагчыма закрыць часовую тэчку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Неатрымалася зьмяніць назву тэчкі: %s"
@@ -9888,7 +10253,7 @@ msgstr "Выдаляць праз %s дзён"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -9978,7 +10343,7 @@ msgid "No such folder `%s'."
 msgstr "Няма гэткае тэчкі \"%s\""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10032,7 +10397,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Дастаўка пошты праз праграму sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10201,7 +10566,7 @@ msgstr "Дастаўка пошты SMTP праз %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Немагчыма даслаць паведамленьне: памылковая адрэса адпраўляльніка."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Адпраўка паведамленьня"
 
@@ -10325,7 +10690,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "укладаньне"
 
@@ -10369,14 +10734,14 @@ msgstr "Тып MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Прапаноўваць аўтаматычнае адлюстраваньне укладаньня"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Вы мусіце наладзіць уліковы запіс\n"
 "да таго як стварыць паведамленьне."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Клікніце тутака для выкліку кнігі адрэсаў"
 
@@ -10387,45 +10752,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Адказаць на:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Ад каго:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Тэма:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Каму:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Пазначце атрымоўцаў паведамленьня"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Копія:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Пазначце атрымоўцаў, якія атрымаюць копію паведамленьня"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Сх. копія:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10436,14 +10801,19 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Даслаць на:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr "Мейсца прызначэньня"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Укласьці файл у паведамленьне"
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Укласьці файл(ы)"
@@ -10479,21 +10849,21 @@ msgstr "Файл існуе, перапісаць?"
 msgid "Error saving file: %s"
 msgstr "Памылка захаваньня файла: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Памылка пад час загрузкі файла: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Памылка доступу да файла: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Неатрымліваецца атрымаць паведамленьне з рэдактара"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10502,7 +10872,7 @@ msgstr ""
 "Немагчыма зрушыць па файле: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10511,7 +10881,7 @@ msgstr ""
 "Немагчыма усекчы файл: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10520,7 +10890,7 @@ msgstr ""
 "Немагчыма скапіяваць дэскрыптар файла: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10529,7 +10899,7 @@ msgstr ""
 "Памылка аўтазахаваньня паведамленьня: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10537,7 +10907,7 @@ msgstr ""
 "\"Эвалюцыя\" адшукала незахаваныя файлы з папярэдняга сэанса.\n"
 "Жадаеце пспрабаваць аднавіць іх?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10548,28 +10918,28 @@ msgstr ""
 "\n"
 "Жадаеце захаваць зьмены?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Увага: Зьмененае паведамленьне"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Адкрыцьцё файла"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "Подпіс:"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "Створана аўтаматычна"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Стварыць паведамленьне"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10577,7 +10947,7 @@ msgstr ""
 "Немагчыма стварыць акно рэдактара.\n"
 "Немагчыма актывізаваць кіраваньне выбарам адрэсы."
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10589,7 +10959,7 @@ msgstr ""
 "Калі ласка, праверце карэктнасьць усталяванае вэрсыі\n"
 "gtkhtml і libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10597,7 +10967,7 @@ msgstr ""
 "Неатрымалася стварыць акно рэдактара:\n"
 "Неатрымалася актывізаваць HTML-кампанэнт рэдактара."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10606,11 +10976,13 @@ msgstr ""
 "нельга рэдагаваць.)<b>"
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Збор дастасаваньняў для групавой працы \"Эвалюцыя\""
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "\"Эвалюцыя Ximian\""
 
 #: data/evolution.keys.in.h:1
@@ -10858,13 +11230,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -10983,7 +11355,7 @@ msgstr "Тады"
 msgid "You must specify a folder."
 msgstr "Вы мусіце пазначыць тэчку."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Выбраць тэчку"
@@ -10997,24 +11369,24 @@ msgstr ""
 "Памылка ў сталым выразе \"%s\":\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Важнае"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "Трэба выканаць"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Пазьней"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Тэст"
 
@@ -11116,7 +11488,7 @@ msgstr "раней"
 msgid "months"
 msgstr "месяцы"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "сэкундаў"
 
@@ -11213,7 +11585,7 @@ msgstr "Выраз"
 msgid "Follow Up"
 msgstr "Падняцца вышэй"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "Адмеціна"
 
@@ -11283,112 +11655,118 @@ msgid "Source Account"
 msgstr "Крыніца рахунка"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Пырскі"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Спэцыфічны загаловак"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Спыніць апрацоўку"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Тэма"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "Адмяніць папярэдні стан"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "утрымлівае"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "ня ўтрымлівае"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "не сканчаецца на"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "ня існуе"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "does not return"
 msgstr "не вяртае"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "не гучыць як"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "не пачынаецца на"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "сканчаецца на"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "існуе"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr "пазначана"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr "пасьля"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "is before"
 msgstr "перад"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "больш за"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "менш за"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr "не пазначана"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "ня гэта"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "гэта"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr "вяртае больш за"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr "вяртае менш за"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr "вяртае"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "гукі як"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "пачынаецца з"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Пазва правіла '%s' ня ўнікальна, выбярыце іншую."
@@ -11413,18 +11791,80 @@ msgstr "Назва правіла"
 msgid "Score Rules"
 msgstr "Правіла падліку"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Вы мусіце назваць гэтую віртуальную тэчку."
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr "Вам трэба пазначыць хаця бы адну тэчку ў якасьці крыніцы."
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 msgid "VFolder source"
 msgstr "Крыніца віртуальнае тэчкі"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Перавагі рэдактара паведамленьняў"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Тут наладжваюцца парвмэтры пошты, уключаючы бясьпеку й адлюстраваньне "
+"паведамленьняў"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Тут наладжваюцца праверка правапісу, подпісу й стварэньне паведамленьняў"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Наладка вашых уліковых запісаў пошты робіцца тут"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Пошта \"Эвалюцыі\""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Сродак кіраваньня уліковамі запісамі пошты \"Эвалюцыі\""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Кампанэнт пошты \"Эвалюцыі\""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Рэдактар паведамленьняў \"Эвалюцыі\""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Сродак кіраваньня рэдактарам паведамленьняў \"Эвалюцыі\""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail folder viewer"
+msgstr "Праглядальнік паштовае тэчкі \"Эвалюцыі\"."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Кіраваньне перавагамі пошты \"Эвалюцыі\""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Пошта"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Уліковыя запісы пошты"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "Перавагі пошты"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Вы упэўнены што жадаеце выдаліць гэты рахунак?"
@@ -11466,7 +11906,7 @@ msgid "Protocol"
 msgstr "Пратакол"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr "Бяз назвы"
 
@@ -11490,21 +11930,18 @@ msgstr "Дадаць подпіс сцэнара"
 msgid "Signature(s)"
 msgstr "Подпіс(ы)"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "Вы дасылаеце паведамленьне фарматаванае ў HTML. Калі ласка,\n"
 "упэўніцеся што наступныя атрымоўцы жадаюць і могуць атрымліваць\n"
 "пошту у фармаце HTML:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Даслаць у любым выпадку?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11512,28 +11949,28 @@ msgstr ""
 "Гэтае паведамленьне ня мае тэмы.\n"
 "Даслаць яго?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Гэтае паведамленьне утрымлівае толькі атрымоўцаў схаванае копіі."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Вы мусіце пазначыць атрымоўцаў, каб даслаць гэтае паведамленьне."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11545,189 +11982,402 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Стварыць _віртуальную тэчку вынікаў пошуку..."
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "Пошта"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<клікніце тутака для выбару тэчкі>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" у \"%s\""
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Стварыць новую тэчку"
 
-#: mail/em-folder-selector.c:267
-#, fuzzy
-msgid "Folder _name"
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Пазначце дзе стварыць тэчку:"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
 msgstr "_Назва тэчкі:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Неатрымалася стварыць часовы каталёг: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Неатрымалася стварыць часовы каталёг: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Немагчыма стварыць часовы файл '%s': %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Немагчыма закрыць часовую тэчку: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Загрузка..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Выбраць тэчку"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Стварыць новую тэчку"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr ""
+"Немагчыма выдаліць тэчку \"%s\":\n"
+"%s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Сапраўды выдаліць тэчку \"%s\"?"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Выдаліць \"%s\""
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Зьмяніць назву тэчкі \"%s\" на:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+msgid "Rename Folder"
+msgstr "Зьмяніць назву тэчкі"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Уласьцівасьці шрыфта"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Уласьцівасьці"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "Назва _тэчкі:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "Выгляд"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Адкрыць у новым акне"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Перамясьціць"
+
+#: mail/em-folder-tree.c:1500
+msgid "_New Folder..."
+msgstr "_Новая тэчка..."
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "Зьмяніць _назву"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "_Уласьцівасьці..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "Зьмяніць як новае паведамленьне..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "_Друк"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "Адказаць адпраўляльніку"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Адказаць у сьпіс"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Адказаць усім"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "_Перадаслаць"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr "Падняцца вышэй..."
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr "Выкананы сьцяг"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "Ачысьціць сьцяг"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Пазначыць як чытанае"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "Пазначыць як нечытанае"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Пазначыць як важнае"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "Пазначыць як неважнае"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Пазначыць як нечытанае"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Пазначыць як важнае"
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "_Вярнуць"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "Перамясьціць у тэчку..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Капіяваць у тэчку..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "Дадаць адпраўляльніка ў кнігу адрэсаў"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "_Ужыць фільтары"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "Стварыць правіла з паведамленьня"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "Віртуальная тэчка па тэме"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "Віртуальная тэчка па адпраўляльніку"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "Віртуальная тэчка па атрымоўцы"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "Віртуальная тэчка па сьпісе рассылкі"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "Віртуальная тэчка па адпраўляльніку"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Фільтар па тэме"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Фільтар па адпраўляльніку"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Фільтар па атрымоўцы"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Фільтар па сьпісе рассылкі"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Фільтар па адпраўляльніку"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Дапомна"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Друк паведамленьня"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Скапіяваць спасылку"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Супадзеньні:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Прызначана"
+
+#: mail/em-format-html-display.c:597
+#, fuzzy
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
 msgstr ""
-"Гэта паведамленьне мае лічбавы подпіс. Клікніце па значке замка для "
-"дадатковых зьвестак."
+"Гэта паведамленьне з лічбавым подпісам, які ня можа быць правераны на "
+"тоеснасьць."
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Рэдагаваць подпіс"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Рэдагаваць подпіс"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Перарвана"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "Кадаваньне PGP"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Неатрымалася разабраць паведамленьне MIME. Адлюстроўваецца як крыніца."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Тэма не падтрымліваецца"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Немагчыма праверыць подпіс"
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Убудаваны прагляд"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Схаваць"
@@ -11737,186 +12387,209 @@ msgstr "Схаваць"
 msgid "Page %d of %d"
 msgstr "Аркуш %d з %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Атрыманьне паведамленьня %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Часка external-body памылкова сфармаваная"
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Указальнік на FTP сайт (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Указальнік на лякальны файл (%s), даступны на сайце \"%s\""
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Указальнік на лакальны файл (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Указальнік на аддаленыя даньні (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Указальнік на невядомыя вонкавыя даньні (тыпа \"%s\")"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-"Гэта паведамленьне з лічбавым подпісам, які ня можа быць правераны на "
-"тоеснасьць."
-
-#: mail/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-"Гэта паведамленьне з лічбавым подпісам, які прайшоў праверку тоеснасьці."
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-msgid "No signature present"
-msgstr ""
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Неатрымалася ініцыялізаваць Bonobo"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Тэма не падтрымліваецца"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Неатрымалася разабраць паведамленьне MIME. Адлюстроўваецца як крыніца."
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Перамяшчэньне паведамленьняў"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Ад каго"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Адказаць на"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Каму"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Копія"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Сх.копія"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "Паштавік"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Дата"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "%s укладаньне"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Неатрымалася разабраць паведамленьне MIME. Адлюстроўваецца як крыніца."
+msgid "Session not initialised"
+msgstr "Неатрымалася ініцыялізаваць Bonobo"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+"Гэта паведамленьне з лічбавым подпісам, які прайшоў праверку тоеснасьці."
+
+#: mail/em-format.c:1212
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"Гэта паведамленьне з лічбавым подпісам, які ня можа быць правераны на "
+"тоеснасьць."
+
+#: mail/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Чаканьне..."
 
-#: mail/em-popup.c:593
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Зандаваньне %s"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Збой у кэшы %s: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Збой пад час стварэньня канала да \"%s\": %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Збой вызначэньня вузла \"%s\": %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Захаваць як..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Адказаць адпраўляльніку"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Адкрыць спасылку ў аглядальніке"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Даслаць паве_дамленьне ў сьпіс..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Дадаць адпраўляльніка ў кнігу адрэсаў"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Адкрыць у %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "Паслужнік не падтрымлівае звесткі схемы LDAPv3"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Падпісацца"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Тэчка"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Калі ласка, выбярыце паслужнік."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Небыў выбраны паслужнік"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Неадлюстроўваць гэтае паведамленьне нанова."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11925,27 +12598,27 @@ msgstr ""
 "Памылка пад час загрузкі інфармацыі фільтара:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Фільтары"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Перадасланае паведамленьне"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "невядомы адпраўляльнік"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%a, %Y-%m-%d у %H:%M, %%s піша:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -11954,7 +12627,7 @@ msgstr ""
 "Немагчыма захаваць у `%s'\n"
 " %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -11963,25 +12636,26 @@ msgstr ""
 "`%s' ужо існуе.\n"
 "Перазапісаць?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Паведамленьне"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Захаваць паведамлеьне як..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Неатрымалася стварыць часовы каталёг: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Адрэса"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -11990,61 +12664,431 @@ msgstr ""
 "\n"
 "Сапраўды сьцёрці паведамленьні?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Перавагі рэдактара паведамленьняў"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/em-utils.c:2288
+#, fuzzy
 msgid ""
-"Configure mail preferences, including security and message display, here"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
 msgstr ""
-"Тут наладжваюцца парвмэтры пошты, уключаючы бясьпеку й адлюстраваньне "
-"паведамленьняў"
+"Гэтая апэрацыя прывядзе да поўнага вынішчэньня усіх паведамленьняў\n"
+"пазначаных як выдаленыя. Калі вы працягніце, гэтае нельга будзе аднавіць.\n"
+"\n"
+"Сапраўды сьцёрці паведамленьні?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/evolution-mail.schemas.in.in.h:1
+#, fuzzy
+msgid "Automatic link recognition"
+msgstr "Аўтаматычна дэтэктаваць спасылкі"
+
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "Аўтаматычна дэтэктаваць спасылкі"
+
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
 msgstr ""
-"Тут наладжваюцца праверка правапісу, подпісу й стварэньне паведамленьняў"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Наладка вашых уліковых запісаў пошты робіцца тут"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Пошта \"Эвалюцыі\""
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Сродак кіраваньня уліковамі запісамі пошты \"Эвалюцыі\""
+#: mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
+msgid "Default charset in which to compose messages"
+msgstr "Дапомная тэма паведамленьня."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Кампанэнт пошты \"Эвалюцыі\""
+#: mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
+msgid "Default charset in which to compose messages."
+msgstr "Дапомная тэма паведамленьня."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Рэдактар паведамленьняў \"Эвалюцыі\""
+#: mail/evolution-mail.schemas.in.in.h:8
+#, fuzzy
+msgid "Default charset in which to display messages"
+msgstr "Шукаць тэкст у целе адлюстраванага паведамленьня"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Сродак кіраваньня рэдактарам паведамленьняў \"Эвалюцыі\""
+#: mail/evolution-mail.schemas.in.in.h:9
+#, fuzzy
+msgid "Default charset in which to display messages."
+msgstr "Шукаць тэкст у целе адлюстраванага паведамленьня"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Праглядальнік паштовае тэчкі \"Эвалюцыі\"."
+#: mail/evolution-mail.schemas.in.in.h:10
+#, fuzzy
+msgid "Default forward style"
+msgstr "Стыль перасылкі:"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Кіраваньне перавагамі пошты \"Эвалюцыі\""
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default reply style"
+msgstr "Стыль _адказа:"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Empty Trash folders on exit"
+msgstr "Ачышчаць сьметніцу пад час выхаду"
+
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Ачышчаць сьметніцу пад час выхаду"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "Уліковыя запісы пошты"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "Перавагі пошты"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "Выканаць дзеяньні"
+
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Нагаданьне аб пошце"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Нагаданьне аб пошце"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+"_Папярэджваць пад час адпраўленьня паведамленьняў у фармаце HTML тым, хто не "
+"жадае гэтага"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr ""
+"Папярэджваць пад час адпраўленьня паведамленьняў, у якіх вызначаны толькі "
+"атрымоўцы схаванае копіі."
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "Даслаць ліст у фармаце HTML?"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "Даслаць ліст у фармаце HTML?"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "Паказываць анімаваныя відарысы"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "Паказываць анімаваныя відарысы"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Паказаць паведамленьне ў звычайным стылі"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "_Акно перадпрагляду"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "Граць файл, калі атрымана новая пошта"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "_Праверка правапіса"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "Тэрмінальны шрыфт:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "Выбярыце шрыфт HTML пераменае шырыні для друку"
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Паведамленьні як абмеркаваньне тэмы"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Паведамленьні як абмеркаваньне тэмы"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "_Зрабіць дапомным уліковым запісам"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "Пераменая шырыня:"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Імпарт у \"Эвалюцыю\" з Elm"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+msgid "Evolution mbox importer"
+msgstr "Імпарт у \"Эвалюцыю\" з mbox"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Netscape Mail importer"
+msgstr "Імпарт у \"Эвалюцыю\" з пошты \"Netscape\""
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Імпарт у \"Эвалюцыю\" з \"Outlook Express 4\""
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Pine importer"
+msgstr "Імпарт у \"Эвалюцыю\" з \"Сасны\""
 
 #: mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
@@ -12084,34 +13128,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Імпарт у \"Эвалюцыю\" з Elm"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Імпарт у \"Эвалюцыю\" з mbox"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Netscape Mail importer"
-msgstr "Імпарт у \"Эвалюцыю\" з пошты \"Netscape\""
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Імпарт у \"Эвалюцыю\" з \"Outlook Express 4\""
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Pine importer"
-msgstr "Імпарт у \"Эвалюцыю\" з \"Сасны\""
-
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -12153,12 +13169,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "\"Эвалюцыя\" імпартуе вашыя старыя даньні Netscape"
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Сьметніца"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Сканаваньне фільтараў пошты"
@@ -12167,7 +13177,7 @@ msgstr "Сканаваньне фільтараў пошты"
 msgid "Scanning directory"
 msgstr "Сканаваньне каталёга"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Распачата імпартаваньне"
 
@@ -12242,23 +13252,23 @@ msgid "You have not filled in all of the required information."
 msgstr "Вы не пазначылі ўсё неабходную інфармацыю."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Рэдактар уліковага запіса \"Эвалюцыі\""
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Вузел:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "_Імя карыстальніка:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Шлях:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Вы ня можаце стварыць два рахункі з аднолькавымі назвамі."
 
@@ -12267,35 +13277,35 @@ msgstr "Вы ня можаце стварыць два рахункі з адн�
 msgid "Mail to %s"
 msgstr "Даслаць на %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Тэма %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Ліст ад %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s сьпіс рассылкі"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Адказана на"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Дадаць правіла фільтра"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "Наступныя правілы фільтара(ў):\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12306,145 +13316,30 @@ msgstr ""
 "    '%s'\n"
 "І будзе абноўлена."
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "Далучэньне..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Гэтая тэчка ня мажа ўтрымліваць паведамленьні."
-
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Не атрымалася адкрыць падзеленую тэчку: %s"
-
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Неатрымалася стварыць часовы каталёг: %s"
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Новае паштовае паведамленьне"
 
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Немагчыма стварыць часовы файл '%s': %s"
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "_Паштовае паведамленьне"
 
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Немагчыма закрыць часовую тэчку: %s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "Скласьці новае паведамленьне"
 
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Выбярыце мейсца прызначэньня для імпартаваньня гэтых даньняў"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Выбярыце мейсца прызначэньня для імпартаваньня гэтых даньняў"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Стварыць новую тэчку"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Пазначце дзе стварыць тэчку:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr ""
-"Немагчыма выдаліць тэчку \"%s\":\n"
-"%s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Сапраўды выдаліць тэчку \"%s\"?"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Выдаліць \"%s\""
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Зьмяніць назву тэчкі \"%s\" на:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-msgid "Rename Folder"
-msgstr "Зьмяніць назву тэчкі"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Пазначаная назва тэчкі недапушчальна: %s"
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Уласьцівасьці шрыфта"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Уласьцівасьці"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "Назва _тэчкі:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "Выгляд"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Адкрыць у новым акне"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Перамясьціць"
-
-#: mail/mail-component.c:2087
-msgid "_New Folder..."
-msgstr "_Новая тэчка..."
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "Зьмяніць _назву"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Уласьцівасьці..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "сапраўдны"
 
@@ -12497,11 +13392,11 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Праверка паслугі"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Далучэньне да паслужніка..."
 
@@ -12583,26 +13478,35 @@ msgid "C_olors"
 msgstr "Колеры"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Праверка новае пошты"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "Правяраць правапіс пад час уводу тэкста"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Праверка новае пошты"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "Колер для памылковых словаў:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Стварэньне паведамленьняў"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Канфігурацыя"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12618,282 +13522,287 @@ msgstr ""
 "\n"
 "Клікніце \"Ужыць\" каб захаваць вашыя усталёўкі."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "_Дапомна"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Дапомныя паводзіны"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "Дапомнае кадаваньне сымбаляў:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Выдаленьне пошты"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr ""
 "Заўсёды падпісываць паведамленьні, калі выкарыстоўваецца гэты уліковы запіс"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "Не цытавацьь зыходнае паведамленьне"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Не падпісываць запыты на нараду (для сумяшчальнасьці з Outlook)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Зроблена"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "Тэчка чарнавіка:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "Уключыць"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "Уліковыя запісы пошты"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "Электроная адрэса пошты:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "Ачышчаць сьметніцу пад час выхаду"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Ід сэртыфіката:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Дапаможнік уліковага запісу \"Эвалюцыі\""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Выканаць каманду..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "Фіксаваная шырыня:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "<< Менш можнасьцяў"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "Уласьцівасьці шрыфта"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "Фарматаваць паведамленьні ў HTML"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "Вылучаць _цытаваньне:"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "убудаваны"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Адмеціны і колеры"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Загрузка відарысаў"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Наладка пошты"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Разьмяшчэньне паштовае скрыні"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Рэдактар паведамленьняў"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Адлюстраваньне паведамленьняў"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 msgid "Message Fonts"
 msgstr "Шрыфт паведамленьня"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Нагаданьне аб пошце"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Дадатковая інфармацыя"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "Установа:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "Ід ключа PGP/GPG:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Выбярыце колер"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Папярэджваць пад час адпраўленьня паведамленьняў, у якіх вызначаны толькі "
 "атрымоўцы схаванае копіі."
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Шрыфты для друку"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Паштовы каталёг Qmail"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "Цытаваць арыгінальнае паведамленьне"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Працытавана"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "Запомніць гэты пароль"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "Адказаць на:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Атрыманьне пошты"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "Парамэтры атрыманьня"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "Запомніць гэты пароль"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Неабходная інфармацыя"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "Аднавіць дапомнае"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "Бясьпека"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "Абараніць MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr "Выбярыце шрыфт HTML фіксаванае шырыні"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr "Выбярыце шрыфт HTML фіксаванае шырыні для друку"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr "Выбярыце шрыфт HTML пераменае шырыні"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr "Выбярыце шрыфт HTML пераменае шырыні для друку"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Адпраўка пошты"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Тэчка дасланых паведамленьняў:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Дасланыя паведамленьні і чарнавікі"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Паслужнік патрабуе аўтарызацыю"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Наладка паслужніка"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Тып паслужніка: "
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Самападпісаны сэртыфікат у ланцужку"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "Пазначце назву файла:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "_Праверка правапіса"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Стандартны файл Unix mbox"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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 "
@@ -12902,7 +13811,7 @@ msgstr ""
 "Гэтая старонка дазваляе наладзіць паводзіны праверкі правапіса і мову. Сіпіс "
 "моваў адлюстроўвае толькі мовы, слоўнікі якіх усталяваны ў вашае сыстэме."
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12910,11 +13819,15 @@ msgstr ""
 "Пазначце назву для гэтага рахунка.\n"
 "Да прыкладу: \"Праца\" ці \"Асабістае\""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "Пераменая шырыня:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12924,172 +13837,181 @@ msgstr ""
 "\n"
 "Калі ласка, клікніце \"Наперад\" каб пачаць. "
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "_Дадаць подпіс"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "Заўсёды загружаць відарысы з сеціва"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 "Заўсёды падпісываць паведамленьні, калі выкарыстоўваецца гэты уліковы запіс"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "Тып аўтарызацыі: "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "_Тып аўтарызацыі: "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr "Аўтаматычна правяраць пошту кожныя"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "_Аўтаматычна устаўляць відарысы \"усьмешак\""
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "_Гукавы сыгнал пад час атрыманьня новае пошты"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "_Запытвацца падцьверджаньня ачысткі тэчкі ад выдаленых паведамленьняў"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "_Дапомны подпіс:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "Дапомнае"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Не паведамляць пра атрыманьне новай пошты"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "_Уключыць"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "Стыль перасылкі:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "Поўнае імя:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "По_шта у HTML"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "_Тоеснасьць"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Чэрвень"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "Загрузіць відарысы, калі адпраўляльнік ёсьць у кнізе адрэсаў"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "_Зрабіць дапомным уліковым запісам"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "Паз_начаць паведамленьні як \"Прачытанае\" праз:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Назва:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "Ніколі не загружаць відарысы з сеціва"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "Граць файл, калі атрымана новая пошта"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "_Папярэджваць пад час адпраўленьня паведамленьняў у фармаце HTML тым, хто не "
 "жадае гэтага"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Папярэджваць пад час адпраўкі паведамленьняў з пустой тэмай"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "_Атрыманьне пошты"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "Стыль _адказа:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "_Вярнуць дапомнасьці"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Сцэнар:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Выдаліць..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "А_дпраўка пошты"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "Паказываць анімаваныя відарысы"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Подпісы"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr "Стандартны шрыфт:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr "Тэрмінальны шрыфт:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "_Выкарыстоўваць злучэньне праз SSL:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr "Выкарыстоўваць тойжа шрыфт што і аснатнія дастасаваньні"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "апісаньне"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr "Зандаваньне %s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13098,7 +14020,7 @@ msgstr ""
 "Памылка пад час \"%s\":\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13107,7 +14029,7 @@ msgstr ""
 "Памылка пад час выкананьня апэрацыі:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Праца"
 
@@ -13119,118 +14041,118 @@ msgstr "Фільтраваньне тэчкі"
 msgid "Fetching Mail"
 msgstr "Атрыманьне пошты"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Збой пад час захаваньня пошты ў часовым файле %s: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Збой пад час захаваньня пошты ў часовым файле %s: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Адпраўленьне \"%s\""
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Адпраўленьне паведамленьня %d з %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Збой на паведамленьні %d з %d"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Выканана."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Захаваньне паведамленьня ў тэчцы"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Перамяшчэньне паведамленьняў у %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Капіяваньне паведамленьняў у %s"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканаваньне тэчак у \"%s\""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Перадасланыя паведамленьні"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Адкрыцьцё тэчкі \"%s\""
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "Адкрыцьцё сховішча %s"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Выдаленьне тэчкі %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Захаваньне тэчкі \"%s\""
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Абнаўленьне тэчкі"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Выкрэсьленьне тэчкі"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Спусташэньне сьметніцы ў \"%s\""
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Лакальныя тэчкі"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Атрыманьне паведамленьня %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Атрыманьне %d паведамленьняў"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Захаваньне %d паведамленьняў"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13239,7 +14161,7 @@ msgstr ""
 "Неатрымалася стварыць файл вываду: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13248,11 +14170,11 @@ msgstr ""
 "Памылка захаваньня паведамленьняў у: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Захаваньне ўкладаньня"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13261,21 +14183,25 @@ msgstr ""
 "Неатрымалася стварыць файл вываду: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Немагчыма запісаць даньні: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Адлучэньне ад %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Перадалучэньне да %s"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Улічваць рэгістар"
@@ -13292,59 +14218,74 @@ msgstr "Пошук:"
 msgid "Search"
 msgstr "Пошук"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Рэдагаваць подпіс"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Выключэньні"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Зьвесткі аб уліковым запісе"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Адмена..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Паслужнік: %s, Тып: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Шлях: %s, Тып: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Тып: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Атрыманьне і адпраўленьне пошты"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 msgid "Cancel _All"
 msgstr "Адмяніць _усё"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Абнаўленьне..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Чаканьне..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Апэрацыя адменена карыстальнікам."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Пазначце пароль для %s"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Пазначце пароль"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "_Запомніць гэты пароль"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Запомніць гэты пароль да завяршэньня сэанса"
 
@@ -13383,26 +14324,31 @@ msgstr "Пазначце назву для гэтага подпіса."
 msgid "Name:"
 msgstr "Назва:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Перадасланае паведамленьне - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Перадасланае паведамленьне"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Адкрыцьцё тэчкі \"%s\""
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Наладка віртуальнае тэчкі %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Абнаўленьне віртуальнае тэчкі на URI: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13415,88 +14361,88 @@ msgstr ""
 "    \"%s\"\n"
 "І быдзе абноўлена."
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "Віртуальныя тэчкі"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "Віртуальныя тэчкі"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Рэдагаваньне віртуальных тэчак"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Спроба рэдагаваць віртуальную тэчку '%s' якая не існуе."
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Новая віртуальная тэчка"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Нечытанае"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Прагледзенае"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Адказанае"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Шматлікія непрагледзеныя паведамленьні"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Шматлікія паведамленьні"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Ніжэйшы"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Ніжей"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Высокі"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Вышэйшы"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Сёньня %I:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Учора %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Стварэньне сьпісу паведамленьняў"
 
@@ -13552,11 +14498,11 @@ msgstr "Перадаслаць"
 msgid "No Response Necessary"
 msgstr "Можна не адказваць"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Адказаць"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Адказаць усім"
 
@@ -13606,41 +14552,138 @@ msgstr "_Падпісацца"
 msgid "_Unsubscribe"
 msgstr "_Адмовіцца ад падпіскі"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr "Наладжваеце паводзіны адмысловых і лакальных тэчак тут"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Абалонка \"Эвалюцыі\""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Усталёўкі тэчкі"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "380"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Зьмяніць назву групы лычак"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+msgid "Default width of the folder bar pane"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Схаваць панэлю лычак"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Дапомны прыярытэт:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Дапомны прыярытэт:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Інтэрфэйс наладкі пошты \"Эвалюцыі\""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+#, fuzzy
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "Дапомна пазначаць укладаньне для адлюстраваньня ўбудаваным."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
 msgstr ""
-"Не атрымалася перадаць тэчку:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Дадаць тэчку"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Чарнавікі"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Атрыманае"
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "Адкрыцьцё тэчкі з дапомнымі задачамі"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Адкрыцьцё тэчкі з дапомнымі задачамі"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Адкрыцьцё тэчкі з дапомнымі задачамі"
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Чакае адпраўкі"
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Дасланае"
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Адкрыцьцё тэчкі з дапомнымі задачамі"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Зьмяніць назву гэтае тэчкі"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Схаваць панэлю лычак"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "Э. пошта"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Немагчыма карэктана абнавіць файлы"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13651,7 +14694,7 @@ msgstr ""
 " %s\n"
 "Памылка: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13660,7 +14703,7 @@ msgstr ""
 "Адбылася памылка пад час капіяваньня файлаў у\n"
 "`%s'."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13668,7 +14711,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13763,10 +14806,11 @@ msgstr ""
 "Немагчыма зьмяніць назву тэчкі:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+msgid "The specified folder name is not valid: %s"
+msgstr "Пазначаная назва тэчкі недапушчальна: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -13790,19 +14834,15 @@ msgstr ""
 "Немагчыма стварыць пазначаную тэчку:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Стварыць новую тэчку"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Бяз назвы)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Выбярыце тып імпарту для выкананьня:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13816,11 +14856,11 @@ msgstr ""
 "Вы можаце выбраць \"Аўтаматычна\", калі не ведаеце, і \"Эвалюцыя\" паспрабуе "
 "зрабіць гэта сама."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Калі ласка выбярыце інфармацыю, якую вы жадаеце імпартаваць:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13828,7 +14868,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13837,21 +14877,21 @@ msgstr ""
 "Імпартаваньне %s\n"
 "Імпартаваньне элемэнта %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "Выбраць імпарт"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "файл \"%s\" не існуе"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Памылка \"Эвалюцыі\""
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -13860,11 +14900,11 @@ msgstr ""
 "Няма адпаведнага імпарту каб апрацаваць гэта\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Імпартаваньне"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -13873,17 +14913,17 @@ msgstr ""
 "Імпартаваньне %s.\n"
 "Запуск %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Памылка запуску %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Памылка загрузк %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13892,35 +14932,35 @@ msgstr ""
 "Імпартаваньне %s\n"
 "Імпартаваньне 1 элемэнта."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Аўтаматычна"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Назва файла:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Выбярыце файл"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Тып файла:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Імпартаваньне даньняў і усталёвак са старых праграм"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Імпартаваньне асобнага файла"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -13928,47 +14968,28 @@ msgstr ""
 "Калі ласка пачакайце...\n"
 "Сканаваньне існуючых усталёвак"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Запуск інтэлектуальнага імпарту"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "Ад %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Выбярыце мейсца прызначэньня для імпартаваньня гэтых даньняў"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Імпарт"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Закрыцьцё далучэньняў..."
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Памылка сынхранізацыі \"%s\":\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "Сынхранізацыя тэчкі"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Сынхранізацыя \"%s\" (%d з %d) ..."
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Наладкі \"Эвалюцыі\""
@@ -14003,7 +15024,7 @@ msgstr "Не атрымалася адкрыць падзеленую тэчку
 msgid "Cannot find the specified shared folder."
 msgstr "Немагчыма адшукаць пазначаную падзеленую тэчку."
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14012,17 +15033,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Памочнік"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Стварыць"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Назва тэчкі не пазначана"
@@ -14080,64 +15095,51 @@ msgstr "Стварыць новую лычку"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Выбярыце тэчку на якую мусіць указываць лычка:"
 
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "_Далучаны рэжым"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "_Адлучаны рэжым"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Працаваць у адлучаным рэжыме"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr ""
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Няма)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "\"Эвалюцыя\" працуе ў далучаным рэжыме.  Клікніце на гэтую кнопку каб "
 "працаваць у адлучаным рэжыме."
 
-#: shell/e-shell-view.c:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Эвалюцыя пераходзіць да працы ў адлучаным рэжымн."
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "\"Эвалюцыя\" працуе ў адлучаным рэжыме.  Клікніце на гэтую кнопку каб "
 "працаваць у далучаным рэжыме."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Недапушчальныя аргумэнты"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Неатрымалася зарэгістраваць на OAF"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Адсутніча канфігурацыя базы даньняў"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Звычайная памылка"
 
@@ -14250,74 +15252,18 @@ msgstr "_Выдаліць"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Выдаліць гэтую лычку з панэлі лычак"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Памылка захаваньня лычак."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Атрыманае"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Лычкаі"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Няма памылкі"
-
-#: shell/e-storage.c:573
-msgid "A folder with the same name already exists"
-msgstr "Тэчка з гэткай назвай ужо існуе."
-
-#: shell/e-storage.c:575
-msgid "The specified folder type is not valid"
-msgstr "Пазначаны тып тэчкі недапушчальны"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "Памылка ўводу/вываду"
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr "Недахоп прасторы для стварэньня тэчкі"
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr "Тэчка не пустая"
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "Пазначаная тэчка адсутнічае"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "Функцыя не вызначана ў гэтым сховішчы"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "Апэрацыя не падтрымліваецца"
-
-#: shell/e-storage.c:591
-msgid "The specified type is not supported in this storage"
-msgstr "Пазначаны тып не падтрымліваецца у гэтым сховішчы"
-
-#: shell/e-storage.c:593
-msgid "The specified folder cannot be modified or removed"
-msgstr "Пазначаная тэчка ня можа  мадыфікавацца ці выдаляцца"
-
-#: shell/e-storage.c:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr ""
-
-#: shell/e-storage.c:597
-msgid "Cannot create a folder with that name"
-msgstr "Немагчыма стварыць тэчку з гэткай назвай"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Гэтая апэрацыя не працуе ў адлучаным рэжыме."
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Пазначальнік"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14328,6 +15274,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% завершана)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Стварыць"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "\"%s\" у \"%s\""
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14365,74 +15322,6 @@ msgstr ""
 "Памылка ад актывацыі сыстэмы:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "Памылка CORBA"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Перарвана"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Недапушчальны аргумэнт"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Ужо мае ўладальніка"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Няма ўладальніка"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Адсутнічае"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Тып не падтрымліваецца"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Тэма не падтрымліваецца"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Апэрацыя не падтрымліваецца"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Нутраная памылка"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Існуе"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "Памылковы URI"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Мае падтэчкі"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Недахоп прасторы"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "Стары уладальнік памёр"
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Тып тэста"
-
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr "Кампанэнт тэставаньня \"Эвалюцыі\"."
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr "Актыўныя далучэньні"
@@ -14463,10 +15352,6 @@ msgstr "_Пошта:"
 msgid "_Tasks:"
 msgstr "_Заданьні:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr "_Назва тэчкі:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder _type:"
 msgstr "Т_ып тэчкі:"
@@ -14529,22 +15414,6 @@ msgstr ""
 "\n"
 "Клікніце кнопку \"Ужыць\" каб захаваць вашыя усталёўкі. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "Наладжваеце паводзіны адмысловых і лакальных тэчак тут"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Абалонка \"Эвалюцыі\""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Сродак кіраваньня наладкамі тэчак \"Эвалюцыі\""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Усталёўкі тэчкі"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Клікніце \"Імпарт\" для імпартаваньня файлаў у \"Эвалюцыю\"."
@@ -14583,7 +15452,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Імпарт"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Імпарт"
 
@@ -14599,16 +15468,16 @@ msgstr "Не пытацца наступнага разу."
 msgid "Evolution can import data from the following files:"
 msgstr "\"Эвалюцыя\" можа імпартаваць даньні з наступных файлаў:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "\"Эвалюцыя\""
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "\"Эвалюцыя\" зараз сканчае працу..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14628,7 +15497,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -14636,36 +15505,48 @@ msgstr ""
 "Дзякуй\n"
 "Каманда распрацоўшчыкаў \"Эвалюцыі Ximian\"\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr "Не пытацца ў наступны раз."
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Няма доступу да абалонкі \"Эвалюцыі\"."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Не атрымліваецца ініцыялізаваць абалонку \"Эвалюцыі\": %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Запуск у адлучаным рэжыме"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Запуск у далучаным рэжыме"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr "Прымусова выключыць усе кампанэнты \"Эвалюцыі\""
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Даслаць вывад адладкі усіх кампанэнтаў у файле."
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14674,31 +15555,60 @@ msgstr ""
 "%s: --online і --offline не могуць выкарыстоўвацца разам.\n"
 "  Use %s --help для атрыманьня падрабязнасьцяў.\n"
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Выбраць імпарт"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Ід сэртыфіката:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "Выкананьне"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Выраз"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Адрэса пошты:"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"Сэртыфікат састарэў: %s\n"
+"Выдавец: %s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14754,91 +15664,375 @@ msgid "Backup All"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "_Ід сэртыфіката:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Сэртыфікат ненадзейны"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "_Ід сэртыфіката:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Агульная назва"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "_Ід сэртыфіката:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "_Рэдагаваньне"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Неатрымалася праверыць сэртыфікаты."
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Выраз"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Установа"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Пасада"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "Выгляд"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "_Ід сэртыфіката:"
+
+#: smime/gui/smime-ui.glade.h:42
+#, fuzzy
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr "Некарэктная аўтарызацыя сэртыфіката (CA)"
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "_Ід сэртыфіката:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Імпарт"
+msgid "Certificate already exists"
+msgstr "Ід карткі ужо існуе"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "месяц"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "месяц"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "месяц"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "месяц"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " °C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "Так"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "_Ід сэртыфіката:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "_Ід сэртыфіката:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "Сэртыфікат ненадзейны"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "Iд"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Тэма %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Неатрымалася апрацаваць тэчку спула"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "Некарэктная аўтарызацыя сэртыфіката (CA)"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Некарэктная аўтарызацыя сэртыфіката (CA)"
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Запускаецца:"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Зьвесткі адсутнічаюць"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "укладаньне"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "_Ід сэртыфіката:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Харватыя"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+msgid "Not Critical"
+msgstr ""
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Выраз"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s на %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Подпіс сэртыфіката памылковы"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "Уставіць"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Тэма %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Подпіс сэртыфіката памылковы"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Пазначце пароль для %s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "_Ід сэртыфіката:"
 
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
@@ -14889,7 +16083,7 @@ msgstr "Капіяваць вылучэньне"
 msgid "Copy to Folder..."
 msgstr "Капіяваць у тэчку..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Выразаць вылучэньне"
 
@@ -14905,7 +16099,7 @@ msgstr "Перамясьціць кантакты у іншую тэчку"
 msgid "Move to Folder..."
 msgstr "Перамясьціць у тэчку..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Уставіць з буфэра абмену"
 
@@ -14913,8 +16107,8 @@ msgstr "Уставіць з буфэра абмену"
 msgid "Previews the contacts to be printed"
 msgstr "Прагледзіць выгляд кантактаў у друку"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "_Перадпрагляд друку"
@@ -14959,13 +16153,13 @@ msgstr "Спыніць загрузку"
 msgid "View the current contact"
 msgstr "Прагледзіць бягучы кантакт"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "_Дзеяньні"
 
@@ -14995,142 +16189,110 @@ msgstr "Даслаць паведамленьне кантактанае асо�
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "Стварыць новую сустрэчу на увесь дзень"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Стварыць новую сустрэчу"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "Стварыць новую тэчку"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Стварыць запыт новае нарады"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Стварыць новае заданьне"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Дзень"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Выдаліць усе падзеі"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Выдаліць сустрэчу"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Выдаліць гэтую падзею"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Выдаліць гэтую падзею"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Перайсьці"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Вярнуцца назад"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Ісьці далей"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Перайсьці да _даты"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Ісьці да пазначанай даты"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Перайсьці да сёньня"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "Сьпіс"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Месяц"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Новая _сустрэча"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Новая Калядонія"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Новая нарада"
-
-#: ui/evolution-calendar.xml.h:27
-#, fuzzy
-msgid "New _Task"
-msgstr "Новае заданьне"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Прагледзіць выгляд каляндара ў друку"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Надрукаваць гэты каляндар"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Апублікаваць інфармацыю \"Вольны/Заняты\" для гэтага каляндара"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Старонка"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Публічная тэчка утрымлівае сустрэчы і падзеі"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Паказаць падрабязнасьці"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Паказаць адзень"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Паказаць адзін месяц"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Паказаць адзін тыдзень"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Паказаць працоўны тыдзень"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Тыдзень"
 
@@ -15195,7 +16357,7 @@ msgstr "Захаваць гэты элемэнт на дыск"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Файл"
 
@@ -15412,7 +16574,7 @@ msgstr "Пазначыць усё як _чытанае"
 msgid "Mark all visible messages as read"
 msgstr "Пазначыць усе бачныя паведамленьні як чытанае"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "Уставіць паведамленьне(і) з буфэра абмену"
 
@@ -15468,16 +16630,6 @@ msgstr "_Інвертаваць вылучэньне"
 msgid "_Threaded Message List"
 msgstr "Паведамленьні як абмеркаваньне тэмы"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Закрыць гэтае акно"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "Закрыць"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "_Дадаць адпраўляльніка ў кнігу адрэсаў"
@@ -15638,257 +16790,282 @@ msgstr "Перадаслаць вылучанае паведамленьне я�
 msgid "Increase the text size"
 msgstr "Павялічыць памер тэкста"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Загрузіць відарысы"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Пазначыць як важнае"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Пазначыць як нечытанае"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Пазначыць як няважнае"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "Пазначыць вылучаныя паведамленьні як \"да чытаньня\""
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "Пазначыць вылучаныя паведамленьні як важныя"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Пазначыць вылучаныя паведамленьні як няважныя"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Пазначыць вылучаныя паведамленьні як \"не для чытаньня\""
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Пазначыць вылучаныя паведамленьні як \"не для чытаньня\""
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Пазначыць вылучаныя паведамленьні як няважныя"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Пазначыць вылучаныя паведамленьні для выдаленьня"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Перамясьціць"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "Перамясьціць вылучаныя паведамленьні у іншую тэчку"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Наступнае"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "Наступнае важнае паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "Наступнае абмеркаваньне тэмы"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "Наступнае нечытанае паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Адсутнічае"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Адкрыць вылучанае паведамленьне ў новым акне"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Адкрыць вылучанае паведамленьне ў рэдактары каб перадаслаць яго"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Арыгінальны памер"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "Папярэдняе нечытанае паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Даслаць адказ"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr "Даслаць адказ на паведамленьне ў публічную тэчку"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "Папярэдняе важнае паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Прагледзіць выгляд паведамленьня ў друку"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Папярэдняе"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Надрукаваць гэтае паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "Пера_накіраваць"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Скінуць тэкст да ягонага арыгінальнага памера"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "Шукаць паведамленьне..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "Меншы"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Захаваць паведамленьне як файл тэкста"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Шукаць тэкст у целе адлюстраванага паведамленьня"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr "Усталяваць парамэтры аркуша для вашае бягучае друкаркі"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Паказаць крыніцу паведамленьня"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Паказаць усе загалоўкі"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Шукаць тэкст у целе адлюстраванага паведамленьня"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Паказаць паведамленьне ў звычайным стылі"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Паказаць паведамленьне з усімі загалоўкамі"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Паказаць зьмест крыніцы паведамленьня"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "Памер тэкста"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Вярнуць з выдаленага вылучаныя паведамленьні"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "Віртуальная тэчка па сьпісе рассылкі..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "Віртуальная тэчка па адпраўляльніках..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "Віртуальная тэчка па атрымоўцах..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "Віртуальная тэчка па тэме..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "Як укладзенае"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "Капіяваць у тэчку"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "Стварыць фільтар з паведамленьня"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "Перадаслаць паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "Перайсьці да"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "Як убудаванае"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "Большы"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "Выгляд паведамленьня"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "Перамясьціць у тэчку"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "Наступнае паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "Звычайны выгляд"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "Адкрыць паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "Папярэдняе паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "_Цытавана"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "Перадаслаць..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "Інструмэнты"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "Вярнуць з выдаленага"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Закрыць гэтае акно"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "Закрыць"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Укласьці"
@@ -16167,12 +17344,13 @@ msgid "Change Evolution's settings"
 msgstr "Зьмяніць наладкі \"Эвалюцыі\""
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "Выхад"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Стварыць запыт новае нарады"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "Акно \"Эвалюцыі\""
+msgid "E_xit"
+msgstr "Выхад"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16184,61 +17362,74 @@ msgstr "Імпартаваць даньні з іншай праграмы"
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "Акно \"Эвалюцыі\""
+msgid "Open a new window"
+msgstr "Адкрыць у новым акне"
 
 #: ui/evolution.xml.h:11
 msgid "Pi_lot Settings..."
 msgstr "Наладкі \"Пілёта\"..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Даслаць / Атрымаць"
+
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr "Даслаць паведамленьні з чаргі й атрымаць новыя"
+
+#: ui/evolution.xml.h:14
 msgid "Set up Pilot configuration"
 msgstr "Наладзіць \"Пілёт\""
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Паказаць інфармацыю пра \"Эвалюцыю\" Ximian"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Даслаць паведамленьне аб памылках"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "Даслаць паведамленьне аб памылках"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Даслаць паведамленьне аб памылках карыстаючыся \"Bug Buddy\""
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Пераключыць"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Пераключыць у выпадку працы ў адлучаным рэжыме."
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "Частыя пытаньні"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "_Пра \"Эвалюцыю\" Ximian"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "_Дапамога"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "_Імпартаваць..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Стварыць"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "Даслаць / Атрымаць"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "_Шукаць зараз"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Надрукаваць агульныя зьвесткі"
@@ -16367,12 +17558,12 @@ msgstr "Вызначаныя праглядальнікі..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "ПАСЧПСН"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -16505,7 +17696,7 @@ msgstr "По_шук"
 msgid "_Find Now"
 msgstr "_Шукаць зараз"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "А_чысьціць"
 
@@ -16521,24 +17712,253 @@ msgstr "ІД падпункта"
 msgid "Text"
 msgstr "Тэкст"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Ачысьціць"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Шукаць зараз"
 
+#~ msgid "Account Name"
+#~ msgstr "Назва уліковага запіса"
+
+#~ msgid "Server Name"
+#~ msgstr "Назва паслужніка"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "Падтрымка LDAP не уключана ў гэтае зборцы \"Эвалюцыі\""
+
+#~ msgid "Other Contacts"
+#~ msgstr "Іншыя кантакты"
+
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "Наладжвайце доступ да паслужніка каталёгаў LDAP тутака"
+
+#~ msgid "Directory Servers"
+#~ msgstr "Паслужнікі каталёгаў"
+
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Сродак кіраваньня LDAP кнігі адрэсаў \"Эвалюцыі\"."
+
+#~ msgid "Add LDAP Server"
+#~ msgstr "Дадаць паслужнік LDAP"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Крок 4: Адлюстраваньне назвы"
+
+#~ msgid "Find contact in"
+#~ msgstr "Пошук кантактаў у"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Клікніце тутака каб дадаць кантакт *"
+
+#~ msgid "Business Address"
+#~ msgstr "Працоўная адрэса"
+
+#~ msgid "Department"
+#~ msgstr "Падразьдзяленьне"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "Вольны/заняты URL"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Прафэсыя"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Адкрыцьцё заданьняў %s"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Даслаць у любым выпадку?"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Адмяніць бягучую паштовую апэрацыю"
+#~ msgid "Folder _name"
+#~ msgstr "_Назва тэчкі:"
+
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "Гэта паведамленьне мае лічбавы подпіс. Клікніце па значке замка для "
+#~ "дадатковых зьвестак."
+
+#~ msgid "Connecting..."
+#~ msgstr "Далучэньне..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Гэтая тэчка ня мажа ўтрымліваць паведамленьні."
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Назва поля"
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Не атрымалася адкрыць падзеленую тэчку: %s"
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Выбярыце мейсца прызначэньня для імпартаваньня гэтых даньняў"
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не атрымалася перадаць тэчку:\n"
+#~ "%s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "Дадаць тэчку"
+
+#~ msgid "Drafts"
+#~ msgstr "Чарнавікі"
+
+#~ msgid "Outbox"
+#~ msgstr "Чакае адпраўкі"
+
+#~ msgid "Sent"
+#~ msgstr "Дасланае"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Памылка сынхранізацыі \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "Сынхранізацыя тэчкі"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Сынхранізацыя \"%s\" (%d з %d) ..."
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(Няма)"
+
+#~ msgid "No error"
+#~ msgstr "Няма памылкі"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Тэчка з гэткай назвай ужо існуе."
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Пазначаны тып тэчкі недапушчальны"
+
+#~ msgid "I/O error"
+#~ msgstr "Памылка ўводу/вываду"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Недахоп прасторы для стварэньня тэчкі"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Тэчка не пустая"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Пазначаная тэчка адсутнічае"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Функцыя не вызначана ў гэтым сховішчы"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Апэрацыя не падтрымліваецца"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Пазначаны тып не падтрымліваецца у гэтым сховішчы"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Пазначаная тэчка ня можа  мадыфікавацца ці выдаляцца"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Немагчыма стварыць тэчку з гэткай назвай"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Гэтая апэрацыя не працуе ў адлучаным рэжыме."
+
+#~ msgid "Checkbox"
+#~ msgstr "Пазначальнік"
+
+#~ msgid "CORBA error"
+#~ msgstr "Памылка CORBA"
 
-#~ msgid "Family Name"
-#~ msgstr "Прозьвішча"
+#~ msgid "Invalid argument"
+#~ msgstr "Недапушчальны аргумэнт"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Ужо мае ўладальніка"
+
+#~ msgid "No owner"
+#~ msgstr "Няма ўладальніка"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Тып не падтрымліваецца"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Тэма не падтрымліваецца"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Апэрацыя не падтрымліваецца"
+
+#~ msgid "Internal error"
+#~ msgstr "Нутраная памылка"
+
+#~ msgid "Exists"
+#~ msgstr "Існуе"
+
+#~ msgid "Invalid URI"
+#~ msgstr "Памылковы URI"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Мае падтэчкі"
+
+#~ msgid "No space left"
+#~ msgstr "Недахоп прасторы"
+
+#~ msgid "Old owner has died"
+#~ msgstr "Стары уладальнік памёр"
+
+#~ msgid "Test type"
+#~ msgstr "Тып тэста"
+
+#~ msgid "Evolution Test Component"
+#~ msgstr "Кампанэнт тэставаньня \"Эвалюцыі\"."
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "Імпарт"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Стварыць новую сустрэчу на увесь дзень"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Новая _сустрэча"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Новая нарада"
+
+#, fuzzy
+#~ msgid "New _Task"
+#~ msgstr "Новае заданьне"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "Акно \"Эвалюцыі\""
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "Акно \"Эвалюцыі\""
+
+#~ msgid "Toggle"
+#~ msgstr "Пераключыць"
+
+#~ msgid "Clear"
+#~ msgstr "Ачысьціць"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Адмяніць бягучую паштовую апэрацыю"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -16631,9 +18051,6 @@ msgstr "Шукаць зараз"
 #~ msgid "VCard (.vcf, .gcrd)"
 #~ msgstr "Візытоўка (.vcf, .gcrd)"
 
-#~ msgid "Loading..."
-#~ msgstr "Загрузка..."
-
 #~ msgid "Searching..."
 #~ msgstr "Пошук..."
 
@@ -16685,10 +18102,6 @@ msgstr "Шукаць зараз"
 #~ msgstr "EBook не загружана\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "Ід карткі ужо існуе"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Дзеяньне адмененае"
 
@@ -16829,9 +18242,6 @@ msgstr "Шукаць зараз"
 #~ msgid "Callback"
 #~ msgstr "Зваротны выклік"
 
-#~ msgid "Company"
-#~ msgstr "Прадпрыемства"
-
 #~ msgid "Comp"
 #~ msgstr "Прадпр"
 
@@ -16898,9 +18308,6 @@ msgstr "Шукаць зараз"
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#~ msgid "Phone"
-#~ msgstr "Тэлефон"
-
 #~ msgid "Birth date"
 #~ msgstr "Дата нараджэньня"
 
@@ -16913,9 +18320,6 @@ msgstr "Шукаць зараз"
 #~ msgid "Arbitrary"
 #~ msgstr "Адвольнае"
 
-#~ msgid "ID"
-#~ msgstr "Iд"
-
 #~ msgid "Last Use"
 #~ msgstr "Апошняе скарыстанае"
 
@@ -16928,9 +18332,6 @@ msgstr "Шукаць зараз"
 #~ msgid "Folder containing contact information"
 #~ msgstr "Тэчка якая утрымлівае кантактную інфармацыю"
 
-#~ msgid "LDAP Server"
-#~ msgstr "Паслужнік LDAP"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "Паслужнік LDAP, які утрымлівае кантактную інфармацыю"
 
@@ -16940,18 +18341,6 @@ msgstr "Шукаць зараз"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Публічная тэчка, якая утрымлівае кантактную інфармацыю"
 
-#~ msgid "_Contact"
-#~ msgstr "_Кантакт"
-
-#~ msgid "Create a new contact"
-#~ msgstr "Стварыць новы кантакт"
-
-#~ msgid "New Contact List"
-#~ msgstr "Новы сьпіс кантактаў"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "Стварыць новы сьпіс кантактаў"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "URI, які будзе адлюстроўваць праграма прагляду тэчак"
 
@@ -16967,9 +18356,6 @@ msgstr "Шукаць зараз"
 #~ msgid "Is New Card"
 #~ msgstr "Гэта новая картка"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "Няма карткі"
 
@@ -17016,30 +18402,6 @@ msgstr "Шукаць зараз"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "Публічная тэчка утрымлівае запісы заданьняў якія трэба выканаць"
 
-#~ msgid "New appointment"
-#~ msgstr "Новая сустрэча"
-
-#~ msgid "_Appointment"
-#~ msgstr "_Сустрэча"
-
-#~ msgid "New meeting"
-#~ msgstr "Новая нарада"
-
-#~ msgid "M_eeting"
-#~ msgstr "Нарада"
-
-#~ msgid "New task"
-#~ msgstr "Новае заданьне"
-
-#~ msgid "_Task"
-#~ msgstr "_Заданьне"
-
-#~ msgid "New All Day Appointment"
-#~ msgstr "Новая сустрэча на увесь дзень"
-
-#~ msgid "All _Day Appointment"
-#~ msgstr "Сустрэча на увесь _дзень"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "Немагчыма абнавіць нерэчаісны аб'ект"
 
@@ -17085,9 +18447,6 @@ msgstr "Шукаць зараз"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "Адкрыцьцё календара %s"
 
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Адкрыцьцё тэчкі з дапомнымі задачамі"
-
 #~ msgid "Evaluation of the search expression did not yield a boolean value"
 #~ msgstr "Выкананьне выраза пошуку не выдала лягічнага значэньня"
 
@@ -17127,9 +18486,6 @@ msgstr "Шукаць зараз"
 #~ "\"Эвалюцыя\" адшукала файлы GnomeCard.\n"
 #~ "Жадаеце імпартаваць іх у \"Эвалюцыю\"?"
 
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Інтэрфэйс наладкі пошты \"Эвалюцыі\""
-
 #~ msgid "Folder containing mail"
 #~ msgstr "Тэчка, якая ўтрымлівае пошту"
 
@@ -17145,9 +18501,6 @@ msgstr "Шукаць зараз"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Тэчка віртуальнае сьметніцы"
 
-#~ msgid "Properties..."
-#~ msgstr "Уласьцівасьці..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Зьмяніць уласьцівасьць гэтае тэчкі"
 
@@ -17157,15 +18510,6 @@ msgstr "Шукаць зараз"
 #~ msgid "You have unsent messages, do you wish to quit anyway?"
 #~ msgstr "Маюцца недасланыя паведамленьні! Вы жадаеце завяршыць працу?"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Новае паштовае паведамленьне"
-
-#~ msgid "_Mail Message"
-#~ msgstr "_Паштовае паведамленьне"
-
-#~ msgid "Compose a new mail message"
-#~ msgstr "Скласьці новае паведамленьне"
-
 #~ msgid "New Message Post"
 #~ msgstr "Даслаць новае паведамленьне"
 
@@ -20974,10 +22318,6 @@ msgstr "Шукаць зараз"
 #~ msgstr "Дата заканчэньня:"
 
 #, fuzzy
-#~ msgid "Stauning"
-#~ msgstr "Запускаецца:"
-
-#, fuzzy
 #~ msgid "Staverton"
 #~ msgstr "Запускаецца:"
 
@@ -21320,10 +22660,6 @@ msgstr "Шукаць зараз"
 #~ msgstr "Злучаныя Арабскія Эміраты"
 
 #, fuzzy
-#~ msgid "Unst"
-#~ msgstr "Нечытанае"
-
-#, fuzzy
 #~ msgid "Upington"
 #~ msgstr "Арлінгтон"
 
@@ -21420,10 +22756,6 @@ msgstr "Шукаць зараз"
 #~ msgstr "Юнікод"
 
 #, fuzzy
-#~ msgid "Vermont"
-#~ msgstr "месяц"
-
-#, fuzzy
 #~ msgid "Vernal"
 #~ msgstr "Пэрсанальнае"
 
@@ -21782,9 +23114,6 @@ msgstr "Шукаць зараз"
 #~ msgid " F"
 #~ msgstr " °F"
 
-#~ msgid " C"
-#~ msgstr " °C"
-
 #~ msgid "knots"
 #~ msgstr "вузлы"
 
@@ -22232,9 +23561,6 @@ msgstr "Шукаць зараз"
 #~ msgid "Freezing haze"
 #~ msgstr "Халодная смуга"
 
-#~ msgid "Spray"
-#~ msgstr "Пырскі"
-
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Пырскі ў ваколіцах"
 
@@ -22475,9 +23801,6 @@ msgstr "Шукаць зараз"
 #~ msgid "Add to _Shortcut Bar"
 #~ msgstr "Дадаць да панэлі лычак"
 
-#~ msgid "Change the name of this folder"
-#~ msgstr "Зьмяніць назву гэтае тэчкі"
-
 #~ msgid "Copy this folder"
 #~ msgstr "Капіяваць гэтую тэчку"
 
@@ -22508,12 +23831,6 @@ msgstr "Шукаць зараз"
 #~ msgid "Remove a folder added with \"Open Other User's Folder\""
 #~ msgstr "Выдаліць тэчку даданую праз \"Адкрыць іншыя тэчкі карыстальніка\""
 
-#~ msgid "Send / Receive"
-#~ msgstr "Даслаць / Атрымаць"
-
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Даслаць паведамленьні з чаргі й атрымаць новыя"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Прагляд вылучанае тэчкі"
 
@@ -22541,9 +23858,6 @@ msgstr "Шукаць зараз"
 #~ msgid "_Rename..."
 #~ msgstr "Зьмяніць назву..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "Даслаць / Атрымаць"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "Панэля лычак"
 
@@ -22578,18 +23892,12 @@ msgstr "Шукаць зараз"
 #~ msgid "1234"
 #~ msgstr "1234"
 
-#~ msgid "380"
-#~ msgstr "380"
-
 #~ msgid "666"
 #~ msgstr "666"
 
 #~ msgid "<- _Remove"
 #~ msgstr "<- _Выдаліць"
 
-#~ msgid "<< Fewer Options"
-#~ msgstr "<< Менш можнасьцяў"
-
 #~ msgid "A Bonobo control for an address popup."
 #~ msgstr "Кіраваньне Bonobo для адрэсаў."
 
@@ -22620,9 +23928,6 @@ msgstr "Шукаць зараз"
 #~ msgid "All folders"
 #~ msgstr "Усе тэчкі"
 
-#~ msgid "Automatically _detect links"
-#~ msgstr "Аўтаматычна дэтэктаваць спасылкі"
-
 #~ msgid "Can't call getFolderAtPath on storage: %s"
 #~ msgstr "Немагчыма выклікаць \"getFolderAtPath\" на сховішчы: %s"
 
diff --git a/po/bg.po b/po/bg.po
index 55681434c7..abb4c90896 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.1\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-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,12 +32,171 @@ msgstr "Не мога да заредя %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Дата на приключване"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "_Сертифициран ID:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Създава или редактира пощенски акаунти и други настройки"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Контакти"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Редактирай адресната книга"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Композер на поща за Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Компонент на Evolution за показване на пощенски папки"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Фабрика за контрол на задачи в Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Адресна книга"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Свойства..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Изтрий"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "_Преименува"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Нов контакт:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Контакт"
+
+#: addressbook/gui/component/addressbook-component.c:219
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Създай нов контакт"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Нов списък с контакти"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "Списък _Контакти"
+
+#: addressbook/gui/component/addressbook-component.c:226
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Създай нов списък с контакт"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+#, fuzzy
+msgid "Personal"
+msgstr "Вернал"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+#, fuzzy
+msgid "Work"
+msgstr "Корк"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "LDAP сървър"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Не мога да създам директория %s: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr "Не успях да се свържа с LDAP сървъра."
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -45,49 +204,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "IMAP сървъра не съдържа %s информация"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Грешка при зареждане информацията за финтъра:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP сървъра не съдържа %s информация"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Потребителско име"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Име на сървъра"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(SSL не се подържа в тази версия на evolution)"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Други Контакти"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -95,7 +237,7 @@ msgstr ""
 "Не мога да отворя тази адресна книга. Проверете\n"
 "дали пътя съществува и дали имате права за достъп."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -106,7 +248,7 @@ msgstr ""
 "въвели невярно URI, или LDAP сървъра не работи.\n"
 " "
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -118,7 +260,7 @@ msgstr ""
 "програмата от CVS след като сте изтеглили и инсталирали \n"
 "OpenLDAP от хипервръзката отдолу.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -133,11 +275,11 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Не мога да отворя адресната книга"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr ""
@@ -145,38 +287,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "Въведедете парола за %s (потребител %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 #, fuzzy
 msgid "Name begins with"
 msgstr "завършва с"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 #, fuzzy
 msgid "Email begins with"
 msgstr "завършва с"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Категорията е"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Кое да е поле съдържа"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Допълнителни..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -184,7 +325,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -192,94 +333,41 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Коя да е категория"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "URI, което ще се показва в календара"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "_Сертифициран ID:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
 msgstr ""
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Контакти"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Редактирай адресната книга"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Композер на поща за Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Компонент на Evolution за показване на пощенски папки"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -303,6 +391,7 @@ msgstr " _Проверка за подържани типове"
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -338,8 +427,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Add LDAP Server"
-msgstr "LDAP сървър"
+msgid "Addressbook Creation Assistant"
+msgstr "Източници на адреси"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -358,61 +447,60 @@ msgstr "Анонимно"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 #, fuzzy
 msgid "Connecting"
 msgstr "Концепсион"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "_Име на списък:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Edit LDAP Server"
 msgstr "LDAP сървър"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address:"
 msgstr "Адрес на ел. поща"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Еволюшън ще използва този адрес, за да ви идентифицира пред сървъра"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr "Еволюшън ще използва този адрес, за да ви идентифицира пред сървъра"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Finished"
 msgstr "Тъ_рси"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Основен"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
-msgid "LDAP Configuration Assistant"
-msgstr "Конфигурация"
+msgid "Group:"
+msgstr "Група"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Never"
 msgstr "_всеки"
@@ -437,8 +525,8 @@ msgid "S_earch scope: "
 msgstr "Обхват на търсенето: "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Търся"
 
@@ -483,27 +571,28 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:47
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-#, fuzzy
-msgid "Step 1: Server Information"
-msgstr "Източник на Информация"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
-msgid "Step 2: Connecting to Server"
-msgstr "Свързване със сървъра..."
+msgid "Step 2: Server Information"
+msgstr "Източник на Информация"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr ""
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Свързване със сървъра..."
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr ""
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Свързване със сървъра..."
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -516,14 +605,6 @@ msgstr "Неподържана схема"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -531,7 +612,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -539,7 +620,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -549,37 +630,36 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 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:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 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:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -589,6 +669,15 @@ msgstr ""
 "Това име ще се изпозва за идентифицирнаето на потребителското ви име. Ползва "
 "се само при показване."
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Това име ще се изпозва за идентифицирнаето на потребителското ви име. Ползва "
+"се само при показване."
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -615,22 +704,30 @@ msgid "Using email address"
 msgstr "Това е пощен_ски адрес"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Дисплей"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -638,61 +735,60 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Редактирай"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 #, fuzzy
 msgid "_Port number:"
 msgstr "Порт:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 #, fuzzy
 msgid "_Search base:"
 msgstr "Търси в база:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "Име на сървъра:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Време за забавяне (минути)"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid "cards"
 msgstr "Няма карти"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Отново връзка с %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid "general-tab"
 msgstr "Основен"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "searching-tab"
 msgstr "Търся"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Име"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
+msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Премахни всички"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Премахни"
@@ -721,25 +817,21 @@ msgstr "Добави към контактите"
 msgid "Unnamed Contact"
 msgstr "Неименуван Контакт"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Име"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Източник"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Избор на Контакт от Адресната книга"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-#, fuzzy
-msgid "Find contact in"
-msgstr "Изпращача съдържа"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
 msgid "Find"
@@ -820,7 +912,8 @@ msgid "D_epartment:"
 msgstr "От_дел"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Детайли"
 
@@ -888,12 +981,12 @@ msgid "_Categories..."
 msgstr "Ка_тегорий..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "Изтрий"
@@ -2035,7 +2128,7 @@ msgid "Esq."
 msgstr ""
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Пълно Име"
 
@@ -2132,11 +2225,27 @@ msgstr "Редактор за Контакти"
 msgid "Save List as VCard"
 msgstr "Съхрани Списък като VCard"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Променен Контакт:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Конфликтен Контакт:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Намерени Дублирани Контакти"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Промененото име или на Ел. поща на този контакт вече\n"
+"съществува в папката. Искате ли да го добавите въпреки това?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Нов контакт:"
@@ -2153,22 +2262,6 @@ msgstr ""
 "Името или Е-пощенският адрес на този контакт вече съществува\n"
 "в тази папка. Искате ли да я добавите въпреки това?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Променен Контакт:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Конфликтен Контакт:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"Промененото име или на Ел. поща на този контакт вече\n"
-"съществува в папката. Искате ли да го добавите въпреки това?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2277,9 +2370,9 @@ msgstr "Препрати Контакт"
 msgid "Send Message to Contact"
 msgstr "Изпрати съобщението на Контакт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Отпечатай"
@@ -2303,9 +2396,12 @@ msgstr "Премести в Папка..."
 msgid "Cut"
 msgstr "Отрежи"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Копирай"
 
@@ -2314,16 +2410,8 @@ msgstr "Копирай"
 msgid "Paste"
 msgstr "Поставя"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Изтрий"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 #, fuzzy
 msgid "Current View"
 msgstr "_Текущ Преглед"
@@ -2337,166 +2425,170 @@ msgid ""
 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:2
 msgid "Assistant"
 msgstr "Асистент"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Раб. Факс"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Работен Телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Работем телефон 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Телефон в автомобил"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Категории"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Телефон на Компания"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Отдел"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "Ел. Поща 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "Ел. Поща 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Фамилия"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Файл като:"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "Free-busy адрес"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Домашен Адрес"
+#, fuzzy
+msgid "Given Name"
+msgstr "Фамилия"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Домашен Факс"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Домашен телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Домашен телефон 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Понце"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Йордания"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Мениджър"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Мобилен Телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Прякор"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Бележка"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Офис"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Организация"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Друг Адрес"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Друг Факс"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Друг Телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Пейджър"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Основен Телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Професия"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Радио"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Роля"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Съпруг(а)"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Телекс"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Титла"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Неименувано"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Web страница"
 
@@ -2601,11 +2693,19 @@ msgstr "Членове"
 msgid "Job Title"
 msgstr "Работа:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Домашен Адрес"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Домашен Адрес"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Друг Адрес"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2618,123 +2718,120 @@ msgstr "Домашен Факс"
 msgid "Blog"
 msgstr "Болоня"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Успешно"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Неизвестна грешка"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Отказан достъп"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Картата не е намерена"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Карта ID вече съществува"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Протокола на се подържа"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Прекратено"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "Оторизацията пропадна"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Изисква Удостоверение"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #, fuzzy
 msgid "Addressbook does not exist"
 msgstr "Файлът `%s' не съществува."
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Друга грешка"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Искате ли да съхраните промените?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 #, fuzzy
 msgid "_Discard"
 msgstr "Динард"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Грешка при добавяне на списък"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Грешка при добавяне на карта"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Грешка при модифициране на списък"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Грешка при модифициране на карта"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Грешка при изтриване на списък"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Грешка при изтриване на карта"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2743,50 +2840,50 @@ msgstr ""
 "%s вече съществува\n"
 "Искате ли да го презапишете?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, fuzzy
 msgid "Overwrite"
 msgstr "Презаписване на файл?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, fuzzy, c-format
 msgid "Error saving %s: %s"
 msgstr "Грешка при съхранението на файл: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "списък"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Премести съобщени(ето/ята) в"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Копира избраната задача"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Няма карти"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Няма карти"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Множество VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard за %s"
@@ -2983,7 +3080,7 @@ msgstr "Полета"
 msgid "Number of columns:"
 msgstr "Брой колони:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Опций"
 
@@ -3171,18 +3268,18 @@ msgstr "Неименуван Списък с Контакти"
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Не мога да стартирам wombat сървър"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Не мога да стартирам wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Не мога да прочета календара от pilot"
 
@@ -3191,24 +3288,91 @@ msgstr "Не мога да прочета календара от pilot"
 msgid "Default Priority:"
 msgstr "_Приоритет:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Не мога да прочета списъкът със задачи от pilot"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Настройки на Календар и Задачи"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Календар"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Настройки на Календар и Задачи"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Фабрика за контрол на задачи в Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Календар на Evolution iTip/iMip преглед"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Календар на Evolution iTip/iMip преглед"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution - Редактор на Новини"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution - Редактор на Новини"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Компонент на Evolution за показване на пощенски папки"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Композер на поща за Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Задачи"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Алармено известяващо обслужване"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Стартиращ:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Завършващ:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Аларма на Evolution."
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Аларма на %s"
@@ -3277,44 +3441,173 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Не показвай това съобщение отново."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Алармено известяващо обслужване"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Не мога да инициализирам Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Не мога да инициализирам gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "грешно време"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "iКалендар Грешка"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Цвят на задачи за деня"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Цвят на задачи за деня"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "Показвай времето на с_вършване на срещите в седмицата и месеца"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Преглед на календар за печат"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#, fuzzy
+msgid "Units of default reminder"
+msgstr "Създаване на нова среща с подраз_биращо напомняне"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "_Пита за подтвърждение при изтриване на обекти"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "_Пита за подтвърждение при изтриване на обекти"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Изтрива избраните задачи"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Показвай номерата на седмиците в навигацията за _ден"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Съдържания на Обобщен"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Съдържания на описание"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Съдържание на Коментар"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Несъвпадащ"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3327,83 +3620,115 @@ msgstr ""
 "\n"
 "Действително ли да изтрия съобщенията?"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "е по малко от"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "дни"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Отпечатай този календар"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Нова Каледония"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
 #, fuzzy
-msgid "Rename"
-msgstr "_Преименува"
+msgid "New appointment"
+msgstr "Нова Среща"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:633
+#, fuzzy
+msgid "_Appointment"
+msgstr "Среща"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Създава нова поща"
+
+#: calendar/gui/calendar-component.c:639
 #, fuzzy
-msgid "Personal"
-msgstr "Вернал"
+msgid "New meeting"
+msgstr "Настройки за Източник на Новини"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
+#: calendar/gui/calendar-component.c:640
 #, fuzzy
-msgid "Work"
-msgstr "Корк"
+msgid "M_eeting"
+msgstr "Среща"
+
+#: calendar/gui/calendar-component.c:641
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Създава нова задача"
+
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Нова Среща"
+
+#: calendar/gui/calendar-component.c:647
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "Нова _Среща"
+
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Създава нова поща"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3526,7 +3851,7 @@ msgstr "Изпрати"
 msgid "With these arguments:"
 msgstr "С тези аргументи:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr ""
 
@@ -3542,6 +3867,10 @@ msgstr "часове"
 msgid "minutes"
 msgstr "минути"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3575,8 +3904,8 @@ msgstr "Изпрати email"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Обобщено:"
 
@@ -3605,7 +3934,7 @@ msgstr "край на среща"
 msgid "hour(s)"
 msgstr "час(ове)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "минут(а/и)"
 
@@ -3660,7 +3989,7 @@ msgstr "Дни"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Петък"
 
@@ -3674,7 +4003,7 @@ msgstr "Минути"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Понеделник"
 
@@ -3685,7 +4014,7 @@ msgstr "Н_ед"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Събота"
 
@@ -3699,7 +4028,7 @@ msgstr "Показвай номерата на седмиците в навиг�
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Неделя"
 
@@ -3719,7 +4048,7 @@ msgstr "_Списък със задачи"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Четвъртък"
 
@@ -3737,7 +4066,7 @@ msgstr "Формат на време:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Вторник"
 
@@ -3747,12 +4076,12 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Сряда"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Работна Седмица"
 
@@ -3790,7 +4119,7 @@ msgid "_Fri"
 msgstr "_Пет"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Основен"
 
@@ -3835,77 +4164,77 @@ msgstr "_Ср"
 msgid "before every appointment"
 msgstr "след началото на срещата"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Сигурни ли сте, че искате да прекъснете и изтриете тази среща?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Сигурни ли сте, че искате да прекъснете и изтриете тази задача?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 "Сигурни ли сте, че искате да прекъснете и изтриете този запис в дневника?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Това събитие е било изтрито."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Тази задача е била изтрита."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Този запис в дневника е бил изтрит."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Вие направихте промени. Да ги збравя ли и да затворя редактора?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Вие нямате направени промени, да затворя редактора?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Това събитие е било променено."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Тази задача е била променена."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Този запис в дневника е бил променен."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Вие имате промени. Да ги забравя ли и да обновя редактора?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Вие нямате направени промени, да обновя редактора?"
@@ -3915,166 +4244,171 @@ msgstr "%s  Вие нямате направени промени, да обно
 msgid "Validation error: %s"
 msgstr "Неизвестна грешка: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " в"
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Приключено "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Приключено "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Дължим"
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Дължим"
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 #, fuzzy
 msgid "Could not update object"
 msgstr "Не мога да обновя обекта!"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Редактиране на Среща"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Среща - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Задача - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Запис в дневник - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Няма резюме"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Съхрани като..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Не мога да получа текущата версия!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Избор на отдалечена папка за импортиране на тези данни"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Сигурен ли сте, че искате да изтриете срещата %s?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Сигурен ли сте, че искате да изтриете тази неименувана среща?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Сигурен ли сте, че искате да изтриете задача %s?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Сигурен ли сте, че искате да изтриете тази неименувана задача?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Сигурен ли сте, че искате да изтриете записа в дневник %s?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Сигурен ли сте, че искате да неименуван запис в дневника?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Сигурен ли сте, че искате да изтриете среща %d?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Сигурни ли сте, че искате да изтриете %d задачи?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Сигурни ли сте, че искате да изтриете %d журнални записи?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 #, fuzzy
 msgid "The item could not be deleted due to a corba error"
 msgstr "Обекта не може да бъде изпратен!\n"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Обекта не може да бъде изпратен!\n"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Обекта не може да бъде изпратен!\n"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Обекта не може да бъде изпратен!\n"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Обекта не може да бъде изпратен!\n"
@@ -4091,45 +4425,45 @@ msgstr "Делегира На:"
 msgid "Enter Delegate"
 msgstr "Въведете Делегата"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Среща"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Напомня"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Повторение"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Разпределение"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Среща"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Начална Дата"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 #, fuzzy
 msgid "Start time is wrong"
 msgstr "Начало:"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr ""
 
@@ -4199,31 +4533,31 @@ msgid "_Start time:"
 msgstr "Начало:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Без"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "Необходим е организатор."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "Необходим е поне един участник."
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Делегира На.."
 
@@ -4265,21 +4599,15 @@ msgid "Member"
 msgstr "Член"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Роля"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Статус"
@@ -4299,6 +4627,7 @@ msgid "_Invite Others..."
 msgstr "_Други Поканени..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4331,6 +4660,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Не мога да създам директория %s: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "Трябва да бъде зададен организатор."
@@ -4360,34 +4690,59 @@ msgstr "Календарна информация"
 msgid "Calendar Name"
 msgstr "Календар"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Не мога да създам директория %s: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Календарна информация"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "_Списък със задачи"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "_Списък със задачи"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "_Списък със задачи"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Острови Уолис и Футуна"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 #, fuzzy
 msgid "This and Future Instances"
 msgstr "Острови Уолис и Футуна"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 #, fuzzy
 msgid "All Instances"
 msgstr "Всички станции"
@@ -4441,10 +4796,15 @@ msgstr "ден"
 msgid "on the"
 msgstr "на"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "събития"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Дата/Време:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "Д_обави"
@@ -4509,7 +4869,7 @@ msgstr "седмиц(а/и)"
 msgid "year(s)"
 msgstr "годин(а/и)"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 #, fuzzy
 msgid ""
 "This event has been changed, but has not been saved.\n"
@@ -4520,34 +4880,34 @@ msgstr ""
 "\n"
 "Искате ли да запазите промените?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 #, fuzzy
 msgid "Save Event"
 msgstr "Съобщение на Календар"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 #, fuzzy
 msgid "The meeting information has been created. Send it?"
 msgstr "Информацията за срещата е променена. Да изпратя ли обновената версия?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Информацията за срещата е променена. Да изпратя ли обновената версия?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 #, fuzzy
 msgid "The task assignment information has been created. Send it?"
 msgstr "Информацията за задачата е променена. Да изпратя ли обновената версия?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "Информацията за задачата е променена. Да изпратя ли обновената версия?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "Приключено "
@@ -4558,43 +4918,43 @@ msgid "% _Complete"
 msgstr "% Приключено"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Приключено"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Високо"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "В Прогрес"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Ниско"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Нормално"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Не е Стартиран"
 
@@ -4603,7 +4963,7 @@ msgid "Progress"
 msgstr "Прогрес"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Недефинирано"
 
@@ -4625,21 +4985,21 @@ msgstr "_Статус:"
 msgid "_Web Page:"
 msgstr "_Web адрес:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Основни"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Задача"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4647,9 +5007,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "_Конфиденциален"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Описание:"
 
@@ -4754,26 +5114,21 @@ msgstr "%s в %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s е неизвестен тип за превключване"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Публичен"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Частен"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Конфиденциален"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Категории"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4786,29 +5141,27 @@ msgid "Start Date"
 msgstr "Начална Дата"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Резюме"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " цвят"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Среща"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Свободно"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Заето"
 
@@ -4820,7 +5173,7 @@ msgstr "С"
 msgid "S"
 msgstr "Ю"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "И"
 
@@ -4828,7 +5181,7 @@ msgstr "И"
 msgid "W"
 msgstr "З"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4838,7 +5191,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4846,7 +5199,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Да"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4854,17 +5207,17 @@ msgstr "Не"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Неизвестен"
 
@@ -4876,188 +5229,186 @@ msgstr "Повтарям"
 msgid "Assigned"
 msgstr "Назначен"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Обновява обектите"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Изтрий избраните обекти"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Обновява обектите"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Нова _Среща..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Всички Нови _Събития за Деня"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 #, fuzzy
 msgid "New Meeting"
 msgstr "Среща"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Нова Задача"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Печат..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Постави"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Отиди на _Днес"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "Отиди _на Дата..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Потребителска Информация"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-#, fuzzy
-msgid "_Settings..."
-msgstr "Пощенски Настройки..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Отвори"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Запази като..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "Копирай"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "План на _Среща"
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Препраща като _iКалендар"
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Изтрии това С_ъбитие"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Изтрии Всички _Събития"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+#, fuzzy
+msgid "_Settings..."
+msgstr "Пощенски Настройки..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "Отваря _Съобщение"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Присвояване на Задача"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Препраща като _iКалендар"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "_Маркира като Приключено"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Мар_кирай тази Задача като Завършена"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "_Изтрива Избраните Задачи"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Кликнете за да добавите задача"
@@ -5071,8 +5422,8 @@ msgstr "% Приключено"
 msgid "Alarms"
 msgstr "Аларми"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Приключено"
 
@@ -5101,18 +5452,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5131,7 +5482,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5144,134 +5495,134 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "Пр_осто повторение"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
 msgid "Every day"
 msgstr "Всеки"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, fuzzy, c-format
 msgid "Every %d days"
 msgstr "%d дни"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 #, fuzzy
 msgid "Every week"
 msgstr "Всеки"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, fuzzy, c-format
 msgid "Every %d weeks"
 msgstr "%d седмици"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 #, fuzzy
 msgid "Every week on "
 msgstr "Евъргриин"
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, fuzzy, c-format
 msgid "Every %d weeks on "
 msgstr "%d седмици"
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 #, fuzzy
 msgid " and "
 msgstr "Пясък"
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 #, fuzzy
 msgid "every month"
 msgstr "Един месец"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 #, fuzzy
 msgid "Every year"
 msgstr "Всеки"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Край: <b>"
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Приключено "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "iКалендарна информация"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "iКалендар Грешка"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Неизвестна личност"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5279,323 +5630,322 @@ msgstr ""
 "<br> Моля, прегледайте следната информация и тогава изберете действие от "
 "долното меню."
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Без</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 #, fuzzy
 msgid "Location:"
 msgstr "_Местонахождение: "
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 #, fuzzy
 msgid "Status:"
 msgstr "_Статус:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Приет"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Временно приема"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Отказан"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Избери действие:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Обновява"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Приеми"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Временно приема"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Откажи"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Изпрати Информация Свободен/Зает"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Обновява статуса на отговарящият"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Изпраща Последната Информация"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Прекръсва"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> публикува информация за среща."
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Информация за Среща"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, 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:1271
+#: calendar/gui/e-itip-control.c:1269
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> изисква вашето присъствие на срещата."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Предложение на срещата:"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> желае да бъде добавен на съществуващата среща."
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Обновяване на срещата:"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> желае да получи последната информация за срещата.."
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Заявка за Обновяване на срещата:"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> отговори на запитване за срещата."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Отговор на Среща"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> прекъсна срещата."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Прекъсване на срещата"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> изпрати неразбираемо съобщение."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Лошо Съобщение за Среща"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> публикува информация за задачата."
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Информация за задача"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> изисква вашето участие в задача.."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> изисква вашето участие в задача.."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Предложение за Задача"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> желае да бъде добавен към съществуваща задача.."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Обновяване на Задача"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> желае да получи последната информация за задача.."
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Заявка за Обновяване на задача"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> отговори на включване в задача."
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Отговор на Задача"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> прекъсна задача."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Прекъсване на Задача"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Лошо Съобщение за Задача"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> публикува информация свободен/зает."
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Информация Свободен/Зает"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> изисква от вас информация за свободен/зает."
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Заявка Свободен/Зает"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> отговори на заявката свободен/зает."
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Отговор Свободен/Зает"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Лошо Свободен/Зает Съобщение"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr "Папката изглежда да е невъстановимо повредена."
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "Съобщението съдържа само неподържани заявки."
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Прикаченото не съдържа валидно календар съобщение."
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr "Прикаченото няма видими обекти на календар"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "Календарният файл не може да бъде зареден!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Обновяването приключено\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Обекта не може да бъде изпратен!\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Не мога да отворя папка в `%s'"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Преместването Приключено"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Обекта изпратен!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Обекта не може да бъде изпратен!\n"
 
@@ -5758,7 +6108,7 @@ msgstr "%a %m/%d/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
@@ -5822,100 +6172,86 @@ msgstr "Начяло на срещата:"
 msgid "Meeting _end time:"
 msgstr "Край на срещата:"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "На_чална Дата:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "_Крайна Дата"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "_Приоритет:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Страница"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Отваряне на задачи в %s"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Не мога да заредя задачи в `%s'"
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Метода заявен за зареждане на `%s' не се подържа"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Не мога да отворя папка в `%s'"
 
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "Грешка при стартиране на %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Дата на приключване"
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Изтрий избраните обекти"
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 #, fuzzy
 msgid "Expunging"
 msgstr "Изтриване на папка"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Задачи"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Календар"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Не мога да отворя папка в `%s'"
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Метода заявен за отваряне на `%s' не се подържа"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Аларма на %s"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5923,7 +6259,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5931,65 +6267,11 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Торино"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#, fuzzy
-msgid "Calendar and Tasks"
-msgstr "Настройки на Календар и Задачи"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Календар"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Настройки на Календар и Задачи"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Фабрика за контрол на задачи в Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Календар на Evolution iTip/iMip преглед"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Календар на Evolution iTip/iMip преглед"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution - Редактор на Новини"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Evolution - Редактор на Новини"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Компонент на Evolution за показване на пощенски папки"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Композер на поща за Evolution."
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Април"
@@ -6046,298 +6328,335 @@ msgstr "Октомври"
 msgid "September"
 msgstr "Септември"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Трябва да бъде зададен организатор."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Необходим е поне един участник."
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Информация за събитие"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Информация за задача"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Информация за дневник"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Информация Свободен/Зает"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Календарна информация"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 #, fuzzy
 msgid "Updated"
 msgstr "Обновява"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 #, fuzzy
 msgid "Refresh"
 msgstr "Освежава Списък"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Информация Свободен/Зает (%s на %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "iКалендарна информация"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Вие трябва да сте участни на събирието."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1ви"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2ри"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3ти"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4ти"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5ти"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6ти"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7ми"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8ми"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9ти"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10ти"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11ти"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12ти"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13ти"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14ти"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15ти"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16ти"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17ти"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18ти"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19ти"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20ти"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21ви"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22ри"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23ти"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24ти"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25ти"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26ти"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27ми"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28ми"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29ти"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30ти"
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31ви"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Нд"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Пн"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Вт"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Ср"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Чт"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Пт"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Сб"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Избран ден (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Избрана седмица (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Избран месец (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Избрана година (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Задача"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Статус: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Приоритет: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Приключено в проценти: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Категории: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Контакти:"
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Печатен Преглед"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Печат на Обект"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Печатни Настройки..."
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Преименуваи тази препратка"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "_Списък със задачи"
+
+#: calendar/gui/tasks-component.c:590
+#, fuzzy
+msgid "New task"
+msgstr "Нова Задача"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Задачи"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Създава нова задача"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "URI на папки със  задачи за показване"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 #, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -6351,11 +6670,11 @@ msgstr ""
 "\n"
 "Действително ли да изтрия съобщенията?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Не показвай това съобщение отново."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Отпечатай карти"
@@ -6388,17 +6707,17 @@ msgstr "Съобщение на Календар"
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Напомня"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Съобщение на Календар"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6407,7 +6726,7 @@ msgstr ""
 "Evolution намери пощенски файлове на Pine.\n"
 "Искате ли те да бъдат импортиране в Evolution?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Календар"
@@ -7945,28 +8264,28 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "Подпис не се подържа от този шифър"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "Верификация не се подържа от този шифър"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Криптиране не се подържа от този шифър"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Декриптиране не се подържа от този шифър"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 #, fuzzy
 msgid "You may not import keys with this cipher"
 msgstr "Декриптиране не се подържа от този шифър"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 #, fuzzy
 msgid "You may not export keys with this cipher"
 msgstr "Декриптиране не се подържа от този шифър"
@@ -8019,89 +8338,89 @@ msgstr "Запазване на папка %s"
 msgid "You must be working online to complete this operation"
 msgstr "Вие трябва да сте в 'online' за да завършите тази операция"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Неуспех при кеширане на съобщение %s: %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Неуспех при кеширане на съобщение %s: %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Не мога да създам директория %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Синхронизиране на папки"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Грешка при работа с филтър: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Грешка при изпълнение на филтър: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Не мога да отворя spool папка"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Не мога да обработя spool папка"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Получаване на съобщение номер %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Не мога да отворя съобщение"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Грешка на съобщение %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Синхронизиране на папка"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Получаване на съобщение номер %d от %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Грешка на съобщение - %d от %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Неуспех при декодиране на съобщението"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Грешни аргументи"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Грешни аргументи"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Грешка при търсене на филтър: %s: %s"
@@ -8133,36 +8452,36 @@ msgstr "(съвпадение на всичи) изисква единичен �
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Неподържана операция: добавяне на съобщение за %s"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Неподържана операция: търсене по израз: за %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Неподържана операция: търсене по uids: за %s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Премести съобщения"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 #, fuzzy
 msgid "Copying messages"
 msgstr "Копиране на съобщението в %s"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Получавам %d съобщение"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8170,47 +8489,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Прекратено."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Неочакван отговор от POP сървър: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 #, fuzzy
 msgid "No data provided"
 msgstr "Няма име на файл"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Не мога да криптирам това съобщение: няма зададен получател"
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8218,50 +8537,62 @@ msgid ""
 "%s"
 msgstr "Неуспех при кеширане на съобщение %s: %s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Неуспех при кеширане на съобщение %s: %s"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Не мога да запиша данните: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Неуспех при декодиране на съобщението"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Неуспех при декодиране на съобщението"
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr "Не мога да проверя съобщението: не мога да създам временен файл: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Не мога да проверя съобщението: не мога да създам временен файл: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Не мога да запиша данните: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Това е част от криптирано съобщение"
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Съдържанието на съобщенията"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Не мога да получа съобщение от редактора"
@@ -8362,15 +8693,15 @@ msgstr "Грешка при писане на поща във временен �
 msgid "Error copying mail temp file: %s"
 msgstr "Грешка при копиране на поща във временен файл: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 #, fuzzy
 msgid "parse error"
 msgstr "Друга грешка"
@@ -8686,12 +9017,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Няма наличен доставчик за протокол `%s'"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8700,71 +9031,82 @@ msgstr ""
 "Не мога да създам директория %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Моля въведете вашият %s шифър за %s"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Недефинирано"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Добави критерии"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Добави критерии"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Конфигурационната база данни не е намерена"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "_Сертифициран ID:"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Запазва сигнатура"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Друга грешка"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Сървър:%s, Тип: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Не мога да взема папката. Грешна операция за това хранилище"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Не мога да създам папката: Грешна операция за това хранилище"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Кошче"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "Юни"
+
 #: camel/camel-tcp-stream-openssl.c:568
 #, fuzzy
 msgid "Unable to get issuer's certificate"
@@ -8970,7 +9312,7 @@ msgid ""
 "Issuer: %s"
 msgstr "_Сертифициран ID:"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Не мога да анализирам URL `%s'"
@@ -8990,22 +9332,22 @@ msgstr "Няма такова съобщение: %s в %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Проврка за нови съобщения във всички папки"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Не мога да изтрия папка %s: Грешна операция"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Не мога да изтрия папка %s: Няма такава папка"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Не мога да преименувам папката %s Грешна операция"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Не мога да преименувам папката %s Няма такава папка"
@@ -9083,7 +9425,7 @@ msgstr "Неуспех при декодиране на съобщението"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9097,7 +9439,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Няма такова съобщение"
@@ -9135,54 +9477,71 @@ msgid "Failed to cache %s: %s"
 msgstr "Неуспех при кеширане на съобщение %s: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Свързване със сървъра..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Не успях да се свържа с LDAP сървъра."
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr ""
+"\n"
+"Коментар:"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Проверка за нова поща"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Check for new messages in all folders"
 msgstr "Проврка за нови съобщения във всички папки"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Папки"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Показва само папките с абонат"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Място за име"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Използва филтри за нови съобщения в INBOX от този сървър"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Автоматична проверка за нов email"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "За четене и запазване на поща от IMAP сървъри"
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Парола"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Тази опция ще ви свърже с IMAP сървър използващ нешифрована парола"
@@ -9435,7 +9794,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Не мога да преименувам папката %s на %s: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Не мога да преименувам папката: %s"
@@ -9554,29 +9913,29 @@ msgstr "Сканирам за нови съобщения"
 msgid "Storing folder"
 msgstr "Запазва папка"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Не мога да създам заклюване за папката %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Не мога да отворя mailbox: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "Действието добавяне на поща е прекъснато"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Не мога да добавя съобщението в mbox файла: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9585,11 +9944,11 @@ msgstr ""
 "Не мога да получа съобщение  %s от папка %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Папката изглежда да е невъстановимо повредена."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Конструирането на съобщението пропадна: Повреден mailbox?"
 
@@ -9657,12 +10016,17 @@ msgstr "Не мога да създам директория %s: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "Не мога да получа папка: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "Карта ID вече съществува"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Не мога да преименувам папката %s на %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Указаното име на папка е невалидно: %s"
@@ -9706,7 +10070,7 @@ msgstr "Не мога да затворя папката източник %s: %s
 msgid "Could not close temp folder: %s"
 msgstr "Не мога да затворя временната папка: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Не мога да преименувам папката: %s"
@@ -9990,7 +10354,7 @@ msgstr "Изтрива след %s дни"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -10080,7 +10444,7 @@ msgid "No such folder `%s'."
 msgstr "Няма такава папка `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10135,7 +10499,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Изпращане на поща през програмата sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10309,7 +10673,7 @@ msgstr "SMTP поща през %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Не мога да изпратя съобщение: невалиден адрес на изпращача."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Изпращане на съпбщението"
 
@@ -10437,7 +10801,7 @@ msgstr "%.1fM"
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "прикачен"
 
@@ -10482,14 +10846,14 @@ msgstr "MIME тип:"
 msgid "Suggest automatic display of attachment"
 msgstr "Предлага автоматично показване на прикачен"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Необходимо е да конфигурирате потребител\n"
 "преди да създадете поща."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Кликнете тук за адресна книга"
 
@@ -10500,45 +10864,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Отговор-До:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "От:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Тема:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "До:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Въведете получател на съобщението"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Въведете адреса на получателя на карбон копие за това съобщение"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10549,16 +10913,21 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "Порто"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 #, fuzzy
 msgid "Posting destination"
 msgstr "Няма Описание"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Прикрепи файл към съобщението"
+
 #: composer/e-msg-composer-select-file.c:119
 #, fuzzy
 msgid "Attach file(s)"
@@ -10595,21 +10964,21 @@ msgstr "Файла съществува. Да го презапиша?"
 msgid "Error saving file: %s"
 msgstr "Грешка при съхранението на файл: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Грешка при зареждането на файл: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Грешка при достъп на файл: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Не мога да получа съобщение от редактора"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10618,7 +10987,7 @@ msgstr ""
 "Не мога да намеря във файл %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10627,7 +10996,7 @@ msgstr ""
 "Не мога да отрежа файл %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10636,7 +11005,7 @@ msgstr ""
 "Не мога да намеря във файл %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10645,7 +11014,7 @@ msgstr ""
 "Грешка при автоматичното запазване на файл: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10653,7 +11022,7 @@ msgstr ""
 "Ximian Evolution намери незапазени файлове от предишната сесия.\n"
 "Искате ли да се опитам да ги възстановя?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10664,35 +11033,35 @@ msgstr ""
 "\n"
 "Искате ли да запазите промените?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Предупреждение: Модифицирано Съобщение"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Отвори файл"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 #, fuzzy
 msgid "Signature:"
 msgstr "Запазва сигнатура"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Напиши Съобщение"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10700,24 +11069,26 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
-msgstr ""
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
+msgstr "Относно Evolution"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Относно Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10967,13 +11338,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11103,7 +11474,7 @@ msgstr "Тогава"
 msgid "You must specify a folder."
 msgstr "Име на стил:"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Избери Папка"
@@ -11117,26 +11488,26 @@ msgstr ""
 "Грешка в регулярен израз '%s':\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Важно"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 #, fuzzy
 msgid "To Do"
 msgstr "Того"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 #, fuzzy
 msgid "Later"
 msgstr "след"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Тест"
 
@@ -11240,7 +11611,7 @@ msgstr "преди"
 msgid "months"
 msgstr "месеци"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "секунди"
 
@@ -11339,7 +11710,7 @@ msgstr "Израз"
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 #, fuzzy
 msgid "Label"
 msgstr "Лаурел"
@@ -11413,121 +11784,127 @@ msgid "Source Account"
 msgstr ""
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Пръскане"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Специфично заглавие"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Прекрати Обработката"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Тема"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "Задава статус"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "съдържа"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "не съдържа"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "не завършва с"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "не съществува"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 #, fuzzy
 msgid "does not return"
 msgstr "не съществува"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "не звучи като"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "не започва с"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "завършва с"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "съществува"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 #, fuzzy
 msgid "is Flagged"
 msgstr "Маркирано"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 #, fuzzy
 msgid "is after"
 msgstr "било след"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "is before"
 msgstr "било преди"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "е по-голямо от"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "е по малко от"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Маркирано"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "не е"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "е"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 #, fuzzy
 msgid "returns greater than"
 msgstr "е по-голямо от"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 #, fuzzy
 msgid "returns less than"
 msgstr "е по малко от"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 #, fuzzy
 msgid "returns"
 msgstr "Бърнс"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "звучи като"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "започва с"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
@@ -11553,19 +11930,87 @@ msgstr "Име на правило:"
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Тази vпапка трябва да има име."
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr "Необходимо е да зададете поне една папка като източник"
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 #, fuzzy
 msgid "VFolder source"
 msgstr "Източници на vПапки"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#, fuzzy
+msgid "Configure your email accounts here"
+msgstr "Създава или редактира пощенски акаунти и други настройки"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Фабрика за контрол на задачи в Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Композер на поща за Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Композер на поща за Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Фабрика за контрол на задачи в Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Компонент на Evolution за показване на пощенски папки"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Компонент на Evolution за показване на пощенски папки"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Поща"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Акаунти"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr ""
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Сигурен ли сте, че искате да изтриете този акаунт?"
@@ -11610,7 +12055,7 @@ msgid "Protocol"
 msgstr "Пуерто Рико"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 #, fuzzy
 msgid "Unnamed"
 msgstr "Неименуван Контакт"
@@ -11640,21 +12085,17 @@ msgstr "Добави критерии"
 msgid "Signature(s)"
 msgstr "_Файл с Подпис:"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
-#, fuzzy
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "Вие изпращате HTML-форматирано съобщение, но следните получатели не искат "
 "HTML форматирана поща:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Изпрати въпреки това?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11662,28 +12103,28 @@ msgstr ""
 "Съобщението няма Тема.\n"
 "Найстина ли да го изпратя?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Това съобщение съдържа само Bcc получател."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Трябва да укажете получател(и) за да може да изпратите съобщението."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11696,198 +12137,415 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Създава Виртуална _Папка От Съобщение"
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "Поща"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<натиснете тук за да изберете папка>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, fuzzy, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "Отвори в %s..."
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Създай нова папка..."
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Укажете каде да бъде създадена папката:"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
-msgid "Folder _name"
+msgid "Folder _name:"
 msgstr "Име на папка:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Не мога да създам временна директория: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Не мога да създам временна директория: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Не мога да създам временна директория: %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Не мога да затворя временната папка: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Зареждам"
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Избери папка"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Създай нова папка"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Не мога да изтрия папката `%s': %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr ""
+"Не мога да изтрия папката:\n"
+"%s"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Изтрий \"%s\""
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Преименувай папката \"%s\" на:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+#, fuzzy
+msgid "Rename Folder"
+msgstr "Преименувай папка"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Свойства"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Свойства"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "Име на папка:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Изглед"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Отвори в Нов Прозорец"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Премести"
+
+#: mail/em-folder-tree.c:1500
+#, fuzzy
+msgid "_New Folder..."
+msgstr "Нова папка"
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "_Преименува"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "Свойства..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "Редактирай като ново съобщение..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "Печат"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "Отговори на подателя"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Отговори на списъка"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Отговори на всички"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "Препрати"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Приключено"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Изчисти"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Отбележи: прочетено"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Отбележи: непрочетено"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Маркира като В_ажно"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Маркирай като Не_важни"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Отбележи: непрочетено"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Маркира като В_ажно"
+
+#: mail/em-folder-view.c:706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Възстанови изтрито"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Премести в Папка..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "Копирай в Папка..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Добави подателя в адресната книга"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Приложи Филтри"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Създай правило от съобщението"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "VFolder върху _Тема"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "_vПапка на Изпращач"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "v_Папка на Получатели"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "Филтър върху _Mailing List"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "_vПапка на Изпращач"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Филтър върху Т_ема"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Филтър върху Из_пращач"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Филтър върху По_лучатели"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Филтър върху Mailing _List"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Филтър върху Из_пращач"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "По подразбиране"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Отпечатай Съобщението"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Копира местоположениет на указател"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Съвпадения:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Назначен"
+
+#: mail/em-format-html-display.c:597
+#, fuzzy
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
 msgstr ""
 "Това съобщение е цифрово подписано. Кликнете на иконата за заключване за "
 "повече информация."
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Добави критерии"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Добави критерии"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Прекъснат"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "PGP криптиране"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Не мога да анализирам MIME съобщение. Показвам го в изходен код."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Неподържана схема"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Неуспех при проверка на сертификати"
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Работа в 'O_nline' "
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Скрий"
@@ -11897,101 +12555,72 @@ msgstr "Скрий"
 msgid "Page %d of %d"
 msgstr "Получаване на съобщение номер %d от %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Получавам съобщение %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Указател към FTP сайт (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Указател към локален файл (%s) валиден на сайта \"%s\""
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Указател към локален файл (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Указател към отдалечени данни (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Указател към неизвестни външни данни (\"%s\" type)"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-#, fuzzy
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-"Това съобщение е цифрово подписано. Кликнете на иконата за заключване за "
-"повече информация."
-
-#: mail/em-format-html.c:906 mail/em-format.c:1217
-#, fuzzy
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-"Това съобщение е цифрово подписано. Кликнете на иконата за заключване за "
-"повече информация."
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-#, fuzzy
-msgid "No signature present"
-msgstr "HTML сигнатурен файл"
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Не мога да инициализирам GNOME"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Неподържана схема"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Не мога да анализирам MIME съобщение. Показвам го в изходен код."
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Премести съобщения"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "От"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Отговор-До"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "До"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 #, fuzzy
 msgid "Mailer"
 msgstr ""
@@ -11999,91 +12628,142 @@ msgstr ""
 "Пощенска програма: "
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Дата"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "%s прикачен"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Не мога да анализирам MIME съобщение. Показвам го в изходен код."
+msgid "Session not initialised"
+msgstr "Не мога да инициализирам GNOME"
+
+#: mail/em-format.c:1210
+#, fuzzy
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+"Това съобщение е цифрово подписано. Кликнете на иконата за заключване за "
+"повече информация."
+
+#: mail/em-format.c:1212
+#, fuzzy
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"Това съобщение е цифрово подписано. Кликнете на иконата за заключване за "
+"повече информация."
+
+#: mail/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Изчакване ..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Сканира на \"%s\""
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Неуспех при кеширане на съобщение %s: %s"
 
-#: mail/em-popup.c:593
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Неуспех при кеширане на съобщение %s: %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Неуспех при кеширане на съобщение %s: %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Съхрани Като..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Отговори на подателя"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "_Отвори Указател в Браузер"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Изпраща с_ъобщението към списък..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Добави адресна книга"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Отвори в %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "IMAP сървъра не съдържа %s информация"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Абонира"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Папка"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Моля, изберете сървър."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Не е избран сървър"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Не показвай това съобщение отново."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12092,27 +12772,27 @@ msgstr ""
 "Грешка при зареждане информацията за финтъра:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Филтри"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Препратени съобщения"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "неизвестен изпрашач"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "На %a, %Y-%m-%d в %H:%M, %%s записа:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12121,7 +12801,7 @@ msgstr ""
 "Не мога да взема съобщение: %s\n"
 "  %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12130,26 +12810,40 @@ msgstr ""
 "%s вече съществува\n"
 "Искате ли да го презапишете?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Съобщение"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Съхрани Съобщението Като..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Не мога да създам временна директория: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "_Адрес:"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
+msgid ""
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Тази операция ще изтрие за постоянно всички съобщения маркирани за "
+"изтриване. Ако продължите, вие няма да сте в състояние да възстановите тези "
+"съобщения.\n"
+"\n"
+"Действително ли да изтрия съобщенията?"
+
+#: mail/em-utils.c:2288
 #, fuzzy
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12159,105 +12853,387 @@ msgstr ""
 "\n"
 "Действително ли да изтрия съобщенията?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
+#: mail/evolution-mail.schemas.in.in.h:1
+#, fuzzy
+msgid "Automatic link recognition"
+msgstr "_Автоматична проверка за нов email"
+
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "_Автоматична проверка за нов email"
+
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: mail/evolution-mail.schemas.in.in.h:6
 #, fuzzy
-msgid "Configure your email accounts here"
-msgstr "Създава или редактира пощенски акаунти и други настройки"
+msgid "Default charset in which to compose messages"
+msgstr "Отрязва избраните съобщения"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/evolution-mail.schemas.in.in.h:7
 #, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
+msgid "Default charset in which to compose messages."
+msgstr "Отрязва избраните съобщения"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Фабрика за контрол на задачи в Evolution"
+msgid "Default charset in which to display messages"
+msgstr "Търсене на текст в тялото на показваното съобщение"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
-msgid "Evolution Mail component"
-msgstr "Композер на поща за Evolution."
+msgid "Default charset in which to display messages."
+msgstr "Търсене на текст в тялото на показваното съобщение"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Композер на поща за Evolution."
+msgid "Default forward style"
+msgstr "Подразбираш се стил на Препращане:"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Фабрика за контрол на задачи в Evolution"
+msgid "Default reply style"
+msgstr "Подразбираш се стил на Препращане:"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
 #, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Компонент на Evolution за показване на пощенски папки"
+msgid "Empty Trash folders on exit"
+msgstr "_Изпразва кошчето при излизане"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Компонент на Evolution за показване на пощенски папки"
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "_Изпразва кошчето при излизане"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
-msgid "Mail Accounts"
+msgid "Height of the message-list pane"
+msgstr "Изпрати съобщението по-късно"
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "Акаунти"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: mail/importers/elm-importer.c:105
-msgid "Evolution is importing your old Elm mail"
-msgstr "Evolution импортира вашите стари Elm пощи"
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
-msgid "Importing..."
-msgstr "Импортира..."
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
-msgid "Please wait"
-msgstr "Моля почакайте"
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Импортира %s като %s"
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
 
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Сканира на \"%s\""
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "Де_йствия за филтриране на журнал за:"
 
-#: mail/importers/elm-importer.c:547
+#: mail/evolution-mail.schemas.in.in.h:28
+#, fuzzy
+msgid "Log filter actions to the specified log file."
+msgstr "Де_йствия за филтриране на журнал за:"
+
+#: mail/evolution-mail.schemas.in.in.h:29
+#, fuzzy
+msgid "Logfile to log filter actions"
+msgstr "Де_йствия за филтриране на журнал за:"
+
+#: mail/evolution-mail.schemas.in.in.h:30
+#, fuzzy
+msgid "Logfile to log filter actions."
+msgstr "Де_йствия за филтриране на журнал за:"
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Mail Конфигурация"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Mail Конфигурация"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
-"Evolution намери пощенски файлове на Elm\n"
-"Искате ли да ги импортирате в Evolution?"
 
-#: mail/importers/elm-importer.c:568
-msgid "Elm"
-msgstr "Elm"
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr "Пита при изпращане на HTML съобщения до контакти които не я искат"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "Пита когато се изпраща поща само с получатели в полето _Bcc"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "_Изпрати mail в HTML формат по подразбиране."
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "_Изпрати mail в HTML формат по подразбиране."
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "Покажи Времето Като"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "Покажи Времето Като"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Показва съобщение в нормален стил"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "_Предварителен преглед на Pane"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+msgid "Sound file to play when new mail arrives."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+msgid "Spell check inline"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "Оригинален Контакт:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+msgid "The variable width font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Изпрати съобщението по-късно"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Изпрати съобщението по-късно"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "Прави това моя подразбиращ се акаунт"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "Променливо"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 #, fuzzy
@@ -12291,6 +13267,44 @@ msgstr ""
 msgid "Evolution Pine importer"
 msgstr "Композер на поща за Evolution."
 
+#: mail/importers/elm-importer.c:105
+msgid "Evolution is importing your old Elm mail"
+msgstr "Evolution импортира вашите стари Elm пощи"
+
+#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
+#: mail/importers/pine-importer.c:115
+msgid "Importing..."
+msgstr "Импортира..."
+
+#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
+#: mail/importers/pine-importer.c:117
+msgid "Please wait"
+msgstr "Моля почакайте"
+
+#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
+#: mail/importers/pine-importer.c:288
+#, c-format
+msgid "Importing %s as %s"
+msgstr "Импортира %s като %s"
+
+#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
+#: mail/importers/pine-importer.c:425
+#, c-format
+msgid "Scanning %s"
+msgstr "Сканира на \"%s\""
+
+#: mail/importers/elm-importer.c:547
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution намери пощенски файлове на Elm\n"
+"Искате ли да ги импортирате в Evolution?"
+
+#: mail/importers/elm-importer.c:568
+msgid "Elm"
+msgstr "Elm"
+
 #: mail/importers/netscape-importer.c:75
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
@@ -12332,12 +13346,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution импортира вашите стари дани от Netscape"
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Кошче"
-
 #: mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
@@ -12347,7 +13355,7 @@ msgstr "Локален mail файл %s"
 msgid "Scanning directory"
 msgstr "Сканира директория"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Стартира импорт"
 
@@ -12426,24 +13434,24 @@ msgid "You have not filled in all of the required information."
 msgstr "Вие не сте попълнили всичи полета за необходимата информация."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Редактор на Акаунти в Evolution"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Хост:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "_Потрбителско име:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Път:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Вие не може да имате две сигнатури с едно име."
 
@@ -12452,35 +13460,35 @@ msgstr "Вие не може да имате две сигнатури с едн
 msgid "Mail to %s"
 msgstr "Mail до %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Темата е %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Mail от %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s пощенски списък"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Отговаря на"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Добавя правило за Филтър"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12488,148 +13496,31 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:194
-#, fuzzy
-msgid "Connecting..."
-msgstr "Свързване със сървъра..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Тази папка не може да съдържа съобщения."
-
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Не мога да преименувам папката: %s"
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Ново _Mail съобщение"
 
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Не мога да създам временна директория: %s"
-
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Не мога да създам временна директория: %s"
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "_Пощенско Съобщение"
 
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Не мога да затворя временната папка: %s"
+#: mail/mail-component.c:381
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Напиши Съобщение"
 
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Избор на отдалечена папка за импортиране на тези данни"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Избор на отдалечена папка за импортиране на тези данни"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Създай нова папка"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Укажете каде да бъде създадена папката:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Не мога да изтрия папката `%s': %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr ""
-"Не мога да изтрия папката:\n"
-"%s"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Изтрий \"%s\""
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Преименувай папката \"%s\" на:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-#, fuzzy
-msgid "Rename Folder"
-msgstr "Преименувай папка"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Указаното име на папка е невалидно: %s"
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Свойства"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Свойства"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "Име на папка:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Изглед"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Отвори в Нов Прозорец"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Премести"
-
-#: mail/mail-component.c:2087
-#, fuzzy
-msgid "_New Folder..."
-msgstr "Нова папка"
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "_Преименува"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "Свойства..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Потребител"
 
@@ -12698,11 +13589,11 @@ msgstr ""
 "да състави акаунта за пощата. Моля въведете име за този акаунт долу.\n"
 "Това име ще бъде предназначено само за показване."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Проверява Обслужване"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Свързване със сървъра..."
 
@@ -12792,28 +13683,37 @@ msgid "C_olors"
 msgstr "_Затвори"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Проверка за Нов email"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Проверка за Нов email"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Цвят на задачи за деня"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Напиши Съобщение"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Конфигурация"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -12830,329 +13730,338 @@ msgstr ""
 "\n"
 "Кликнете на \"Завърши\" за да запазите настройките."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "По Подразбиране"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Дел Бажио"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Подразбираща се кодова таблица:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Получаване на Пощата"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "В_инаги подписва изходящите съобщения когато използва този акаунт"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Не мога да отворя съобщение"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Приключено"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Папки _Черова"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "Раз_решен"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Адресът за ел. поща съдържа"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email _address:"
 msgstr "Адрес на ел. поща"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "_Изпразва кошчето при излизане"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Сертифициран ID:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Помощник на Evolution за Акаунти"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Изпълнява действия"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "завършва с"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "Опций"
+
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Font Properties"
 msgstr "Свойства"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Препратени съобщения"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Подсветнато цитиране с"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Съхрани и Затвори"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Loading Images"
 msgstr "Зарежда _Картинки"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Mail Конфигурация"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Местоположение на Пощенската кутия"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Composer"
 msgstr "Съобщения"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Message Display"
 msgstr "Показване на _Съобщение"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Fonts"
 msgstr "Съобщението съдържа"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Mail Конфигурация"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Опционална Информация"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Организа_ция:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP _Ключ ID:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Избери цвят"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Пита когато се изпраща поща само с получатели в полето _Bcc"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "PGP"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Отпечатай избраните контактите"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Пощенска директория Qmail"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Quote original message"
 msgstr "Не мога да отворя съобщение"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "Запомни тази парол_а"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Отговор-До:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Получаване на Пощата"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Опции на Получаване"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Запомни тази парола"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "изискана Информация"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "По подразбиране"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Сигурност"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Защитен MIME"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Изпращане на Email"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Изпати _папка със съобщения:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Изпрати и Чернова Съобщение"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Сървърът изисква ото_ризация"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Сървър Конфигурация"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Тип С_ървър:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Конфигурационната база данни не е намерена"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Име на стил:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Стандартен Unix mbox"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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:121
+#: mail/mail-config.glade.h:124
 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:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Променливо"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -13163,194 +14072,203 @@ msgstr ""
 "\n"
 "Кликнете на \"Следващ\" за да започнете."
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_Файл с Подпис:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "_Винаги отказва да зарежда картинки от мрежата"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr "В_инаги подписва изходящите съобщения когато използва този акаунт"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "Тип на Идентифика_ция:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Тип на Идентифика_ция:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "_Автоматична проверка за нов email"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Автоматична проверка за нов email"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Подтвърждение при редактиране на папка"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML сигнатура:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Defaults"
 msgstr "По подразбиране"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Enable"
 msgstr "Разрешава"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Препрати Като"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Пълно Име:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "В HTML поща"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Identity"
 msgstr "Потребител"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Юни"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "_Зарежда картинки ако изпращача е в адресната книга"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Прави това моя подразбиращ се акаунт"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Маркир_ай съобщенията като \"Прочетени\" след:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Име:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "_Никога не зарежда картинки от мрежата"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Пита при изпращане на HTML съобщения до контакти които не я искат"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Пита пр_и изпращане на поща без тема"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Получаване на Пощата"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Отговори на Всички"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Script:"
 msgstr "_Сигурност"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Изтрии..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Изпращане на Email"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Покажи Времето Като"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Signatures"
 msgstr "_Файл с Подпис:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Standard Font:"
 msgstr "Стандартен Unix mbox"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Terminal Font:"
 msgstr "Оригинален Контакт:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Изплзва криптирана връзка (_SSL)"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "описание"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Сканира на \"%s\""
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13359,7 +14277,7 @@ msgstr ""
 "Грешка при '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13368,7 +14286,7 @@ msgstr ""
 "Грешка при извършване на операция:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Работи"
 
@@ -13380,118 +14298,118 @@ msgstr "Филтър върху папка"
 msgid "Fetching Mail"
 msgstr "Получаване на Пощата"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Неуспех при запазване на поща във времен файл %s: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Неуспех при запазване на поща във времен файл %s: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Изпращане на \"%s\""
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Изпращане на съпбщение %d от %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Грешка на съобщение %d от %d"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Приключено."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Запазва съобщението в папка"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Премести съобщени в %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копиране на съобщението в %s"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканиране на папки в \"%s\""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Препратени съобщения"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Отваряне на папка %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "Отваря хранилище %s"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Изтривам папка %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Запазване на папка %s"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Освежаване на папка"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Изтриване на папка"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Импортира %s като %s"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Локални Папки"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Получавам съобщение %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Получавам %d съобщение"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Съхраняване на %d съобщения"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13500,7 +14418,7 @@ msgstr ""
 "Не мога да създам изходен файл: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13509,11 +14427,11 @@ msgstr ""
 "Грешка при запазване на съобщения в: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Запазвам прикачено"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13522,21 +14440,25 @@ msgstr ""
 "Не мога да създам изходен файл: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Не мога да запиша данните: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Разкачване от %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Отново връзка с %s"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Със значение на малки/големи букви"
@@ -13553,60 +14475,75 @@ msgstr "Намери:"
 msgid "Search"
 msgstr "Търсене"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Добави критерии"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Изключения"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Източник на Информация"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Прекратяване..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Сървър:%s, Тип: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Път: %s, Тип: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Изпращане и Получаване на поща"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Прекъсва Всичко"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Обновяване ..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Изчакване ..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Потребителя прекрати операцията."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Въведедете парола за %s"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Въведедете парола"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "_Запомни тази парола"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "Запомня тази парола за остатъка от тази сесия"
@@ -13648,26 +14585,31 @@ msgstr "_HTML сигнатура:"
 msgid "Name:"
 msgstr "Име:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Препратено съобщение - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Препратени съобщения"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Отваряне на папка %s"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Настройка на vпапка %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Обновяване на vпапки за uri: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13676,88 +14618,88 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "vПапки"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Редактирай VПапки"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Опит за редактиране на vпапка '%s' която не съществува."
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Нов VFolder"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Непрегледано"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Прегледано"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Отговорено"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Множество Невидяни Съобщения"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Множество Съобщения"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Най долу"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Ниско"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "По Горе"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Най Горе"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Днес %l:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Вчера %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Генерирам списък на съобщенията"
 
@@ -13819,11 +14761,11 @@ msgstr "Препрати"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Отговори"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Отговори на Всички"
 
@@ -13880,42 +14822,140 @@ msgstr "Абонирай се"
 msgid "_Unsubscribe"
 msgstr "О_тпиши се"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Shell на Evolution"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+#, fuzzy
+msgid "Folder Settings"
+msgstr "Настройки на Поща"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "80%"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Преименува тази група препратка"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Превключи показването на панела с папките"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Скрива лентата с препратки"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "_Приоритет:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "_Приоритет:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Интерфейс на Mail Конфигурация"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
 msgstr ""
-"Не мога да прехвърля папка:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 #, fuzzy
-msgid "Add a Folder"
-msgstr "Избери Папка"
+msgid "Path to the default contacts folder"
+msgstr "Отваряне на папка %s"
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Чернови"
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Отваряне на папка %s"
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Inbox"
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Отваряне на папка %s"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Outbox"
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Изпрати"
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Отваряне на папка %s"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Превключи показването на панела с папките"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Превключи показването на панела с ускорителите"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "Email"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Не мога да обновя правилно файловете"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13926,7 +14966,7 @@ msgstr ""
 "%s\n"
 "Грешка: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13935,7 +14975,7 @@ msgstr ""
 "Възникна грешка при копирането на файлове в\n"
 "`%s'."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13946,7 +14986,7 @@ msgstr ""
 "Преместето го, за да могат файловете на\n"
 "Еволюшън да се инсталират."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -14055,10 +15095,11 @@ msgstr ""
 "Не мога да преименувам папката:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+msgid "The specified folder name is not valid: %s"
+msgstr "Указаното име на папка е невалидно: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -14082,20 +15123,15 @@ msgstr ""
 "Не мога да създам указаната папка:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-#, fuzzy
-msgid "Create New Folder"
-msgstr "Създай нова папка..."
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Неименуван)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Изберете типа на импортера за изпълнение:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -14109,11 +15145,11 @@ msgstr ""
 "Вие може да изберете \"Автоматично\" ако не знаете и Evolution ще се опита "
 "да го определи."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Моля, изберете информацията която искате да импортирате:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -14121,7 +15157,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14130,22 +15166,22 @@ msgstr ""
 "Импортирам %s\n"
 "Импортирам обект %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 #, fuzzy
 msgid "Select importer"
 msgstr "Избери Папка"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "Файлът `%s' не съществува."
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Грешка в Evolution"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -14154,11 +15190,11 @@ msgstr ""
 "Няма импортер който да подържа\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Импортира"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -14167,17 +15203,17 @@ msgstr ""
 "Импортирам %s.\n"
 "Стартирам %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Грешка при стартиране на %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Грешка при зареждането на %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14186,35 +15222,35 @@ msgstr ""
 "Импортирам %s\n"
 "Импортирам обект 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Име на файл:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Избери файл"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Тип на файл:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Импорт на данни и настройки от стари програми"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Импорт на единичен файл"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -14222,48 +15258,28 @@ msgstr ""
 "Моля, почакайте...\n"
 "Сканирам за съществуващи настройки"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Стартира Интелигентно Импортиране"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "От %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Избор на отдалечена папка за импортиране на тези данни"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Вмъкни"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Затварям връзката..."
 
-#: shell/e-shell-offline-sync.c:163
-#, fuzzy, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Грешка при '%s':\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-#, fuzzy
-msgid "Syncing Folder"
-msgstr "Синхронизиране на папка"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr ""
-
 #: shell/e-shell-settings-dialog.c:346
 #, fuzzy
 msgid "Evolution Settings"
@@ -14304,7 +15320,7 @@ msgstr ""
 "Не мога да създам указаната папка:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14313,17 +15329,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Асистент"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Нов"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Няма име на папка."
@@ -14385,64 +15395,51 @@ msgstr "Създай нова препратка"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Изберете папката на която искате да сочи препратката:"
 
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "Работа в 'O_nline' "
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "Работа в '_Offline'"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Работа в 'Offline'"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Няма показана папка)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Няма)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolution в момента е 'online'.  Кликнете на този бутон за да го превключите "
 "в режим 'offline'."
 
-#: shell/e-shell-view.c:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Evolution е в процес на преминаване на режим 'offline'."
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Evolution  в момента е 'offline.' Кликнете на този бутон за да го "
 "превключите на 'online'."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Грешни аргументи"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Не мога да регистрирам в OAF"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Конфигурационната база данни не е намерена"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Генерира грешка"
 
@@ -14562,75 +15559,18 @@ msgstr "Пр_емахни"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Изтрива тази препратка от лентата с препратки"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Грешка при запазване на препратки."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Inbox"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Препратки"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Няма грешка"
-
-#: shell/e-storage.c:573
-msgid "A folder with the same name already exists"
-msgstr "Папка със същото име вече съществува"
-
-#: shell/e-storage.c:575
-msgid "The specified folder type is not valid"
-msgstr "Типа на зададената папка не е валиден"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "Входно/Изходна Грешка"
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr "Няма достатъчно пространство за създаването на папка"
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr "Папката не е празна"
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "Посочената папка не е намерена"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "Функцията не се използва в това хранилище"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "Операцията не се подържа"
-
-#: shell/e-storage.c:591
-msgid "The specified type is not supported in this storage"
-msgstr "Зададеният тип не се поддържа в това хранилище"
-
-#: shell/e-storage.c:593
-msgid "The specified folder cannot be modified or removed"
-msgstr "Посочената папка не може да бъде модифицирана или изтрита"
-
-#: shell/e-storage.c:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr ""
-
-#: shell/e-storage.c:597
-msgid "Cannot create a folder with that name"
-msgstr "Не мога да създам папка с това име"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr ""
-
-#: shell/e-storage-set-view.etspec.h:1
-#, fuzzy
-msgid "Checkbox"
-msgstr "Чико"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14641,6 +15581,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% приключено)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Нов"
+
+#: shell/evolution-folder-selector-button.c:128
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "Отвори в %s..."
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14678,76 +15629,6 @@ msgstr ""
 "Грешката от активиране на системата е:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "Грешка в CORBA"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Прекъснат"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Грешен аргумент"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Вече има собственик"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Няма соственик"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Не е намерен"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Неподържан тип"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Неподържана схема"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Неподържана операция"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Вътрешна грешка"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Съществуват"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "Грешен URI"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Има подпапки"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Няма място"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "Старият собственик е умрял"
-
-#: shell/evolution-test-component.c:63
-#, fuzzy
-msgid "Test type"
-msgstr "Тип на файл:"
-
-#: shell/evolution-test-component.c:703
-#, fuzzy
-msgid "Evolution Test Component"
-msgstr "Композер на поща за Evolution."
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "Active Connections"
@@ -14781,11 +15662,6 @@ msgstr "_Поща"
 msgid "_Tasks:"
 msgstr "Задачи"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-#, fuzzy
-msgid "Folder _name:"
-msgstr "Име на папка:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 #, fuzzy
 msgid "Folder _type:"
@@ -14855,25 +15731,6 @@ msgstr ""
 "\n"
 "Кликнете на бутона \"Завърши\" за да запазите настройките."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Shell на Evolution"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-#, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Фабрика за контрол на задачи в Evolution"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-#, fuzzy
-msgid "Folder Settings"
-msgstr "Настройки на Поща"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -14913,7 +15770,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Импортери"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Вмъкни"
 
@@ -14929,16 +15786,16 @@ msgstr "Не ме питай отново"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution не може да импортира данни от следните файлове:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Evolution сега излиза..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14958,77 +15815,116 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:289
+#: shell/main.c:294
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Относно Evolution"
 
-#: shell/main.c:297
+#: shell/main.c:302
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Не ме питай отново"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Нямам достъп до Ximian Evolution shell."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Не мога да инициализирам Ximian Evolution shell: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Стартира импорт"
 
-#: shell/main.c:532
+#: shell/main.c:530
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Стартира Интелигентно Импортиране"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Изпраща изхода от дебъга на всички компоненти във файл."
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Избери Папка"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Сертифициран ID:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "Прогрес"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Израз"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Адрес на ел. поща"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr "_Сертифициран ID:"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -15084,91 +15980,378 @@ msgid "Backup All"
 msgstr "Блякпул"
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "_Сертифициран ID:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "_Сертифициран ID:"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "_Сертифициран ID:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Общо име"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "_Сертифициран ID:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "_Редактирай"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Неуспех при проверка на сертификати"
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Израз"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Организация"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Организация"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Изглед"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "_Сертифициран ID:"
+
+#: smime/gui/smime-ui.glade.h:42
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "_Сертифициран ID:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Вмъкни"
+msgid "Certificate already exists"
+msgstr "Карта ID вече съществува"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%m/%d/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Върмонт"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Върмонт"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Върмонт"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Върмонт"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "С"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "OK"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "С"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "_Сертифициран ID:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "_Сертифициран ID:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "_Сертифициран ID:"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "1-ви"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+#, fuzzy
+msgid "Subject Public Key Info"
+msgstr ""
+"\n"
+"Публичен Ключ: "
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Темата е %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Не мога да обработя spool папка"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "_Сертифициран ID:"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Неуспех при проверка на сертификати"
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "входящ"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Няма Информация"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "прикачен"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "_Сертифициран ID:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Куритиба"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "Северна Каролина"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Израз"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s в %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Файл с Подпис:"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "_Вмъква"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Темата е %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Файл с Подпис:"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Въведедете парола за %s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "_Сертифициран ID:"
 
 #: tools/evolution-launch-composer.c:324
 #, fuzzy
@@ -15224,7 +16407,7 @@ msgstr "Копира избраното"
 msgid "Copy to Folder..."
 msgstr "Копирай в Папка..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Отрежи избраното"
 
@@ -15242,7 +16425,7 @@ msgstr "Премести избраните съобщения в нова па�
 msgid "Move to Folder..."
 msgstr "Премести в Папка..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Поставя съдържанието на буфера за обмен"
 
@@ -15250,8 +16433,8 @@ msgstr "Поставя съдържанието на буфера за обме�
 msgid "Previews the contacts to be printed"
 msgstr "Преглед на контактите за печат"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Печатен Преглед"
@@ -15297,13 +16480,13 @@ msgstr "Прекрати Зареждането"
 msgid "View the current contact"
 msgstr "текущото време"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "_Действия"
 
@@ -15334,145 +16517,114 @@ msgstr "Изпрати Съобщението на Контакт.."
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "Създава нова поща"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Създава нова поща"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "Създай нова папка"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Създава нова задача"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Създава нова задача"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Ден"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 #, fuzzy
 msgid "Delete All Occurrences"
 msgstr "Изтрии Всички _Събития"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Изтрива срещата"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "Изтрии това С_ъбитие"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "Изтрии това С_ъбитие"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Отиди"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Отива назад"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Отива напред"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Отиди на Дата"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Отва на определена дата"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Отиди на днес"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "List"
 msgstr "Листа"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Месец"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Нова _Среща"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Нова Каледония"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Среща"
-
-#: ui/evolution-calendar.xml.h:27
-msgid "New _Task"
-msgstr "Нова _Задача"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Преглед на календар за печат"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Отпечатай този календар"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Публична Свободна/Заета информация за този календар"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Бургес"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Папката съдържа срещи и събития"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Показва Детайли"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Покажи един ден"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Покажи един месец"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Покажи една седмица"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Покажи работната седмица"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Седмица"
 
@@ -15537,7 +16689,7 @@ msgstr "Запазва тази точка на диска"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Файл"
 
@@ -15764,7 +16916,7 @@ msgstr "Маркирай като _Прочетено"
 msgid "Mark all visible messages as read"
 msgstr "Маркирай всички видими съобщенията като прочетени"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Paste message(s) from the clipboard"
 msgstr "Поставя съобщението в буфера за обмен"
@@ -15821,16 +16973,6 @@ msgstr "_Обърнат Избор"
 msgid "_Threaded Message List"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Затвори този прозорец"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "Затвори"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Addressbook"
@@ -15994,276 +17136,301 @@ msgstr "Препраща избраното съобщение за някой �
 msgid "Increase the text size"
 msgstr "Увеличава размера на текст"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Зарежда _Картинки"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Маркира като Важно"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Отбележи: непрочетено"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Маркирай като Не_важни"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark the selected message(s) as having been read"
 msgstr "Маркира избраните съобщения като прочетени"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark the selected message(s) as important"
 msgstr "Маркира избраните съобщения като важни"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Маркира избраните съобщения като неважни"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Маркира избраните съобщения като непрочетени"
+
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Маркира избраните съобщения като непрочетени"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Маркира избраните съобщения като неважни"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Маркира избраните съобщения за изтриване"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Премести"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
 msgid "Move selected message(s) to another folder"
 msgstr "Премести избраните съобщения в нова папка"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Следващ"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Next _Important Message"
 msgstr "Следващо Важно Съобщение"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Next _Thread"
 msgstr "Следваща Нишка"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "Next _Unread Message"
 msgstr "Следващо Непрочетено Съобщение"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Не е намерен"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Отваря избраните съобщения в нов прозорец"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Отваря избраното съобщение в редактора за препращане"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Оригинален Раз_мер"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "P_revious Unread Message"
 msgstr "Предишно Непрочетено Съобщение"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Отговор на Задача"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "Проврка за нови съобщения във всички папки"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Предишно Важно Съобщение"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Преглед на съобщението за печат"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Предишен"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Отпечатай това Съобщение"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Препраща избраното съобщение за някой"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Възстановява текста в неговият оригинален размер"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "Търсене на съобщение..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "По-_малък"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Съхрани съобщението като текстови файл"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Търсене на текст в тялото на показваното съобщение"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "Set up the page settings for your current printer"
 msgstr "Настройка на страницата за вашият текущ принтер"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Показва Източника на Ел. Поща"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Покажи Пълните Заглавия"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Търсене на текст в тялото на показваното съобщение"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Показва съобщение в нормален стил"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Показва съобщение със всички Пощенски заглавия"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Показва необработено съобщението на Ел. поща"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "Раз_мер на Текст"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Не изтрива избраните съобщения"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "VFolder върху Пощенски списък..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "VFolder върху _Изпращач"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "VFolder върху _Получатели"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "VFolder върху _Тема"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 #, fuzzy
 msgid "_Attached"
 msgstr "Прикрепи"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "_Копирай в Папка"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "_Създай Правило От Съобщението"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "П_репратени съобщения"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 #, fuzzy
 msgid "_Go To"
 msgstr "Отиди"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 #, fuzzy
 msgid "_Inline"
 msgstr "Работа в 'O_nline' "
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "_По-голям"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "Показване на _Съобщение"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "Премести в _Папка"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 #, fuzzy
 msgid "_Next Message"
 msgstr "Следващо Съобщение"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "_Нормално Показване"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "Отваря _Съобщение"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Предишно Съобщение"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 #, fuzzy
 msgid "_Resend..."
 msgstr "Преименувай..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "Инс_трументи"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "Възстанови изтрито"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Затвори този прозорец"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "Затвори"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Прикрепи"
@@ -16550,12 +17717,13 @@ msgid "Change Evolution's settings"
 msgstr "Еволюшън "
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "Изход"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Създава нова задача"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "Прозорец на еволюшън"
+msgid "E_xit"
+msgstr "Изход"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16567,8 +17735,8 @@ msgstr "Внеси данни от други програми"
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "Прозорец на еволюшън"
+msgid "Open a new window"
+msgstr "Отвори в Нов Прозорец"
 
 #: ui/evolution.xml.h:11
 #, fuzzy
@@ -16576,54 +17744,68 @@ msgid "Pi_lot Settings..."
 msgstr "Настройки за Pilot..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Изпращане / Получаване"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "Изпраща опашката от пощи и получава нова"
+
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Mail Конфигурация"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Покажи информация за Ximian Еволюшън"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Изпрати доклад за грешка"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "Изпрати доклад за грешка"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Изпрати доклад за грешка чрез Бъг Бъди"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Превключи"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Превключи работа оф/он-лайн"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "Относно Ximian Еволюшън..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "_Помощ"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "Внеси..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "Нов"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "Изпращане / Получаване"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "Намери Сега"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Печат на Обобщение"
@@ -16765,12 +17947,12 @@ msgstr "Задава Прегледи"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -16908,7 +18090,7 @@ msgstr "Търсене"
 msgid "_Find Now"
 msgstr "Намери Сега"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 #, fuzzy
 msgid "_Clear"
 msgstr "Изчисти"
@@ -16926,24 +18108,259 @@ msgstr ""
 msgid "Text"
 msgstr "Тест"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Изчисти"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Намери Сега"
 
+#~ msgid "Account Name"
+#~ msgstr "Потребителско име"
+
+#~ msgid "Server Name"
+#~ msgstr "Име на сървъра"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Прекъсва текущата пощенска операция"
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "(SSL не се подържа в тази версия на evolution)"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Други Контакти"
+
+#, fuzzy
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Фамилия"
+#~ msgid "Add LDAP Server"
+#~ msgstr "LDAP сървър"
+
+#, fuzzy
+#~ msgid "LDAP Configuration Assistant"
+#~ msgstr "Конфигурация"
+
+#, fuzzy
+#~ msgid "Find contact in"
+#~ msgstr "Изпращача съдържа"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Натиснете тук за да добавите контакт *"
+
+#~ msgid "Business Address"
+#~ msgstr "Работен адрес"
+
+#~ msgid "Department"
+#~ msgstr "Отдел"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "Free-busy адрес"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
 
-#~ msgid "Family Name"
-#~ msgstr "Фамилия"
+#~ msgid "Profession"
+#~ msgstr "Професия"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Отваряне на задачи в %s"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Изпрати въпреки това?"
+
+#, fuzzy
+#~ msgid "Folder _name"
+#~ msgstr "Име на папка:"
+
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "Това съобщение е цифрово подписано. Кликнете на иконата за заключване за "
+#~ "повече информация."
+
+#, fuzzy
+#~ msgid "No signature present"
+#~ msgstr "HTML сигнатурен файл"
+
+#, fuzzy
+#~ msgid "Connecting..."
+#~ msgstr "Свързване със сървъра..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Тази папка не може да съдържа съобщения."
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Не мога да преименувам папката: %s"
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Избор на отдалечена папка за импортиране на тези данни"
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не мога да прехвърля папка:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Add a Folder"
+#~ msgstr "Избери Папка"
+
+#~ msgid "Drafts"
+#~ msgstr "Чернови"
+
+#~ msgid "Outbox"
+#~ msgstr "Outbox"
+
+#~ msgid "Sent"
+#~ msgstr "Изпрати"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Грешка при '%s':\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Syncing Folder"
+#~ msgstr "Синхронизиране на папка"
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Няма показана папка)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(Няма)"
+
+#~ msgid "No error"
+#~ msgstr "Няма грешка"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Папка със същото име вече съществува"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Типа на зададената папка не е валиден"
+
+#~ msgid "I/O error"
+#~ msgstr "Входно/Изходна Грешка"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Няма достатъчно пространство за създаването на папка"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Папката не е празна"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Посочената папка не е намерена"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Функцията не се използва в това хранилище"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Операцията не се подържа"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Зададеният тип не се поддържа в това хранилище"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Посочената папка не може да бъде модифицирана или изтрита"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Не мога да създам папка с това име"
+
+#, fuzzy
+#~ msgid "Checkbox"
+#~ msgstr "Чико"
+
+#~ msgid "CORBA error"
+#~ msgstr "Грешка в CORBA"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Грешен аргумент"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Вече има собственик"
+
+#~ msgid "No owner"
+#~ msgstr "Няма соственик"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Неподържан тип"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Неподържана схема"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Неподържана операция"
+
+#~ msgid "Internal error"
+#~ msgstr "Вътрешна грешка"
+
+#~ msgid "Exists"
+#~ msgstr "Съществуват"
+
+#~ msgid "Invalid URI"
+#~ msgstr "Грешен URI"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Има подпапки"
+
+#~ msgid "No space left"
+#~ msgstr "Няма място"
+
+#~ msgid "Old owner has died"
+#~ msgstr "Старият собственик е умрял"
+
+#, fuzzy
+#~ msgid "Test type"
+#~ msgstr "Тип на файл:"
+
+#, fuzzy
+#~ msgid "Evolution Test Component"
+#~ msgstr "Композер на поща за Evolution."
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "Вмъкни"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Създава нова поща"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Нова _Среща"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Среща"
+
+#~ msgid "New _Task"
+#~ msgstr "Нова _Задача"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "Прозорец на еволюшън"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "Прозорец на еволюшън"
+
+#~ msgid "Toggle"
+#~ msgstr "Превключи"
+
+#~ msgid "Clear"
+#~ msgstr "Изчисти"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Прекъсва текущата пощенска операция"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -17038,9 +18455,6 @@ msgstr "Намери Сега"
 #~ msgid "Evolution VCard importer"
 #~ msgstr "Композер на поща за Evolution."
 
-#~ msgid "Loading..."
-#~ msgstr "Зареждам"
-
 #~ msgid "Searching..."
 #~ msgstr "Търся..."
 
@@ -17092,10 +18506,6 @@ msgstr "Намери Сега"
 #~ msgstr "EBook не е зареден\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "Карта ID вече съществува"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Действието прекратено"
 
@@ -17240,10 +18650,6 @@ msgstr "Намери Сега"
 #~ msgstr "%x"
 
 #, fuzzy
-#~ msgid "Phone"
-#~ msgstr "Понце"
-
-#, fuzzy
 #~ msgid "Birth date"
 #~ msgstr "Дата на раждане"
 
@@ -17256,10 +18662,6 @@ msgstr "Намери Сега"
 #~ msgstr "Амристар"
 
 #, fuzzy
-#~ msgid "ID"
-#~ msgstr "1-ви"
-
-#, fuzzy
 #~ msgid "Last Use"
 #~ msgstr "Поставя"
 
@@ -17273,9 +18675,6 @@ msgstr "Намери Сега"
 #~ msgid "Folder containing contact information"
 #~ msgstr "Папка, която съдържа информацията за контакти"
 
-#~ msgid "LDAP Server"
-#~ msgstr "LDAP сървър"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "LDAP сървър съдържащ информация за контакт"
 
@@ -17287,20 +18686,6 @@ msgstr "Намери Сега"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Папка, която съдържа информацията за контакти"
 
-#~ msgid "_Contact"
-#~ msgstr "_Контакт"
-
-#, fuzzy
-#~ msgid "Create a new contact"
-#~ msgstr "Създай нов контакт"
-
-#~ msgid "New Contact List"
-#~ msgstr "Нов списък с контакти"
-
-#, fuzzy
-#~ msgid "Create a new contact list"
-#~ msgstr "Създай нов списък с контакт"
-
 #~ msgid "Disable Queries"
 #~ msgstr "Забрани търсенето"
 
@@ -17315,9 +18700,6 @@ msgstr "Намери Сега"
 #~ msgid "Is New Card"
 #~ msgstr "Нов"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "Няма карти"
 
@@ -17372,37 +18754,6 @@ msgstr "Намери Сега"
 #~ msgstr "Папката съдържа задачи за правене"
 
 #, fuzzy
-#~ msgid "New appointment"
-#~ msgstr "Нова Среща"
-
-#, fuzzy
-#~ msgid "_Appointment"
-#~ msgstr "Среща"
-
-#, fuzzy
-#~ msgid "New meeting"
-#~ msgstr "Настройки за Източник на Новини"
-
-#, fuzzy
-#~ msgid "M_eeting"
-#~ msgstr "Среща"
-
-#, fuzzy
-#~ msgid "New task"
-#~ msgstr "Нова Задача"
-
-#~ msgid "_Task"
-#~ msgstr "_Задачи"
-
-#, fuzzy
-#~ msgid "New All Day Appointment"
-#~ msgstr "Нова Среща"
-
-#, fuzzy
-#~ msgid "All _Day Appointment"
-#~ msgstr "Нова _Среща"
-
-#, fuzzy
 #~ msgid "Could not update invalid object"
 #~ msgstr "Не мога да обновя обекта!"
 
@@ -17434,10 +18785,6 @@ msgstr "Намери Сега"
 #~ msgstr "Отвори календар в %s"
 
 #, fuzzy
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Отваряне на папка %s"
-
-#, fuzzy
 #~ msgid "Purging event %s"
 #~ msgstr "Сканира на \"%s\""
 
@@ -17467,10 +18814,6 @@ msgstr "Намери Сега"
 #~ "Evolution намери файлове на GnomeCard.\n"
 #~ "Искате ли те да бъдат импортиране в Evolution?"
 
-#, fuzzy
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Интерфейс на Mail Конфигурация"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "Папка съдържаща поща"
 
@@ -17488,25 +18831,12 @@ msgstr "Намери Сега"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Папка на Виртуално Кошче"
 
-#~ msgid "Properties..."
-#~ msgstr "Свойства..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Промяна настройките на тази папка"
 
 #~ msgid "You have not set a mail transport method"
 #~ msgstr "Не се указали метода на изпращане на поща"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Ново _Mail съобщение"
-
-#~ msgid "_Mail Message"
-#~ msgstr "_Пощенско Съобщение"
-
-#, fuzzy
-#~ msgid "Compose a new mail message"
-#~ msgstr "Напиши Съобщение"
-
 #, fuzzy
 #~ msgid "New Message Post"
 #~ msgstr "Ново Съобщение"
@@ -19321,9 +20651,6 @@ msgstr "Намери Сега"
 #~ msgid "Cumberland"
 #~ msgstr "Къмбърленд"
 
-#~ msgid "Curitiba"
-#~ msgstr "Куритиба"
-
 #~ msgid "Curitiba Apt"
 #~ msgstr "Куритиба Апт"
 
@@ -21521,9 +22848,6 @@ msgstr "Намери Сега"
 #~ msgid "Norfolk NAS"
 #~ msgstr "Норфолк"
 
-#~ msgid "North Carolina"
-#~ msgstr "Северна Каролина"
-
 #~ msgid "North Dakota"
 #~ msgstr "Северна Дакота"
 
@@ -22477,9 +23801,6 @@ msgstr "Намери Сега"
 #~ msgid "Veracruz"
 #~ msgstr "Веракруз"
 
-#~ msgid "Vermont"
-#~ msgstr "Върмонт"
-
 #~ msgid "Vernal"
 #~ msgstr "Вернал"
 
@@ -22689,9 +24010,6 @@ msgstr "Намери Сега"
 #~ msgid " F"
 #~ msgstr " F"
 
-#~ msgid " C"
-#~ msgstr " C"
-
 #~ msgid "knots"
 #~ msgstr "възела"
 
@@ -22956,9 +24274,6 @@ msgstr "Намери Сега"
 #~ msgid "Shallow haze"
 #~ msgstr "Незначителна мъгла"
 
-#~ msgid "Spray"
-#~ msgstr "Пръскане"
-
 #~ msgid "Light spray"
 #~ msgstr "Леко пръскане"
 
@@ -23143,19 +24458,6 @@ msgstr "Намери Сега"
 #~ msgid "Remove a folder added with \"Open Other User's Folder\""
 #~ msgstr "Създай нова папка..."
 
-#~ msgid "Send / Receive"
-#~ msgstr "Изпращане / Получаване"
-
-#, fuzzy
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Изпраща опашката от пощи и получава нова"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Превключи показването на панела с папките"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Превключи показването на панела с ускорителите"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Покажи избраната папка"
 
@@ -23185,9 +24487,6 @@ msgstr "Намери Сега"
 #~ msgid "_Rename..."
 #~ msgstr "Преименувай..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "Изпращане / Получаване"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "Панел с ускорители"
 
@@ -23239,10 +24538,6 @@ msgstr "Намери Сега"
 #~ msgstr "_Няма повторение"
 
 #, fuzzy
-#~ msgid "Automatically _detect links"
-#~ msgstr "_Автоматична проверка за нов email"
-
-#, fuzzy
 #~ msgid "Emacs"
 #~ msgstr "Изток"
 
@@ -23343,18 +24638,10 @@ msgstr "Намери Сега"
 #~ msgstr "Фабрика за композитора на Evolution "
 
 #, fuzzy
-#~ msgid "380"
-#~ msgstr "80%"
-
-#, fuzzy
 #~ msgid "<- _Remove"
 #~ msgstr "Махни"
 
 #, fuzzy
-#~ msgid "<< Fewer Options"
-#~ msgstr "Опций"
-
-#, fuzzy
 #~ msgid "DN Customization"
 #~ msgstr "Няма Информация"
 
@@ -23943,9 +25230,6 @@ msgstr "Намери Сега"
 #~ msgid "News Servers"
 #~ msgstr "Новини"
 
-#~ msgid "Source Information"
-#~ msgstr "Източник на Информация"
-
 #~ msgid "newswindow1"
 #~ msgstr "прозорец за новини 1"
 
@@ -23969,9 +25253,6 @@ msgstr "Намери Сега"
 #~ msgid "You may only import to local folders"
 #~ msgstr "Вие може да импортирате само локални папки"
 
-#~ msgid "_Contact List"
-#~ msgstr "Списък _Контакти"
-
 #~ msgid "Insert a file as text into the message"
 #~ msgstr "Вмъкни текстов файл в съобщението"
 
@@ -23984,17 +25265,10 @@ msgstr "Намери Сега"
 #~ msgid "Send _later"
 #~ msgstr "Изпрати по-късно"
 
-#~ msgid "Send the message later"
-#~ msgstr "Изпрати съобщението по-късно"
-
 #~ msgid "_Pilot Settings..."
 #~ msgstr "Настройки за Pilot..."
 
 #, fuzzy
-#~ msgid "Addressbook Settings"
-#~ msgstr "Източници на адреси"
-
-#, fuzzy
 #~ msgid "Could not query for schema information"
 #~ msgstr ""
 #~ "Грешна информация при трасиране:\n"
@@ -24366,25 +25640,11 @@ msgstr "Намери Сега"
 
 #~ msgid ""
 #~ "\n"
-#~ "Comment: "
-#~ msgstr ""
-#~ "\n"
-#~ "Коментар:"
-
-#~ msgid ""
-#~ "\n"
 #~ "Unique String: "
 #~ msgstr ""
 #~ "\n"
 #~ "Уникален Низ: "
 
-#~ msgid ""
-#~ "\n"
-#~ "Public Key: "
-#~ msgstr ""
-#~ "\n"
-#~ "Публичен Ключ: "
-
 #~ msgid "Waiting for connection to LDAP server..."
 #~ msgstr "Чакам за връзка с LDAP сървъра..."
 
@@ -24455,9 +25715,6 @@ msgstr "Намери Сега"
 #~ msgid "Republic Of Moldova"
 #~ msgstr "Молдова"
 
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "Създаване на нова среща с подраз_биращо напомняне"
-
 #~ msgid "First day of wee_k:"
 #~ msgstr "Първи ден от сед_мицата:"
 
@@ -24579,9 +25836,6 @@ msgstr "Намери Сега"
 #~ msgid "Composer"
 #~ msgstr "Композер"
 
-#~ msgid "Default Forward style is: "
-#~ msgstr "Подразбираш се стил на Препращане:"
-
 #~ msgid "Edit..."
 #~ msgstr "Редакция...."
 
@@ -24597,15 +25851,9 @@ msgstr "Намери Сега"
 #~ msgid "_Email Address:"
 #~ msgstr "_Email Адрес:"
 
-#~ msgid "_Log filter actions to:"
-#~ msgstr "Де_йствия за филтриране на журнал за:"
-
 #~ msgid "_Organization:"
 #~ msgstr "_Организация:"
 
-#~ msgid "_Send mail in HTML format by default."
-#~ msgstr "_Изпрати mail в HTML формат по подразбиране."
-
 #~ msgid "_Server Type: "
 #~ msgstr "_Тип Сървър:"
 
diff --git a/po/ca.po b/po/ca.po
index 6caf265d9c..6751c6f86f 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: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-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"
@@ -31,7 +31,170 @@ msgstr "No s'ha pogut carregar %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicació d'adreça del Pilot"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Completat"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Certificates"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Configuració del correu"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+#, fuzzy
+msgid "Contacts"
+msgstr "_Contactes..."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Desa a la llibreta d'adreces"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Utilitat de configuració per al conducte de l'agenda de l'Evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Conducte de la llibreta d'adreces de l'Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Conducte de la llibreta d'adreces de l'Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Conducte de la llibreta d'adreces de l'Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Conducte de la llibreta d'adreces de l'Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr ""
+"No es pot inicialitzar el component de resum del correu de l'Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Utilitat de configuració per al conducte de l'agenda de l'Evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Desa a la llibreta d'adreces"
+
+#: addressbook/gui/component/addressbook-component.c:146
+#, fuzzy
+msgid "Properties..."
+msgstr "Propietats..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Suprimeix"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "Nom de la regla: "
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Visualitza tots els contactes"
+
+#: addressbook/gui/component/addressbook-component.c:218
+#, fuzzy
+msgid "_Contact"
+msgstr "_Contactes..."
+
+#: addressbook/gui/component/addressbook-component.c:219
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Crea un nou contacte"
+
+#: addressbook/gui/component/addressbook-component.c:224
+#, fuzzy
+msgid "New Contact List"
+msgstr "Visualitza tots els contactes"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "_Contactes..."
+
+#: addressbook/gui/component/addressbook-component.c:226
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Crea un nou contacte"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr ""
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+#, fuzzy
+msgid "Work"
+msgstr "S'està movent"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "Servidor LDAP:"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "No s'ha pogut crear el directori %s: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr ""
@@ -39,7 +202,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -47,65 +210,45 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "La resposta del servidor IMAP no contenia la informació %s"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Error en carregar la informació del filtre:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "La resposta del servidor IMAP no contenia la informació %s"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-#, fuzzy
-msgid "Account Name"
-msgstr "conté"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-#, fuzzy
-msgid "Server Name"
-msgstr "Servidor:"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-#, 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-storage.c:178
-#, fuzzy
-msgid "Other Contacts"
-msgstr "Contacte _nou"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is unreachable."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -113,7 +256,7 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -124,11 +267,11 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "No es pot obrir la llibreta d'adreces"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr ""
@@ -136,41 +279,40 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "Si us plau, introduïu la contrasenya NNTP per a %s@%s"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 #, fuzzy
 msgid "Name begins with"
 msgstr "acaba amb"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 #, fuzzy
 msgid "Email begins with"
 msgstr "acaba amb"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 #, fuzzy
 msgid "Category is"
 msgstr "categories"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 #, fuzzy
 msgid "Any field contains"
 msgstr "El cos conté"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 #, fuzzy
 msgid "Advanced..."
 msgstr "Afegeix..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -178,7 +320,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -186,98 +328,42 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 #, fuzzy
 msgid "Any Category"
 msgstr "categories"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "La URI que mostrarà l'agenda"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Certificates"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
 msgstr ""
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-#, fuzzy
-msgid "Contacts"
-msgstr "_Contactes..."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#, fuzzy
-msgid "Directory Servers"
-msgstr "N_ou servidor de directori"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Desa a la llibreta d'adreces"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Configuració del _correu..."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Utilitat de configuració per al conducte de l'agenda de l'Evolution.\n"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Conducte de la llibreta d'adreces de l'Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Conducte de la llibreta d'adreces de l'Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Conducte de la llibreta d'adreces de l'Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Conducte de la llibreta d'adreces de l'Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
 msgstr ""
-"No es pot inicialitzar el component de resum del correu de l'Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -301,6 +387,7 @@ msgstr "Detecta els tipus suportats..."
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -335,8 +422,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Add LDAP Server"
-msgstr "Servidor LDAP:"
+msgid "Addressbook Creation Assistant"
+msgstr "Afegeix una font"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
@@ -355,60 +442,59 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 #, fuzzy
 msgid "Connecting"
 msgstr "S'està recollint el correu des de %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "Nom d'usuari:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Edit LDAP Server"
 msgstr "Servidor LDAP:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address:"
 msgstr "Adreça electrònica:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Finished"
 msgstr "Cerca"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
-msgid "LDAP Configuration Assistant"
-msgstr "Configuració del correu"
+msgid "Group:"
+msgstr "Grup %i"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Never"
 msgstr "Cada"
@@ -433,8 +519,8 @@ msgid "S_earch scope: "
 msgstr "Cerca"
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 #, fuzzy
 msgid "Searching"
 msgstr "Cerca"
@@ -480,28 +566,28 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:47
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-#, fuzzy
-msgid "Step 1: Server Information"
-msgstr "Cap informació"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
-msgid "Step 2: Connecting to Server"
-msgstr "Connexió de prova a \"%s\""
+msgid "Step 2: Server Information"
+msgstr "Cap informació"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr ""
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Connexió de prova a \"%s\""
 
 #: addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
-msgid "Step 4: Display Name"
-msgstr "Fes un so en visualitzar les alarmes"
+msgid "Step 4: Searching the Directory"
+msgstr "Connexió de prova a \"%s\""
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 #, fuzzy
@@ -515,14 +601,6 @@ msgstr "Seleccioneu una carpeta"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -530,7 +608,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -538,7 +616,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -548,43 +626,48 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 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:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 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:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 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:74
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -611,22 +694,30 @@ msgid "Using email address"
 msgstr "Adreça electrònica:"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Visualització"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -634,55 +725,54 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Edita"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 #, fuzzy
 msgid "_Port number:"
 msgstr "Número de port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 #, fuzzy
 msgid "_Search base:"
 msgstr "Cerca"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 #, fuzzy
 msgid "_Server name:"
 msgstr "Servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Durada de l'snooze (minuts)"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid "cards"
 msgstr "No iniciat"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "connecting-tab"
 msgstr "S'està recollint el correu des de %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid "general-tab"
 msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "searching-tab"
 msgstr "Cerca"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Nom"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
+msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 #, fuzzy
@@ -690,7 +780,7 @@ msgid "Remove All"
 msgstr "Elimina"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Elimina"
@@ -722,25 +812,21 @@ msgstr "Contacte _nou"
 msgid "Unnamed Contact"
 msgstr "Contacte _nou"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Nom"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Font"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-#, fuzzy
-msgid "Find contact in"
-msgstr "Cerca un contacte"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Conducte de la llibreta d'adreces de l'Evolution"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
 msgid "Find"
@@ -826,7 +912,8 @@ msgid "D_epartment:"
 msgstr "_Departament:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalls"
 
@@ -898,12 +985,12 @@ msgid "_Categories..."
 msgstr "Ca_tegories..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Suprimeix"
@@ -2122,7 +2209,7 @@ msgid "Esq."
 msgstr ""
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 #, fuzzy
 msgid "Full Name"
 msgstr "Nom complet:"
@@ -2224,11 +2311,26 @@ msgstr "Contacta l'editor"
 msgid "Save List as VCard"
 msgstr "Desa com a VCard"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+#, fuzzy
+msgid "Changed Contact:"
+msgstr "Contacte _nou"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr ""
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr ""
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 #, fuzzy
 msgid "New Contact:"
@@ -2245,21 +2347,6 @@ msgid ""
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-#, fuzzy
-msgid "Changed Contact:"
-msgstr "Contacte _nou"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr ""
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2374,9 +2461,9 @@ msgstr "Reenvia"
 msgid "Send Message to Contact"
 msgstr "FIXME: Nou _missatge per contactar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimeix"
@@ -2402,9 +2489,12 @@ msgstr "Mou a la carpeta"
 msgid "Cut"
 msgstr "Personalitzat"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copia"
 
@@ -2413,16 +2503,8 @@ msgstr "Copia"
 msgid "Paste"
 msgstr "Enganxa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Suprimeix"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 #, fuzzy
 msgid "Current View"
 msgstr "l'hora actual"
@@ -2436,191 +2518,191 @@ msgid ""
 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:2
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 #, 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Fax de la feina"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 #, fuzzy
 msgid "Business Phone"
 msgstr "Feina 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 #, fuzzy
 msgid "Business Phone 2"
 msgstr "Feina 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 #, fuzzy
 msgid "Callback Phone"
 msgstr "Crida de retorn"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
 #, fuzzy
-msgid "Company Phone"
-msgstr "Empresa"
+msgid "Categories"
+msgstr "categories"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 #, fuzzy
-msgid "Department"
-msgstr "_Departament:"
+msgid "Company Phone"
+msgstr "Empresa"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 #, fuzzy
 msgid "Email"
 msgstr "Adreça electrònica 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "Adreça electrònica 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "Adreça electrònica 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#, fuzzy
+msgid "Family Name"
+msgstr "Nom complet:"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 #, fuzzy
 msgid "File As"
 msgstr "Arxiva com:"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
 #, fuzzy
-msgid "Home Address"
-msgstr "Comprova l'adreça"
+msgid "Given Name"
+msgstr "Nom complet:"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Fax particular"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 #, fuzzy
 msgid "Home Phone"
 msgstr "Particular 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "Particular 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "XDSI"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Cap"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Normal"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 #, fuzzy
 msgid "Manager"
 msgstr "Busca"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 #, fuzzy
 msgid "Mobile Phone"
 msgstr "Mòbil"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 #, fuzzy
 msgid "Nickname"
 msgstr "_Sobrenom:"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 #, fuzzy
 msgid "Note"
 msgstr "Cap"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 #, fuzzy
 msgid "Office"
 msgstr "_Oficina"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organització"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-#, fuzzy
-msgid "Other Address"
-msgstr "Comprova l'adreça"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Un altre fax"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 #, fuzzy
 msgid "Other Phone"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Busca"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 #, fuzzy
 msgid "Primary Phone"
 msgstr "Primari"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#, fuzzy
-msgid "Profession"
-msgstr "_Professió:"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Ràdio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#, fuzzy
+msgid "Role"
+msgstr "Mòbil"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 #, fuzzy
 msgid "Spouse"
 msgstr "_Cònjuge:"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 #, fuzzy
-msgid "TTY"
+msgid "TTYTDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Tèlex"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 #, fuzzy
 msgid "Title"
 msgstr "_Títol:"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "No vist"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr ""
 
@@ -2724,11 +2806,21 @@ msgstr "desembre"
 msgid "Job Title"
 msgstr "_Càrrec:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+#, fuzzy
+msgid "Home Address"
+msgstr "Comprova l'adreça"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Comprova l'adreça"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+#, fuzzy
+msgid "Other Address"
+msgstr "Comprova l'adreça"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2741,50 +2833,47 @@ msgstr "Fax particular"
 msgid "Blog"
 msgstr "per sempre"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 #, fuzzy
 msgid "Success"
 msgstr "Fonts"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Error desconegut"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 #, fuzzy
 msgid "Repository offline"
 msgstr "S'està movent"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Permís denegat"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "No s'ha trobat el fitxer"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Contact ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 #, fuzzy
 msgid "Protocol not supported"
 msgstr "Operació no suportada"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
@@ -2792,131 +2881,131 @@ msgstr "Operació no suportada"
 msgid "Cancelled"
 msgstr "Cancel·lat"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "Autenticació:"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Autenticació:"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #, fuzzy
 msgid "Addressbook does not exist"
 msgstr "La carpeta `%s' no existeix."
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 #, fuzzy
 msgid "Other error"
 msgstr "Error d'E/S"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 #, fuzzy
 msgid "_Discard"
 msgstr "Imprimeix l'agenda"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 #, fuzzy
 msgid "Error adding list"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying list"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 #, fuzzy
 msgid "Error removing list"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Error en llegir el fitxer de correu: %s"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, fuzzy
 msgid "Overwrite"
 msgstr "Voleu sobreescriure el fitxer?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, fuzzy, c-format
 msgid "Error saving %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 #, fuzzy
 msgid "list"
 msgstr "és"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "No iniciat"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "No iniciat"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "No iniciat"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "No iniciat"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 #, fuzzy
 msgid "Multiple VCards"
 msgstr "Mou el missatge"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, fuzzy, c-format
 msgid "VCard for %s"
 msgstr "Si us plau, introduïu la contrasenya NNTP per a %s@%s"
@@ -3120,7 +3209,7 @@ msgstr "Marges"
 msgid "Number of columns:"
 msgstr "Nombre de columnes:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Opcions"
 
@@ -3312,18 +3401,18 @@ msgstr "Contacte _nou"
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "No s'ha pogut iniciar el servidor wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "No s'ha pogut iniciar el wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicació d'agenda del Pilot"
 
@@ -3332,27 +3421,95 @@ msgstr "No s'ha pogut llegir el bloc d'aplicació d'agenda del Pilot"
 msgid "Default Priority:"
 msgstr "_Prioritat:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicació de coses per fer del Pilot"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "_Paràmetres"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Agenda"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "_Paràmetres"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Configuració del correu"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Conducte de l'agenda de l'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Conducte de l'agenda de l'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Conducte de l'agenda de l'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Conducte de les coses per fer de l'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr ""
+"No es pot inicialitzar el component de resum del correu de l'Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Tasques"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Conducte de l'agenda de l'Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 #, fuzzy
 msgid "Starting:"
 msgstr "_Paràmetres"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 #, fuzzy
 msgid "Ending:"
 msgstr "Ombrejat"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, fuzzy, c-format
 msgid "Alarm on %s"
 msgstr "Alarmes"
@@ -3423,86 +3580,213 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Envia aquest missatge"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Conducte de l'agenda de l'Evolution"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "No s'ha pogut crear el directori temporal: %s"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 #, fuzzy
 msgid "invalid time"
 msgstr "Hora de _finalització:"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "Agenda"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Element per fer que venç avui:"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Element per fer que venç avui:"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "Mostra les hores d'acabament de les cites"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Previsualitza el missatge que s'ha d'imprimir"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#, fuzzy
+msgid "Units of default reminder"
+msgstr "Crea una nova cita"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Suprimeix la tasca"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Mostra els números de les setmanes"
+
+#: calendar/gui/cal-search-bar.c:49
 #, fuzzy
 msgid "Summary contains"
 msgstr "conté"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 #, fuzzy
 msgid "Description contains"
 msgstr "Descripció:"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 #, fuzzy
 msgid "Comment contains"
 msgstr "conté"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
 "events."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "és més petit que"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "dies"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 #, fuzzy
 msgid "%A %d %B %Y"
 msgstr "%A, %d de %B de %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 #, fuzzy
 msgid "%d %B %Y"
 msgstr "%A, %d de %B de %Y"
@@ -3510,48 +3794,81 @@ msgstr "%A, %d de %B de %Y"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "_Imprimeix aquest agenda"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Visualitza tots els contactes"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
 #, fuzzy
-msgid "Rename"
-msgstr "Nom de la regla: "
+msgid "New appointment"
+msgstr "Nova cita..."
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:633
+#, fuzzy
+msgid "_Appointment"
+msgstr "Cites:"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr ""
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Crea una nova cita"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
+#: calendar/gui/calendar-component.c:639
 #, fuzzy
-msgid "Work"
-msgstr "S'està movent"
+msgid "New meeting"
+msgstr "Cancel·lat"
+
+#: calendar/gui/calendar-component.c:640
+#, fuzzy
+msgid "M_eeting"
+msgstr "Cancel·lat"
+
+#: calendar/gui/calendar-component.c:641
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Crea un nou contacte"
+
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Nova cita..."
+
+#: calendar/gui/calendar-component.c:647
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "Nova cita..."
+
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Crea una nova cita"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3685,7 +4002,7 @@ msgstr "Envia \"%s\""
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr ""
 
@@ -3702,6 +4019,10 @@ msgstr "hores"
 msgid "minutes"
 msgstr "minuts"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 #, fuzzy
@@ -3739,8 +4060,8 @@ msgstr "S'està recollint el correu des de %s"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Resum:"
 
@@ -3772,7 +4093,7 @@ msgstr "Recorda'm totes les cites"
 msgid "hour(s)"
 msgstr "hores"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 #, fuzzy
 msgid "minute(s)"
 msgstr "minuts"
@@ -3832,7 +4153,7 @@ msgstr "Dies"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Divendres"
 
@@ -3846,7 +4167,7 @@ msgstr "Minuts"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Dilluns"
 
@@ -3857,7 +4178,7 @@ msgstr "dg."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Dissabte"
 
@@ -3872,7 +4193,7 @@ msgstr "Mostra els números de les setmanes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Diumenge"
 
@@ -3893,7 +4214,7 @@ msgstr "Tasques"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Dijous"
 
@@ -3912,7 +4233,7 @@ msgstr "Format de l'hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Dimarts"
 
@@ -3922,12 +4243,12 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Dimecres"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 #, fuzzy
 msgid "Work Week"
 msgstr "Setmana de treball"
@@ -3971,7 +4292,7 @@ msgid "_Fri"
 msgstr "dv."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_General"
 msgstr "General"
@@ -4021,85 +4342,85 @@ msgstr "dc."
 msgid "before every appointment"
 msgstr "Recorda'm totes les cites"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
@@ -4109,186 +4430,191 @@ msgstr ""
 msgid "Validation error: %s"
 msgstr "Error desconegut: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 #, fuzzy
 msgid " (Completed "
 msgstr "% comp_let:"
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 #, fuzzy
 msgid "Completed "
 msgstr "% comp_let:"
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 #, fuzzy
 msgid "Due "
 msgstr "Data de venciment"
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 #, fuzzy
 msgid "Could not update object"
 msgstr "No s'han pogut actualitzar correctament els fitxers"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Edita una cita"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Tasca - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada al diari - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Sense resum"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Anomena i desa..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Fitxer de signatura:"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 #, fuzzy
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 #, fuzzy
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 #, fuzzy
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 msgid "The journal entry could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr ""
 
@@ -4307,48 +4633,48 @@ msgstr "Suprimeix"
 msgid "Enter Delegate"
 msgstr "Suprimeix"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 #, fuzzy
 msgid "Appointment"
 msgstr "Cites:"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Recordatori"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Recurrència"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 #, fuzzy
 msgid "Scheduling"
 msgstr "Seleccioneu una carpeta"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 #, fuzzy
 msgid "Meeting"
 msgstr "Cancel·lat"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Data d'ini_ci:"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 #, fuzzy
 msgid "Start time is wrong"
 msgstr "Hora d'_inici:"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr ""
 
@@ -4424,31 +4750,31 @@ msgid "_Start time:"
 msgstr "Hora d'_inici:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Cap"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Suprimeix"
@@ -4497,22 +4823,15 @@ msgid "Member"
 msgstr "desembre"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-#, fuzzy
-msgid "Role"
-msgstr "Mòbil"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 #, fuzzy
 msgid "Status"
@@ -4535,6 +4854,7 @@ msgid "_Invite Others..."
 msgstr "_Invita a altres..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4567,6 +4887,7 @@ msgid "Could not create directory for new calendar"
 msgstr "No s'ha pogut crear el directori %s: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "S'ha rebut el missatge"
@@ -4596,32 +4917,57 @@ msgstr "Cap informació"
 msgid "Calendar Name"
 msgstr "Agenda"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "No s'ha pogut crear el directori %s: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Cap informació"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Tasques"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Tasques"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Tasques"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 msgid "This and Prior Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 #, fuzzy
 msgid "All Instances"
 msgstr "Afegeix..."
@@ -4674,11 +5020,16 @@ msgstr "dia"
 msgid "on the"
 msgstr "mes"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 #, fuzzy
 msgid "occurrences"
 msgstr "aparicions"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Data d'enviament"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 #, fuzzy
 msgid "A_dd"
@@ -4750,7 +5101,7 @@ msgstr "setmana(es)"
 msgid "year(s)"
 msgstr "any(s)"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 #, fuzzy
 msgid ""
 "This event has been changed, but has not been saved.\n"
@@ -4761,32 +5112,32 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 #, fuzzy
 msgid "Save Event"
 msgstr "Agenda"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "% comp_let:"
@@ -4797,44 +5148,44 @@ msgid "% _Complete"
 msgstr "% comp_let:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 #, fuzzy
 msgid "Completed"
 msgstr "% comp_let:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Alta"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "En procés"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Baixa"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "No iniciat"
 
@@ -4844,7 +5195,7 @@ msgid "Progress"
 msgstr "En procés"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr ""
 
@@ -4866,23 +5217,23 @@ msgstr "_Estat:"
 msgid "_Web Page:"
 msgstr "Adreça de pàgina web:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 #, fuzzy
 msgid "Basic"
 msgstr "Enganxa"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 #, fuzzy
 msgid "Assignment"
 msgstr "Assigna una puntuació"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4891,9 +5242,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "Confidencial"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Descripció:"
 
@@ -5006,27 +5357,21 @@ msgstr "%2$s%1$s"
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Públic"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-#, fuzzy
-msgid "Categories"
-msgstr "categories"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -5040,31 +5385,29 @@ msgid "Start Date"
 msgstr "Data d'ini_ci:"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 #, fuzzy
 msgid "Summary"
 msgstr "R_esum"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr "Colors"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Cites:"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 #, fuzzy
 msgid "Free"
 msgstr "setmana"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Ocupat"
 
@@ -5076,7 +5419,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "E"
 
@@ -5084,7 +5427,7 @@ msgstr "E"
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -5094,7 +5437,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -5102,7 +5445,7 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 #, fuzzy
@@ -5111,17 +5454,17 @@ msgstr "Ara"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Desconegut"
 
@@ -5135,205 +5478,203 @@ msgstr "Recurrència"
 msgid "Assigned"
 msgstr "Assigna una puntuació"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Suprimeix un contacte"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Nova cita..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Esdeveniment per a _tot el dia"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 #, fuzzy
 msgid "New Meeting"
 msgstr "Cancel·lat"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 #, fuzzy
 msgid "New Task"
 msgstr "Tasca"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 #, fuzzy
 msgid "_Print..."
 msgstr "Imprimeix..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 #, fuzzy
 msgid "_Paste"
 msgstr "Enganxa"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 #, fuzzy
 msgid "Go to _Today"
 msgstr "Vés a avui"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Vés a una data"
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "Cap informació"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-#, fuzzy
-msgid "_Settings..."
-msgstr "_Paràmetres"
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 #, fuzzy
 msgid "_Open"
 msgstr "_Obre"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 #, fuzzy
 msgid "_Save As..."
 msgstr "Anomena i desa..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 #, fuzzy
 msgid "_Copy"
 msgstr "Copia"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Seleccioneu una carpeta"
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "FIXME: Reenvia com a v_Calendar"
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Suprimeix-ne aquesta aparició"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Suprimeix-ne totes les aparicions"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+#, fuzzy
+msgid "_Settings..."
+msgstr "_Paràmetres"
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "FIXME: _Obre la pàgina web"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Assign Task"
 msgstr "_Tasca (FIXME)"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "FIXME: Reenvia com a v_Calendar"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Marca com a completa"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Marca com a completa"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Suprimeix la tasca"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
@@ -5348,8 +5689,8 @@ msgstr "% comp_let:"
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 #, fuzzy
 msgid "Complete"
 msgstr "% comp_let:"
@@ -5382,18 +5723,18 @@ msgid "URL"
 msgstr "URL:"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5412,7 +5753,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A, %d de %B"
 
@@ -5425,495 +5766,494 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "Recurrència simple"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
 msgid "Every day"
 msgstr "Cada"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, fuzzy, c-format
 msgid "Every %d days"
 msgstr "dies"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 #, fuzzy
 msgid "Every week"
 msgstr "Cada"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, fuzzy, c-format
 msgid "Every %d weeks"
 msgstr "setmanes"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, fuzzy, c-format
 msgid "Every %d weeks on "
 msgstr "setmanes"
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 #, fuzzy
 msgid " and "
 msgstr "_Envia"
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 #, fuzzy
 msgid "every month"
 msgstr "mes"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 #, fuzzy
 msgid "Every year"
 msgstr "Cada"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Hora de _finalització de la reunió:"
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "% comp_let:"
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "Descripció:"
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "Cap informació"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Agenda"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 #, fuzzy
 msgid "An unknown person"
 msgstr "Error desconegut"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 #, fuzzy
 msgid "Location:"
 msgstr "_Accions"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 #, fuzzy
 msgid "Status:"
 msgstr "_Estat:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 #, fuzzy
 msgid "Accepted"
 msgstr "set"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Tentatiu"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 #, fuzzy
 msgid "Declined"
 msgstr "Suprimeix"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Fitxer de signatura:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 #, fuzzy
 msgid "Update"
 msgstr "ha estat després de"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 #, fuzzy
 msgid "Accept"
 msgstr "set"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "Tentatiu"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 #, fuzzy
 msgid "Decline"
 msgstr "Suprimeix"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 #, fuzzy
 msgid "Cancel"
 msgstr "Cancel·lat"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, 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:1271
+#: calendar/gui/e-itip-control.c:1269
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1270
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Cancel·lat"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1277
+#: calendar/gui/e-itip-control.c:1275
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Hora de _finalització de la reunió:"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1282
+#: calendar/gui/e-itip-control.c:1280
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "FIXME: Pe_tició de cita"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, 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:1290
+#: calendar/gui/e-itip-control.c:1288
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Cancel·lat"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, 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:1298
+#: calendar/gui/e-itip-control.c:1296
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Fitxer de signatura:"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "_Edita el missatge"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
 #, fuzzy
 msgid "Task Information"
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
 #, fuzzy
 msgid "Task Proposal"
 msgstr "TaskPad"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, 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:1344
+#: calendar/gui/e-itip-control.c:1342
 #, fuzzy
 msgid "Task Update"
 msgstr "ha estat després de"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, 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:1349
+#: calendar/gui/e-itip-control.c:1347
 #, fuzzy
 msgid "Task Update Request"
 msgstr "FIXME: _Petició de tasca"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, 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:1357
+#: calendar/gui/e-itip-control.c:1355
 #, fuzzy
 msgid "Task Reply"
 msgstr "Respon"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, 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:1365
+#: calendar/gui/e-itip-control.c:1363
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Cancel·lat"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Agenda"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1391
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1396
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "Imprimeix el missatge"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, 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:1403
+#: calendar/gui/e-itip-control.c:1401
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Imprimeix el missatge"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Imprimeix el missatge"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "S'està afegint un missatge sense cap assumpte"
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Data completa:"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "No es pot executar el Bug Buddy."
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 #, 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:1951
+#: calendar/gui/e-itip-control.c:1949
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Tots els assistents"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Tots els assistents"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% comp_let:"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Data d'enviament"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -6091,7 +6431,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -6155,103 +6495,89 @@ msgstr "Hora d'_inici de la reunió:"
 msgid "Meeting _end time:"
 msgstr "Hora de _finalització de la reunió:"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "Data d'ini_ci:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 msgid "Due Date:"
 msgstr "Data de venciment:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "_Prioritat:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Pàgina"
 
-#: calendar/gui/e-tasks.c:715
-#, fuzzy, c-format
-msgid "Opening tasks at %s"
-msgstr "S'estan escanejant les carpetes de \"%s\""
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "No s'ha pogut carregar l'agenda en `%s'"
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "El mètode necessari per carregar `%s' no està suportat"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, 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:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Completat"
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Suprimeix un contacte"
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 #, fuzzy
 msgid "Expunging"
 msgstr "_Esborra"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Tasques"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Agenda"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, 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:1752
+#: calendar/gui/gnome-cal.c:1751
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "El mètode necessari per carregar `%s' no està suportat"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarmes"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6259,7 +6585,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6267,66 +6593,11 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Tasca"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#, fuzzy
-msgid "Calendar and Tasks"
-msgstr "_Paràmetres"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Agenda"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "_Paràmetres"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Configuració del correu"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Conducte de l'agenda de l'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Conducte de l'agenda de l'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Conducte de l'agenda de l'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Conducte de les coses per fer de l'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr ""
-"No es pot inicialitzar el component de resum del correu de l'Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "No es pot inicialitzar el component de correu de l'Evolution."
-
 #: calendar/gui/goto-dialog.glade.h:1
 #, fuzzy
 msgid "April"
@@ -6397,312 +6668,351 @@ msgstr "octubre"
 msgid "September"
 msgstr "setembre"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 #, fuzzy
 msgid "Event information"
 msgstr "Cap informació"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 #, fuzzy
 msgid "Task information"
 msgstr "Cap informació"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 #, fuzzy
 msgid "Journal information"
 msgstr "Cap informació"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Cap informació"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 #, fuzzy
 msgid "Calendar information"
 msgstr "Cap informació"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 #, fuzzy
 msgid "Updated"
 msgstr "ha estat després de"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 #, fuzzy
 msgid "Refresh"
 msgstr "Refresca la llista"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Cap informació"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 #, fuzzy
 msgid "iCalendar information"
 msgstr "Cap informació"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Dg"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Dl"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Dm"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Dc"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Dj"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Dv"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Ds"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 #, fuzzy
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Avui (%a, %d de %b de %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a, %d de %b de %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, fuzzy, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Aquesta setmana (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 #, fuzzy
 msgid "Selected month (%b %Y)"
 msgstr "Aquest mes (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 #, fuzzy
 msgid "Selected year (%Y)"
 msgstr "Enguany (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 #, fuzzy
 msgid "Task"
 msgstr "Tasca"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, fuzzy, c-format
 msgid "Status: %s"
 msgstr "_Estat:"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "_Prioritat:"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, fuzzy, c-format
 msgid "Percent Complete: %i"
 msgstr "Marca la tasca com a completa"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, fuzzy, c-format
 msgid "URL: %s"
 msgstr "URL:"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, fuzzy, c-format
 msgid "Categories: %s"
 msgstr "categories"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 #, fuzzy
 msgid "Contacts: "
 msgstr "_Contactes..."
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Previsualització d'impressió"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 #, fuzzy
 msgid "Print Item"
 msgstr "Imprimeix aquest element"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 #, fuzzy
 msgid "Print Setup"
 msgstr "Configuració de la pàgina:"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Elimina aquest grup de dreceres"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Tasques"
+
+#: calendar/gui/tasks-component.c:590
+#, fuzzy
+msgid "New task"
+msgstr "Tasca"
+
+#: calendar/gui/tasks-component.c:591
+#, fuzzy
+msgid "_Task"
+msgstr "Tasca"
+
+#: calendar/gui/tasks-component.c:592
+#, fuzzy
+msgid "Create a new task"
+msgstr "Crea un nou contacte"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "La URI que mostrarà l'agenda"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6710,12 +7020,12 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Envia aquest missatge"
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Imprimeix l'agenda"
@@ -6749,23 +7059,23 @@ msgstr "Agenda"
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Recordatori"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Agenda"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "_Obre una agenda"
@@ -8329,32 +8639,32 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 #, fuzzy
 msgid "Signing is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 #, fuzzy
 msgid "Verifying is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 #, fuzzy
 msgid "Encryption is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 #, fuzzy
 msgid "You may not import keys with this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 #, fuzzy
 msgid "You may not export keys with this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
@@ -8402,94 +8712,94 @@ msgstr "S'estan escanejant les carpetes de \"%s\""
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "No s'ha pogut crear el conducte a %s: %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "No s'ha pogut crear el directori %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 #, fuzzy
 msgid "Syncing folders"
 msgstr "S'està sincronitzant \"%s\""
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "No es pot obrir la llibreta d'adreces"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "S'està escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 #, fuzzy
 msgid "Cannot open message"
 msgstr "No es pot recuperar el missatge: %s"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 #, fuzzy
 msgid "Syncing folder"
 msgstr "S'està sincronitzant \"%s\""
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "S'està escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "S'està escrivint el missatge %d de %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "adjunció"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "adjunció"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error en desar el fitxer: %s"
@@ -8521,41 +8831,41 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 #, fuzzy
 msgid "Moving messages"
 msgstr "Còpia de missatges"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 #, fuzzy
 msgid "Copying messages"
 msgstr "Còpia de missatges"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8563,47 +8873,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 #, fuzzy
 msgid "Cancelled."
 msgstr "Cancel·lat"
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 #, fuzzy
 msgid "No data provided"
 msgstr "(Cap carpeta mostrada)"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8611,49 +8921,61 @@ msgid ""
 "%s"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "No s'han pogut escriure les dades: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr "No s'ha pogut crear el conducte: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "No s'ha pogut crear el conducte: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "No s'han pogut escriure les dades: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Edita el missatge"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "No s'ha pogut recuperar el missatge %s del servidor POP: %s"
@@ -8754,15 +9076,15 @@ msgstr "Error en escriure el fitxer temporal de correu: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Error en escriure el fitxer temporal de correu: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 #, fuzzy
 msgid "parse error"
 msgstr "Error d'E/S"
@@ -9094,12 +9416,12 @@ msgstr "Proveïdor de correu de la carpeta virtual"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Per llegir correu com a consulta d'un altre joc de carpetes"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "No hi ha cap proveïdor disponible per al protocol `%s'"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9108,72 +9430,84 @@ msgstr ""
 "No s'ha pogut crear el directori %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Si us plau, introduïu la vostra contrasenya PGP/GPG."
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Especifiqueu la capçalera"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Afegeix un criteri"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Afegeix un criteri"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Configuració del correu"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 msgid "Signing certificate not trusted"
 msgstr ""
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Fitxer de signatura:"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Error d'E/S"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Servidor:"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "No es pot bifurcar %s: %s"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+#, fuzzy
+msgid "Trash"
+msgstr "Tasca"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "juny"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr ""
@@ -9364,7 +9698,7 @@ msgid ""
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, fuzzy, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
@@ -9386,22 +9720,22 @@ msgstr "L'ordinador central %s no existeix."
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Comprova si hi ha nou correu"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "No es pot bifurcar %s: %s"
@@ -9482,7 +9816,7 @@ msgstr "Missatge de _correu (FIXME)"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9496,7 +9830,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #, fuzzy
 msgid "No such message"
@@ -9539,58 +9873,76 @@ msgstr "Missatge de _correu (FIXME)"
 
 #: camel/providers/imap/camel-imap-provider.c:43
 #, fuzzy
+msgid "Connection to Server"
+msgstr "No s'ha pogut connectar al servidor POP en %s."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr ""
+"No es pot autenticar davant del servidor IMAP.\n"
+"%s\n"
+"\n"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "_Empresa:"
+
+#: camel/providers/imap/camel-imap-provider.c:50
+#, fuzzy
 msgid "Checking for new mail"
 msgstr "Comprova si hi ha nou correu"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 #, fuzzy
 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:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Carpetes"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 #, fuzzy
 msgid "Show only subscribed folders"
 msgstr "Escaneja les carpetes de \"%s\""
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 #, fuzzy
 msgid "Namespace"
 msgstr "Nom:"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "Comprova si hi ha nou correu"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 #, fuzzy
 msgid "IMAP"
 msgstr "IMAPv4"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Per llegir i emmagatzemar correu en servidors IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Contrasenya"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9854,7 +10206,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta `%s': %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
@@ -9976,30 +10328,30 @@ msgstr "Còpia de missatges"
 msgid "Storing folder"
 msgstr "S'està sincronitzant \"%s\""
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "No es pot obrir la bústia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "Obre l'agenda"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, fuzzy, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "No es pot afegir el missatge al fitxer mbox: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -10008,11 +10360,11 @@ msgstr ""
 "No es pot recuperar el missatge: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -10080,12 +10432,17 @@ msgstr "No s'ha pogut crear el directori %s: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "Ja existeix una carpeta amb el mateix nom"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta `%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "El nom de carpeta indicat no és vàlid."
@@ -10133,7 +10490,7 @@ msgstr "No s'ha pogut tancar la carpeta font %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "No es pot tancar la carpeta temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
@@ -10424,7 +10781,7 @@ msgstr "Suprimeix la tasca"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -10516,7 +10873,7 @@ msgid "No such folder `%s'."
 msgstr "La carpeta `%s' no existeix."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10574,7 +10931,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Lliurament de correu mitjançant el programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr ""
 
@@ -10757,7 +11114,7 @@ msgstr "Lliurament de correu mitjançant el programa sendmail"
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 #, fuzzy
 msgid "Sending message"
 msgstr "Envia aquest missatge"
@@ -10890,7 +11247,7 @@ msgstr "%.1fM"
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "adjunció"
 
@@ -10935,14 +11292,14 @@ msgstr "Tipus de MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Cal que configureu una identitat\n"
 "abans de poder redactar correu."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Feu clic aquí per a la llibreta d'adreces"
 
@@ -10953,7 +11310,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:513
+#: composer/e-msg-composer-hdrs.c:510
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Respon"
@@ -10961,38 +11318,38 @@ msgstr "Respon"
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Assumpte:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Per a:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Introduïu els destinataris del missatge"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Întroduïu les adreces que rebran una còpia del missatge"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -11003,16 +11360,21 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "Prioritat:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 #, fuzzy
 msgid "Posting destination"
 msgstr "Descripció:"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Adjunta un fitxer al missatge"
+
 #: composer/e-msg-composer-select-file.c:119
 #, fuzzy
 msgid "Attach file(s)"
@@ -11047,56 +11409,56 @@ msgstr ""
 msgid "Error saving file: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "No s'ha pogut recuperar el missatge %s del servidor POP: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11107,36 +11469,36 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Reenvia el missatge"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Obre un fitxer"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 #, fuzzy
 msgid "Signature:"
 msgstr "Fitxer de signatura:"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Redacta un missatge"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -11145,14 +11507,14 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr "No s'ha pogut crear la finestra del redactor."
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr "No s'ha pogut crear la finestra del redactor."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11160,12 +11522,12 @@ msgstr ""
 
 #: data/evolution.desktop.in.in.h:1
 #, fuzzy
-msgid "The Evolution groupware suite"
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Barra de _dreceres de l'Evolution"
 
 #: data/evolution.desktop.in.in.h:2
 #, fuzzy
-msgid "Ximian Evolution"
+msgid "Ximian Evolution (Unstable)"
 msgstr "Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -11432,13 +11794,13 @@ msgstr "%H:%M:%S%n"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11570,7 +11932,7 @@ msgstr "Aleshores"
 msgid "You must specify a folder."
 msgstr "Nom de l'estil:"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Seleccioneu una carpeta"
@@ -11584,26 +11946,26 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 #, fuzzy
 msgid "To Do"
 msgstr "Per a"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 #, fuzzy
 msgid "Later"
 msgstr "després de"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Comprova"
 
@@ -11716,7 +12078,7 @@ msgstr "fa"
 msgid "months"
 msgstr "mesos"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "segons"
 
@@ -11824,7 +12186,7 @@ msgstr "Expressió"
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 #, fuzzy
 msgid "Label"
 msgstr "etiqueta9"
@@ -11905,121 +12267,127 @@ msgid "Source Account"
 msgstr "conté"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "dies"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Especifiqueu la capçalera"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Atura el processament"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Assumpte"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "Estat de la connexió"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "conté"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "no conté"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "no acaba amb "
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "no existeix"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 #, fuzzy
 msgid "does not return"
 msgstr "no existeix"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 #, fuzzy
 msgid "does not sound like"
 msgstr "no acaba amb "
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "no comença per"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "acaba amb"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "existeix"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 #, fuzzy
 msgid "is after"
 msgstr "ha estat després de"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "is before"
 msgstr "ha estat abans de"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "és més gran que"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "és més petit que"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 #, fuzzy
 msgid "is not Flagged"
 msgstr "no és"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "no és"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "és"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 #, fuzzy
 msgid "returns greater than"
 msgstr "és més gran que"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 #, fuzzy
 msgid "returns less than"
 msgstr "és més petit que"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 #, fuzzy
 msgid "returns"
 msgstr "Ocupat"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "comença per"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
@@ -12048,20 +12416,92 @@ msgstr "Nom de la regla: "
 msgid "Score Rules"
 msgstr "Edita la regla de puntuació"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "Suprimeix aquest element"
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 #, fuzzy
 msgid "VFolder source"
 msgstr "Fonts de la vFolder"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#, fuzzy
+msgid "Composer Preferences"
+msgstr "Preferències de l'agenda"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Configuració del correu"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Configuració del correu"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr ""
+"No es pot inicialitzar el component de resum del correu de l'Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr ""
+"No es pot inicialitzar el component de resum del correu de l'Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+#, fuzzy
+msgid "Mail"
+msgstr "_Correu"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "conté"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "Preferències"
+
 #: mail/em-account-prefs.c:233
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
@@ -12111,7 +12551,7 @@ msgid "Protocol"
 msgstr ""
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 #, fuzzy
 msgid "Unnamed"
 msgstr "Contacte _nou"
@@ -12141,19 +12581,15 @@ msgstr "Afegeix un criteri"
 msgid "Signature(s)"
 msgstr "Fitxer de signatura:"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 
-#: mail/em-composer-utils.c:129
-#, fuzzy
-msgid "Send anyway?"
-msgstr "S'està recollint el correu des de %s"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -12161,29 +12597,29 @@ msgstr ""
 "Aquest missatge no té cap assumpte.\n"
 "Voleu que l'enviï igualment?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 #, fuzzy
 msgid "This message contains only Bcc recipients."
 msgstr "S'està afegint un missatge sense cap assumpte"
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Cal que indiqueu els destinataris per poder enviar aquest missatge."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -12194,211 +12630,430 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Carpetes virtuals"
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-#, fuzzy
-msgid "Mail"
-msgstr "_Correu"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<feu clic aquí per seleccionar una carpeta>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, fuzzy, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "Obre a %s..."
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#, fuzzy
+msgid "Create New Folder"
+msgstr "_Crea una carpeta nova..."
+
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#, fuzzy
+msgid "Specify where to create the folder:"
+msgstr "No hi ha espai suficient per crear la carpeta"
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
-msgid "Folder _name"
+msgid "Folder _name:"
 msgstr "Nom del fitxer:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "No s'ha pogut crear el directori temporal: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "No s'ha pogut crear el directori temporal: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "No s'ha pogut crear la mbox temporal `%s': %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "No es pot tancar la carpeta temporal: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+#, fuzzy
+msgid "Loading..."
+msgstr "_Paràmetres"
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, fuzzy, c-format
+msgid "%s"
+msgstr "s"
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 #, fuzzy
 msgid "Select folder"
 msgstr "Seleccioneu una carpeta"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Creació d'una nova carpeta"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Suprimeix la tasca"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, fuzzy, c-format
+msgid "Delete \"%s\""
+msgstr "Crea \"%s\""
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, fuzzy, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "S'estan escanejant les carpetes de \"%s\""
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+#, fuzzy
+msgid "Rename Folder"
+msgstr "S'estan escanejant les carpetes de \"%s\""
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Propietats de l'adjunció"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+#, fuzzy
+msgid "Properties"
+msgstr "Propietats..."
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "Nom del fitxer:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Visualitza"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Obre'l en una nova finestra"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Mou"
+
+#: mail/em-folder-tree.c:1500
+#, fuzzy
+msgid "_New Folder..."
+msgstr "Nova VFolder"
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+#, fuzzy
+msgid "_Rename"
+msgstr "Nom de la regla: "
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+msgid "_Properties..."
+msgstr "Propietats..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "_Anomena i desa..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "_Imprimeix"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Respon al remitent"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Respon a _tots"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Respon a _tots"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "_Reenvia"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "% comp_let:"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Agenda"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Mar_k as Read"
 msgstr "Mar_ca'l com a llegit"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Marca'l com a per _llegir"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Marca'l com a per _llegir"
+
+#: mail/em-folder-view.c:706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Suprimeix"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Mou a la carpeta"
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "_Copia a la carpeta"
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Desa a la llibreta d'adreces"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "_Aplica els filtres"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Carpetes virtuals"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "VFolder sobre l'assumpte"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "VFolder sobre el remite_nt"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "VFolder sobre els destinata_ris"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "VFolder sobre el remitent"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Filtre sobre l'assumpte"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "Filtre sobre el remitent"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Filtre sobre els destinataris"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filtre sobre el remitent"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default"
 msgstr "Valors predeterminats"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Imprimeix el missatge"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "_Contacte (FIXME)"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Camí:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Assigna una puntuació"
+
+#: mail/em-format-html-display.c:597
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
 msgstr ""
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Afegeix un criteri"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Afegeix un criteri"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+msgid "Unencrypted"
+msgstr ""
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+#, fuzzy
+msgid "Encrypted, weak"
+msgstr "Edita el missatge"
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "Edita el missatge"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+#, fuzzy
+msgid "Encrypted, strong"
+msgstr "Edita el missatge"
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Consulta cancel·lada per l'usuari."
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "No s'ha pogut recuperar el missatge %s del servidor POP: %s"
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Visualitza en línia"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Amaga"
@@ -12408,195 +13063,217 @@ msgstr "Amaga"
 msgid "Page %d of %d"
 msgstr "S'està escrivint el missatge %d de %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-
-#: mail/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-#, fuzzy
-msgid "No signature present"
-msgstr "Fitxer de signatura:"
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "No s'ha pogut inicialitzar el Bonobo"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Consulta cancel·lada per l'usuari."
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 #, 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/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Còpia de missatges"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 #, fuzzy
 msgid "From"
 msgstr "De:"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 #, fuzzy
 msgid "Reply-To"
 msgstr "Respon"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Per a"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 #, fuzzy
 msgid "Mailer"
 msgstr "_Correu"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 #, fuzzy
 msgid "Date"
 msgstr "Data de venciment"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "adjunció"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
+msgid "Session not initialised"
+msgstr "No s'ha pogut inicialitzar el Bonobo"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
 
-#: mail/em-popup.c:593
+#: mail/em-format.c:1212
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "_Paràmetres"
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "S'està creant \"%s\""
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Missatge de _correu (FIXME)"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "No s'ha pogut crear el conducte a %s: %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "No s'ha pogut crear el conducte a %s: %s"
+
+#: mail/em-popup.c:599
 #, fuzzy
 msgid "Save As..."
 msgstr "Anomena i desa..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Respon al remitent"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Obre'l en una nova finestra"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "FIXME: Nou _missatge per contactar"
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Desa a la llibreta d'adreces"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Obre a %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "La resposta del servidor IMAP no contenia la informació %s"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Subscriu-me"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 #, fuzzy
 msgid "Folder"
 msgstr "Carpetes"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 #, fuzzy
 msgid "No server has been selected"
 msgstr "S'ha rebut el missatge"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 #, fuzzy
 msgid "Don't show this message again."
 msgstr "Envia aquest missatge"
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12605,28 +13282,28 @@ msgstr ""
 "Error en carregar la informació del filtre:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 #, fuzzy
 msgid "Filters"
 msgstr "_Filtres de correu ..."
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Reenvia el missatge"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Error desconegut"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr ""
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12635,7 +13312,7 @@ msgstr ""
 "No es pot obrir la ubicació `%s':\n"
 "%s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12644,130 +13321,413 @@ msgstr ""
 "Ja existeix una fitxer amb aquest nom.\n"
 "El voleu sobreescriure?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "_Missatge"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Anomena i desa..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "_Adreça:"
+
+#: mail/em-utils.c:2262
 #, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "No s'ha pogut crear el directori temporal: %s"
+msgid ""
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2288
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#: mail/evolution-mail.schemas.in.in.h:1
 #, fuzzy
-msgid "Composer Preferences"
-msgstr "Preferències de l'agenda"
+msgid "Automatic link recognition"
+msgstr "Comprova si hi ha nou correu"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "Comprova si hi ha nou correu"
+
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
+msgid "Default charset in which to compose messages"
+msgstr "Suprimeix aquest missatge"
+
+#: mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
+msgid "Default charset in which to compose messages."
+msgstr "Suprimeix aquest missatge"
+
+#: mail/evolution-mail.schemas.in.in.h:8
+msgid "Default charset in which to display messages"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:9
+msgid "Default charset in which to display messages."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:10
+#, fuzzy
+msgid "Default forward style"
+msgstr "Reenvia"
+
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default reply style"
+msgstr "Respon a tots"
+
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Empty Trash folders on exit"
+msgstr "La carpeta `%s' no existeix."
+
+#: mail/evolution-mail.schemas.in.in.h:14
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+#, fuzzy
+msgid "Height of the message-list pane"
+msgstr "Envia aquest missatge"
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid ""
-"Configure mail preferences, including security and message display, here"
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
+msgstr "conté"
+
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
+msgid "Log filter actions"
+msgstr "Executa les accions"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
 #, fuzzy
-msgid "Evolution Mail accounts configuration control"
+msgid "New Mail Notify sound file"
 msgstr "Configuració del correu"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:37
 #, fuzzy
-msgid "Evolution Mail component"
-msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+msgid "New Mail Notify type"
+msgstr "Configuració del correu"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
 #, fuzzy
-msgid "Evolution Mail composer"
-msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr "S'està afegint un missatge sense cap assumpte"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:44
 #, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Configuració del correu"
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "S'està afegint un missatge sense cap assumpte"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
 #, fuzzy
-msgid "Evolution Mail folder viewer"
+msgid "Send HTML mail by default"
+msgstr "Envia els missatges en format HTML"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "Envia els missatges en format HTML"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "Mostra"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "Mostra"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
-"No es pot inicialitzar el component de resum del correu de l'Evolution."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:56
 #, fuzzy
-msgid "Evolution Mail preferences control"
+msgid "Show deleted messages in the message-list"
+msgstr "Envia els missatges en format HTML"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "Previsualització:"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
 msgstr ""
-"No es pot inicialitzar el component de resum del correu de l'Evolution."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:59
+msgid "Sound file to play when new mail arrives."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+msgid "Spell check inline"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:62
 #, fuzzy
-msgid "Mail Accounts"
-msgstr "conté"
+msgid "Terminal font"
+msgstr "Autor original:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+msgid "The variable width font for mail display"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
-msgid "Mail Preferences"
-msgstr "Preferències"
+msgid "Thread the message list."
+msgstr "Llista de missatges en cadena"
 
-#: mail/importers/elm-importer.c:105
-msgid "Evolution is importing your old Elm mail"
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Llista de missatges en cadena"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+#, fuzzy
+msgid "Thread the message-list based on Subject"
+msgstr "Missatge reenviat (sense assumpte)"
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
-msgid "Importing..."
-msgstr "S'està movent"
+msgid "UID string of the default account."
+msgstr "Descripció:"
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
 #, fuzzy
-msgid "Please wait"
-msgstr "acaba amb"
+msgid "Variable width font"
+msgstr "Inhabilitat"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, fuzzy, c-format
-msgid "Importing %s as %s"
-msgstr "S'està movent"
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
 
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, fuzzy, c-format
-msgid "Scanning %s"
-msgstr "S'està examinant %s"
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
 
-#: mail/importers/elm-importer.c:547
-msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/importers/elm-importer.c:568
-msgid "Elm"
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
 msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
@@ -12802,6 +13762,44 @@ msgstr ""
 msgid "Evolution Pine importer"
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
+#: mail/importers/elm-importer.c:105
+msgid "Evolution is importing your old Elm mail"
+msgstr ""
+
+#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
+#: mail/importers/pine-importer.c:115
+#, fuzzy
+msgid "Importing..."
+msgstr "S'està movent"
+
+#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
+#: mail/importers/pine-importer.c:117
+#, fuzzy
+msgid "Please wait"
+msgstr "acaba amb"
+
+#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
+#: mail/importers/pine-importer.c:288
+#, fuzzy, c-format
+msgid "Importing %s as %s"
+msgstr "S'està movent"
+
+#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
+#: mail/importers/pine-importer.c:425
+#, fuzzy, c-format
+msgid "Scanning %s"
+msgstr "S'està examinant %s"
+
+#: mail/importers/elm-importer.c:547
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: mail/importers/elm-importer.c:568
+msgid "Elm"
+msgstr ""
+
 #: mail/importers/netscape-importer.c:75
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
@@ -12843,13 +13841,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-#, fuzzy
-msgid "Trash"
-msgstr "Tasca"
-
 #: mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
@@ -12860,7 +13851,7 @@ msgstr "Fitxer de correu local %s"
 msgid "Scanning directory"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 #, fuzzy
 msgid "Starting import"
 msgstr "Data d'_inici:"
@@ -12937,27 +13928,27 @@ msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "Conducte de les coses per fer de l'Evolution"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Host:"
 msgstr "Hores"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "Nom d'usuari:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Path:"
 msgstr "Camí:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -12966,35 +13957,35 @@ msgstr ""
 msgid "Mail to %s"
 msgstr "Correu per a %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, fuzzy, c-format
 msgid "Subject is %s"
 msgstr "Assumpte"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Correu de %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "Llista de correu %s"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Respon a tots"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Afegeix una regla de filtre"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -13002,150 +13993,33 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:194
-#, fuzzy
-msgid "Connecting..."
-msgstr "Connexió de prova a \"%s\""
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr ""
-
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
-
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "No s'ha pogut crear el directori temporal: %s"
-
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "No s'ha pogut crear la mbox temporal `%s': %s"
-
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "No es pot tancar la carpeta temporal: %s"
-
-#: mail/mail-component.c:1014
-#, c-format
-msgid ""
-"The following error occured while migrating your mail data:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Fitxer de signatura:"
-
-#: mail/mail-component.c:1643
+#: mail/mail-component.c:379
 #, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Seleccioneu un nom de la llista:"
+msgid "New Mail Message"
+msgstr "FIXME: Missatge de _correu"
 
-#: mail/mail-component.c:1707
+#: mail/mail-component.c:380
 #, fuzzy
-msgid "Create folder"
-msgstr "Creació d'una nova carpeta"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-#, fuzzy
-msgid "Specify where to create the folder:"
-msgstr "No hi ha espai suficient per crear la carpeta"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
+msgid "_Mail Message"
+msgstr "FIXME: Missatge de _correu"
 
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Suprimeix la tasca"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, fuzzy, c-format
-msgid "Delete \"%s\""
-msgstr "Crea \"%s\""
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, fuzzy, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "S'estan escanejant les carpetes de \"%s\""
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
+#: mail/mail-component.c:381
 #, fuzzy
-msgid "Rename Folder"
-msgstr "S'estan escanejant les carpetes de \"%s\""
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, fuzzy, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "El nom de carpeta indicat no és vàlid."
+msgid "Compose a new mail message"
+msgstr "Redacta un missatge"
 
-#: mail/mail-component.c:1860
+#: mail/mail-component.c:472
 #, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
+msgid ""
+"The following error occured while migrating your mail data:\n"
+"%s"
 msgstr ""
 
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Propietats de l'adjunció"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-#, fuzzy
-msgid "Properties"
-msgstr "Propietats..."
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "Nom del fitxer:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Visualitza"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Obre'l en una nova finestra"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Mou"
-
-#: mail/mail-component.c:2087
-#, fuzzy
-msgid "_New Folder..."
-msgstr "Nova VFolder"
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-#, fuzzy
-msgid "_Rename"
-msgstr "Nom de la regla: "
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-#, fuzzy
-msgid "_Properties..."
-msgstr "Propietats..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Identitat"
 
@@ -13195,11 +14069,11 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Connexió de prova a \"%s\""
@@ -13293,30 +14167,39 @@ msgid "C_olors"
 msgstr "Tanca"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Comprova si hi ha nou correu"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "Comprova si hi ha nou correu"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Element per fer que venç avui:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Redacta un missatge"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 #, fuzzy
 msgid "Configuration"
 msgstr "Configuració del correu"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -13329,537 +14212,555 @@ msgstr ""
 "Ja teniu enllestida la configuració del correu.\n"
 "Feu clic a \"Finalitza\" per desar els nous paràmetres"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "De_fault"
 msgstr "Valors predeterminats"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Valors predeterminats"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "No es pot recuperar el missatge: %s"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 #, fuzzy
 msgid "Done"
 msgstr "Cap"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Creació d'una nova carpeta"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "E_nable"
 msgstr "Inhabilitat"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email Accounts"
 msgstr "conté"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email _address:"
 msgstr "Adreça electrònica:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Contactes..."
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Conducte de les coses per fer de l'Evolution"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Executa les accions"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "acaba amb"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "Opcions"
+
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propietats de l'adjunció"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "Ressalta els elemts que vencen avui"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Inline"
 msgstr "Visualitza en línia"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Kerberos "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Desa i tanca"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Loading Images"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Configuració del correu"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Mailbox location"
 msgstr "Format"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Composer"
 msgstr "Cos del missatge"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Message Display"
 msgstr "Esborra la visualització del missatge"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Fonts"
 msgstr "conté"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Configuració del correu"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Optional Information"
 msgstr "Cap informació"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organització:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Agafa un color"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "S'està afegint un missatge sense cap assumpte"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Imprimeix els contactes"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "Adreça electrònica 2"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Quote original message"
 msgstr "No es pot recuperar el missatge: %s"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Quoted"
 msgstr "Cap"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_member this password"
 msgstr "Desa com a VCard"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Respon"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Data de recepció"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Desa com a VCard"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Required Information"
 msgstr "Cap informació"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Valors predeterminats"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 #, fuzzy
 msgid "Sending Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:107
+#: 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:108
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Agenda"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Autenticació:"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Configuració del correu"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Configuració del correu"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nom de l'estil:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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:121
+#: mail/mail-config.glade.h:124
 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:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Inhabilitat"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Autenticació:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Autenticació:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "Comprova si hi ha nou correu"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Comprova si hi ha nou correu"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "S'està esborrant \"%s\""
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Defaults"
 msgstr "Valors predeterminats"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Enable"
 msgstr "Inhabilitat"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Reenvia"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 #, fuzzy
 msgid "_Full name:"
 msgstr "Nom complet:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitat"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "juny"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Marca el missatge com a vist [ms]: "
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Name:"
 msgstr "Nom:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 #, 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:159
+#: mail/mail-config.glade.h:165
 #, 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:160
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Respon a tots"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Script:"
 msgstr "Descripció:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Suprimeix"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Mostra"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Signatures"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Terminal Font:"
 msgstr "Autor original:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "description"
 msgstr "Descripció:"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "S'està examinant %s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, fuzzy, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13868,7 +14769,7 @@ msgstr ""
 "Error en `%s':\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13877,7 +14778,7 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 #, fuzzy
 msgid "Working"
 msgstr "S'està movent"
@@ -13892,164 +14793,168 @@ msgstr "Fi_ltre sobre el remitent"
 msgid "Fetching Mail"
 msgstr "Sendmail"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "No s'ha pogut emmagatzemar el correu en el fitxer temporal %s: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "No s'ha pogut emmagatzemar el correu en el fitxer temporal %s: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "S'està enviant \"%s\""
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "S'està escrivint el missatge %d de %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "S'està marcant el missatge %d de %d"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 #, fuzzy
 msgid "Complete."
 msgstr "% comp_let:"
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Còpia de missatges"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "_Configura la carpeta"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 #, fuzzy
 msgid "Expunging folder"
 msgstr "S'està esborrant \"%s\""
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "S'està movent"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 #, fuzzy
 msgid "Local Folders"
 msgstr "Carpetes virtuals"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Còpia de missatges"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Desa l'adjunció"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No s'han pogut escriure les dades: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, fuzzy, c-format
 msgid "Disconnecting from %s"
 msgstr "S'està recollint el correu des de %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "S'està recollint el correu des de %s"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr ""
@@ -14068,67 +14973,82 @@ msgstr "Cerca"
 msgid "Search"
 msgstr "Cerca"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Afegeix un criteri"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Excepcions"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Cap informació"
+
+#: mail/mail-send-recv.c:146
 #, fuzzy
 msgid "Cancelling..."
 msgstr "Cancel·lat"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Servidor:"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Tipus:"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Sendmail"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Cancel·lat"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 #, fuzzy
 msgid "Updating..."
 msgstr "_Paràmetres"
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 #, fuzzy
 msgid "Waiting..."
 msgstr "_Paràmetres"
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 #, fuzzy
 msgid "User canceled operation."
 msgstr "Consulta cancel·lada per l'usuari."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Si us plau, introduïu la contrasenya NNTP per a %s@%s"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 #, fuzzy
 msgid "Enter Password"
 msgstr "Si us plau, introduïu la contrasenya NNTP per a %s@%s"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 #, fuzzy
 msgid "_Remember this password"
 msgstr "Desa com a VCard"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -14173,27 +15093,32 @@ msgstr "Fitxer de signatura:"
 msgid "Name:"
 msgstr "Nom:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 #, fuzzy
 msgid "Forwarded message"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "S'estan escanejant les carpetes de \"%s\""
+
+#: mail/mail-vfolder.c:87
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "S'està carregant la carpeta %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -14202,100 +15127,100 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 #, fuzzy
 msgid "vFolders"
 msgstr "Carpetes"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Edita les VFolders"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Nova VFolder"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "No vist"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Vist"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Respost"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "No s'ha pogut enviar el missatge: %s"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Mou el missatge"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 #, fuzzy
 msgid "Lowest"
 msgstr "Baixa"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 #, fuzzy
 msgid "Lower"
 msgstr "Baixa"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 #, fuzzy
 msgid "Higher"
 msgstr "Alta"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 #, fuzzy
 msgid "Highest"
 msgstr "Alta"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 #, fuzzy
 msgid "Generating message list"
 msgstr "Còpia de missatges"
@@ -14359,11 +15284,11 @@ msgstr "Reenvia"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Respon"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Respon a tots"
 
@@ -14423,44 +15348,139 @@ msgstr "Subscriu-me"
 msgid "_Unsubscribe"
 msgstr "Cancel·la la subscripció"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, fuzzy, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "No es pot inicialitzat l'intèrpret d'ordres de l'Evolution."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+#, fuzzy
+msgid "Folder Settings"
+msgstr "_Paràmetres"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+msgid "480"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Elimina aquest grup de dreceres"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Commuta la visualització o no de la barra de carpetes"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Mostra la barra de _dreceres"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "_Prioritat:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "_Prioritat:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Configuració del correu"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
 msgstr ""
-"No s'ha pogut suprimir la carpeta `%s':\n"
-"%s"
 
-#: shell/e-folder-list.c:338
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 #, fuzzy
-msgid "Add a Folder"
-msgstr "Afegeix una regla de la VFolder"
+msgid "Path to the default contacts folder"
+msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: shell/e-local-storage.c:179
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
-msgid "Drafts"
-msgstr "Data de venciment"
+msgid "Path to the default mail folder"
+msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "S'estan escanejant les carpetes de \"%s\""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
 msgstr ""
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
 msgstr ""
 
-#: shell/e-local-storage.c:182
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
 #, fuzzy
-msgid "Sent"
-msgstr "Vist"
+msgid "Physical URI to the default tasks folder"
+msgstr "S'estan escanejant les carpetes de \"%s\""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Commuta la visualització o no de la barra de carpetes"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Commuta la visualització o no de la barra de dreceres"
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "Adreça electrònica 2"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "No s'han pogut actualitzar correctament els fitxers"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -14471,14 +15491,14 @@ msgstr ""
 "%s\n"
 "Error: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, fuzzy, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr "S'ha produït un error en llegir el fitxer."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -14489,7 +15509,7 @@ msgstr ""
 "Si us plau, moveu-lo per permetre la instal·lació\n"
 "dels fitxers d'usuari de l'Evolution."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -14600,10 +15620,11 @@ msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
-#, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
+#, fuzzy, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "El nom de carpeta indicat no és vàlid."
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -14627,20 +15648,15 @@ msgstr ""
 "No es pot crear la carpeta indicada:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-#, fuzzy
-msgid "Create New Folder"
-msgstr "_Crea una carpeta nova..."
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Sense títol)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr ""
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -14649,11 +15665,11 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -14661,140 +15677,122 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 #, fuzzy
 msgid "Select importer"
 msgstr "Seleccioneu una carpeta"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "La carpeta `%s' no existeix."
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, fuzzy, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr "No hi ha nou correu a %s."
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 #, fuzzy
 msgid "Importing"
 msgstr "S'està movent"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, fuzzy, c-format
 msgid "Error loading %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 #, fuzzy
 msgid "Automatic"
 msgstr "Tria automàtica"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Nom del fitxer:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 #, fuzzy
 msgid "Select a file"
 msgstr "Fitxer de signatura:"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Nom del fitxer:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "S'està movent"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "De:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "S'està movent"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-offline-sync.c:163
-#, fuzzy, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr "Sincronitza \"%s\""
-
-#: shell/e-shell-offline-sync.c:232
-#, fuzzy
-msgid "Syncing Folder"
-msgstr "S'està sincronitzant \"%s\""
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, fuzzy, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Sincronitza \"%s\""
-
 #: shell/e-shell-settings-dialog.c:346
 #, fuzzy
 msgid "Evolution Settings"
@@ -14835,7 +15833,7 @@ msgstr ""
 "No es pot crear la carpeta indicada:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14844,17 +15842,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Assistent"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Nou"
-
 #: shell/e-shell-utils.c:116
 #, fuzzy
 msgid "No folder name specified."
@@ -14918,66 +15910,52 @@ 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:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 #, fuzzy
 msgid "_Work Online"
 msgstr "S'està movent"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 #, fuzzy
 msgid "_Work Offline"
 msgstr "S'està movent"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 #, fuzzy
 msgid "Work Offline"
 msgstr "S'està movent"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Cap carpeta mostrada)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr ""
-
-#: shell/e-shell-view.c:2042
-#, fuzzy
-msgid "(None)"
-msgstr "(Sense nom)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 #, fuzzy
 msgid "Cannot register on OAF"
 msgstr "No es pot registrar l'emmagatzemament amb l'intèrpret d'ordres"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 #, fuzzy
 msgid "Configuration Database not found"
 msgstr "Configuració del correu"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Error genèric"
 
@@ -15109,76 +16087,18 @@ msgstr "Elimina"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Elimina aquesta drecera de la barra de dreceres"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Error en desar les dreceres."
 
-#: shell/e-shortcuts.c:1096
-#, fuzzy
-msgid "Shortcuts"
-msgstr "Mostra la barra de _dreceres"
-
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Cap error"
-
-#: 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:575
-msgid "The specified folder type is not valid"
-msgstr "El tipus de carpeta especificat no és vàlid"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "Error d'E/S"
-
-#: 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:581
-msgid "The folder is not empty"
-msgstr ""
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "No s'ha trobat la carpeta indicada"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "Funció no implementada en aquest emmagatzemament"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "Operació no suportada"
-
-#: 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:593
-#, fuzzy
-msgid "The specified folder cannot be modified or removed"
-msgstr "No s'ha trobat la carpeta indicada"
-
-#: shell/e-storage.c:595
-msgid "Cannot make a folder a child of one of its descendants"
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
 msgstr ""
 
-#: shell/e-storage.c:597
+#: shell/e-shortcuts.c:1097
 #, fuzzy
-msgid "Cannot create a folder with that name"
-msgstr "No es pot bifurcar %s: %s"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr ""
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr ""
+msgid "Shortcuts"
+msgstr "Mostra la barra de _dreceres"
 
 #: shell/e-task-widget.c:211
 #, c-format
@@ -15190,6 +16110,17 @@ msgstr ""
 msgid "%s (%d%% complete)"
 msgstr "% comp_let:"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Nou"
+
+#: shell/evolution-folder-selector-button.c:128
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "Obre a %s..."
+
 #: shell/evolution-shell-component-utils.c:124
 #, fuzzy, c-format
 msgid ""
@@ -15216,87 +16147,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1187
-#, fuzzy
-msgid "CORBA error"
-msgstr "Error d'E/S"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1191
-#, fuzzy
-msgid "Invalid argument"
-msgstr "adjunció"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1195
-#, fuzzy
-msgid "No owner"
-msgstr "Cap"
-
-#: shell/evolution-shell-component.c:1197
-#, fuzzy
-msgid "Not found"
-msgstr "No s'ha trobat el fitxer"
-
-#: shell/evolution-shell-component.c:1199
-#, fuzzy
-msgid "Unsupported type"
-msgstr "Detecta els tipus suportats..."
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1203
-#, fuzzy
-msgid "Unsupported operation"
-msgstr "Consulta cancel·lada per l'usuari."
-
-#: shell/evolution-shell-component.c:1205
-#, fuzzy
-msgid "Internal error"
-msgstr "Error d'E/S"
-
-#: shell/evolution-shell-component.c:1209
-#, fuzzy
-msgid "Exists"
-msgstr "S_urt"
-
-#: shell/evolution-shell-component.c:1211
-#, fuzzy
-msgid "Invalid URI"
-msgstr "Agenda"
-
-#: shell/evolution-shell-component.c:1215
-#, fuzzy
-msgid "Has subfolders"
-msgstr "La carpeta `%s' no existeix."
-
-#: shell/evolution-shell-component.c:1217
-#, fuzzy
-msgid "No space left"
-msgstr "S'ha rebut el missatge"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr ""
-
-#: shell/evolution-test-component.c:63
-#, fuzzy
-msgid "Test type"
-msgstr "Nom del fitxer:"
-
-#: shell/evolution-test-component.c:703
-#, fuzzy
-msgid "Evolution Test Component"
-msgstr "No es pot inicialitzar el component de correu de l'Evolution."
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "Active Connections"
@@ -15330,11 +16180,6 @@ msgstr "_Correu"
 msgid "_Tasks:"
 msgstr "Tasques"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-#, fuzzy
-msgid "Folder _name:"
-msgstr "Nom del fitxer:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 #, fuzzy
 msgid "Folder _type:"
@@ -15396,25 +16241,6 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "No es pot inicialitzat l'intèrpret d'ordres de l'Evolution."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-#, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Utilitat de configuració per al conducte de l'agenda de l'Evolution.\n"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-#, fuzzy
-msgid "Folder Settings"
-msgstr "_Paràmetres"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -15455,7 +16281,7 @@ msgstr ""
 msgid "Importers"
 msgstr "S'està movent"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr ""
 
@@ -15473,17 +16299,17 @@ msgstr "Envia aquest missatge"
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "_Paràmetres"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -15524,7 +16350,7 @@ msgstr ""
 "Esperem que gaudiu del resultat de la nostra feixuga feina, i esperem\n"
 "ansiosament les vostres contribucions!\n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -15533,71 +16359,110 @@ msgstr ""
 "Gràcies\n"
 "L'equip de l'Evolution\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Envia aquest missatge"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "No es pot inicialitzat l'intèrpret d'ordres de l'Evolution."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "No es pot inicialitzat l'intèrpret d'ordres de l'Evolution."
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Data d'_inici:"
 
-#: shell/main.c:532
+#: shell/main.c:530
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Data d'_inici:"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Seleccioneu una carpeta"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "Fitxer de signatura:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "En procés"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Expressió"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Adreça electrònica:"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr "Fitxer de signatura:"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, fuzzy, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr "Assumpte"
+
+#: smime/gui/e-cert-selector.c:117
+#, fuzzy, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr "Assumpte"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -15652,89 +16517,369 @@ msgid "Backup All"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "Fitxer de signatura:"
+
+#: smime/gui/smime-ui.glade.h:15
+msgid "Certificate Authority Trust"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "Fitxer de signatura:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Completat"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "_Contactes..."
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "_Edita"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 msgid "Email Signer Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Expressió"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Organització"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Organització"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Visualitza"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "Fitxer de signatura:"
+
+#: smime/gui/smime-ui.glade.h:42
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "No l'eliminis"
+msgid "Certificate already exists"
+msgstr "Fitxer de signatura:"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "mes"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "mes"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "mes"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "mes"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr "Cc:"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+msgid "O"
+msgstr ""
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "S"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "Fitxer de signatura:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "Fitxer de signatura:"
+
+#: smime/lib/e-cert.c:618
+msgid "Certificate Authority Key Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "Si"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+#, fuzzy
+msgid "Subject Public Key Info"
+msgstr "Públic"
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Assumpte"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+msgid "SSL Certificate Authority"
+msgstr ""
+
+#: smime/lib/e-cert.c:781
+msgid "Email Certificate Authority"
+msgstr ""
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "_Paràmetres"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Cap informació"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "adjunció"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "Fitxer de signatura:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Opcions"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+msgid "Not Critical"
+msgstr ""
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Expressió"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%2$s%1$s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Fitxer de signatura:"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "_Índex"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Assumpte"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Fitxer de signatura:"
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "PKCS12 File Password"
+msgstr "Desa com a VCard"
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Si us plau, introduïu la contrasenya NNTP per a %s@%s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "_Contactes..."
 
 #: tools/evolution-launch-composer.c:324
 #, fuzzy
@@ -15791,7 +16936,7 @@ msgstr "_Inverteix la selecció"
 msgid "Copy to Folder..."
 msgstr "Copia a la carpeta"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 #, fuzzy
 msgid "Cut the selection"
 msgstr "_Inverteix la selecció"
@@ -15811,7 +16956,7 @@ msgstr "Mou a la carpeta"
 msgid "Move to Folder..."
 msgstr "Mou a la carpeta"
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 #, fuzzy
 msgid "Paste the clipboard"
 msgstr "Enganxa l'element del porta-retalls"
@@ -15821,8 +16966,8 @@ msgstr "Enganxa l'element del porta-retalls"
 msgid "Previews the contacts to be printed"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 #, fuzzy
 msgid "Print Pre_view"
@@ -15876,13 +17021,13 @@ msgstr "Atura la càrrega"
 msgid "View the current contact"
 msgstr "l'hora actual"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "_Accions"
 
@@ -15917,159 +17062,125 @@ msgid "_Send Message to Contact..."
 msgstr "FIXME: Nou _missatge per contactar"
 
 #: ui/evolution-calendar.xml.h:3
-#, fuzzy
-msgid "Create a new all-day event"
-msgstr "Crea una nova cita"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Crea una nova cita"
-
-#: ui/evolution-calendar.xml.h:5
 msgid "Create a new calendar"
 msgstr "Crea una nova agenda"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Crea un nou contacte"
-
-#: ui/evolution-calendar.xml.h:7
-#, fuzzy
-msgid "Create a new task"
-msgstr "Crea un nou contacte"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Dia"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 #, fuzzy
 msgid "Delete All Occurrences"
 msgstr "Suprimeix-ne totes les aparicions"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 #, fuzzy
 msgid "Delete the appointment"
 msgstr "Suprimeix aquesta cita"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "Suprimeix-ne aquesta aparició"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "Suprimeix-ne aquesta aparició"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 #, fuzzy
 msgid "Go To"
 msgstr "Vés a"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 #, fuzzy
 msgid "Go back"
 msgstr "Vés enrera en el temps"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 #, fuzzy
 msgid "Go forward"
 msgstr "Vés endavant en el temps"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 #, fuzzy
 msgid "Go to _Date"
 msgstr "Vés a una data"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Vés a una data concreta"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 #, fuzzy
 msgid "Go to today"
 msgstr "Vés a avui"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "List"
 msgstr "és"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 #, fuzzy
 msgid "Month"
 msgstr "Mes"
 
-#: ui/evolution-calendar.xml.h:24
-#, fuzzy
-msgid "New _Appointment"
-msgstr "Nova cita..."
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Visualitza tots els contactes"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Cancel·lat"
-
-#: ui/evolution-calendar.xml.h:27
-#, fuzzy
-msgid "New _Task"
-msgstr "Tasca"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "Previews the calendar to be printed"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 #, fuzzy
 msgid "Print this calendar"
 msgstr "_Imprimeix aquest agenda"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Fonts"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 msgid "Purge old appointments and meetings"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Detalls"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 #, fuzzy
 msgid "Show one day"
 msgstr "Mostra 1 dia"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 #, fuzzy
 msgid "Show one month"
 msgstr "Mostra 1 mes"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 #, fuzzy
 msgid "Show one week"
 msgstr "Mostra 1 setmana"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Mostra la setmana de treball"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 #, fuzzy
 msgid "Week"
 msgstr "Setmanes"
@@ -16140,7 +17251,7 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Fitxer"
 
@@ -16390,7 +17501,7 @@ msgstr "Mar_ca'l com a llegit"
 msgid "Mark all visible messages as read"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Paste message(s) from the clipboard"
 msgstr "Enganxa l'element del porta-retalls"
@@ -16454,18 +17565,6 @@ msgstr "_Inverteix la selecció"
 msgid "_Threaded Message List"
 msgstr "Llista de missatges en cadena"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-#, fuzzy
-msgid "Close this window"
-msgstr "Suprimeix aquesta cita"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-#, fuzzy
-msgid "_Close"
-msgstr "Tanca"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Addressbook"
@@ -16652,304 +17751,331 @@ msgstr "Imprimeix el missatge seleccionat"
 msgid "Increase the text size"
 msgstr "_Insereix el fitxer de text... (FIXME)"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 #, fuzzy
 msgid "Load _Images"
 msgstr "Missatge reenviat - %s"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 #, fuzzy
 msgid "Mark as I_mportant"
 msgstr "Marca'l com a per _llegir"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Mark as U_nread"
 msgstr "Marca'l com a per _llegir"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 #, fuzzy
 msgid "Mark as Unimp_ortant"
 msgstr "Marca'l com a per _llegir"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark the selected message(s) as having been read"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark the selected message(s) as important"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Imprimeix el missatge seleccionat"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Imprimeix el missatge seleccionat"
+
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 #, fuzzy
 msgid "Mark the selected messages for deletion"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Mou"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
 msgid "Move selected message(s) to another folder"
 msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Següent"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Next _Important Message"
 msgstr "Respon al remitent d'aquest missatge"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Next _Thread"
 msgstr "Selecciona'ls _tots"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "Next _Unread Message"
 msgstr "Mou el missatge"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "No s'ha trobat el fitxer"
+
+#: ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Open the selected message in a new window"
 msgstr "Envia aquest missatge"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "P_revious Unread Message"
 msgstr "Carrega un missatge desat anteriorment"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Respon"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "Comprova si hi ha nou correu"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Carrega un missatge desat anteriorment"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 #, fuzzy
 msgid "Preview the message to be printed"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
 msgid "Previous"
 msgstr "Ant_erior"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 #, fuzzy
 msgid "Print this message"
 msgstr "Imprimeix el missatge"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "Anomena i desa..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Desa el missatge a una carpeta determinada"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
 msgid "Show Email _Source"
 msgstr "Font del correu"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "Show Full _Headers"
 msgstr "Cerca completa"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "Show message in the normal style"
 msgstr "Envia els missatges en format HTML"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 #, fuzzy
 msgid "Show message with all email headers"
 msgstr "Comprova si hi ha nou correu"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 #, fuzzy
 msgid "Show the raw email source of the message"
 msgstr "Adjunta un fitxer al missatge"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "VFolder on Mailing _List..."
 msgstr "Filtre sobre la llista de correu"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 #, fuzzy
 msgid "VFolder on Se_nder..."
 msgstr "VFolder sobre el remite_nt"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 #, fuzzy
 msgid "VFolder on _Recipients..."
 msgstr "VFolder sobre els destinata_ris"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "VFolder on _Subject..."
 msgstr "VFolder sobre l'assumpte"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 #, fuzzy
 msgid "_Attached"
 msgstr "Adjunta"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "Copia a la carpeta"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Reenvia el missatge"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 #, fuzzy
 msgid "_Go To"
 msgstr "Vés a"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 #, fuzzy
 msgid "_Inline"
 msgstr "Visualitza en línia"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 #, fuzzy
 msgid "_Larger"
 msgstr "Busca"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 #, fuzzy
 msgid "_Message Display"
 msgstr "Esborra la visualització del missatge"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Mou a la carpeta"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 #, fuzzy
 msgid "_Next Message"
 msgstr "_Missatge"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 #, fuzzy
 msgid "_Normal Display"
 msgstr "_Visualització"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 #, fuzzy
 msgid "_Open Message"
 msgstr "_Edita el missatge"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Imprimeix el missatge"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 #, fuzzy
 msgid "_Quoted"
 msgstr "Cap"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 #, fuzzy
 msgid "_Resend..."
 msgstr "_Tanca..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "_Eines"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 #, fuzzy
 msgid "_Undelete"
 msgstr "_Suprimeix"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#, fuzzy
+msgid "Close this window"
+msgstr "Suprimeix aquesta cita"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "_Close"
+msgstr "Tanca"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Adjunta"
@@ -17272,13 +18398,13 @@ msgid "Change Evolution's settings"
 msgstr "Instal·lació de l'Evolution"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "S_urt"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Crea un nou contacte"
 
 #: ui/evolution.xml.h:6
-#, fuzzy
-msgid "Evolution _Window"
-msgstr "Evolution"
+msgid "E_xit"
+msgstr "S_urt"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -17290,8 +18416,8 @@ msgstr ""
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "Evolution"
+msgid "Open a new window"
+msgstr "Obre'l en una nova finestra"
 
 #: ui/evolution.xml.h:11
 #, fuzzy
@@ -17300,62 +18426,77 @@ msgstr "_Paràmetres"
 
 #: ui/evolution.xml.h:12
 #, fuzzy
+msgid "Send / Receive"
+msgstr "Sendmail"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "Envia el correu de la cua i recupera'n el nou"
+
+#: ui/evolution.xml.h:14
+#, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Configuració del correu"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 #, fuzzy
 msgid "Show information about Ximian Evolution"
 msgstr "Mostra informació referent a l'Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 #, fuzzy
 msgid "Submit Bug Report"
 msgstr "_Envia un informe d'error"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 #, fuzzy
 msgid "Submit _Bug Report"
 msgstr "_Envia un informe d'error"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 #, fuzzy
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Envia un informe d'error mitjançant el Bug Buddy"
 
-#: ui/evolution.xml.h:17
-#, fuzzy
-msgid "Toggle"
-msgstr "Mòbil"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 #, fuzzy
 msgid "Toggle whether we are working offline."
 msgstr "Commuta la visualització o no de la barra de carpetes"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 #, fuzzy
 msgid "_About Ximian Evolution..."
 msgstr "_Quant a l'Evolution..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 #, fuzzy
 msgid "_Import..."
 msgstr "S'està movent"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Nou"
 
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "_Send / Receive"
+msgstr "Sendmail"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "finestra2"
+
 #: ui/my-evolution.xml.h:2
 #, fuzzy
 msgid "Print Summary"
@@ -17499,12 +18640,12 @@ msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "DDDDDDD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -17652,7 +18793,7 @@ msgstr "Cerca"
 msgid "_Find Now"
 msgstr "finestra2"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 #, fuzzy
 msgid "_Clear"
 msgstr "Agenda"
@@ -17671,27 +18812,262 @@ msgstr ""
 msgid "Text"
 msgstr "Comprova"
 
-#: widgets/misc/e-search-bar.c:928
-#, fuzzy
-msgid "Clear"
-msgstr "Agenda"
-
 #: widgets/misc/e-search-bar.c:930
 #, fuzzy
-msgid "Find Now"
+msgid "Find _Now"
 msgstr "finestra2"
 
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "l'hora actual"
+#~ msgid "Account Name"
+#~ msgstr "conté"
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Nom complet:"
+#~ msgid "Server Name"
+#~ msgstr "Servidor:"
 
 #, fuzzy
-#~ msgid "Family Name"
-#~ msgstr "Nom complet:"
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
+
+#, fuzzy
+#~ msgid "Other Contacts"
+#~ msgstr "Contacte _nou"
+
+#, fuzzy
+#~ msgid "Directory Servers"
+#~ msgstr "N_ou servidor de directori"
+
+#, fuzzy
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Configuració del _correu..."
+
+#, fuzzy
+#~ msgid "Add LDAP Server"
+#~ msgstr "Servidor LDAP:"
+
+#, fuzzy
+#~ msgid "LDAP Configuration Assistant"
+#~ msgstr "Configuració del correu"
+
+#, fuzzy
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Fes un so en visualitzar les alarmes"
+
+#, fuzzy
+#~ msgid "Find contact in"
+#~ msgstr "Cerca un contacte"
+
+#, fuzzy
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "<feu clic aquí per seleccionar una data>"
+
+#, fuzzy
+#~ msgid "Business Address"
+#~ msgstr "Feina 2"
+
+#, fuzzy
+#~ msgid "Department"
+#~ msgstr "_Departament:"
+
+#~ msgid "ISDN"
+#~ msgstr "XDSI"
+
+#, fuzzy
+#~ msgid "Profession"
+#~ msgstr "_Professió:"
+
+#, fuzzy
+#~ msgid "TTY"
+#~ msgstr "TTY/TDD"
+
+#, fuzzy
+#~ msgid "Opening tasks at %s"
+#~ msgstr "S'estan escanejant les carpetes de \"%s\""
+
+#, fuzzy
+#~ msgid "Send anyway?"
+#~ msgstr "S'està recollint el correu des de %s"
+
+#, fuzzy
+#~ msgid "Folder _name"
+#~ msgstr "Nom del fitxer:"
+
+#, fuzzy
+#~ msgid "No signature present"
+#~ msgstr "Fitxer de signatura:"
+
+#, fuzzy
+#~ msgid "Connecting..."
+#~ msgstr "Connexió de prova a \"%s\""
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Seleccioneu un nom de la llista:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No s'ha pogut suprimir la carpeta `%s':\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Add a Folder"
+#~ msgstr "Afegeix una regla de la VFolder"
+
+#, fuzzy
+#~ msgid "Drafts"
+#~ msgstr "Data de venciment"
+
+#, fuzzy
+#~ msgid "Sent"
+#~ msgstr "Vist"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr "Sincronitza \"%s\""
+
+#, fuzzy
+#~ msgid "Syncing Folder"
+#~ msgstr "S'està sincronitzant \"%s\""
+
+#, fuzzy
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Sincronitza \"%s\""
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Cap carpeta mostrada)"
+
+#, fuzzy
+#~ msgid "(None)"
+#~ msgstr "(Sense nom)"
+
+#~ msgid "No error"
+#~ msgstr "Cap error"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "El tipus de carpeta especificat no és vàlid"
+
+#~ msgid "I/O error"
+#~ msgstr "Error d'E/S"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "No hi ha espai suficient per crear la carpeta"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "No s'ha trobat la carpeta indicada"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Funció no implementada en aquest emmagatzemament"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Operació no suportada"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
+
+#, fuzzy
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "No s'ha trobat la carpeta indicada"
+
+#, fuzzy
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "No es pot bifurcar %s: %s"
+
+#, fuzzy
+#~ msgid "CORBA error"
+#~ msgstr "Error d'E/S"
+
+#, fuzzy
+#~ msgid "Invalid argument"
+#~ msgstr "adjunció"
+
+#, fuzzy
+#~ msgid "No owner"
+#~ msgstr "Cap"
+
+#, fuzzy
+#~ msgid "Unsupported type"
+#~ msgstr "Detecta els tipus suportats..."
+
+#, fuzzy
+#~ msgid "Unsupported operation"
+#~ msgstr "Consulta cancel·lada per l'usuari."
+
+#, fuzzy
+#~ msgid "Internal error"
+#~ msgstr "Error d'E/S"
+
+#, fuzzy
+#~ msgid "Exists"
+#~ msgstr "S_urt"
+
+#, fuzzy
+#~ msgid "Invalid URI"
+#~ msgstr "Agenda"
+
+#, fuzzy
+#~ msgid "Has subfolders"
+#~ msgstr "La carpeta `%s' no existeix."
+
+#, fuzzy
+#~ msgid "No space left"
+#~ msgstr "S'ha rebut el missatge"
+
+#, fuzzy
+#~ msgid "Test type"
+#~ msgstr "Nom del fitxer:"
+
+#, fuzzy
+#~ msgid "Evolution Test Component"
+#~ msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "No l'eliminis"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Crea una nova cita"
+
+#, fuzzy
+#~ msgid "New _Appointment"
+#~ msgstr "Nova cita..."
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Cancel·lat"
+
+#, fuzzy
+#~ msgid "New _Task"
+#~ msgstr "Tasca"
+
+#, fuzzy
+#~ msgid "Evolution _Window"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "Toggle"
+#~ msgstr "Mòbil"
+
+#, fuzzy
+#~ msgid "Clear"
+#~ msgstr "Agenda"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "l'hora actual"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -17790,10 +19166,6 @@ msgstr "finestra2"
 #~ msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
 #, fuzzy
-#~ msgid "Loading..."
-#~ msgstr "_Paràmetres"
-
-#, fuzzy
 #~ msgid "Searching..."
 #~ msgstr "Cerca"
 
@@ -17943,10 +19315,6 @@ msgstr "finestra2"
 #~ msgstr "x"
 
 #, fuzzy
-#~ msgid "Phone"
-#~ msgstr "Cap"
-
-#, fuzzy
 #~ msgid "Birth date"
 #~ msgstr "Data d'ini_ci:"
 
@@ -17959,10 +19327,6 @@ msgstr "finestra2"
 #~ msgstr "Primari"
 
 #, fuzzy
-#~ msgid "ID"
-#~ msgstr "Si"
-
-#, fuzzy
 #~ msgid "Last Use"
 #~ msgstr "Enganxa"
 
@@ -17977,10 +19341,6 @@ msgstr "finestra2"
 #~ "%s"
 
 #, fuzzy
-#~ msgid "LDAP Server"
-#~ msgstr "Servidor LDAP:"
-
-#, fuzzy
 #~ msgid "LDAP server containing contact information"
 #~ msgstr ""
 #~ "Error en carregar la informació del filtre:\n"
@@ -17996,22 +19356,6 @@ msgstr "finestra2"
 #~ "Error en carregar la informació del filtre:\n"
 #~ "%s"
 
-#, fuzzy
-#~ msgid "_Contact"
-#~ msgstr "_Contactes..."
-
-#, fuzzy
-#~ msgid "Create a new contact"
-#~ msgstr "Crea un nou contacte"
-
-#, fuzzy
-#~ msgid "New Contact List"
-#~ msgstr "Visualitza tots els contactes"
-
-#, fuzzy
-#~ msgid "Create a new contact list"
-#~ msgstr "Crea un nou contacte"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "L'URI que mostrarà el navegador de carpetes"
 
@@ -18027,9 +19371,6 @@ msgstr "finestra2"
 #~ msgid "Is New Card"
 #~ msgstr "Nou"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #, fuzzy
 #~ msgid "No cards"
 #~ msgstr "No iniciat"
@@ -18070,38 +19411,6 @@ msgstr "finestra2"
 #~ msgstr "Filtre sobre la llista de correu"
 
 #, fuzzy
-#~ msgid "New appointment"
-#~ msgstr "Nova cita..."
-
-#, fuzzy
-#~ msgid "_Appointment"
-#~ msgstr "Cites:"
-
-#, fuzzy
-#~ msgid "New meeting"
-#~ msgstr "Cancel·lat"
-
-#, fuzzy
-#~ msgid "M_eeting"
-#~ msgstr "Cancel·lat"
-
-#, fuzzy
-#~ msgid "New task"
-#~ msgstr "Tasca"
-
-#, fuzzy
-#~ msgid "_Task"
-#~ msgstr "Tasca"
-
-#, fuzzy
-#~ msgid "New All Day Appointment"
-#~ msgstr "Nova cita..."
-
-#, fuzzy
-#~ msgid "All _Day Appointment"
-#~ msgstr "Nova cita..."
-
-#, fuzzy
 #~ msgid "Could not update invalid object"
 #~ msgstr "No s'han pogut actualitzar correctament els fitxers"
 
@@ -18135,10 +19444,6 @@ msgstr "finestra2"
 #~ msgstr "Obre l'agenda"
 
 #, fuzzy
-#~ msgid "Opening default tasks folder"
-#~ msgstr "S'estan escanejant les carpetes de \"%s\""
-
-#, fuzzy
 #~ msgid "Please enter your password for %s"
 #~ msgstr "Si us plau, introduïu la vostra contrasenya PGP/GPG."
 
@@ -18163,10 +19468,6 @@ msgstr "finestra2"
 #~ msgstr "No s'ha pogut crear el quadre de diàleg."
 
 #, fuzzy
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Configuració del correu"
-
-#, fuzzy
 #~ msgid "Folder containing mail"
 #~ msgstr "Filtre sobre la llista de correu"
 
@@ -18187,10 +19488,6 @@ msgstr "finestra2"
 #~ msgstr "Carpetes virtuals"
 
 #, fuzzy
-#~ msgid "Properties..."
-#~ msgstr "Propietats..."
-
-#, fuzzy
 #~ msgid "Change this folder's properties"
 #~ msgstr "Propietats de la llista de coses per fer"
 
@@ -18198,18 +19495,6 @@ msgstr "finestra2"
 #~ msgstr "No heu definit cap mètode de transport de correu"
 
 #, fuzzy
-#~ msgid "New Mail Message"
-#~ msgstr "FIXME: Missatge de _correu"
-
-#, fuzzy
-#~ msgid "_Mail Message"
-#~ msgstr "FIXME: Missatge de _correu"
-
-#, fuzzy
-#~ msgid "Compose a new mail message"
-#~ msgstr "Redacta un missatge"
-
-#, fuzzy
 #~ msgid "New Message Post"
 #~ msgstr "_Missatge"
 
@@ -21526,10 +22811,6 @@ msgstr "finestra2"
 #~ msgstr "Data completa:"
 
 #, fuzzy
-#~ msgid "Stauning"
-#~ msgstr "_Paràmetres"
-
-#, fuzzy
 #~ msgid "Staverton"
 #~ msgstr "_Paràmetres"
 
@@ -21802,10 +23083,6 @@ msgstr "finestra2"
 #~ msgstr "Mou el missatge"
 
 #, fuzzy
-#~ msgid "Unst"
-#~ msgstr "No vist"
-
-#, fuzzy
 #~ msgid "Uruguaiana"
 #~ msgstr "Canadà"
 
@@ -21858,10 +23135,6 @@ msgstr "finestra2"
 #~ msgstr "després de"
 
 #, fuzzy
-#~ msgid "Vermont"
-#~ msgstr "mes"
-
-#, fuzzy
 #~ msgid "Vernal"
 #~ msgstr "General"
 
@@ -22242,10 +23515,6 @@ msgstr "finestra2"
 #~ msgstr "vuitè"
 
 #, fuzzy
-#~ msgid "Spray"
-#~ msgstr "dies"
-
-#, fuzzy
 #~ msgid "Light spray"
 #~ msgstr "vuitè"
 
@@ -22375,20 +23644,6 @@ msgstr "finestra2"
 #~ msgid "Remove a folder added with \"Open Other User's Folder\""
 #~ msgstr "_Crea una carpeta nova..."
 
-#, fuzzy
-#~ msgid "Send / Receive"
-#~ msgstr "Sendmail"
-
-#, fuzzy
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Envia el correu de la cua i recupera'n el nou"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Commuta la visualització o no de la barra de carpetes"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Commuta la visualització o no de la barra de dreceres"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Visualitza la carpeta seleccionada"
 
@@ -22424,10 +23679,6 @@ msgstr "finestra2"
 #~ msgstr "_Tanca..."
 
 #, fuzzy
-#~ msgid "_Send / Receive"
-#~ msgstr "Sendmail"
-
-#, fuzzy
 #~ msgid "_Shortcut Bar"
 #~ msgstr "Mostra la barra de _dreceres"
 
@@ -22480,10 +23731,6 @@ msgstr "finestra2"
 #~ msgstr "Preferències"
 
 #, fuzzy
-#~ msgid "Automatically _detect links"
-#~ msgstr "Comprova si hi ha nou correu"
-
-#, fuzzy
 #~ msgid "Emacs"
 #~ msgstr "últim"
 
@@ -22592,10 +23839,6 @@ msgstr "finestra2"
 #~ msgstr "<< Elimina"
 
 #, fuzzy
-#~ msgid "<< Fewer Options"
-#~ msgstr "Opcions"
-
-#, fuzzy
 #~ msgid "DN Customization"
 #~ msgstr "Cerca personalitzada"
 
@@ -23042,10 +24285,6 @@ msgstr "finestra2"
 #~ msgid "Scanning for new messages"
 #~ msgstr "Còpia de missatges"
 
-#, fuzzy
-#~ msgid "The folder %s no longer exists"
-#~ msgstr "La carpeta `%s' no existeix."
-
 #~ msgid "1 byte"
 #~ msgstr "1 octet"
 
@@ -23133,12 +24372,6 @@ msgstr "finestra2"
 #~ msgstr "Suprimeix aquesta cita"
 
 #, fuzzy
-#~ msgid ""
-#~ "Issuer: %s\n"
-#~ "Subject: %s"
-#~ msgstr "Assumpte"
-
-#, fuzzy
 #~ msgid "I/O Error: %s"
 #~ msgstr "Error d'E/S"
 
@@ -23176,10 +24409,6 @@ msgstr "finestra2"
 #~ msgstr "Edita el servidor de notícies"
 
 #, fuzzy
-#~ msgid "Source Information"
-#~ msgstr "Cap informació"
-
-#, fuzzy
 #~ msgid "newswindow1"
 #~ msgstr "finestra1"
 
@@ -23201,10 +24430,6 @@ msgstr "finestra2"
 #~ "l'operació sol·licitada."
 
 #, fuzzy
-#~ msgid "_Contact List"
-#~ msgstr "_Contactes..."
-
-#, fuzzy
 #~ msgid "Inline Text _File..."
 #~ msgstr "_Insereix el fitxer de text... (FIXME)"
 
@@ -23224,18 +24449,10 @@ msgstr "finestra2"
 #~ msgstr "Remitent"
 
 #, fuzzy
-#~ msgid "Send the message later"
-#~ msgstr "Envia aquest missatge"
-
-#, fuzzy
 #~ msgid "_Pilot Settings..."
 #~ msgstr "_Paràmetres"
 
 #, fuzzy
-#~ msgid "Addressbook Settings"
-#~ msgstr "Afegeix una font"
-
-#, fuzzy
 #~ msgid "Configuration control for the Evolution Addressbook."
 #~ msgstr ""
 #~ "Utilitat de configuració per al conducte de les coses per fer de "
@@ -23447,12 +24664,6 @@ msgstr "finestra2"
 #~ msgstr "Comentaris sobre l'element:"
 
 #, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Public Key: "
-#~ msgstr "Públic"
-
-#, fuzzy
 #~ msgid "Waiting for connection to LDAP server..."
 #~ msgstr "Connexió de prova a \"%s\""
 
@@ -23482,10 +24693,6 @@ msgstr "finestra2"
 #~ msgstr "Fax de la feina"
 
 #, fuzzy
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "Crea una nova cita"
-
-#, fuzzy
 #~ msgid "First day of wee_k:"
 #~ msgstr "primer dia de la setmana:"
 
@@ -23590,10 +24797,6 @@ msgstr "finestra2"
 #~ msgstr "Organització:"
 
 #, fuzzy
-#~ msgid "_Send mail in HTML format by default."
-#~ msgstr "Envia els missatges en format HTML"
-
-#, fuzzy
 #~ msgid "_Server Type: "
 #~ msgstr "Servidor:"
 
@@ -23709,10 +24912,6 @@ msgstr "finestra2"
 #~ msgstr "Assistent"
 
 #, fuzzy
-#~ msgid "Your configuration is complete."
-#~ msgstr "Configuració del correu"
-
-#, fuzzy
 #~ msgid "Notification about your appointment starting on %s and ending on %s"
 #~ msgstr "Notificació sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
 
@@ -23784,10 +24983,6 @@ msgstr "finestra2"
 #~ msgstr "Esborra la visualització del missatge"
 
 #, fuzzy
-#~ msgid "Encrypted message"
-#~ msgstr "Edita el missatge"
-
-#, fuzzy
 #~ msgid "Cannot copy a folder `%s' to itself"
 #~ msgstr ""
 #~ "No es poden copiar els fitxers a\n"
@@ -23909,9 +25104,6 @@ msgstr "finestra2"
 #~ msgid "r"
 #~ msgstr "r"
 
-#~ msgid "s"
-#~ msgstr "s"
-
 #~ msgid "t"
 #~ msgstr "t"
 
@@ -23996,10 +25188,6 @@ msgstr "finestra2"
 #~ "sistemes propietaris de correu."
 
 #, fuzzy
-#~ msgid "%d/%m/%Y"
-#~ msgstr "%d/%m/%Y"
-
-#, fuzzy
 #~ msgid "%Y/%m/%d"
 #~ msgstr "%a %d/%m/%Y"
 
@@ -24236,9 +25424,6 @@ msgstr "finestra2"
 #~ msgid "TasksPreferences"
 #~ msgstr "Preferències de l'agenda..."
 
-#~ msgid "_Company:"
-#~ msgstr "_Empresa:"
-
 #~ msgid "As _Minicards"
 #~ msgstr "Com a _Minicards"
 
@@ -24460,9 +25645,6 @@ msgstr "finestra2"
 #~ msgid "[%s] (forwarded message)"
 #~ msgstr "[%s] (missatge reenviat)"
 
-#~ msgid "Forwarded message (no subject)"
-#~ msgstr "Missatge reenviat (sense assumpte)"
-
 #~ msgid "Print the selected message"
 #~ msgstr "Imprimeix el missatge seleccionat"
 
@@ -24754,10 +25936,6 @@ msgstr "finestra2"
 #~ msgstr "Persones _requerides"
 
 #, fuzzy
-#~ msgid "Save password"
-#~ msgstr "Desa com a VCard"
-
-#, fuzzy
 #~ msgid "Transport Authentication"
 #~ msgstr "Autenticació:"
 
@@ -24791,10 +25969,6 @@ msgstr "finestra2"
 #~ "Per llegir el correu lliurat al sistema local i per emmagatzemar correu "
 #~ "en el disc local."
 
-#, fuzzy
-#~ msgid "Connect to server"
-#~ msgstr "No s'ha pogut connectar al servidor POP en %s."
-
 #~ msgid "Synchronize"
 #~ msgstr "Sincronitza"
 
@@ -25409,9 +26583,6 @@ msgstr "finestra2"
 #~ msgid "Load \"%s\""
 #~ msgstr "Carrega \"%s\""
 
-#~ msgid "Creating \"%s\""
-#~ msgstr "S'està creant \"%s\""
-
 #~ msgid "Exception while reporting result to shell component listener."
 #~ msgstr ""
 #~ "Excepció en informar del resultat a l'escoltador de components de "
diff --git a/po/cs.po b/po/cs.po
index ae12f92ca2..2f112ddd41 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution VERSION\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-06-23 20:43+0200\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -30,51 +30,184 @@ msgstr "Nelze načíst %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Není možné přečíst blok aplikace Adresa z pilota"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Složky automatického dokončení"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "ID _certifikátu:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Zde se nachází nastavení vašich emailových účtů"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Kontakty"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
+msgstr "Adresář Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address pop-up"
+msgstr "Pop-up menu adresy adresáře Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address viewer"
+msgstr "Prohlížeč adres adresáře Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook card viewer"
+msgstr "Prohlížeč karet adresáře Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook component"
+msgstr "Komponenta adresáře Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook folder viewer"
+msgstr "Prohlížeč složek adresáře Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Ovládací prvek nastavení pošty Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Ovládací prvek nastavení složky Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Adresář"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Vlastnosti..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Smazat"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "_Přejmenovat"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Nový kontakt:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "Vytvořit nový kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Nový seznam kontaktů"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "Nový seznam kontaktů"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "Vytvořit nový seznam kontaktů"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Osobní"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Pracovní"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "Server LDAP"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Nelze vytvořit adresář %s: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "Nepodařilo se připojit k serveru LDAP."
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "Nepodařilo se ověřit na serveru LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "Není možné dotázat se na kořenový DSE"
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "V odpovědi serveru nejsou podporované základy vyhledávání"
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Tento server nepodporuje schéma informací LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "Chyba při načítání informací o schématu"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr "Server neodpověděl platnou informací o schématu"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Název účtu"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Jméno serveru"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP není v tomto sestavení Evolution povolen"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Další kontakty"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -82,7 +215,7 @@ msgstr ""
 "Nebylo možné otevřít tento adresář. Ověřte, zda cesta\n"
 "existuje a zda máte přístupová práva."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -92,7 +225,7 @@ msgstr ""
 "že jste zadali nesprávné URI nebo že server LDAP \n"
 "není dosažitelný."
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -103,7 +236,7 @@ msgstr ""
 "Pokud chcete LDAP v Evolution používat, musíte program \n"
 "překompilovat z CVS po získání OpenLDAP z níže uvedeného odkazu.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -117,44 +250,43 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Nelze otevřít adresář"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "K serveru LDAP se přistupuje anonymně"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "Selhalo ověření.\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sZadejte heslo pro  %s (uživatel %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "Jméno začíná na"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "Email začíná na"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Kategorie je"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Jakékoliv políčko obsahuje"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Pokročilé..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -167,7 +299,7 @@ msgstr ""
 "zvyšte omezení maximálního počtu vrácených karet v nastavení\n"
 "adresářového serveru pro tento adresář."
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -179,88 +311,41 @@ msgstr ""
 "nebo zvyšte časový limit v nastavení adresářového serveru pro tento\n"
 "adresář."
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Obsluha tohoto adresáře nebyla schopna zpracovat tento dotaz."
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Obsluha tohoto adresáře odmítla provést tento dotaz."
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "Tento dotaz nebyl úspěšně dokončen."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Jakákoliv kategorie"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "URI, které kalendář zobrazí"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "ID _certifikátu:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "Zde lze nastavit přístup k adresářům LDAP serverů"
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Kontakty"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "Adresářové servery"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Adresář Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Ovládací prvek nastavení adresáře LDAP Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "Pop-up menu adresy adresáře Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "Prohlížeč adres adresáře Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Prohlížeč karet adresáře Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr "Komponenta adresáře Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook folder viewer"
-msgstr "Prohlížeč složek adresáře Evolution"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Ovládací prvek nastavení pošty Evolution."
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -283,6 +368,7 @@ msgstr "  Zo_brazit podporované základy "
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -316,8 +402,9 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "Přidat server LDAP"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "Pomocník nastavení LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -333,9 +420,9 @@ msgid "Anonymously"
 msgstr "Anonymně"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -346,48 +433,49 @@ msgstr ""
 "Pro uložení nastavení, které jste zde uvedli, klikněte\n"
 "na tlačítko \"Použít\""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "Připojení"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "Distinguished _name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr "Upravit server LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
 msgstr "Emailová adresa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution bude používat toto DN k vašemu ověření na serveru"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution bude používat tuto e-mailovou adresu k vašemu ověření na serveru"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "Ukončeno"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Obecné"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "Pomocník nastavení LDAP"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "Skupina"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Nikdy"
 
@@ -416,8 +504,8 @@ msgid "S_earch scope: "
 msgstr "_Rozsah vyhledávání: "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Vyhledávání"
 
@@ -475,27 +563,31 @@ msgstr ""
 "v LDAP a pro vytváření a úpravu kontaktů."
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 "Zadání zobrazovaného názvu je posledním krokem v nastavení LDAP serveru."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "Krok 1: Informace o serveru"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "Krok 2: Připojení k serveru"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "Krok 1: Informace o serveru"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "Krok 3: Prohledávání adresáře"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Krok 2: Připojení k serveru"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "Krok 4: Zobrazení jména"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Krok 3: Prohledávání adresáře"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -507,16 +599,6 @@ msgstr "Podporované základy vyhledávání"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"Prvním krokem v nastavení LDAP serveru je zadání jména a informací o vašem\n"
-"přihlášení. Pokud si nejste jisti, zeptejte se svého správce systému."
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -528,7 +610,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:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -539,7 +621,7 @@ msgstr ""
 "vaše hledání. Pokud je ponecháte prázdné, prohledávání začne v kořeni "
 "adresářového stromu."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -555,14 +637,14 @@ msgstr ""
 "Rozsah vyhledávání \"jeden\" zahrnuje záznamy jednu úroveň pod základem "
 "vyhledávání.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
+#, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "Tento průvodce vám pomůže přistupovat k online adresářovým službám\n"
 "pomocí serverů LDAP (Lightweight Directory Access Protocol).\n"
@@ -571,14 +653,14 @@ msgstr ""
 "serveru. Pokud potřebujete pomoc s nalezením správných informací, "
 "kontaktujte prosím svého správce systému."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "Toto je plný název vašeho LDAP serveru. Například  \"ldap.mycompany.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -587,7 +669,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:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -596,7 +678,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:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -606,6 +688,16 @@ msgstr ""
 "Evolution.\n"
 "Bude se používat pouze pro zobrazování."
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Toto je jméno pro tento server, které se objeví ve vašem seznamu složek "
+"Evolution.\n"
+"Bude se používat pouze pro zobrazování."
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -634,21 +726,32 @@ msgid "Using email address"
 msgstr "Použít e-mailovou adresu"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Kdykoliv je možné"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+"Prvním krokem v nastavení LDAP serveru je zadání jména a informací o vašem\n"
+"přihlášení. Pokud si nejste jisti, zeptejte se svého správce systému."
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "_Zobrazovaný název:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "_Omezení stahování:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -656,54 +759,52 @@ msgstr "_Omezení stahování:"
 msgid "_Edit"
 msgstr "_Upravit"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "_Metoda přihlášení:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "Číslo _portu:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "_Základ vyhledávání:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "Název _serveru:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "_Prodleva (minuty):"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "karty"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr "připojovací-karta"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr "obecný přehled"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr "vyhledávací přehled"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Jméno"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Rozhraní pro výběr jména adresáře Evolution"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Odstranit vše"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Odstranit"
@@ -730,23 +831,21 @@ msgstr "Přidat ke kontaktům"
 msgid "Unnamed Contact"
 msgstr "Nepojmenovaný kontakt"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Jméno"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Zdroj"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Vyberte kontakty z adresáře"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "Hledat kontakt v"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Rozhraní pro výběr jména adresáře Evolution"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Hledat"
@@ -823,7 +922,8 @@ msgid "D_epartment:"
 msgstr "O_ddělení:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Podrobnosti"
 
@@ -890,12 +990,12 @@ msgid "_Categories..."
 msgstr "Ka_tegorie..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Smazat"
@@ -2018,7 +2118,7 @@ msgid "Esq."
 msgstr "Váž. p."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Celé jméno"
 
@@ -2111,11 +2211,27 @@ msgstr "Editor seznamu kontaktů"
 msgid "Save List as VCard"
 msgstr "Uložit seznam jako VCard"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Změněný kontakt:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Konfliktní kontakt:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Zjištěn duplicitní kontakt"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Změněný e-mail nebo jméno tohoto kontaktu již v tomto souboru existuje. "
+"Přejete si jej přesto přidat?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Nový kontakt:"
@@ -2132,22 +2248,6 @@ msgstr ""
 "Jméno nebo e-mail tohoto kontaktu již v tomto souboru existuje. Přejete si "
 "jej přesto přidat?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Změněný kontakt:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Konfliktní kontakt:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"Změněný e-mail nebo jméno tohoto kontaktu již v tomto souboru existuje. "
-"Přejete si jej přesto přidat?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2246,9 +2346,9 @@ msgstr "Přeposlat kontakt"
 msgid "Send Message to Contact"
 msgstr "Poslat kontaktu zprávu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Tisknout"
@@ -2270,9 +2370,12 @@ msgstr "Přesunout do složky..."
 msgid "Cut"
 msgstr "Vyjmout"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopírovat"
 
@@ -2281,16 +2384,8 @@ msgstr "Kopírovat"
 msgid "Paste"
 msgstr "Vložit"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Smazat"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "Aktuální náhled"
 
@@ -2306,166 +2401,170 @@ msgstr ""
 "havarovala. Pokud jej chcete znovu použít, musíte znovu spustit Evolution."
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "* Click here to add a contact *"
-msgstr "* Kontakt přidáte kliknutím zde *"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Asistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Fax - práce"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Telefon do práce"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "2. telefon do práce"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Telefon pro zpětný dotaz"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Telefon do auta"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategorie"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Firemní telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Oddělení"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "2. e-mail"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "3. e-mail"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Příjmení"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Uložit jako"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "URL volno/zaneprázdněn"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Adresa domů"
+#, fuzzy
+msgid "Given Name"
+msgstr "Název pole"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Fax - domů"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Telefon domů"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "2. telefon domů"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Jordánsko"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Vedoucí"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobilní telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Přezdívka"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Poznámka"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Kancelář"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organizace"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Další adresa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Další fax"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Další telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Primární telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Povolání"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Rádio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Funkce"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Partner/-ka"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Titul"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Unst"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Webová stránka"
 
@@ -2558,11 +2657,19 @@ msgstr "Členové"
 msgid "Job Title"
 msgstr "_Název pozice:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Adresa domů"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Adresa domů"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Další adresa"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2575,112 +2682,109 @@ msgstr "Fax - domů"
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Úspěch"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Neznámá chyba"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Sklad při odpojení"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Přístup zamítnut"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Karta nenalezena"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Identifikační číslo karty již existuje"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Protokol není podporován"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Zrušeno"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "Ověření se nepodařilo"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "Je vyžadováno ověření"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS není k dispozici"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "Adresář neexistuje"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Jiná chyba"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Přejete si uložit změny?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr "Zaho_dit"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Chyba při přidávání seznamu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Chyba při přidávání karty"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Chyba při úpravě seznamu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Chyba při úpravě karty"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Chyba při odstraňování seznamu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Chyba při odstraňování karty"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2689,7 +2793,7 @@ msgstr ""
 "Zobrazení %d karet otevře %d nových oken.\n"
 "Opravdu si přejete zobrazit všechny tyto karty?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2699,49 +2803,49 @@ msgstr ""
 "\"%s již existuje.\n"
 "Chcete jej přepsat?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "Přepsat"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Chyba při ukládání %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "seznam"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Přesunout kartu do"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kopírovat kartu do"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Přesunout karty do"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kopírovat karty do"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Vícero VKaret"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard pro %s"
@@ -2936,7 +3040,7 @@ msgstr "Okraje"
 msgid "Number of columns:"
 msgstr "Počet sloupců:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Volby"
 
@@ -3123,18 +3227,18 @@ msgstr "Nepojmenovaný seznam"
 msgid "Split Multi-Day Events:"
 msgstr "Rozdělit vícedenní události:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Nelze spustit wombat server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Nelze spustit wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nelze přečíst blok aplikací Calendar pilota"
 
@@ -3142,24 +3246,83 @@ msgstr "Nelze přečíst blok aplikací Calendar pilota"
 msgid "Default Priority:"
 msgstr "Výchozí priority:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nelze přečíst blok aplikací ToDo pilota"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Kalendář a úkoly"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Kalendář"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Nastavení vaší časové zóny, Kalendáře a Seznamu úloh"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution Kalendář a úkoly"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Ovládací prvek nastavení kalendáře Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Prohlížeč naplánovaných zpráv kalendáře Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Prohlížeč kalendáře Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Editor kalendáře/úkolů Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Prohlížeč úkolů Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Komponenta Kalendář a úkoly Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Testovací komponenta Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Úkoly"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Sloužba upozornění na alarm kalendáře Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Spuštění:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Ukončení:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Evolution alarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm na %s"
@@ -3234,43 +3397,172 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Příště se neptat na tento program."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Sloužba upozornění na alarm kalendáře Evolution"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Nelze spustit Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Nelze spustit gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Nelze vytvořit továrnu ke službě hlášení alarmu"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "neplatný čas"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "Chyba iCalendar"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Barva pro úkoly, které mají být splněny dnes"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Barva pro úkoly, které mají být splněny dnes"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "_Ukazovat konec události v týdenních a měsíčních přehledech"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Náhledy kalendáře k tisku"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "_Vyžadovat potvrzení před mazáním položek"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "_Vyžadovat potvrzení před mazáním položek"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Smazat dokončené úkoly"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Ukazovat čísla _týdnů v měsíčním přehledu"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Přehled obsahuje"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Popis obsahuje"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Komentář obsahuje"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Nepřiřazené"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3282,81 +3574,110 @@ msgstr ""
 "\n"
 "Opravdu odstranit tyto úkoly?"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "vrací méně než"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "den/dny/dnů"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Tisknout tento kalendář"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Nová Kaledonie"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "Nová událost"
+
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "_Událost"
+
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Vytvořit novou událost"
+
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "Nová schůzka"
+
+#: calendar/gui/calendar-component.c:640
+msgid "M_eeting"
+msgstr "_Schůzka"
+
+#: calendar/gui/calendar-component.c:641
 #, fuzzy
-msgid "Rename"
-msgstr "_Přejmenovat"
+msgid "Create a new meeting request"
+msgstr "Vytvořit požadavek na novou schůzku"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Nová celodenní událost"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Osobní"
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr "_Celodenní událost"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Pracovní"
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Vytvořit novou událost"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3473,7 +3794,7 @@ msgstr "Komu poslat:"
 msgid "With these arguments:"
 msgstr "S těmito parametry:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -3489,6 +3810,10 @@ msgstr "hodinu/-y"
 msgid "minutes"
 msgstr "minut"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3521,8 +3846,8 @@ msgstr "Poslat e-mail"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Shrnutí"
 
@@ -3551,7 +3876,7 @@ msgstr "skončení(-m) události"
 msgid "hour(s)"
 msgstr "hodin(-u,-y)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minut(-u,-y)"
 
@@ -3605,7 +3930,7 @@ msgstr "den/dny/dní"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "pátek"
 
@@ -3619,7 +3944,7 @@ msgstr "minut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "pondělí"
 
@@ -3629,7 +3954,7 @@ msgstr "_ne"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "sobota"
 
@@ -3643,7 +3968,7 @@ msgstr "Ukazovat čí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:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "neděle"
 
@@ -3661,7 +3986,7 @@ msgstr "Seznam úkolů"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "čtvrtek"
 
@@ -3679,7 +4004,7 @@ msgstr "Formát času:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "úterý"
 
@@ -3689,12 +4014,12 @@ msgstr "_Týden začíná:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "středa"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Pracovní týden"
 
@@ -3731,7 +4056,7 @@ msgid "_Fri"
 msgstr "p_á"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "O_becné"
 
@@ -3771,77 +4096,77 @@ msgstr "_st"
 msgid "before every appointment"
 msgstr "před každou událostí"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr "Odstraňovaná událost je schůzka, chcete poslat oznámení o zrušení?"
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Opravdu chcete zrušit a smazat tuto schůzku?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr "Rušená úloha je přiřazená, chcete poslat oznámení o zrušení?"
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Opravdu chcete zrušit a smazat tento úkol?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 "Odstraňovaný zápis v deníku je zveřejněn, chcete poslat oznámení o zrušení?"
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Opravdu chcete zrušit a smazat tento zápis v deníku?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Tato událost byla smazána."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Tento úkol byl smazán."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Tento zápis v deníku byl smazán."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s Byly provedeny změny. Opominout tyto změny a zavřít editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Nebyly provedeny žádné změny. Zavřít editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Tato událost byla změněna."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Tento úkol byl změněn."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Tento zápis v deníku byl změněn."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s Byly provedeny změny. Opominout tyto změny a aktualizovat editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Nebyly provedeny žádné změny. Aktualizovat editor?"
@@ -3851,165 +4176,170 @@ msgstr "%s Nebyly provedeny žádné změny. Aktualizovat editor?"
 msgid "Validation error: %s"
 msgstr "Chyba ověření: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " do "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Dokončený "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Dokončený "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Termín dokončení "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Termín dokončení "
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "Nelze aktualizovat objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Upravit událost"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Událost - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Úkol - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Zápis v deníku - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Není shrnutí"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Uložit jako..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Změny provedené v této položce mohou být ztraceny, pokud dorazí aktualizace"
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Není možné získat aktuální verzi!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Výběr složky, do které mají být importována tato data"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Opravdu chcete smazat událost  `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Opravdu chcete smazat tuto neoznačenou událost?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Opravdu chcete smazat úkol `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Opravdu chcete smazat tento neoznačený úkol?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Opravdu chcete smazat zápis v deníku `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Opravdu chcete smazat tento neoznačený zápis v deníku?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Opravdu chcete smazat %d událostí?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Opravdu chcete smazat %d úkolů?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Opravdu chcete smazat %d zápisů v deníku?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "Událost nemohla být odstraněna kvůli chybě corba"
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "Úkol nemohl být odstraněn kvůli chybě corba"
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Zápis v deníku nemohl být odstraněn kvůli chybě corba"
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Položka nemohla být odstraněna kvůli chybě corba"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "Událost nemohla být odstraněna, protože přístup byl zamítnut"
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "Úkol nemohl být odstraněn, protože přístup byl zamítnut"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Zápis v deníku nemohl být odstraněn, protože přístup byl zamítnut"
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "Položka nemohla být odstraněna, protože přístup byl zamítnut"
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Událost nemohla být odstraněna kvůli chybě corba"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Úkol nemohl být odstraněn kvůli chybě corba"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Zápis v deníku nemohl být odstraněn kvůli chybě corba"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Položka nemohla být odstraněna kvůli chybě corba"
@@ -4026,43 +4356,43 @@ msgstr "Postoupit komu:"
 msgid "Enter Delegate"
 msgstr "Zapsat postoupení"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Událost"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Připomínka"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Opakování"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Plánování"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Schůzka"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "Počáteční datum je chybné"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "Konečné datum je chybné"
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "Počáteční čas je chybný"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "Konečný čas je chybný"
 
@@ -4132,31 +4462,31 @@ msgid "_Start time:"
 msgstr "_Začátek:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "žádný"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr "Vybraný organizátor už nemá účet."
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "Je požadován organizátor."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "Je požadován alespoň jeden účastník."
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Postoupit komu..."
 
@@ -4197,21 +4527,15 @@ msgid "Member"
 msgstr "Člen"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Funkce"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stav"
@@ -4231,6 +4555,7 @@ msgid "_Invite Others..."
 msgstr "_Pozvat další..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4263,6 +4588,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Nelze vytvořit adresář %s: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "Musí být stanoven organizátor."
@@ -4292,33 +4618,58 @@ msgstr "Informace o kalendáři"
 msgid "Calendar Name"
 msgstr "Kalendář"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Nelze vytvořit adresář %s: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Informace o kalendáři"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Seznam úkolů"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Seznam úkolů"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Seznam úkolů"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr "Měníte opakující se událost, co chcete změnit?"
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Měníte opakující se úlohu, co chcete změnit?"
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr "Měníte opakující se zápis v deníku, co chcete změnit?"
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr "Jen tuto instanci"
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Tuto a budoucí instance"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr "Tuto a budoucí instance"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr "Všechny instance"
 
@@ -4367,10 +4718,15 @@ msgstr "den"
 msgid "on the"
 msgstr "_"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "opakování"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Datum/čas:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "P_řidat"
@@ -4435,7 +4791,7 @@ msgstr "týden(-y/-ů)"
 msgid "year(s)"
 msgstr "rok(-y)/let"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
@@ -4445,31 +4801,31 @@ msgstr ""
 "\n"
 "Chcete uložit změny?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "Zaho_dit změny"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 msgid "Save Event"
 msgstr "Uložit událost"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Byla vytvořena informace o schůzce. Poslat ji?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Informace o schůzce se změnila. Poslat aktualizovanou verzi?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "Byla vytvořena informace o předání úkolu. Poslat ji?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "Informace o úkolu se změnila. Poslat aktualizovanou verzi?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Čas dokončení je chybný"
 
@@ -4479,43 +4835,43 @@ msgid "% _Complete"
 msgstr "% dokončeno"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Dokončeno"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Vysoká"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "Probíhá"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Nízká"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Normální"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Nezačato"
 
@@ -4524,7 +4880,7 @@ msgid "Progress"
 msgstr "Průběh"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Nedefinováno"
 
@@ -4546,21 +4902,21 @@ msgstr "_Stav:"
 msgid "_Web Page:"
 msgstr "Adresa _webové stránky:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Základní"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Předání"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "Datum splnění je chybné"
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4568,9 +4924,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "Dů_věrné"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Popis:"
 
@@ -4675,26 +5031,21 @@ msgstr "%s při %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s pro neznámý typ spouštění"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Veřejné"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Soukromé"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Důvěrné"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategorie"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4707,28 +5058,26 @@ msgid "Start Date"
 msgstr "Začátek"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Přehled"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "barva"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Událost"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Volný"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Obsazený"
 
@@ -4740,7 +5089,7 @@ msgstr "S"
 msgid "S"
 msgstr "J"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "V"
 
@@ -4748,7 +5097,7 @@ msgstr "V"
 msgid "W"
 msgstr "Z"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4758,7 +5107,7 @@ msgstr ""
 "\"\\n\"\n"
 "\"45.436845,125.862501\""
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4766,7 +5115,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Ano"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4774,17 +5123,17 @@ msgstr "Ne"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Neznámá"
 
@@ -4796,181 +5145,179 @@ msgstr "Opakovaný"
 msgid "Assigned"
 msgstr "Přiřazeno"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Aktualizuji objekty"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Odstraňuji vybrané objekty"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Aktualizuji objekty"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Nová _událost..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Nová _celodenní událost"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "Nová schůzka"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Nový úkol"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Tisknout..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "Vl_ožit"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Jít na _dnešek"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "_Jít na datum..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Zveřejnit informaci o volném/obsazeném čase"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "Na_stavení..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Otevřít"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Uložit jako..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Kopírovat"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "Naplánovat _schůzku..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "_Odeslat jako iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Odstranit tento vý_skyt"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Odstranit _všechny výskyty"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "Na_stavení..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Otevřít zprávu"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "P_ředat úkol"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "_Odeslat jako iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "Označit jako _dokončené"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Označit _vybrané úkoly jako dokončené"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "_Smazat vybrané úkoly"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Úkol přidáte kliknutím zde"
@@ -4984,8 +5331,8 @@ msgstr "% dokončeno"
 msgid "Alarms"
 msgstr "Alarmy"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Dokončeno"
 
@@ -5014,18 +5361,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5044,7 +5391,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5057,125 +5404,125 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ano. (Komplexní opakování)"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "Každý den"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "Každé(ých) %d dny(ů)"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "Každý týden"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "Každé(ých) %d týdny(ů)"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr "Každý týden v "
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Každé(ých) %d týdny(ů) v "
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " a "
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr "%s. den "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s "
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "každý měsíc"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr "každý %d. měsíc"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "Každý rok"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "Každé(ých) %d roky/let"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr " celkem %dkrát"
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ", konec "
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>Začíná:</b>"
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Končí:</b>"
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>Úkol splněn:</b>"
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>Splnění:</b>"
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "Informace iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "Chyba iCalendar"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Neznámá osoba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5183,320 +5530,319 @@ 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:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Žádná</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "Místo:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Stav"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Akceptováno"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Předběžně akceptováno"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Zamítnuto"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Vybrat akci:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Zaktualizovat"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Akceptovat"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Předběžně akceptovat"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Odmítnout"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Poslat informaci o volném/obsazeném čase"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Aktualizovat stav respondenta"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Poslat nejnovější informace"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, 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:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Informace o schůzce"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> požaduje účast %s na schůzce."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Návrh na schůzku"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Aktualizace schůzky"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Požadavek na aktualizaci schůzky"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, 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:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Odpověď pro schůzku"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, 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:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Zrušení schůzky"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, 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:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Neplatná zpráva o schůzce"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Informace o úkolu"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> žádá %s o vypracování úkolu."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> vás žádá, abyste vypracovali úkol."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Návrh úkolu"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, 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:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Aktualizovat úkol"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, 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:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Požadavek na aktualizaci úkolu."
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, 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:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Odpověď pro úkol"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> zrušil(-a) úkol."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Zrušení úkolu"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Zpráva o špatném úkolu"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, 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:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Informace o volném/obsazeném čase"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, 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:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Požadavek na informace o volném/obsazeném čase"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, 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:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Odpověď s informací o volném/zaneprázdněném čase"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Neplatná zpráva o volném/zaneprázdněném čase"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 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:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "Zpráva obsahuje pouze nepodporované požadavky."
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 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:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr "Příloha nemá žádné zobrazitelné položky kalendáře"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 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:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Aktualizace dokončena\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 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:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 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:1911
+#: calendar/gui/e-itip-control.c:1909
 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:1923
+#: calendar/gui/e-itip-control.c:1921
 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:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr "Nastala chyba v systému CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr "Objekt nelze nalézt\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Nemáte příslušná práva pro aktualizaci kalendáře\n"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Stav účastníka byl zaktualizován\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "Stav účastníka nelze aktualizovat!\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Odstranění dokončeno"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Položka odeslána!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Položka nemůže být odeslána!\n"
 
@@ -5656,7 +6002,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -5720,49 +6066,44 @@ msgstr "_Začátek schůzky:"
 msgid "Meeting _end time:"
 msgstr "_Konec schůzky:"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "_Začátek:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "_Termín dokončení:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "_Naléhavost:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Stránka"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Otevírám úkoly na %s"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nepodařilo se načíst úkoly v `%s'"
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoda potřebná pro načtení `%s' není podporována"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, 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:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5771,48 +6112,39 @@ msgstr ""
 "Chyba na %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "Dokončuji úkoly..."
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "Mažu vybrané objekty..."
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "Čistí se"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Úkoly"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Kalendář"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nelze otevřít složku v `%s'"
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoda vyžadovaná k otevřeni `%s' není podporována"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Přidávají se alarmy pro %s"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5823,7 +6155,7 @@ msgstr ""
 "%s\n"
 "havarovala. Chcete-li ji znovu použít, musíte znovu spustit Evolution"
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5834,58 +6166,11 @@ msgstr ""
 "%s\n"
 "havarovala. Chcete-li jej znovu použít, musíte znovu spustit Evolution"
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Turín"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalendář a úkoly"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Kalendář"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Nastavení vaší časové zóny, Kalendáře a Seznamu úloh"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution Kalendář a úkoly"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Ovládací prvek nastavení kalendáře Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Prohlížeč naplánovaných zpráv kalendáře Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Prohlížeč kalendáře Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Editor kalendáře/úkolů Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Prohlížeč úkolů Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Komponenta Kalendář a úkoly Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Testovací komponenta Evolution."
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "duben"
@@ -5942,296 +6227,332 @@ msgstr "říjen"
 msgid "September"
 msgstr "září"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Musí být stanoven organizátor."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Alespoň jeden účastník je nezbytný"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Informace o události"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Informace o úkolu"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Informace o deníku"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Informace o volném/obsazeném čase"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Informace o kalendáři"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Aktualizováno"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Obnovit"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "Protinávrh"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informace o volném čase (%s do %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "Informace iCalendar"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Musíte být účastníkem události."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Ne"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Po"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Út"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "St"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Čt"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Pá"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "So"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Vybraný den (%a, %b. %d %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a, %e. %b"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Vybraný týden (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Vybraný měsíc (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Vybraný rok (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Úkol"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Stav: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorita: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Dokončeno procent: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorie: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Kontakty: "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Náhled před tiskem"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Tisknout položku"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Tisknout nastavení"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Přejmenovat tuto zkratku"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Seznam úkolů"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Nový úkol"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "Ú_kol"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Vytvořit nový úkol"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "URI, které bude zobrazovat složku úkolů"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6243,11 +6564,11 @@ msgstr ""
 "\n"
 "Opravdu odstranit tyto úkoly?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Příště se neptat."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "Tisknout úkoly"
 
@@ -6275,15 +6596,15 @@ msgstr "soubory iCalendar (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "soubory vCalendar (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "Připomínka!!"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "Události kalendáře"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6291,7 +6612,7 @@ msgstr ""
 "Evolution našla soubory kalendáře Gnome.\n"
 "Chcete je importovat do Evolution?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Kalendář Gnome"
 
@@ -7824,27 +8145,27 @@ msgstr "Tichý oceán/Wallis"
 msgid "Pacific/Yap"
 msgstr "Tichý oceán/Yap"
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "Digitální podpis není podporován touto šifrou"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "Ověření podpisu není podporováno touto šifrou"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Šifrovaní není podporováno touto šifrou"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Dešifrovaní není podporováno touto šifrou"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr "Nemůžete importovat klíče s touto šifrou"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr "Nemůžete exportovat klíče s touto šifrou"
 
@@ -7896,86 +8217,86 @@ msgstr "Příprava složky '%s' pro práci při odpojení"
 msgid "You must be working online to complete this operation"
 msgstr "Pro dokončení této operace musíte pracovat on-line"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Nepodařilo se vytvořit propojení ' %s': %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Selhalo vytvoření procesu potomka '%s': %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Přijat neplatný proud zprávy od %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Synchronizuji složky"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Chyba při zpracování filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Chyba při spuštění filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Nelze otevřít adresář fronty"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Nelze zpracovat adresář fronty"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Stahuji zprávu %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Nelze otevřít zprávu"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nepodařilo se stáhnout zprávu %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Synchronizuji složku"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Stahuji zprávu %d z %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Nepodařilo se stáhnout zprávu %d z %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Nepodařilo se stáhnout zprávu"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr "Neplatné parametry pro (system-flag)"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr "Neplatné parametry pro (user-tag)"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Chyba při spuštění vyhledávání filtru: %s: %s"
@@ -8007,35 +8328,35 @@ msgstr "(odpovídá všemu) vyžaduje jeden pravdivý výsledek"
 msgid "Performing query on unknown header: %s"
 msgstr "Vykonání otázky na neznámé hlavičce: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nepodporovaná operace: přidat zprávu: pro %s"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nepodporovaná operace: hledání výrazem: %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nepodporovaná operace: hledání pomocí uid: %s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Přesunuji zprávy"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr "Kopíruji zprávy"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Získávají se zprávy (%d)"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8046,15 +8367,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr "Selhalo zpracování nápovědy gpg userid."
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr "Selhalo zpracování požadavku gpg hesla."
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8063,30 +8384,30 @@ msgstr ""
 "Potřebujete heslo pro odemčení klíče pro\n"
 "uživatele: \"%s\""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Zrušeno"
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Selhalo odemčení tajného klíče. Byla zadána tři chybná hesla."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Neočekávaná odpověď od GnuPG: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr "Nejsou poskytnuta žádná data."
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 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:1114
+#: camel/camel-gpg-context.c:1121
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8097,49 +8418,61 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Nepodařilo se GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Nelze zapisovat data: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nepodařilo se provést gpg: %s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr "Nepodařilo se provést gpg."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "Toto je digitálně podepsaná část zprávy"
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr "Nelze ověřit podpis zprávy: nelze vytvořit dočasný soubor: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, 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"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nelze zapisovat data: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Toto je digitálně podepsaná část zprávy"
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Indexovat obsah těla"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Nelze obdržet zprávu z editoru"
@@ -8238,15 +8571,15 @@ msgstr "Chyba při zápisu pošty do dočasného souboru: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Chyba při kopírovaní dočasného souboru pošty: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Nepodařilo se dešifrovat MIME part: chyba protokolu"
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "Nepodařilo se dešifrovat MIME part: neplatná struktura"
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "chyba ve zpracování"
 
@@ -8564,12 +8897,12 @@ msgstr "Poskytovatel pošty pro virtuální složky"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Pro čtení pošty jako otázky na jinou množinu složek"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Pro protokol `%s' není k dispozici poskytovatel"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8578,71 +8911,82 @@ msgstr ""
 "Nelze vytvořit adresář %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Zadat heslo pro %s"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Nedefinováno"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Upravit podpis"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Upravit podpis"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Samopodepsaný certifikát v řetězci"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "Nedůvěryhodný certifikát"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Uložit podpis"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Chyba zpracování"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Server: %s, typ: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Nelze získat složku: Neplatná operace pro tento sklad"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nelze vytvořit složku: Neplatná operace pro tento sklad"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Koš"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "červen"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "Nepodařilo se získat certifikát výstavce"
@@ -8856,7 +9200,7 @@ msgstr ""
 "Vypršel seznam zrušených certifikátů: %s\n"
 "Výstavce: %s"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Nelze zpracovat URL `%s'"
@@ -8875,22 +9219,22 @@ msgstr "Taková zpráva neexistuje %s v %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Nelze kopírovat nebo přesunout zprávy do Virtuální složky"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nelze odstranit adresář: %s: Neplatná operace"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nelze odstranit složku: %s: Složka neexistuje"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nelze přejmenovat složku: %s: Neplatná operace"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nelze přejmenovat složku: %s: Složka neexistuje"
@@ -8970,7 +9314,7 @@ msgstr "Nepodařilo se přijmout zprávu: %s"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -8984,7 +9328,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Taková zpráva neexistuje"
@@ -9022,54 +9366,69 @@ msgid "Failed to cache %s: %s"
 msgstr "Nepodařilo se uložit do vyrovnávací paměti %s: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Připojuji se k serveru..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Nepodařilo se připojit k serveru LDAP."
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "Společnost"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Kontrola nové pošty"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Check for new messages in all folders"
 msgstr "Kontroluje se nová pošta ve všech adresářích"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Složky"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Zobrazit pouze přihlášené složky"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "Předefinovat jmenný prostor složek ze serveru"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Jmenný prostor"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Použít filtry na nové příchozí zprávy na tomto serveru"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Automaticky kontrolovat novou poštu každých"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Pro čtení a ukládání pošty na IMAP serverech."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Heslo"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9322,7 +9681,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Nelze přejmenovat složku %s na %s: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nelze přejmenovat '%s': %s"
@@ -9437,29 +9796,29 @@ msgstr "Hledají se nové zprávy"
 msgid "Storing folder"
 msgstr "Ukládá se složka"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Nelze získat zámek na složku %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Nelze otevřít poštovní schránku: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "Přidaní pošty zrušeno"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nelze přidat zprávu do souboru mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9468,11 +9827,11 @@ msgstr ""
 "Nelze získat zprávu: %s ze složky %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Složka je zřejmě nenapravitelně poškozená."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Vytvoření zprávy selhalo: Poškozená poštovní schránka?"
 
@@ -9540,12 +9899,17 @@ msgstr "Nelze vytvořit adresář %s: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "Nelze získat složku: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "Identifikační číslo karty již existuje"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Nelze přejmenovat složku %s na %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Zadaný název složky není platný: %s"
@@ -9589,7 +9953,7 @@ msgstr "Nelze zavřít zdrojovou složku: %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Nelze zavřít dočasnou složku: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nelze přejmenovat složku: %s"
@@ -9876,7 +10240,7 @@ msgstr "Smazat po %s dni/dnech"
 msgid "Disable support for all POP3 extensions"
 msgstr "Zakázat podporu pro všechna rozšíření POP3"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -9965,7 +10329,7 @@ msgid "No such folder `%s'."
 msgstr "Složka `%s' neexistuje."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10017,7 +10381,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Přenos pošty pomocí programu sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10184,7 +10548,7 @@ msgstr "Doručení pošty SMTP pomocí %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Zprávu nelze poslat: adresa odesílatele je neplatná."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Posílám zprávu"
 
@@ -10305,7 +10669,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "příloha"
 
@@ -10349,14 +10713,14 @@ msgstr "Typ MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Navrhnout automatické zobrazovaní příloh"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Než začnete psát zprávu,\n"
 "musíte nastavit účet."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Kliknutím zobrazíte adresář"
 
@@ -10367,45 +10731,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Odpovědět-komu:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Předmět:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Komu:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Vyplnit příjemce zprávy"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Kopie:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 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:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Skrytá kopie:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10416,14 +10780,19 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Poslat komu:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr "Cíl odeslání"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Přiložit soubor ke zprávě"
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Připojit soubor(y)"
@@ -10458,21 +10827,21 @@ msgstr "Soubor existuje, přepsat?"
 msgid "Error saving file: %s"
 msgstr "Chyba při ukládání souboru: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Chyba při načítání souboru: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Chyba při přístupu k souboru: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Nelze obdržet zprávu z editoru"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10481,7 +10850,7 @@ msgstr ""
 "Nelze hledat v souboru: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10490,7 +10859,7 @@ msgstr ""
 "Nelze rozdělit soubor: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10499,7 +10868,7 @@ msgstr ""
 "Nelze kopírovat popisovač souboru: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10508,7 +10877,7 @@ msgstr ""
 "Chyba při automatickém ukládaní zprávy: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10516,7 +10885,7 @@ msgstr ""
 "Ximian Evolution našla neuložené soubory z předchozího sezení.\n"
 "Chcete se pokusit o jejich obnovení?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10527,28 +10896,28 @@ msgstr ""
 "\n"
 "Chcete uložit změny?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Varování: Změněná zpráva"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Otevřít soubor"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "Podpis:"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "automatický"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Napsat zprávu"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10556,7 +10925,7 @@ msgstr ""
 "Nelze vytvořit okno pro psaní zpráv:\n"
 "Nelze aktivovat ovládací prvek pro výběr adresy."
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10568,7 +10937,7 @@ msgstr ""
 "Ujistěte se prosím, že máte instalovanou\n"
 "správnou verzi gtkhtml a libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10576,7 +10945,7 @@ msgstr ""
 "Nelze vytvořit okno pro psaní zpráv:\n"
 "Nelze aktivovat komponentu HTML editor."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10584,11 +10953,13 @@ msgstr ""
 "<b>(Editor zpráv obsahuje netextové tělo zprávy, které nelze upravit.)<b>"
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Evolution - sada nástrojů pro skupinovou spolupráci"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10842,13 +11213,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%H:%M, %x"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -10967,7 +11338,7 @@ msgstr "Potom"
 msgid "You must specify a folder."
 msgstr "Musíte uvést složku."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Vybrat složku"
@@ -10981,24 +11352,24 @@ msgstr ""
 "Chyba v regulérním výrazu '%s':\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Důležité"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "Udělat"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Později"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Test"
 
@@ -11098,7 +11469,7 @@ msgstr "nazpět"
 msgid "months"
 msgstr "měsíce/-ů"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "sekundách"
 
@@ -11195,7 +11566,7 @@ msgstr "Výraz"
 msgid "Follow Up"
 msgstr "Follow Up"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "Štítek"
 
@@ -11265,112 +11636,118 @@ msgid "Source Account"
 msgstr "Zdrojový účet"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Spršky"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Specifická hlavička"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Zastavit zpracování"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Předmět"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "Odnastavit stav"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "obsahuje"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "neobsahuje"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "nekončí na"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "neexistuje"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "does not return"
 msgstr "nevrací"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "nezní jako"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "nezačíná na"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "končí na"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "existuje"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr "je označený"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr "je po"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "is before"
 msgstr "je před"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "je více než"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "je méně než"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr "není označený"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "není"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "je"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr "vrací více než"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr "vrací méně než"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr "vrací"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "zní jako"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "začíná na"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Název pravidla '%s' není unikátní, vyberte jiný."
@@ -11395,18 +11772,78 @@ msgstr "Název pravidla"
 msgid "Score Rules"
 msgstr "Pravidla skóre"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Musíte pojmenovat tuto v-složku."
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr "Musíte zadat alespoň jednu složku jako zdrojovou."
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 msgid "VFolder source"
 msgstr "Zdroj v-složky"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Nastavení editoru"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Zde se nachází nastavení voleb pošty, včetně bezpečnosti a zobrazení zprávy"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Zde se nachází nastavení kontroly pravopisu, podpisů a editoru zpráv"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Zde se nachází nastavení vašich emailových účtů"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolution Pošta"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Ovládací prvek nastavení účtů pošty Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Komponenta pošty Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Editor zpráv pošty Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Ovládací prvek nastavení editoru zpráv pošty Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail folder viewer"
+msgstr "Prohlížeč složek pošty Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Ovládací prvek nastavení pošty Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Pošta"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Emailové účty"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "Nastavení pošty"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Opravdu chcete odstranit tento účet?"
@@ -11448,7 +11885,7 @@ msgid "Protocol"
 msgstr "Protokol"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr "Beze jména"
 
@@ -11472,20 +11909,17 @@ msgstr "Přidat skript podpisu"
 msgid "Signature(s)"
 msgstr "Podpis(y)"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "Posíláte zprávu ve formátu HTML. Ujistěte se, že následující příjemci\n"
 "si přejí a mohou dostávat zprávy ve formátu HTML:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Přesto poslat?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11493,7 +11927,7 @@ msgstr ""
 "Tato zpráva nemá předmět.\n"
 "Opravdu ji chcete poslat?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11501,11 +11935,11 @@ msgstr ""
 "Protože je seznam kontaktů, na který posíláte zprávu, nastavený tak, aby "
 "skrýval adresy, tato zpráva bude obsahovat pouze adresáty ve skryté kopii."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Tato zpráva je určena pouze skrytým příjemcům."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11515,11 +11949,11 @@ msgstr ""
 "Apparently-To.\n"
 "Přesto poslat?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Aby mohla být tato zpráva odeslána, je nutné určit příjemce."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11531,189 +11965,399 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Vytvořit _virtuální složku z vyhledávání..."
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "Pošta"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<kliknutím zde vyberete složku>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" v \"%s\""
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Vytvořit novou složku"
 
-#: mail/em-folder-selector.c:267
-#, fuzzy
-msgid "Folder _name"
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Upřesněte, kde chcete vytvořit složku:"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
 msgstr "_Název složky:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Nelze vytvořit dočasný adresář: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Nelze vytvořit dočasný adresář: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Nelze vytvořit dočasný soubor '%s': %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Nelze zavřít dočasnou složku: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Načítám..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Vyberte složku"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Vytvořit novou složku"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Nelze smazat složku `%s': %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Opravdu odstranit složku \"%s\"?"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Odstranit \"%s\""
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Přejmenovat složku \"%s\" na:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+msgid "Rename Folder"
+msgstr "Přejmenovat složku"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Vlastnosti písma"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Vlastnosti"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "_Název složky:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Zobrazení"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Otevřít v novém oknu"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Přesunout"
+
+#: mail/em-folder-tree.c:1500
+msgid "_New Folder..."
+msgstr "_Nová složka..."
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "_Přejmenovat"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "Vla_stnosti..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "_Upravit jako novou zprávu..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "_Tisknout"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Odpovědět odesílateli"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Odpovědět _do konference"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Odpovědět _všem"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "_Přeposlat"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr "Follo_w Up..."
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr "Označit jako _dokončeno"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "Vymazat _značky"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Označit jako _přečtené"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "Označit jako _nepřečtené"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Označit jako _důležité"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "_Označit jako nedůležité"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Označit jako _nepřečtené"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Označit jako _důležité"
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "Obnovit _smazané"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "Pře_sunout do složky..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kopírovat do složky..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "Přidat odesílatele do _adresáře"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "Použít _filtry"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "Vy_tvořit pravidlo ze zprávy"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "V-složka podle _předmětu"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "V-složka podle _odesílatele"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "V-složka podle příje_mců"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "V-složka podle poštovní _konference"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "V-složka podle _odesílatele"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Filtr podle _předmětu"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Filtr podle _odesílatele"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Filtr podle příje_mců"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Filtr podle poštovní _konference"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filtr podle _odesílatele"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Výchozí"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Tisknout zprávu"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopírovat umístění odkazu"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Odpovídá:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Přiřazeno"
+
+#: mail/em-format-html-display.c:597
+#, fuzzy
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr "Tato zpráva je digitálně podepsaná, ale nelze ověřit její platnost."
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Upravit podpis"
+
+#: mail/em-format-html-display.c:598
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
 msgstr ""
-"Tato zpráva je digitálně podepsaná. Kliknutím na ikonu zámku získáte "
-"podrobnosti."
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Upravit podpis"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+#, fuzzy
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr "Input_token obsahuje neplatný podpis nebo nebylo možné podpis ověřit."
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Přerušeno"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "Šifrování PGP"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Není možné zpracovat zprávu MIME. Zobrazí se jako zdrojový kód."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Nepodporované schéma"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Nelze ověřit podpis větve"
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Zobrazit v textu"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Skrýt"
@@ -11723,183 +12367,206 @@ msgstr "Skrýt"
 msgid "Page %d of %d"
 msgstr "Stránka %d z %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Získává se zpráva %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Chybná část externího těla."
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Odkaz na FTP server (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Odkaz na lokální soubor (%s) platný na serveru \"%s\""
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Odkaz na lokální soubor (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Odkaz na vzdálená data (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Odkaz na neznámá externí data (typ \"%s\")"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "Tato zpráva je digitálně podepsaná, ale nelze ověřit její platnost."
-
-#: mail/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Tato zpráva je digitálně podepsaná a byla shledána platnou."
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-msgid "No signature present"
-msgstr ""
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Nelze spustit Bonobo"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Nepodporované schéma"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Není možné zpracovat zprávu MIME. Zobrazí se jako zdrojový kód."
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Přesunuji zprávy"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Od"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Odpovědět-komu"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Komu"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Kopie"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Skrytá kopie"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "Program elektronické pošty"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "%s příloha"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Není možné zpracovat zprávu MIME. Zobrazí se jako zdrojový kód."
+msgid "Session not initialised"
+msgstr "Nelze spustit Bonobo"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Tato zpráva je digitálně podepsaná a byla shledána platnou."
+
+#: mail/em-format.c:1212
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr "Tato zpráva je digitálně podepsaná, ale nelze ověřit její platnost."
+
+#: mail/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Čeká se..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Zkouší se %s"
 
-#: mail/em-popup.c:593
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Nepodařilo se uložit do vyrovnávací paměti %s: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Nepodařilo se vytvořit propojení ' %s': %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Nepodařilo se nalézt počítač `%s': %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Uložit jako..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Odpovědět odesílateli"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Otevřít odkaz v prohlížeči"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Poslat _zprávu seznamu..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Přidat odesílatele do adresáře"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Otevřít v %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "Tento server nepodporuje schéma informací LDAPv3"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Přihlásit se"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Složka"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Vyberte prosím server."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Nebyl vybrán žádný server"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Příště tuto zprávu nezobrazovat."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11908,27 +12575,27 @@ msgstr ""
 "Chyba při načítání informací o filtrech:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Filtry"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Přeposlaná zpráva"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "neznámý odesílatel"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "V %a, %d. %m. %Y v %H:%M, %%s píše:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -11937,7 +12604,7 @@ msgstr ""
 "Nelze uložit do `%s'\n"
 " %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -11946,25 +12613,26 @@ msgstr ""
 "`%s' již existuje.\n"
 "Chcete jej přepsat?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Zpráva"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Uložit zprávu jako..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Nelze vytvořit dočasný adresář: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Adresa"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -11973,59 +12641,428 @@ msgstr ""
 "\n"
 "Opravdu vymazat tyto zprávy?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Nastavení editoru"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/em-utils.c:2288
+#, fuzzy
 msgid ""
-"Configure mail preferences, including security and message display, here"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
 msgstr ""
-"Zde se nachází nastavení voleb pošty, včetně bezpečnosti a zobrazení zprávy"
+"Tato operace trvale vymaže všechny zprávy označené jako smazané.\n"
+"Pokud budete pokračovat, nebude už možné tyto zprávy obnovit.\n"
+"\n"
+"Opravdu vymazat tyto zprávy?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Zde se nachází nastavení kontroly pravopisu, podpisů a editoru zpráv"
+#: mail/evolution-mail.schemas.in.in.h:1
+msgid "Automatic link recognition"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Zde se nachází nastavení vašich emailových účtů"
+#: mail/evolution-mail.schemas.in.in.h:2
+msgid "Automatic smiley recognition"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution Pošta"
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Ovládací prvek nastavení účtů pošty Evolution"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Komponenta pošty Evolution"
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Editor zpráv pošty Evolution"
+#: mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
+msgid "Default charset in which to compose messages"
+msgstr "Implicitní předmět zprávy."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Ovládací prvek nastavení editoru zpráv pošty Evolution"
+#: mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
+msgid "Default charset in which to compose messages."
+msgstr "Implicitní předmět zprávy."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Prohlížeč složek pošty Evolution"
+#: mail/evolution-mail.schemas.in.in.h:8
+#, fuzzy
+msgid "Default charset in which to display messages"
+msgstr "Hledat text v těle zobrazené zprávy"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Ovládací prvek nastavení pošty Evolution."
+#: mail/evolution-mail.schemas.in.in.h:9
+#, fuzzy
+msgid "Default charset in which to display messages."
+msgstr "Hledat text v těle zobrazené zprávy"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/evolution-mail.schemas.in.in.h:10
+#, fuzzy
+msgid "Default forward style"
+msgstr "_Styl přeposílání:"
+
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default reply style"
+msgstr "Styl _odpovědí:"
+
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Empty Trash folders on exit"
+msgstr "Při ukončení vyprázdnit složku _koš"
+
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Při ukončení vyprázdnit složku _koš"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "Emailové účty"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "Nastavení pošty"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "Provést akce"
+
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Upozornění na novou poštu"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Upozornění na novou poštu"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+"_Upozornit, když posílám zprávu v HTML formátu kontaktům, které si to nepřejí"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr ""
+"Up_ozornit, když posílám zprávu, kde jsou uvedeni jen příjemci v neviditelné "
+"kopii"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "Poslat HTML dopis?"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "Poslat HTML dopis?"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "_Zobrazovat animované obrázky"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "_Zobrazovat animované obrázky"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Ukázat zprávu v normálním stylu"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "_Panel náhledu"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "_Zahrát zvuk, když přijde nová pošta"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "_Kontrola pravopisu"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "Písmo _terminálu:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "Vyberte písmo s proměnlivou šířkou pro tisk HTML"
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Seznam zpráv dle vláken"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Seznam zpráv dle vláken"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "Použít tento účet jako _výchozí"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "P_roměnlivá šířka:"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Importér Evolution z Elm"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+msgid "Evolution mbox importer"
+msgstr "Importér Evolution z mbox"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Netscape Mail importer"
+msgstr "Importér Evolution z Netscape Mail"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Importéer Evolution z Outlook Express 4"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Pine importer"
+msgstr "Importér Evolution z Pine"
 
 #: mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
@@ -12065,34 +13102,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Importér Evolution z Elm"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Importér Evolution z mbox"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Netscape Mail importer"
-msgstr "Importér Evolution z Netscape Mail"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Importéer Evolution z Outlook Express 4"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Pine importer"
-msgstr "Importér Evolution z Pine"
-
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -12153,12 +13162,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importuje vaše stará data z Netscape"
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Koš"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Zkoumají se poštovní filtry"
@@ -12167,7 +13170,7 @@ msgstr "Zkoumají se poštovní filtry"
 msgid "Scanning directory"
 msgstr "Prohledává se adresář"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Spouští se import"
 
@@ -12242,23 +13245,23 @@ msgid "You have not filled in all of the required information."
 msgstr "Nevyplnili jste všechny požadované informace."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Editor účtů Evolution"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Počítač:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "_Jméno uživatele:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Cesta:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Nemůžete vytvořit dva účty se stejným jménem."
 
@@ -12267,35 +13270,35 @@ msgstr "Nemůžete vytvořit dva účty se stejným jménem."
 msgid "Mail to %s"
 msgstr "Poslat %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Předmět je %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s konferencí"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Odpovězeno komu:"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Přidat pravidlo filtru"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "Následující pravidlo(a) filtru:\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12306,143 +13309,30 @@ msgstr ""
 "    '%s'\n"
 "a byla aktualizována."
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "Připojuji se..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Tato složka nemůže obsahovat zprávy."
-
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Nelze otevřít sdílenou složku: %s."
-
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Nelze vytvořit dočasný adresář: %s"
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Nový dopis"
 
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Nelze vytvořit dočasný soubor '%s': %s"
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "_Dopis"
 
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Nelze zavřít dočasnou složku: %s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "Napsat nový dopis"
 
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Výběr složky, do které mají být importována tato data"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Výběr složky, do které mají být importována tato data"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Vytvořit novou složku"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Upřesněte, kde chcete vytvořit složku:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Nelze smazat složku `%s': %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Opravdu odstranit složku \"%s\"?"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Odstranit \"%s\""
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Přejmenovat složku \"%s\" na:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-msgid "Rename Folder"
-msgstr "Přejmenovat složku"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Zadaný název složky není platný: %s"
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Vlastnosti písma"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Vlastnosti"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "_Název složky:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Zobrazení"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Otevřít v novém oknu"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Přesunout"
-
-#: mail/mail-component.c:2087
-msgid "_New Folder..."
-msgstr "_Nová složka..."
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "_Přejmenovat"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "Vla_stnosti..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Identita"
 
@@ -12501,11 +13391,11 @@ msgstr ""
 "pro vytvoření poštovního účtu Evolution. Zadejte prosím níže název pro tento "
 "účet. Tento název bude použit pouze pro zobrazení."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Kontroluje se služba"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Připojuji se k serveru..."
 
@@ -12587,26 +13477,35 @@ msgid "C_olors"
 msgstr "_Barvy"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Kontrola nové pošty"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "Kontrolovat pravopis během _psaní"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Kontrola nové pošty"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "_Barva pro špatně napsaná slova:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Psání zpráv"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Nastavení"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12622,275 +13521,280 @@ msgstr ""
 "\n"
 "Kliknutím na \"Použít\" uložíte vaše nastavení."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "_Výchozí"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Předem nastavené chování"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "Výchozí kódování _znaků:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Mazání pošty"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Vždy podepsat odchozí zprávy, když se používá tento účet"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "Necitovat původní zprávu"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 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:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Hotovo"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "_Složka konceptů:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "_Povolit"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "Emailové účty"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "Emailová _adresa:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "Při ukončení vyprázdnit složku _koš"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "ID _certifikátu:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Průvodce účtem Evolution"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Vykonat příkaz..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "Pe_vná šířka:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "Filtry"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "Vlastnosti písma"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "Psát zprávy ve formátu _HTML"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "_Zvýraznit citace pomocí"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Vložené"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Popisky a barvy"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Nahrávání obrázků"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Nastavení pošty"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Umístění poštovní schránky"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Editor zpráv"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Zobrazení zprávy"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 msgid "Message Fonts"
 msgstr "Písma zprávy"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Upozornění na novou poštu"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Poznámka: na heslo budete dotázáni, až když se pokusíte poprvé připojit"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Nepovinné informace"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "Or_ganizace:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "ID PGP/GPG _klíče:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Vyberte barvu"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Up_ozornit, když posílám zprávu, kde jsou uvedeni jen příjemci v neviditelné "
 "kopii"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Písma pro tisk"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "Citovat původní zprávu"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Citace"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "Zapa_matovat si toto heslo"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "O_dpovědět-komu:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Příjem pošty"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "Možnosti _příjmu"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "Zapamatovat si toto _heslo"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Povinné informace"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "Obnovit výchozí hodnoty"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "Zab_ezpečení"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "Bezpečné MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr "Vyberte písmo s pevnou šířkou pro HTML"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr "Vyberte písmo s pevnou šířkou pro tisk HTML"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr "Vyberte písmo s proměnlivou šířkou pro HTML"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr "Vyberte písmo s proměnlivou šířkou pro tisk HTML"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Posílání pošty"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Složka pro _odeslané zprávy:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Odeslané zprávy a koncepty"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver vyžaduje přihlášení"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Nastavení serveru"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "_Typ serveru: "
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Samopodepsaný certifikát v řetězci"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "Upřesnit _název souboru:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "_Kontrola pravopisu"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Standardní Unixový mbox"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12900,7 +13804,7 @@ msgstr ""
 "váš podpis. Název, který zadáte, bude použit\n"
 "pouze pro zobrazení."
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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 "
@@ -12910,7 +13814,7 @@ msgstr ""
 "Uvedený seznam jazyků odpovídá tomu, pro jaké jazyky máte nainstalovaný "
 "slovník."
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12918,11 +13822,15 @@ msgstr ""
 "Napište název, který má odkazovat na tento účet.\n"
 "Například \"Práce\" nebo \"Osobní\""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "P_roměnlivá šířka:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12932,170 +13840,179 @@ msgstr ""
 "\n"
 "Začněte kliknutím na \"Vpřed\"."
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "Přid_at podpis"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "_Vždy načítat obrázky ze sítě"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Vždy podepsat odchozí zprávy, když se používá tento účet"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "Typ _ověření: "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "Typ _ověření: "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr "_Automaticky kontrolovat novou poštu každých"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "_Automaticky vkládat smajlíky"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "_Pípnout, když přijde nová pošta"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "_Vyžadovat potvrzení před vyčištěním složky"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "_Výchozí podpis:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "_Výchozí hodnoty"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Neupozorňovat, když přijde nová pošta"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "_Povolit"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "_Styl přeposílání:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "_Celé jméno:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "_HTML dopis"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "_Identita"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "červen"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "_Načíst obrázky, pokud je odesílatel v adresáři"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "Použít tento účet jako _výchozí"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "_Označit zprávu jako přečtenou po"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Jméno:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "_Nikdy nenačítat obrázky ze sítě"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "_Zahrát zvuk, když přijde nová pošta"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 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:159
+#: mail/mail-config.glade.h:165
 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:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "_Příjem pošty"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "Styl _odpovědí:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "_Obnovit výchozí hodnoty"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Smazat..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "Ode_sílání pošty"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "_Zobrazovat animované obrázky"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Podpisy"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr "_Standardní písmo:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr "Písmo _terminálu:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "Použít _bezpečné připojení (SSL):"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr "Používat _stejná písma jako jiné aplikace"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "popis"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr "Zkouší se %s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13104,7 +14021,7 @@ msgstr ""
 "Chyba během '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13113,7 +14030,7 @@ msgstr ""
 "Chyba při vykonávání operace:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Pracuje se"
 
@@ -13125,118 +14042,118 @@ msgstr "Filtruje se složka"
 msgid "Fetching Mail"
 msgstr "Přijímá se pošta"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nepodařilo se uložit poštu v dočasném souboru %s: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Nepodařilo se uložit poštu v dočasném souboru %s: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Posílá se \"%s\""
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Posílá se zpráva č. %d z %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Selhání na zprávě %d z %d"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Dokončeno."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Ukládá se zpráva do složky"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Přesouvají se zprávy do %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopírují se zprávy do %s"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Prochází se složky v \"%s\""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Přeposlané zprávy"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otevírá se složka %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "Otevírá se úložiště %s"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstraňuje se složka %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ukládá se složka '%s'"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Aktualizuje se složka"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Čistí se složka"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vyprazdňuji koš v '%s'"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Místní složky"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Získává se zpráva %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Získávají se zprávy (%d)"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Ukládají se zprávy (%d)"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13245,7 +14162,7 @@ msgstr ""
 "Nepodařilo se vytvořit výstupní soubor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13254,11 +14171,11 @@ msgstr ""
 "Chyba při ukládání zpráv do: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Ukládá se příloha"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13267,21 +14184,25 @@ msgstr ""
 "Nepodařilo se vytvořit výstupní soubor: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nelze zapisovat data: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odpojuji se od %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Znovu se připojuji na %s"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Rozlišovat malá/velká"
@@ -13298,59 +14219,74 @@ msgstr "Hledat:"
 msgid "Search"
 msgstr "Hledat"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Upravit podpis"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Výjimky"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Informace o účtu"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Ruší se..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, typ: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Cesta: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Odeslat a přijmout poštu"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 msgid "Cancel _All"
 msgstr "Zrušit _vše"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Aktualizuje se..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Čeká se..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Uživatel zrušil operaci."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Zadat heslo pro %s"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Zadat heslo"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "_Zapamatovat si toto heslo"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamatovat si toto heslo pro zbytek tohoto sezení"
 
@@ -13389,26 +14325,31 @@ msgstr "Zadejte název tohoto podpisu."
 msgid "Name:"
 msgstr "Název:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Přeposlaná zpráva - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Přeposlaná zpráva"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Otevírá se složka %s"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Nastavuje se v-složka: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Aktualizuje se v-složka pro uri: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13421,88 +14362,88 @@ msgstr ""
 "    '%s'\n"
 "A byly aktualizovány."
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "V-složky"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "v-složky"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Upravit V-složku"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Pokus o úpravu v-složky '%s', která neexistuje."
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Nová V-složka"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Nepřečtené"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Přečtené"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Odpovězené"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Více nepřečtených zpráv"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Více zpráv"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Nejnižší"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Nižší"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Vyšší"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Nejvyšší"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Dnes %k:%M"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Včera %k:%M"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Generuje se seznam zpráv"
 
@@ -13558,11 +14499,11 @@ msgstr "Přeposlat"
 msgid "No Response Necessary"
 msgstr "Není nutná odpověď"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Odpovědět"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Odpovědět všem"
 
@@ -13614,41 +14555,139 @@ msgstr "_Přihlásit se"
 msgid "_Unsubscribe"
 msgstr "_Odhlásit se"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr "Zde lze nastavit speciální složky a chování odpojené složky"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Shell Evolution"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Nastavení složky"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "80%"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Přejmenovat tuto skupinu zkratek"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Přepnout zobrazení lišty složkek"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Skrýt lištu zkratek"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Výchozí priority:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Výchozí priority:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Konfigurační rozhraní pošty Evolution"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+#, fuzzy
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "Označit přílohu tak, aby se implicitně zobrazovala v textu."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
 msgstr ""
-"Nelze přemístit složku:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Přidat složku"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Rozepsaná"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Příchozí"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "Otevírám výchozí složku úkolů"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Otevírám výchozí složku úkolů"
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "K odeslání"
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Otevírám výchozí složku úkolů"
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Odeslaná"
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Otevírám výchozí složku úkolů"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Přepnout zobrazení lišty složkek"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Přepnout zobrazení lišty zkratek"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "E-mail"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Nepodařilo se korektně aktualizovat soubory"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13659,7 +14698,7 @@ msgstr ""
 "%s\n"
 "Chyba: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13668,7 +14707,7 @@ msgstr ""
 "Nastala chyba při kopírování souborů do\n"
 "`%s'."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13679,7 +14718,7 @@ msgstr ""
 "Přesuňte jej prosím, aby mohly\n"
 "být nainstalovány soubory Evolution."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13777,10 +14816,11 @@ msgstr ""
 "Nelze přejmenovat složku:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+msgid "The specified folder name is not valid: %s"
+msgstr "Zadaný název složky není platný: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -13804,19 +14844,15 @@ msgstr ""
 "Zadanou složku nelze vytvořit:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Vytvořit novou složku"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Bez názvu)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Vyberte typ importéru, který chcete spustit:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13829,11 +14865,11 @@ msgstr ""
 "\n"
 "Použijte \"Automaticky\" pokud typ neznáte a Evolution se jej pokusí určit."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Vyberte prosím informace, které chcete importovat:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13841,7 +14877,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13850,21 +14886,21 @@ msgstr ""
 "Importuje se %s\n"
 "Importuje se položka %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "Vyberte importér"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "Soubor %s neexistuje"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Chyba Evolution"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -13873,11 +14909,11 @@ msgstr ""
 "Není k dispozici importér pro zpracování\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Importuje se"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -13886,17 +14922,17 @@ msgstr ""
 "Importuje se %s\n"
 "Začíná %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Chyba při startu %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Chyba při načítání %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13905,35 +14941,35 @@ msgstr ""
 "Importuje se %s\n"
 "Importuje se položka 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Název souboru:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Vyberte soubor"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Typ souboru:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Import dat a nastavení ze starších programů"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Importovat jeden soubor"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -13941,47 +14977,28 @@ msgstr ""
 "Prosím čekejte...\n"
 "Hledají se existující nastavení"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Spouští se inteligentní importy"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "Z %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Výběr složky, do které mají být importována tato data"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Importovat"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Zavírá se spojení..."
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Chyba při synchronizaci \"%s\":\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "Synchronizuje se složka"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Synchronizuje se \"%s\" (%d z %d)..."
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Nastavení Evolution"
@@ -14016,7 +15033,7 @@ msgstr "Nelze otevřít sdílenou složku: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Nelze nalézt zadanou sdílenou složku."
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14025,17 +15042,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Asistent"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Nový"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Není zadán název složky."
@@ -14093,64 +15104,51 @@ msgstr "Vytvořit novou zkratku"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vyberte složku, na kterou má zkratka ukazovat:"
 
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "Pracovat _on-line"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "_Pracovat při odpojení"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Pracovat při odpojení"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Není zobrazena žádná složka)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Nic)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution je nyní on-line. Stiskem tohoto tlačítka přejdete do režimu "
 "off-line."
 
-#: shell/e-shell-view.c:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution přechází do režimu off-line."
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution je nyní off-line. Stiskem tohoto tlačítka přejdete do "
 "režimu on-line."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Neplatné argumenty"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Nelze registrovat u OAF"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Databáze nastavení nebyla nalezena"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Obecná chyba"
 
@@ -14263,74 +15261,18 @@ msgstr "_Odstranit"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstranit tuto zkratku z lišty zkratek"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Chyba při ukládání zkratek."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Příchozí"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Zkratky"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Žádná chyba"
-
-#: shell/e-storage.c:573
-msgid "A folder with the same name already exists"
-msgstr "Složka se stejným názvem již existuje"
-
-#: shell/e-storage.c:575
-msgid "The specified folder type is not valid"
-msgstr "Uvedený typ složky je neplatný"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "Chyba V/V"
-
-#: 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:581
-msgid "The folder is not empty"
-msgstr "Složka není prázdná"
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "Uvedená složka nebyla nalezena"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "Funkce není v tomto úložišti implementovaná"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "Operace není podporovaná"
-
-#: shell/e-storage.c:591
-msgid "The specified type is not supported in this storage"
-msgstr "Uvedený typ není podporovaný tímto úložištěm"
-
-#: 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:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "Nelze přesunout složku do jedné z jejich podsložek"
-
-#: shell/e-storage.c:597
-msgid "Cannot create a folder with that name"
-msgstr "Nelze vytvořit složku s tímto názvem"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Tuto operaci nelze provést v režimu odpojení"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Zaškrtávací políčko"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14341,6 +15283,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% hotovo)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Nový"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "\"%s\" v \"%s\""
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14378,74 +15331,6 @@ msgstr ""
 "Chyba z aktivačního systému je:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "Chyba CORBA"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Přerušeno"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Neplatný argument"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Již má vlastníka"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Žádný vlastník"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Nenalezeno"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Nepodporovaný typ"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Nepodporované schéma"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Nepodporovaná operace"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Vnitřní chyba"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Existuje"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "Neplatné URI"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Má podsložky"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Nezbývá žádné místo"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "Starý vlastník zemřel"
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Typ testu"
-
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr "Testovací komponenta Evolution."
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr "Aktivní spojení"
@@ -14474,10 +15359,6 @@ msgstr "_Pošta:"
 msgid "_Tasks:"
 msgstr "Úk_oly:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr "_Název složky:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder _type:"
 msgstr "_Typ složky:"
@@ -14540,22 +15421,6 @@ msgstr ""
 "\n"
 "Stiskem \"Použít\" své nastavení uložíte."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "Zde lze nastavit speciální složky a chování odpojené složky"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Shell Evolution"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Ovládací prvek nastavení složky Evolution"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Nastavení složky"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Spusťte import souboru do Evolution kliknutím na \"Import\"."
@@ -14594,7 +15459,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Importéry"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Importovat"
 
@@ -14610,16 +15475,16 @@ msgstr "Příště se neptat"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution našel tyto soubory dat vhodné pro import:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Evolution se právě zavírá ..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14655,7 +15520,7 @@ msgstr ""
 "Doufáme, že si užijete výsledků naší tvrdé práce a nedočkavě čekáme\n"
 "na vaše přispění!\n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -14663,36 +15528,48 @@ msgstr ""
 "Děkujeme\n"
 "Team Ximian Evolution\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr "Příště neupozorňovat"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Nelze inicializovat shell Ximian Evolution."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nelze inicializovat shell Ximian Evolution: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Spustit v režimu odpojení"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Spustit v režimu on-line"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr "Vynuceně ukončit všechny komponenty evolution"
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Poslat ladící výstup ze všech komponent do souboru."
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14701,31 +15578,60 @@ msgstr ""
 "%s: --online a --offline není možné použít najednou.\n"
 "  Použijte %s --help pro zobrazení dalších informací.\n"
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Vyberte importér"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "ID _certifikátu:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "Průběh"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Výraz"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Sloučit e-mailovou adresu"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"Certifikát vypršel: %s\n"
+"Výstavce: %s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14783,91 +15689,376 @@ msgid "Backup All"
 msgstr "Blackpool"
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "ID _certifikátu:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Nedůvěryhodný certifikát"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "ID _certifikátu:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Společné jméno"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "ID _certifikátu:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "_Upravit"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Nepodařilo se ověřit certifikáty"
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Výraz"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Organizace"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Organizační jednotka"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Zobrazení"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "ID _certifikátu:"
+
+#: smime/gui/smime-ui.glade.h:42
+#, fuzzy
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr "Neplatná certifikační autorita (CA)"
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "ID _certifikátu:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Importovat"
+msgid "Certificate already exists"
+msgstr "Identifikační číslo karty již existuje"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Vermont"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "S"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "OK"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "S"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "ID _certifikátu:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "ID _certifikátu:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "Nedůvěryhodný certifikát"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "ID"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Předmět je %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Nelze zpracovat adresář fronty"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "Neplatná certifikační autorita (CA)"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Neplatná certifikační autorita (CA)"
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "(Není informace)"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "příloha"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "ID _certifikátu:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Curitiba"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "Severní Karolína"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Výraz"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s při %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Selhala certifikace podpisu"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "_Vložit"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Předmět je %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Selhala certifikace podpisu"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Zadat heslo pro %s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "ID _certifikátu:"
 
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
@@ -14918,7 +16109,7 @@ msgstr "Kopírovat výběr"
 msgid "Copy to Folder..."
 msgstr "Kopírovat do složky..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Vyjmout výběr"
 
@@ -14934,7 +16125,7 @@ msgstr "Přesunout kontakt(y) do jiné složky..."
 msgid "Move to Folder..."
 msgstr "Přesunout do složky..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Vložit schránku"
 
@@ -14942,8 +16133,8 @@ msgstr "Vložit schránku"
 msgid "Previews the contacts to be printed"
 msgstr "Náhled kontaktů před tiskem"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "_Náhled před tiskem"
@@ -14988,13 +16179,13 @@ msgstr "Zastavit načítání"
 msgid "View the current contact"
 msgstr "Zobrazit aktuální kontakt"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "_Akce"
 
@@ -15024,142 +16215,110 @@ msgstr "_Poslat kontaktu zprávu..."
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "Vytvořit novou celodenní událost"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Vytvořit novou událost"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "Vytvořit novou složku"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Vytvořit požadavek na novou schůzku"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Vytvořit nový úkol"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "den"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Odstranit všechny výskyty"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Zrušit událost"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Odstranit tento výskyt"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Odstranit tento výskyt"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Jít na"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Jít zpět"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Jít dopředu"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Jít na _datum"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Jít na určité datum"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Jít na dnešek"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "Seznam"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "měsíc"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Nová _událost"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Nová Kaledonie"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Nová schůzka"
-
-#: ui/evolution-calendar.xml.h:27
-#, fuzzy
-msgid "New _Task"
-msgstr "Nový úkol"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Náhledy kalendáře k tisku"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Tisknout tento kalendář"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Zveřejnit informace o volném/obsazeném čase pro tento kalendář"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Bourges"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Veřejná složka obsahující události a schůzky"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Ukázat podrobnosti"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Ukázat jeden den"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Ukázat jeden měsíc"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Ukázat jeden týden"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Ukázat pracovní týden"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "týden"
 
@@ -15224,7 +16383,7 @@ msgstr "Uložit tuto položku na disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Soubor"
 
@@ -15442,7 +16601,7 @@ msgstr "Označit vše jako př_ečtené"
 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 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "Vložit zprávy ze schránky"
 
@@ -15498,16 +16657,6 @@ msgstr "_Obrátit výběr"
 msgid "_Threaded Message List"
 msgstr "Seznam zpráv dle _vláken"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Zavřít toto okno"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "_Zavřít"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "Přidat _odesílatele do adresáře"
@@ -15665,257 +16814,282 @@ msgstr "Přeposlat někomu vybranou zprávu jako přílohu"
 msgid "Increase the text size"
 msgstr "Zvětšit velikost textu"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Nahrávat _obrázky"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Označit jako _důležité"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Označit jako _nepřečtené"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Označit jako nedů_ležité"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "Označit vybrané zprávy jako přečtené"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "Označit vybrané zprávy jako důležité"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Označit vybrané zprávy jako nedůležité"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Označit vybrané zprávy jako nepřečtené"
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Označit vybrané zprávy jako nepřečtené"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Označit vybrané zprávy jako nedůležité"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Označit vybrané zprávy ke smazání"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Přesunout"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "Přesunout vybrané zprávy do jiné složky"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Další"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "další důležit_ou zprávu"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "další _vlákno"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "d_alší nepřečtenou zprávu"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Nenalezeno"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Otevřít vybranou zprávu v novém okně"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Otevřít vybranou zprávu a upravit ji pro znovu-poslání"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Původní _velikost"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "pře_dchozí nepřečtenou zprávu"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Poslat odpověď"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr "Poslat odpověď na zprávu do veřejné složky"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "př_edchozí důležitou zprávu"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Náhled zprávy před tiskem"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Předchozí"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Vytisknout tuto zprávu"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "Přesmě_rovat"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Přesměruje (bounce) vybranou zprávu někomu jinému"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Obnovit text v jeho původní velikosti"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "Hledat _ve zprávě..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "_Menší"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Uložit tuto zprávu jako textový soubor"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Hledat text v těle zobrazené zprávy"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr "Nastavit stránku pro vaši aktuální tiskárnu"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Ukázat _zdroj emailu"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Ukázat celou _hlavičku"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Hledat text v těle zobrazené zprávy"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Ukázat zprávu v normálním stylu"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Ukázat zprávu se všemi e-mailovými hlavičkami"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Zobrazit zdrojový formát poštovní zprávy"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "_Velikost textu"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Obnovit smazané vybrané zprávy"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "V-složku podle poštovní _konference..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "V-složku podle _odesílatele..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "V-složku podle _příjemců"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "V-složku podle pře_dmětu..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "_Přiložené"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "_Kopírovat do složky"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "_Vytvořit filtr ze zprávy"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "_Přeposlat zprávu"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "_Jít na"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "_Vložené"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "_Větší"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "_Zobrazení zprávy"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Přesunout do složky"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "_následující zprávu"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "_Normální zobrazení"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "_Otevřít zprávu"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "_předchozí zprávu"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "_Citace"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "_Znovu poslat..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "_Nástroje"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "_Obnovit smazané"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Zavřít toto okno"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "_Zavřít"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Příloha"
@@ -16194,12 +17368,13 @@ msgid "Change Evolution's settings"
 msgstr "Změnit nastavení Evolution"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "_Konec"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Vytvořit požadavek na novou schůzku"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "Okno _Evolution"
+msgid "E_xit"
+msgstr "_Konec"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16211,61 +17386,74 @@ msgstr "Importovat data z jiných programů"
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "Okno _Evolution"
+msgid "Open a new window"
+msgstr "Otevřít v novém oknu"
 
 #: ui/evolution.xml.h:11
 msgid "Pi_lot Settings..."
 msgstr "Nastavení diáře _Pilot..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Odeslat / přijmout"
+
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr "Poslat položky čekající ve frontě a přijmout nové položky"
+
+#: ui/evolution.xml.h:14
 msgid "Set up Pilot configuration"
 msgstr "Nastavení Pilota"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Ukázat informace o Ximian Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Poslat hlášení o chybě"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "_Poslat hlášení o chybě"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Poslat hlášení o chybě pomocí nástroje pro hlášení chyb Přítel v nouzi"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Přepínač"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Přepnout, zdali pracujete off-line."
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "O _aplikaci Ximian Evolution..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "Ná_pověda"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "I_mportovat..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Nový"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Odeslat / přijmout"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "_Hledat"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Tisk souhrnu"
@@ -16394,12 +17582,12 @@ msgstr "Definovat zobrazení..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "PÚSČPSN"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -16532,7 +17720,7 @@ msgstr "_Vyhledávání"
 msgid "_Find Now"
 msgstr "_Hledat"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "Vy_mazat"
 
@@ -16548,24 +17736,259 @@ msgstr "ID podpoložky"
 msgid "Text"
 msgstr "Text"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Zrušit filtr"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Hledat"
 
+#~ msgid "Account Name"
+#~ msgstr "Název účtu"
+
+#~ msgid "Server Name"
+#~ msgstr "Jméno serveru"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "LDAP není v tomto sestavení Evolution povolen"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Další kontakty"
+
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "Zde lze nastavit přístup k adresářům LDAP serverů"
+
+#~ msgid "Directory Servers"
+#~ msgstr "Adresářové servery"
+
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Ovládací prvek nastavení adresáře LDAP Evolution"
+
+#~ msgid "Add LDAP Server"
+#~ msgstr "Přidat server LDAP"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Krok 4: Zobrazení jména"
+
+#~ msgid "Find contact in"
+#~ msgstr "Hledat kontakt v"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Kontakt přidáte kliknutím zde *"
+
+#~ msgid "Business Address"
+#~ msgstr "Adresa do zaměstnání"
+
+#~ msgid "Department"
+#~ msgstr "Oddělení"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "URL volno/zaneprázdněn"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Povolání"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Otevírám úkoly na %s"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Přesto poslat?"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Zrušit aktuální emailovou operaci"
+#~ msgid "Folder _name"
+#~ msgstr "_Název složky:"
+
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "Tato zpráva je digitálně podepsaná. Kliknutím na ikonu zámku získáte "
+#~ "podrobnosti."
+
+#~ msgid "Connecting..."
+#~ msgstr "Připojuji se..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Tato složka nemůže obsahovat zprávy."
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Nelze otevřít sdílenou složku: %s."
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Výběr složky, do které mají být importována tato data"
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nelze přemístit složku:\n"
+#~ "%s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "Přidat složku"
+
+#~ msgid "Drafts"
+#~ msgstr "Rozepsaná"
+
+#~ msgid "Outbox"
+#~ msgstr "K odeslání"
+
+#~ msgid "Sent"
+#~ msgstr "Odeslaná"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Chyba při synchronizaci \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "Synchronizuje se složka"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Synchronizuje se \"%s\" (%d z %d)..."
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Není zobrazena žádná složka)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(Nic)"
+
+#~ msgid "No error"
+#~ msgstr "Žádná chyba"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Složka se stejným názvem již existuje"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Uvedený typ složky je neplatný"
+
+#~ msgid "I/O error"
+#~ msgstr "Chyba V/V"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Pro vytvoření složky není dostatek místa"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Složka není prázdná"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Uvedená složka nebyla nalezena"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Funkce není v tomto úložišti implementovaná"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Operace není podporovaná"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Uvedený typ není podporovaný tímto úložištěm"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Uvedená složka nemůže být upravována ani odstraněna"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "Nelze přesunout složku do jedné z jejich podsložek"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Nelze vytvořit složku s tímto názvem"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Tuto operaci nelze provést v režimu odpojení"
+
+#~ msgid "Checkbox"
+#~ msgstr "Zaškrtávací políčko"
+
+#~ msgid "CORBA error"
+#~ msgstr "Chyba CORBA"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Neplatný argument"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Již má vlastníka"
+
+#~ msgid "No owner"
+#~ msgstr "Žádný vlastník"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Nepodporovaný typ"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Nepodporované schéma"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Nepodporovaná operace"
+
+#~ msgid "Internal error"
+#~ msgstr "Vnitřní chyba"
+
+#~ msgid "Exists"
+#~ msgstr "Existuje"
+
+#~ msgid "Invalid URI"
+#~ msgstr "Neplatné URI"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Má podsložky"
+
+#~ msgid "No space left"
+#~ msgstr "Nezbývá žádné místo"
+
+#~ msgid "Old owner has died"
+#~ msgstr "Starý vlastník zemřel"
+
+#~ msgid "Test type"
+#~ msgstr "Typ testu"
+
+#~ msgid "Evolution Test Component"
+#~ msgstr "Testovací komponenta Evolution."
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "Importovat"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Vytvořit novou celodenní událost"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Nová _událost"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Nová schůzka"
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Název pole"
+#~ msgid "New _Task"
+#~ msgstr "Nový úkol"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "Okno _Evolution"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "Okno _Evolution"
+
+#~ msgid "Toggle"
+#~ msgstr "Přepínač"
 
-#~ msgid "Family Name"
-#~ msgstr "Příjmení"
+#~ msgid "Clear"
+#~ msgstr "Zrušit filtr"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Zrušit aktuální emailovou operaci"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -16658,9 +18081,6 @@ msgstr "Hledat"
 #~ msgid "VCard (.vcf, .gcrd)"
 #~ msgstr "VCard (.vcf, .gcrd)"
 
-#~ msgid "Loading..."
-#~ msgstr "Načítám..."
-
 #~ msgid "Searching..."
 #~ msgstr "Vyhledávám..."
 
@@ -16712,10 +18132,6 @@ msgstr "Hledat"
 #~ msgstr "EBook nebyl načten\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "Identifikační číslo karty již existuje"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Operace zrušena"
 
@@ -16862,9 +18278,6 @@ msgstr "Hledat"
 #~ msgid "Callback"
 #~ msgstr "Zpětný dotaz"
 
-#~ msgid "Company"
-#~ msgstr "Společnost"
-
 #~ msgid "Comp"
 #~ msgstr "Spol."
 
@@ -16931,9 +18344,6 @@ msgstr "Hledat"
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
 #~ msgid "Birth date"
 #~ msgstr "Datum narození"
 
@@ -16946,9 +18356,6 @@ msgstr "Hledat"
 #~ msgid "Arbitrary"
 #~ msgstr "Libovolný"
 
-#~ msgid "ID"
-#~ msgstr "ID"
-
 #~ msgid "Last Use"
 #~ msgstr "Poslední použití"
 
@@ -16961,9 +18368,6 @@ msgstr "Hledat"
 #~ msgid "Folder containing contact information"
 #~ msgstr "Složka obsahující kontaktní informace"
 
-#~ msgid "LDAP Server"
-#~ msgstr "Server LDAP"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "Server LDAP obsahující kontaktní informace"
 
@@ -16973,18 +18377,6 @@ msgstr "Hledat"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Veřejná složka obsahující kontaktní informace"
 
-#~ msgid "_Contact"
-#~ msgstr "_Kontakt"
-
-#~ msgid "Create a new contact"
-#~ msgstr "Vytvořit nový kontakt"
-
-#~ msgid "New Contact List"
-#~ msgstr "Nový seznam kontaktů"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "Vytvořit nový seznam kontaktů"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "URI, kterou prohlížeč složek zobrazí"
 
@@ -17000,9 +18392,6 @@ msgstr "Hledat"
 #~ msgid "Is New Card"
 #~ msgstr "Nová karta"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "Žádné karty"
 
@@ -17049,30 +18438,6 @@ msgstr "Hledat"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "Veřejná složka obsahující položky \"udělat\""
 
-#~ msgid "New appointment"
-#~ msgstr "Nová událost"
-
-#~ msgid "_Appointment"
-#~ msgstr "_Událost"
-
-#~ msgid "New meeting"
-#~ msgstr "Nová schůzka"
-
-#~ msgid "M_eeting"
-#~ msgstr "_Schůzka"
-
-#~ msgid "New task"
-#~ msgstr "Nový úkol"
-
-#~ msgid "_Task"
-#~ msgstr "Ú_kol"
-
-#~ msgid "New All Day Appointment"
-#~ msgstr "Nová celodenní událost"
-
-#~ msgid "All _Day Appointment"
-#~ msgstr "_Celodenní událost"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "Nelze aktualizovat neplatný objekt"
 
@@ -17118,9 +18483,6 @@ msgstr "Hledat"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "Otevírám kalendář na %s"
 
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Otevírám výchozí složku úkolů"
-
 #~ msgid "Evaluation of the search expression did not yield a boolean value"
 #~ msgstr "Vyhodnocení výrazu pro hledání neposkytlo booleovskou hodnotou"
 
@@ -17161,9 +18523,6 @@ msgstr "Hledat"
 #~ "Evolution našla soubory GnomeCard.\n"
 #~ "Chcete je importovat do Evolution?"
 
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Konfigurační rozhraní pošty Evolution"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "Složka obsahující poštu"
 
@@ -17179,9 +18538,6 @@ msgstr "Hledat"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Virtuální složka Odpadkový koš"
 
-#~ msgid "Properties..."
-#~ msgstr "Vlastnosti..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Změna vlastností této složky"
 
@@ -17191,15 +18547,6 @@ msgstr "Hledat"
 #~ msgid "You have unsent messages, do you wish to quit anyway?"
 #~ msgstr "Máte neodeslané zprávy, chcete přesto skončit?"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Nový dopis"
-
-#~ msgid "_Mail Message"
-#~ msgstr "_Dopis"
-
-#~ msgid "Compose a new mail message"
-#~ msgstr "Napsat nový dopis"
-
 #~ msgid "New Message Post"
 #~ msgstr "Nový příspěvek"
 
@@ -19006,9 +20353,6 @@ msgstr "Hledat"
 #~ msgid "Cumberland"
 #~ msgstr "Cumberland"
 
-#~ msgid "Curitiba"
-#~ msgstr "Curitiba"
-
 #~ msgid "Curitiba Apt"
 #~ msgstr "Curitiba Apt"
 
@@ -22000,9 +23344,6 @@ msgstr "Hledat"
 #~ msgid "North Bend"
 #~ msgstr "North Bend"
 
-#~ msgid "North Carolina"
-#~ msgstr "Severní Karolína"
-
 #~ msgid "North Conway"
 #~ msgstr "North Conway"
 
@@ -23614,9 +24955,6 @@ msgstr "Hledat"
 #~ msgid "State College"
 #~ msgstr "State College"
 
-#~ msgid "Stauning"
-#~ msgstr "Stauning"
-
 #~ msgid "Staunton"
 #~ msgstr "Staunton"
 
@@ -24205,9 +25543,6 @@ msgstr "Hledat"
 #~ msgid "United Arab Emirates "
 #~ msgstr "Spojené Arabské Emiráty"
 
-#~ msgid "Unst"
-#~ msgstr "Unst"
-
 #~ msgid "Upington"
 #~ msgstr "Upington"
 
@@ -24316,12 +25651,6 @@ msgstr "Hledat"
 #~ msgid "Veracruz"
 #~ msgstr "Veracruz"
 
-#~ msgid "Vermillion"
-#~ msgstr "Vermillion"
-
-#~ msgid "Vermont"
-#~ msgstr "Vermont"
-
 #~ msgid "Vernal"
 #~ msgstr "Vernal"
 
@@ -24850,9 +26179,6 @@ msgstr "Hledat"
 #~ msgid " F"
 #~ msgstr " F"
 
-#~ msgid " C"
-#~ msgstr " C"
-
 #~ msgid "knots"
 #~ msgstr "uzlů"
 
@@ -25471,9 +26797,6 @@ msgstr "Hledat"
 #~ msgid "Freezing haze"
 #~ msgstr "Mrznoucí mlha"
 
-#~ msgid "Spray"
-#~ msgstr "Spršky"
-
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Jemné spršky v okolí"
 
@@ -25837,18 +27160,6 @@ msgstr "Hledat"
 #~ msgid "Remove a folder added with \"Open Other User's Folder\""
 #~ msgstr "Odstranit složku přidanou přes \"Otevřít složku jiného uživatele\""
 
-#~ msgid "Send / Receive"
-#~ msgstr "Odeslat / přijmout"
-
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Poslat položky čekající ve frontě a přijmout nové položky"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Přepnout zobrazení lišty složkek"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Přepnout zobrazení lišty zkratek"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Zobrazit vybranou složku"
 
@@ -25876,9 +27187,6 @@ msgstr "Hledat"
 #~ msgid "_Rename..."
 #~ msgstr "Pře_jmenovat..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Odeslat / přijmout"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "Lišta z_kratek"
 
diff --git a/po/da.po b/po/da.po
index 6909f667c6..d49d96f91e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.4.1\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-02-02 12:41+0100\n"
 "Last-Translator: Søren Boll Overgaard <boll@debian.org>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -35,51 +35,184 @@ msgstr "Kunne ikke indlæse %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke læse pilotens adresseapplikationsblok"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Mapper for automatisk udfyldning"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "_Certifikat-ID:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Konfigurér dine e-post-konti her"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Kontakter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
+msgstr "Evolution adressebog"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution adressebog - adresse-pop-op"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution adressebog - adressevisning"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution adressebog - kortvisning"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook component"
+msgstr "Evolutions adressebogskomponent"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution adressebog - mappevisning"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution e-post-indstillings-styreelement"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution mappeindstillingsopsætnings-styreelement"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Adressebog"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Egenskaber ..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Slet"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "Omdøb"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Ny kontakt:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "Opret en ny kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Ny kontaktliste"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "Ny kontaktliste"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "Opret en ny kontaktliste"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Personligt"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Arbejde"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "LDAP-server"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Kan ikke oprette katalog %s: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "Tilslutning til LDAP-serveren mislykkedes"
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "Mislykkedes med godkendelse på LDAP-server"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "Kunne ikke gennemføre forespørgsel på rod-DSE"
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "Serveren svarede at ingen søgebaser understøttes"
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Denne server understøtter ikke LDAPv3-schemainformation"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "Fejl ved hentning af schemainformation"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr "Serveren svarede ikke med gyldig schemainformation"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Kontonavn"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Servernavn"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP understøttes ikke i denne udgave af Evolution"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Andre kontakter"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -87,7 +220,7 @@ msgstr ""
 "Kunne ikke åbne denne adressebog. Kontrollér venligst at stien\n"
 "eksisterer, og at du har rettigheder til at tilgå den."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -97,7 +230,7 @@ msgstr ""
 "at du har angivet en forkert URI eller at LDAP-serveren ikke\n"
 "kan nåes."
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -109,7 +242,7 @@ msgstr ""
 "må du oversætte programmet fra kildekoden i CVS efter at\n"
 "have hentet OpenLDAP fra adressen nedenfor.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -123,44 +256,43 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke åbne adressebogen"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "Tilslutter LDAP-serveren anonymt"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "Mislykkedes med godkendelse.\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sAngiv adgangskode for %s (bruger %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "Navn begynder med"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "E-postadresse begynder med"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Kategorien er"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Et felt indeholder"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Avanceret..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -172,7 +304,7 @@ msgstr ""
 "Gør din søgning mere specifik eller øg resultatgrænsen i\n"
 "katalogserverindstillingerne for denne adressebog."
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -185,88 +317,41 @@ msgstr ""
 "specifik eller øg resultatgrænsen i katalogserverindstillingerne\n"
 "for denne adressbog."
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Bagenden for denne adressebog kunne ikke forstå forespørgslen."
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Bagenden for denne adressbog nægtede at gennemføre denne forespørgsel."
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "Denne forespørgsel udførtes ikke successfuldt."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Enhver kategori"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "URIen som kalenderen skal vise"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "_Certifikat-ID:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "Konfigurer adgang til LDAP-katalogservere her"
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Kontakter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "Katalogservere"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolution adressebog"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Evolution adressebog - LDAP-opsætningsstyring"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution adressebog - adresse-pop-op"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution adressebog - adressevisning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution adressebog - kortvisning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr "Evolutions adressebogskomponent"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution adressebog - mappevisning"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution e-post-indstillings-styreelement"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -289,6 +374,7 @@ msgstr "  _Vis de baser som understøttes "
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -322,8 +408,9 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "Tilføj LDAP-server"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "LDAP-konfigurationsassistent"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -339,9 +426,9 @@ msgid "Anonymously"
 msgstr "Anonymt"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -351,48 +438,49 @@ msgstr ""
 "\n"
 "Klik på knappen \"Afslut\" for at gemme de indstillinger du har angivet her."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "Tilslutter"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "Distinguished _name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr "Redigér LDAP-server"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address:"
 msgstr "E-post-_adresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution vil anvende dette DN for at godkende dig på servern"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr "Evolution vil bruge denne adresse til at godkende dig på serveren"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "Færdig"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Generelt"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "LDAP-konfigurationsassistent"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "Gruppe"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Aldrig"
 
@@ -419,8 +507,8 @@ msgid "S_earch scope: "
 msgstr "S_øgningsomfang: "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Søger..."
 
@@ -477,28 +565,32 @@ msgstr ""
 "for LDAP-søgninger, og for at oprette og redigere kontakter."
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 "At vælge et visningsnavn er det sidste nødvendige skridt ved konfiguration "
 "af en LDAP-server."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "Skridt 1: Serverinformation"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "Skridt 2: Tilslutter server"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "Skridt 1: Serverinformation"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "Skridt 3: Søger i kataloget"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Skridt 2: Tilslutter server"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "Skridt 4: Viser navn"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Skridt 3: Søger i kataloget"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -510,18 +602,6 @@ msgstr "Understøttede søgebaser"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"Det første skridt ved konfiguration af en LDAP-server er at angive dens navn "
-"og din\n"
-"brugerinformation. Spørg din systemadministratør hvis du er usikker på denne "
-"information."
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -534,7 +614,7 @@ msgstr ""
 "skal ændre\n"
 "disse."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -546,7 +626,7 @@ msgstr ""
 "Hvis du efterlader dette tomt kommer søgningen at begynde ved roden af "
 "katalogtræet."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -561,15 +641,14 @@ msgstr ""
 "Søgeomfanget \"one\" inkluderer alene de poster som er et niveau under din "
 "søgebase.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
 #, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "Denne guide vil hjælpe dig med at bruge katalogtjenester på nettet der\n"
 "anvender LDAP-serverer (Lightweight Directory Access Protocol).\n"
@@ -579,7 +658,7 @@ msgstr ""
 "finde\n"
 "denne information."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -587,7 +666,7 @@ msgstr ""
 "Dette er det komplette navn på din ldap-server. For eksempel \"ldap.mitfirma."
 "dk\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -597,7 +676,7 @@ msgstr ""
 "højt\n"
 "sænkes hastigheden på adressebogen."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -607,7 +686,7 @@ msgstr ""
 "at sætte dette til \"E-postadresse\" kræver anonym adgang til din ldap-"
 "server."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -616,6 +695,15 @@ msgstr ""
 "Dette er navnet på denne server, som vises i din Evolution-mappliste.\n"
 "Det anvends kun i forbindelse med visning."
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Dette er navnet på denne server, som vises i din Evolution-mappliste.\n"
+"Det anvends kun i forbindelse med visning."
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -644,21 +732,34 @@ msgid "Using email address"
 msgstr "Bruger e-postadresse"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Når det er muligt"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+"Det første skridt ved konfiguration af en LDAP-server er at angive dens navn "
+"og din\n"
+"brugerinformation. Spørg din systemadministratør hvis du er usikker på denne "
+"information."
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "_Vis navn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "_Nedhæntningsgrænse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -666,54 +767,52 @@ msgstr "_Nedhæntningsgrænse:"
 msgid "_Edit"
 msgstr "R_edigér"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "_Logindmetode:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "_Portnummer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "_Udgangspunkt for søgning:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "_Servernavn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "_Timeout (minutter):"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "kort"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr "forbindelsesfaneblad"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr "generel-faneblad"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr "søgefaneblad"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Navn"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution adressebog - navnevalgsgrænseflade"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Fjern alle"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Fjern"
@@ -740,23 +839,21 @@ msgstr "Tilføj i kontakter"
 msgid "Unnamed Contact"
 msgstr "Kontakt uden navn:"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Navn"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Kilde"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Vælg kontakter fra adressebogen"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "Søg kontakt i"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution adressebog - navnevalgsgrænseflade"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Søg"
@@ -836,7 +933,8 @@ msgid "D_epartment:"
 msgstr "Af_deling:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detaljer"
 
@@ -907,12 +1005,12 @@ msgid "_Categories..."
 msgstr "Ka_tegorier..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Slet"
@@ -2047,7 +2145,7 @@ msgid "Esq."
 msgstr "Esq."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Fulde navn"
 
@@ -2142,11 +2240,27 @@ msgstr "Kontaktlisteredigering"
 msgid "Save List as VCard"
 msgstr "Gem liste som VCard"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Ændret kontakt:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Kontakt i konflikt:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Duplikeret kontakt fundet"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Den nye e-post-adresse eller navnet for denne kontakt\n"
+"eksisterer allerede i denne mappe. Vil du tilføje den alligevel?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Ny kontakt:"
@@ -2163,22 +2277,6 @@ msgstr ""
 "Navnet eller e-postadressen for denne kontakt eksisterer allerede\n"
 "i denne mappe. Vil du tilføje den alligevel?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Ændret kontakt:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Kontakt i konflikt:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"Den nye e-post-adresse eller navnet for denne kontakt\n"
-"eksisterer allerede i denne mappe. Vil du tilføje den alligevel?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2277,9 +2375,9 @@ msgstr "Videresend kontakt"
 msgid "Send Message to Contact"
 msgstr "Send besked til kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Udskriv"
@@ -2301,9 +2399,12 @@ msgstr "Flyt til mappe..."
 msgid "Cut"
 msgstr "Klip ud"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopier"
 
@@ -2312,16 +2413,8 @@ msgstr "Kopier"
 msgid "Paste"
 msgstr "Indsæt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Slet"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "Aktuel visning"
 
@@ -2337,166 +2430,170 @@ msgstr ""
 "er gået ned. Du skal genstarte Evolution for at kunne anvende den igen"
 
 #: 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:2
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Fax på arbejde"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Arbejdstelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Arbejdstelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Telefon for tilbageringing"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Biltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategorier"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Firmatelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Afdeling"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "E-post 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Efternavn"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Gem som"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "Fri-ledig URL"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Hjemmeadresse"
+#, fuzzy
+msgid "Given Name"
+msgstr "Feltnavn"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Fax hjemme"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Hjemmetelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Hjemmetelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Jordan"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Leder"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Kaldenavn"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Kommentar"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Kontor"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Anden adresse"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Anden fax"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Anden telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Personsøger"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Primær telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Profession"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Rolle"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Ægtefælle"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TTD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Titel"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Unst"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Netside"
 
@@ -2589,11 +2686,19 @@ msgstr "Medlemmer"
 msgid "Job Title"
 msgstr "_Jobtitel:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Hjemmeadresse"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Hjemmeadresse"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Anden adresse"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2606,112 +2711,109 @@ msgstr "Fax hjemme"
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Succes"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "\"Offline\" lager"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Tilgang nægtet"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Kort ikke fundet"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Kort-ID eksisterer allerede"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Protokollen er ikke understøttet"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Afbrudt"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "Godkendelse mislykkedes"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "Godkendelse kræves"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS er ikke tilgængelig"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "Adressbogen findes ikke"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Anden fejl"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Vil du gemme ændringene?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr "_Forkast"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Fejl ved tilføjelse af liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Fejl ved tilføjelse af kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Fejl ved ændring af liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Fejl ved ændring af kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Fejl ved fjernelse af liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Fejl ved fjernelse af kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2720,7 +2822,7 @@ msgstr ""
 "At åbna %d kort vil yderligere åbne %d nye vinduer.\n"
 "Ønsker du virkelig at vise alle disse kort?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2729,49 +2831,49 @@ msgstr ""
 "%s eksisterer allerede\n"
 "Vil du overskrive den?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "Overskriv"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Fejl ved gemning af %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Flyt kort til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kopiér kort til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Flyt kort til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kopiér kort til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Flere VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
@@ -2966,7 +3068,7 @@ msgstr "Margener"
 msgid "Number of columns:"
 msgstr "Antal kolonner:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Valgmuligheder"
 
@@ -3153,18 +3255,18 @@ msgstr "Navnløs liste"
 msgid "Split Multi-Day Events:"
 msgstr "Dél flerdagshændelser:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Kunne ikke starte wombat-server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Kunne ikke starte wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikke læse pilotens kalender-programblok"
 
@@ -3172,25 +3274,84 @@ msgstr "Kunne ikke læse pilotens kalender-programblok"
 msgid "Default Priority:"
 msgstr "Standardprioritet:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke læse pilotens programblok for opgaveliste"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Kalender og opgaver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Konfigurér din tidszone, kalender og opgaveliste her "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution kalender og opgaver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution kalender-opsætnings-styringselement"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution kalendertilrettelægnings-beskedvisning"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Evolution kalendervisning"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution kalender/opgave-redigering"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Evolution opgavevisning"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolution kalender-og-opgaver-komponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolutions testkomponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Opgaver"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution kalenderalarmbekendgørelsestjeneste"
+
 # Konteksten er planlægning af opgaver. Dette er tidspunktet for begyndelsen
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Begynder:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Slutter:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Evolutionalarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarmer %s"
@@ -3265,43 +3426,172 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Spørg mig ikke om dette program igen."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution kalenderalarmbekendgørelsestjeneste"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initialisere Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Kunne ikke initiere gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunne ikke oprette fabrik for alarm-tjenesten"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "Ugyldig tidsangivelse"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "iCalendar-fejl"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Farve for opgaver som går ud i dag"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Farve for opgaver som går ud i dag"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "_Vis sluttiderne for møder i uge- og månadsoversigterne"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Forhåndsviser kalenderen som skal skrives ud"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "Spørg efter bekræftelse ved sletning _af opføringer"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "Spørg efter bekræftelse ved sletning _af opføringer"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Fjern færdiggjorte opgaver"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Vis uge_nummer i datonavigation"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Sammendrag indeholder"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Beskrivelse indeholder"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Kommentar indeholder"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Ingen træffere"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3313,81 +3603,110 @@ msgstr ""
 "\n"
 "Vil du virkelig fjerne disse opgaver?"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "returnerer mindre end"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "dage"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 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:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d. %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d. %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Udskriv denne kalender"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Ny-kaledonia"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "Nyt møde"
+
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "_Møde"
+
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Opret en ny aftale"
+
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "Nyt møde"
+
+#: calendar/gui/calendar-component.c:640
+msgid "M_eeting"
+msgstr "Mød_e"
+
+#: calendar/gui/calendar-component.c:641
 #, fuzzy
-msgid "Rename"
-msgstr "Omdøb"
+msgid "Create a new meeting request"
+msgstr "Opret en ny mødeindkaldelse"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Nyt heldagsmøde"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Personligt"
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr "Hel_dagsmøde"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Arbejde"
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Opret en ny aftale"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3504,7 +3823,7 @@ msgstr "Send-til:"
 msgid "With these arguments:"
 msgstr "Med disse argumenter:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -3520,6 +3839,10 @@ msgstr "timer"
 msgid "minutes"
 msgstr "minutter"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3552,8 +3875,8 @@ msgstr "Send et e-brev"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Sammendrag:"
 
@@ -3582,7 +3905,7 @@ msgstr "slutning på aftale"
 msgid "hour(s)"
 msgstr "time(r)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minutt(er)"
 
@@ -3636,7 +3959,7 @@ msgstr "Dage"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Fredag"
 
@@ -3650,7 +3973,7 @@ msgstr "Minutter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Mandag"
 
@@ -3660,7 +3983,7 @@ msgstr "_søn"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Lørdag"
 
@@ -3674,7 +3997,7 @@ msgstr "Vis uge_nummer i datonavigation"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Søndag"
 
@@ -3692,7 +4015,7 @@ msgstr "Opgaveliste"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Torsdag"
 
@@ -3710,7 +4033,7 @@ msgstr "Tidsformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Tirsdag"
 
@@ -3720,12 +4043,12 @@ msgstr "_Ugen begynder:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Onsdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Arbejdsuge"
 
@@ -3762,7 +4085,7 @@ msgid "_Fri"
 msgstr "_Fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Generelt"
 
@@ -3802,28 +4125,28 @@ msgstr "_Ons"
 msgid "before every appointment"
 msgstr "før hvert møde"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 "Hændelsen som fjernes er et møde. Vil du sende en aflysningsmeddelelse?"
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Er du sikker på, at du vil aflyse og slette dette møde?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr "Opgaven som fjernes er tildelt. Vil du sende en aflysningsmeddelselse?"
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Er du sikker på, at du vil aflyse og slette denne opgave?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -3831,54 +4154,54 @@ msgstr ""
 "Journalindgangen som fjernes er offentliggjort. Vil du sende en "
 "aflysningsmeddelelse?"
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Er du sikker på, at du vil aflyse og slette denne journalopføring?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Denne hændelse er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Denne opgave er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Denne journalopføring er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Du har lavet ændringer. Skal disse ændringer forkastes og redigeringen "
 "lukkes?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Du har ikke lavet ændringer. Skal redigeringen lukkes?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Denne hændelse er ændret."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Denne opgave er ændret."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Denne journalopføring er ændret."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Du har lavet ændringer. Skal disse ændringer forkastes og redigeringen "
 "opdateres?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har ikke gjort ændringer. Opdater redigering?"
@@ -3888,168 +4211,173 @@ msgstr "%s  Du har ikke gjort ændringer. Opdater redigering?"
 msgid "Validation error: %s"
 msgstr "Valideringsfejl: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " til "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Fuldført "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Fuldført "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Færdig "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Færdig "
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "Kunne ikke opdatere objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Redigér aftale"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Aftale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Opgave - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journalopføring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Gem som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 #, fuzzy
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Ændringer i dette objekt kan bliver muligvis ignoreret hvis en opdatering "
 "ankommer via e-post"
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Kan ikke hente versionsdata!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Vælg en målmappe til at importere data"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Er du sikker på at du vil slette aftalen `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Er du sikker på at du vil slette denne aftale uden titel?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Er du sikker på at du vil slette opgaven `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Er du sikker på at du vil slette denne opgave uden titel?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Er du sikker på at du vil slette journalopføringen `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Er du sikker på at du vil slette denne journalopføring uden titel?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Er du sikker på at du vil slette %d aftaler?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Er du sikker på at du vil slette %d opgaver?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Er du sikker på at du vil slette %d journalopføringer?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "Begivenheder kunne ikke fjernes pga. en CORBA-fejl"
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "Opgaven kunne ikke fjernes pga. en CORBA-fejl"
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Journalindgangen kunne ikke fjernes pga. en CORBA-fejl"
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Punktet kunne ikke fjernes pga. en CORBA-fejl"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "Begivenheden kunne ikke fjernes da du ikke har rettigheder hertil"
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 #, fuzzy
 msgid "The task could not be deleted because permission was denied"
 msgstr "Deltagerstatus kunne ikke opdateres pga. ugyldig status!\n"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Journalindgangen kunne ikke fjernes da du ikke har rettigheder hertil"
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "Punktet kunne ikke fjernes da du ikke har rettigheder hertil"
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Begivenheder kunne ikke fjernes pga. en CORBA-fejl"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Opgaven kunne ikke fjernes pga. en CORBA-fejl"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Journalindgangen kunne ikke fjernes pga. en CORBA-fejl"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Punktet kunne ikke fjernes pga. en CORBA-fejl"
@@ -4066,43 +4394,43 @@ msgstr "Delegér til:"
 msgid "Enter Delegate"
 msgstr "Indtast delegat"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Aftale"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Påmindelse"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Genindtræffelse"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Mødeplanlægning"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Møde"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "Startdatoen er forkert"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "Slutdatoen er forkert"
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "Starttiden er forkert"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "Sluttiden er forkert"
 
@@ -4172,31 +4500,31 @@ msgid "_Start time:"
 msgstr "_Start-tid:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr "Den valgte organisator har ikke længere en konto."
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "En organisator er påkrævet."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "Mindst en deltager er nødvendig"
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Deleger til..."
 
@@ -4237,21 +4565,15 @@ msgid "Member"
 msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "SU"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Rolle"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -4271,6 +4593,7 @@ msgid "_Invite Others..."
 msgstr "_Invitér andre..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4303,6 +4626,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Kan ikke oprette katalog %s: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "En organisator skal angives."
@@ -4332,33 +4656,58 @@ msgstr "Kalenderinformation"
 msgid "Calendar Name"
 msgstr "Kalender"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Kan ikke oprette katalog %s: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Kalenderinformation"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Opgaveliste"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Opgaveliste"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Opgaveliste"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr "Kun denne indstans"
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Denne og fremtidige indstanser"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr "Denne og fremtidige indstanser"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr "All indstanser"
 
@@ -4406,10 +4755,15 @@ msgstr "dag"
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "gentagelser"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Dato/klokke:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "_Tilføj"
@@ -4474,7 +4828,7 @@ msgstr "uge(r)"
 msgid "year(s)"
 msgstr "år"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 #, fuzzy
 msgid ""
 "This event has been changed, but has not been saved.\n"
@@ -4485,32 +4839,32 @@ msgstr ""
 "\n"
 "Vil du gemme ændringene?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "_Forkast ændringer"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 #, fuzzy
 msgid "Save Event"
 msgstr "Kalenderhændelser"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Mødesinformationen er blevet genereret. Send den?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Mødeinformationen er ændret. Send en opdateret version?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "Opgaveinformationen er genereret. Send den?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "Opgaveinformationen er ændret. Send en opdateret version?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Udførelsesdatoen er forkert"
 
@@ -4520,43 +4874,43 @@ msgid "% _Complete"
 msgstr "% færdig"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Fuldført"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Høj"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "I gang"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Lav"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Ikke startet"
 
@@ -4565,7 +4919,7 @@ msgid "Progress"
 msgstr "Fremgang"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Udefineret"
 
@@ -4587,21 +4941,21 @@ msgstr "_Status:"
 msgid "_Web Page:"
 msgstr "_Hjemmeside-adresse:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Grundlæggende"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "Forfaldsdatoen er forkert"
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4609,9 +4963,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "Kon_fidensiel"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Beskrivelse:"
 
@@ -4716,26 +5070,21 @@ msgstr "%s ved %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s for en ukendt udløsertype"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Offentlig"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Fortroligt"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategorier"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4748,28 +5097,26 @@ msgid "Start Date"
 msgstr "Startdato"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Sammendrag"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "farve"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Aftale"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Ledig"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Optaget"
 
@@ -4781,7 +5128,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "Ø"
 
@@ -4789,7 +5136,7 @@ msgstr "Ø"
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4799,7 +5146,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4807,7 +5154,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4815,17 +5162,17 @@ msgstr "Nej"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Ukendt"
 
@@ -4837,181 +5184,179 @@ msgstr "Genindtræffer"
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Opdaterer objekter"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Sletter de valgte objekter"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Opdaterer objekter"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Ny _aftale..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Ny aftale som varer h_ele dagen"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "Nyt møde"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Ny opgave"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "S_kriv ud..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Indsæt"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Gå _til i dag"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "_Gå til dato..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Udgiv ledig/optaget-information"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "_Indstillinger..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Åbn"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Gem _som..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Kopiér"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "_Book møde..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Slet denne _hændelse"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Slet _alle hændelser"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "_Indstillinger..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Åbn besked"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "_Tildel opgave"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "_Videresend som iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "_Markér som fuldført"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Markér valgte opgaver som komplette"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "Sle_t valgte opgaver"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klik for at tilføje en opgave"
@@ -5025,8 +5370,8 @@ msgstr "% færdig"
 msgid "Alarms"
 msgstr "Alarmer"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Fuldført"
 
@@ -5055,18 +5400,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %Y-%m-%d %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m-%Y %H:%M:%S"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5085,7 +5430,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5098,125 +5443,125 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr " "
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr " "
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja. (Kompleks genindtræffelse)"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "Hver dag"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "Hver %d. dag"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "Hver uge"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "Hver %d. uge"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr "Hver uge på "
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Hver %d uge på "
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " og "
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr "Den %s. dag af "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr "Den %s %s af "
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "hver månede"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "Hver år"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "Hver %d. år"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr " i alt %d gange"
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ", sluttende på "
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>Begynder:</b>"
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Slutter:<b>"
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>Færdig:</b> "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>Udføres inden:</b> "
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "iCalendar-information"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "iCalendar-fejl"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "en ukendt afsender"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5224,321 +5569,320 @@ msgstr ""
 "<br>Kontrollér venligst følgende information og vælg så en handling fra "
 "menuen nedenfor."
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "Sted:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Accepteret"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Preliminært godtaget"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Afslået"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Vælg en handling"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "O.k."
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Godtaget"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Foreslået"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Afslået"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Send oplysning om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Opdaterer modpartens status"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Send nyeste oplysninger"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Afbryd"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har offentliggjort mødeoplysning."
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Mødeinformation"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> ønsker at %s er til stede ved et møde."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Mødeforslag"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Mødeopdatering"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Anmodning om mødeopdatering"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, 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:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Mødesvar"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, 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:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Mødeaflysing"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, 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:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Ugyldig mødebesked"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Opgaveinformation"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> ønsker at %s udfører en opgave."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, 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:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Forslag om opgave"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, 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:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, 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:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Anmodning om opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, 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:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Svar på opgave"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> har aflyst en opgave."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Aflysing af opgave"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Ugyldig opgavebesked"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, 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:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Ugyldig besked om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, 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:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Forespørgsel om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, 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:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Svar på ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig besked om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr "Meddelelsen ser ikke ud til at være korrekt udformet"
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "Denne besked indeholder forespørgsler, som ikke er understøttet."
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Bilaget indeholder ikke en gyldig kalender-besked"
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr "Bilaget har ingen synlige kalender-elementer"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderfilen kunne ikke opdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Opdatering fuldført\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 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:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet er ugyldigt og kan ikke opdateres\n"
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Dette svar er ikke fra en nuværende mødesdeltager. Tilføj som mødesdeltager?"
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 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:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr "Der opstod en fejl i CORBA-systemet\n"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr "Objektet kunne ikke findes\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Du har ikke rettigheder for at opdatere kalenderen\n"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Deltagerstatus opdateret\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "Deltagerstatus kunne ikke opdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Fjernelse fuldført"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Elementet sendt!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Elementet kunne ikke sendes!\n"
 
@@ -5698,7 +6042,7 @@ msgstr "%a %d/%m-%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d/%m-%Y"
 
@@ -5762,49 +6106,44 @@ msgstr "Tid for mødets _start:"
 msgid "Meeting _end time:"
 msgstr "Tid for mødets slutning:"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "Sta_rt dato:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "Fær_dig-dato:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "_Prioritet:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Side"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Åbner lager %s"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikke indlæse opgaverne i `%s'"
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Den nødvendige metode til indlæsning af `%s' er ikke understøttet"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Du har ikke rettigheder til at åbne mappen i \"%s\""
 
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5813,48 +6152,39 @@ msgstr ""
 "Fejl ved %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "Færdiggør opgaver..."
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "Fjerner markerede objekter..."
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "Udrenser"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Opgaver"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunne ikke åbne mappen i `%s'"
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, 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"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Tilføjer alarm for %s"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5865,7 +6195,7 @@ msgstr ""
 "%s\n"
 " er gået ned. Du skal genstarte Evolution for at kunne bruge den igen"
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5876,58 +6206,11 @@ msgstr ""
 "%s\n"
 " er gået ned. Du skal genstarte Evolution for at kunne bruge den igen"
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Turin"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalender og opgaver"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Kalender"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Konfigurér din tidszone, kalender og opgaveliste her "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution kalender og opgaver"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution kalender-opsætnings-styringselement"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution kalendertilrettelægnings-beskedvisning"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution kalendervisning"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution kalender/opgave-redigering"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution opgavevisning"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolution kalender-og-opgaver-komponent"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolutions testkomponent"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -5984,296 +6267,332 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "En organisator skal angives."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Mindst en deltager er nødvendig"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Kalenderinformation"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Opgaveinformation"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Journalinformation"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Ledig/optaget-information"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Kalenderinformation"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Opdateret"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Opdatér"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "Modforslag"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig/optaget-information (%s til %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "iCalendar-information"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Du må være en deltager i arrangementet"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Søn"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Man"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Tir"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Ons"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Tor"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Fre"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Lør"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Valgt dag (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Valgt uge (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Valgt måned (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Valgt år (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Opgave"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Færdige procenter: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Kontakter: "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Forhåndsvisning af udskrift"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Udskriv element"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Printeropsætning"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Omdøb denne genvej"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Opgaveliste"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Nyt gøremål"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Opgave"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Opret en ny opgave"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "URIen til opgavemappen, der skal vises"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6285,11 +6604,11 @@ msgstr ""
 "\n"
 "Vil du virkelig fjerne disse opgaver?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Spørg mig ikke igen."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "Udskriv opgaver"
 
@@ -6317,15 +6636,15 @@ msgstr "iCalendar-filer (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar-filer (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "Påmindelse!!"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "Kalenderhændelser"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6333,7 +6652,7 @@ msgstr ""
 "Evolution har fundet Gnome-kalenderfiler.\n"
 "Vil du importere dem til Evolution?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Gnome-kalenderen"
 
@@ -7866,27 +8185,27 @@ msgstr "Stillehavet/Wallis"
 msgid "Pacific/Yap"
 msgstr "Stillehavet/Yap"
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "Signering er ikke understøttet af dette cipher"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "Verificering er ikke understøttet af dette cipher"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Kryptering er ikke understøttet af dette cipher"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Dekryptering er ikke understøttet af dette cipher"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr "Du kan ikke importere nøgler med dette cipher"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr "Du kan ikke eksportere nøgler med dette cipher"
 
@@ -7938,86 +8257,86 @@ msgstr "Forbereder mappen \"%s\" til afkoblet tilstand"
 msgid "You must be working online to complete this operation"
 msgstr "Du skal arbejde opkoblet for at fuldføre denne operation"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Mislykkedes med at oprette rør til \"%s\": %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Mislykkedes med at oprette barneprocessen \"%s\": %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ugyldig beskedstrøm modtaget fra %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Synkroniserer mapper"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fejl under læsning af filter: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fejl under kørsel af filter: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Kunne ikke åbne spool-mappen"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Kan ikke behandle spool-mappen"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Henter besked %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Kan ikke åbne besked"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Mislykkedes på besked %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Synkroniserer mappe"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Henter besked %d af %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Mislykkedes på besked %d af %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Meddelelsen kunne ikke hentes"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr "Ugyldige argumenter til (system-flag)"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr "Ugyldige argumenter til (user-tag)"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fejl under udførelse af filtersøgning: %s: %s"
@@ -8049,35 +8368,35 @@ msgstr "(match-all) kræver et enkelt boolsk resultat"
 msgid "Performing query on unknown header: %s"
 msgstr "Udfører forespørgsel på ukendt header: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Uunderstøttet operation: tillæg besked: for %s"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Uunderstøttet operation: søg efter udtryk: efter %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Uunderstøttet operation: søg efter uid'er: efter %s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Flytter beskeder"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr "Kopierer meddelelser"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Henter %d beskeder"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8088,15 +8407,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr "Mislykkedes med at tolke gpg-tips for brugerid."
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr "Mislykkedes med at tolke gpg-løsen."
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8105,30 +8424,30 @@ msgstr ""
 "Du skal bruge et gpg-løsen for at låse nøglen op\n"
 "for brugeren: \"%s\""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Afbrudt."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Mislykkedes med at oplåse hemmelig nøgle: 3 forkerte løsener angivet."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Oventet svar fra GnuPG: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr "Ingen data givet"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Mislykkedes med at kryptere: ingen gyldige modtagere angivet."
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8139,50 +8458,63 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Mislykkedes med at GPG'e %s: %s\n"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg kunne ikke udføres: %s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr "gpg kunne ikke udføres."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "Dette er en digitalt underskrevet brevdel"
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr ""
+"Kan ikke verificere meddelelsesignatur: kunne ikke oprette temporær fil: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Kan ikke verificere meddelelsesignatur: kunne ikke oprette temporær fil: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Dette er en digitalt underskrevet brevdel"
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Indeksér meddelelsers indhold"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Kunne ikke hente besked fra redigering"
@@ -8281,15 +8613,15 @@ msgstr "Fejl under skriving af midlertidig fil: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Fejl under kopiering midlertidig beskedsfil: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Kunne ikke dekryptere MIME-del: protokolfejl"
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "Kunne ikke dekryptere MIME-del: ugyldig struktur"
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "tolkningsfejl"
 
@@ -8603,12 +8935,12 @@ msgstr "E-post-udbyder for virtuelle mapper"
 msgid "For reading mail as a query of another set of folders"
 msgstr "For læsning af e-post som en forespørgsel på et andet sæt mapper"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Ingen udbyder tilgængelig for protokol `%s'"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8617,71 +8949,82 @@ msgstr ""
 "Kan ikke oprette katalog %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Indtast adgangskode for %s"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Udefineret"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Redigér signatur"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Redigér signatur"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Selvsigneret certifikat i kæden"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "Certifikat utroværdigt"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Gem signatur"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Tolkningsfejl"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Server: %s, Type: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kan ikke finde mappe: Ugyldig operation på dette lager"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan ikke oprette mappe: Ugyldig operation på dette lager"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Affald"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "Juni"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "Kan ikke hente udstederens certifikat."
@@ -8890,7 +9233,7 @@ msgstr ""
 "Certifikattilbagekaldelseslisten er udløbet: %s\n"
 "Udsteder: %s"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Kunne ikke tolke URL `%s'"
@@ -8909,22 +9252,22 @@ msgstr "Ingen sådan besked %s i %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kan ikke kopiere eller flytte meddelelser til en virtuel mappe"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikke slette mappe: %s: Ugyldig operation"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikke slette mappe: %s: Ingen sådan mappe"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan ikke ændre navn på mappe: %s: Ugyldig operation"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikke ændre navn på mappe: %s: Ingen sådan mappe"
@@ -9004,7 +9347,7 @@ msgstr "Kan ikke hente meddelelse: %s"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9018,7 +9361,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Ingen sådan besked"
@@ -9056,54 +9399,69 @@ msgid "Failed to cache %s: %s"
 msgstr "Kunne ikke cache %s: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Kobler til server..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Tilslutning til LDAP-serveren mislykkedes"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "Firma"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Ser efter nye beskeder"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 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:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Mapper"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Vis kun abonnerede mapper"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "Tilsidesæt servers navneområde for mapper"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Navneområde"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Brug filtre for nye beskeder i INDBAKKE på denne server"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "Hent nye beskeder _automatisk hver(t)"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For læsning og lagring af e-post på IMAP-servere."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Adgangskode"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9356,7 +9714,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Kunne ikke ændre navn på mappe %s til %s: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kunne ikke skifte navn på \"%s\": %s"
@@ -9471,29 +9829,29 @@ msgstr "Checker for nye meddelelser"
 msgid "Storing folder"
 msgstr "Gemmer mappe"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kan ikke oprette mappelås på: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kan ikke åbne postboks: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "Tilføjelse af brev blev aflyst"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan ikke tilføje besked i mbox-filen: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9502,11 +9860,11 @@ msgstr ""
 "Kan ikke hente besked: %s fra mappe %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappen ser ud til at have blevet korrupt og kan ikke repareres."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Opbygning af besked mislykkedes: Beskadiget postboks?"
 
@@ -9574,12 +9932,17 @@ msgstr "Kan ikke oprette katalog %s: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "Finder ikke mappe: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "Kort-ID eksisterer allerede"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Kunne ikke ændre navn på mappe %s til %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Specificeret mappenavn er ikke gyldigt: %s"
@@ -9623,7 +9986,7 @@ msgstr "Kunne ikke lukke kildemappe %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikke lukke midlertidig mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikke ændre navn på mappe: %s"
@@ -9912,7 +10275,7 @@ msgstr "Slet efter %s dage"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -10002,7 +10365,7 @@ msgid "No such folder `%s'."
 msgstr "Ingen sådan mappe `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10056,7 +10419,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Levering af e-post via sendmail programmet"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10222,7 +10585,7 @@ msgstr "SMTP e-postlevering via %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende besked: afsenderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Sender besked"
 
@@ -10343,7 +10706,7 @@ msgstr "%.0f M"
 msgid "%.0fG"
 msgstr "%.0f G"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "bilag"
 
@@ -10387,14 +10750,14 @@ msgstr "MIME-type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Foreslå automatisk visning af bilag"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Du skal konfigurere en konto\n"
 "inden du kan skrive e-post."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Klik her for at få adressebogen op"
 
@@ -10405,45 +10768,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Fra:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Indtast modtagerene for beskeden"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Indtast adresserne som skal modtage en kopi af beskeden"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10454,14 +10817,19 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Send til:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr "Postdestination"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Vedlæg en fil til beskeden"
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Vedhæft fil(er)"
@@ -10496,21 +10864,21 @@ msgstr "Filen eksisterer, overskriv?"
 msgid "Error saving file: %s"
 msgstr "Fejl under gemning af fil: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fejl under indlæsning af fil: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fejl ved adgang til fil: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente besked fra redigering"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10519,7 +10887,7 @@ msgstr ""
 "Kunne ikke søge i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10528,7 +10896,7 @@ msgstr ""
 "Kunne ikke afkorte fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10537,7 +10905,7 @@ msgstr ""
 "Kan ikke kopiere filhandtag: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10546,7 +10914,7 @@ msgstr ""
 "Fejl under autogemning af besked: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10554,7 +10922,7 @@ msgstr ""
 "Ximian Evolution har fundet ikke-gemte filer fra en tidligere session.\n"
 "Vil du prøve at genoprette dem?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10565,28 +10933,28 @@ msgstr ""
 "\n"
 "Vil du gemme dine ændringar?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Advarsel: Ændret besked"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Åbn fil"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "Automatisk genereret"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Skriv en besked"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10594,7 +10962,7 @@ msgstr ""
 "Kunne ikke oprette vindue:\n"
 "adresseudvælgelses-kontrol kunne ikke aktiveres."
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10606,7 +10974,7 @@ msgstr ""
 "Verficér at du har de rette versioner af\n"
 "gtkhtml og libgtkhtml installeret.\n"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10614,7 +10982,7 @@ msgstr ""
 "Kunne ikke oprette vindue:\n"
 "En komponent i HTML tekstbehandler kunne ikke aktiveres."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10623,11 +10991,13 @@ msgstr ""
 "ikke kan redigeres.)<b>"
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Gruppevaresuiten Evolution"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10875,13 +11245,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11000,7 +11370,7 @@ msgstr "Så"
 msgid "You must specify a folder."
 msgstr "Du skal angive en mappe."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Vælg mappe"
@@ -11014,24 +11384,24 @@ msgstr ""
 "Fejl i regulært udtryk '%s':\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Vigtig"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "At-gøre"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Senere"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Test"
 
@@ -11132,7 +11502,7 @@ msgstr "siden"
 msgid "months"
 msgstr "måneder"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr " sekunder"
 
@@ -11229,7 +11599,7 @@ msgstr "Udtryk"
 msgid "Follow Up"
 msgstr "Følg op"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "Etiket"
 
@@ -11298,113 +11668,120 @@ msgstr "Størrelse (kB)"
 msgid "Source Account"
 msgstr "Kildekonto"
 
+# Spray betyder støvregn men her bruges det om regn
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Støvregn"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Specifik header"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Stop behandling"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Emne"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "Neutraliser status"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "indeholder"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "indeholder ikke"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "slutter ikke med"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "eksisterer ikke"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "does not return"
 msgstr "returnerer ikke"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "ligner ikke"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "starter ikke med"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "slutter med"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "eksisterer"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr "er markeret med flag"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr "er efter"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "is before"
 msgstr "er inden"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "er større end"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "er mindre end"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr "er ikke markeret med flag"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "er ikke"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "er"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr "returnerer større end"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr "returnerer mindre end"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr "returnerer"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "lyder som"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "starter med"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Regelnavnet \"%s\" er ikke unikt, vælg et andet."
@@ -11429,18 +11806,79 @@ msgstr "Regelnavn"
 msgid "Score Rules"
 msgstr "Pointregler"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Du skal give navn til denne vfolder."
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr "Du skal specificere mindst en mappe som kilde."
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 msgid "VFolder source"
 msgstr "Kilde for virtuel mappe"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Redigererindstillinger"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Konfigurér e-post-indstillinger, inklusive sikkerhed og meddelelsesvisning, "
+"hér"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Konfigurér stavekontrol, signaturer, og meddelelseredigeringen hér"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Konfigurér dine e-post-konti her"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolution e-post"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution e-post-kontoopsætnings-styreelement"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Evolutions e-post-komponent"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Evolutions e-post-redigering"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolutions e-post-redigereropsætnings-styreelement"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution e-post-mappevisning"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution e-post-indstillings-styreelement"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Post"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "E-post-konti"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "E-post-indstillinger"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker på at du vil slette denne konto?"
@@ -11482,7 +11920,7 @@ msgid "Protocol"
 msgstr "Protokol"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr "Navnløs"
 
@@ -11506,20 +11944,17 @@ msgstr "Tilføj skriptsignatur"
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "Du sender et HTML-formaterat brev. Sørg for at følgende\n"
 "modtagere ønsker, og kan modtage, HTML-formateret e-post:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Send alligevel?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11527,7 +11962,7 @@ msgstr ""
 "Denne besked har ikke et emne.\n"
 "Send alligevel?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11535,11 +11970,11 @@ msgstr ""
 "Siden kontaktlisten du sender til er konfigureret til at skjule listens "
 "adresser vil denne besked kun indeholde Bcc-modtagere."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Denne besked indeholder kun Bcc-modtagere."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11549,11 +11984,11 @@ msgstr ""
 "\"Apparently-To\" header.\n"
 "Send alligevel?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Du skal specificere modtagere for at kunne sende denne besked."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11565,189 +12000,398 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Opret _virtuel mappe fra søgning..."
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "Post"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<klik her for at vælge en mappe>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" i \"%s\""
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Opret ny mappe"
 
-#: mail/em-folder-selector.c:267
-#, fuzzy
-msgid "Folder _name"
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Specificér hvor mappen skal oprettes:"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
 msgstr "Mappe_navn:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Kunne ikke oprette midlertidigt katalog: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Kunne ikke oprette midlertidigt katalog: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Kunne ikke oprette temporær fil \"%s\": %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Kunne ikke lukke midlertidig mappe: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Indlæser..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Vælg mappe"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Opret en ny mappe"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Kunne ikke slette mappe `%s': %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Skal mappen \"%s\" virkelig fjernes?"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Slet \"%s\""
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Ændr navn på mappe \"%s\" til:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+msgid "Rename Folder"
+msgstr "Ændr navn på mappe"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Skrifttypeegenskaber"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Egenskaber"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "_Mappenavn:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Vis"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Åbn i nyt vindue"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Flyt"
+
+#: mail/em-folder-tree.c:1500
+msgid "_New Folder..."
+msgstr "_Ny mappe..."
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "Omdøb"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "Egenska_ber..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "R_edigér som ny besked..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "S_kriv ud"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "Sva_r til sender"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr "Føl_g op..."
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr "Marker færdi_ge med flag"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "Neutralis_er flag"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Mar_kér som læst"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "Marker som _ulæst"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Markér som v_igtig"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "Markér som uvi_gtig"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Marker som _ulæst"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Markér som v_igtig"
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "_Fortryd sletning"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "Fl_yt til mappe..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "K_opiér til mappe..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "Tilføj afsenderen til adresse_bogen"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "Anvend filtre"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "Ska_b regel fra meddelelse"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "Virtuel mappe for e_mnet"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "Virtuel mappe for afse_nder"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "Virtuel mappe for modtage_re"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "Virtuel mappe på e-post-_liste"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "Virtuel mappe for afse_nder"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Filtrér på em_ne"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Filtrér på afsen_der"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Filtrér på modta_gere"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Filtrér på e-_postliste"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filtrér på afsen_der"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Standard"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Udskriv besked"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopiér henvisning"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Træffere:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Tildelt"
+
+#: mail/em-format-html-display.c:597
+#, fuzzy
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr "Denne besked er digitalt signeret, men kan ikke findes autentisk."
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Redigér signatur"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
 msgstr ""
-"Denne besked er digitalt signeret. For flere informationer, klik på "
-"låsikonen."
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Redigér signatur"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Afbrudt"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "Kryptér med PGP"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Kunne ikke læse MIME-besked. Viser ren beskedstekst."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Et ikke understøttet skema"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Kan ikke verificere bladsignatur"
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Vis indlejret"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Skjul"
@@ -11757,183 +12401,206 @@ msgstr "Skjul"
 msgid "Page %d of %d"
 msgstr "Side %d af %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Henter besked %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Fejludformet del for ekstern-krop."
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peger til FTP-server (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peger til lokal fil (%s) gyldig på netsted \"%s\""
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peger til lokal fil (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peger til eksterne data (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peger til ukendt ekstern data (\"%s\"-type)"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-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/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Denne besked er digitalt signeret og er fundet autentisk."
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-msgid "No signature present"
-msgstr ""
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Kunne ikke initialisere Bonobo"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Et ikke understøttet skema"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke læse MIME-besked. Viser ren beskedstekst."
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Flytter beskeder"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Fra"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Til"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "E-postprogram"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "%s-bilag"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Kunne ikke læse MIME-besked. Viser ren beskedstekst."
+msgid "Session not initialised"
+msgstr "Kunne ikke initialisere Bonobo"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Denne besked er digitalt signeret og er fundet autentisk."
+
+#: mail/em-format.c:1212
+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/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Venter..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Pinger %s"
 
-#: mail/em-popup.c:593
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Kunne ikke cache %s: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Mislykkedes med at oprette rør til \"%s\": %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Mislykkedes med at oprette rør til \"%s\": %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Gem som..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Sva_r til sender"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Åbn henvisning i netlæser"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Send _besked til liste..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Tilføj afsenderen i adressebogen"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Åbn i %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "Denne server understøtter ikke LDAPv3-schemainformation"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Abonnér"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Mappe"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Venligst vælg en server."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Ingen server er valgt"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Vis ikke denne besked igen."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11942,27 +12609,27 @@ msgstr ""
 "Fejl under indlæsning af filter-information:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Videresendt besked"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "en ukendt afsender"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%a, %Y-%m-%d kl. %H:%M skrev %%s:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -11971,7 +12638,7 @@ msgstr ""
 "Kan ikke gemme til \"%s\":\n"
 " %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -11980,25 +12647,26 @@ msgstr ""
 "\"%s\" findes allerede.\n"
 "Vil du overskrive den?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Besked"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Gem besked som..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Kunne ikke oprette midlertidigt katalog: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Adresse"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12008,60 +12676,428 @@ msgstr ""
 "\n"
 "Vil du virkelig fjerne disse meddelelser?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Redigererindstillinger"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/em-utils.c:2288
+#, fuzzy
 msgid ""
-"Configure mail preferences, including security and message display, here"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
 msgstr ""
-"Konfigurér e-post-indstillinger, inklusive sikkerhed og meddelelsesvisning, "
-"hér"
+"Denne handling vil permanent fjerne de meddelelser der er\n"
+"markeret som slettede. Hvis du fortsætter kan du ikke længere tilvejebringe\n"
+"disse meddelelser.\n"
+"\n"
+"Vil du virkelig fjerne disse meddelelser?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Konfigurér stavekontrol, signaturer, og meddelelseredigeringen hér"
+#: mail/evolution-mail.schemas.in.in.h:1
+#, fuzzy
+msgid "Automatic link recognition"
+msgstr "_Detektera automatisk lænker"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Konfigurér dine e-post-konti her"
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "_Detektera automatisk lænker"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution e-post"
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution e-post-kontoopsætnings-styreelement"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolutions e-post-komponent"
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolutions e-post-redigering"
+#: mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
+msgid "Default charset in which to compose messages"
+msgstr "Standard-emne for beskeden"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolutions e-post-redigereropsætnings-styreelement"
+#: mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
+msgid "Default charset in which to compose messages."
+msgstr "Standard-emne for beskeden"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution e-post-mappevisning"
+#: mail/evolution-mail.schemas.in.in.h:8
+#, fuzzy
+msgid "Default charset in which to display messages"
+msgstr "Søg efter tekst i kroppen af vist besked"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution e-post-indstillings-styreelement"
+#: mail/evolution-mail.schemas.in.in.h:9
+#, fuzzy
+msgid "Default charset in which to display messages."
+msgstr "Søg efter tekst i kroppen af vist besked"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/evolution-mail.schemas.in.in.h:10
+#, fuzzy
+msgid "Default forward style"
+msgstr "_Videresendelsesformat:"
+
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default reply style"
+msgstr "_Svarsstil:"
+
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Empty Trash folders on exit"
+msgstr "Tøm _affaldsmappe ved afslutning"
+
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Tøm _affaldsmappe ved afslutning"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "E-post-konti"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "E-post-indstillinger"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "Udfør handlinger"
+
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Notifikation om ny post"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Notifikation om ny post"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr "_Spørg når HTML-meddelelser sendes til kontakter som ikke vil have dem"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "Spørg når der sendes meddelelser kun med blindkopimodtagere"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "Send HTML-baseret e-post?"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "Send HTML-baseret e-post?"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "_Vis animerede billeder"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "_Vis animerede billeder"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Vis besked i normal stíl"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "_Forhåndsvisningsvindue"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "_Spil lydfil når ny post ankommer"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "Stave_kontrol"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "_Terminalskrifttype:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "Vælg HTML-skrifttype med variabel bredde til udskrift"
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Beskedsliste med tråde"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Beskedsliste med tråde"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "_Gør dette til min standardkonto"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "V_ariabel bredde:"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution elm-importering"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox-importering"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape-Mail-importering"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook-Express-4-importering"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine-importering"
 
 #: mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
@@ -12101,34 +13137,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution elm-importering"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox-importering"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape-Mail-importering"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook-Express-4-importering"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine-importering"
-
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -12190,12 +13198,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importerer dine gamle data fra Netscape"
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Affald"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Gennemsøger e-post-filtre"
@@ -12204,7 +13206,7 @@ msgstr "Gennemsøger e-post-filtre"
 msgid "Scanning directory"
 msgstr "Søger i katalog"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Starter import"
 
@@ -12279,23 +13281,23 @@ msgid "You have not filled in all of the required information."
 msgstr "Du har ikke udfyldt al nødvendig information."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Kontoredigering for Evolution"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Vært:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "Bruger_navn:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikke oprette to konti med samme navn."
 
@@ -12304,35 +13306,35 @@ msgstr "Du kan ikke oprette to konti med samme navn."
 msgid "Mail to %s"
 msgstr "E-post til %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "E-post fra %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s e-post-liste"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Svaret til"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Tilføj filterregel"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "Følgende filterregler:\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12343,143 +13345,30 @@ msgstr ""
 "    \"%s\"\n"
 "og er blevet opdateret."
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "Tilslutter..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Denne mappe kan ikke indeholde beskeder."
-
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Kunne ikke åbne den delte mappe: %s."
-
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Kunne ikke oprette midlertidigt katalog: %s"
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Ny e-post-besked"
 
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Kunne ikke oprette temporær fil \"%s\": %s"
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "Send _besked"
 
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Kunne ikke lukke midlertidig mappe: %s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "Skriv en ny e-post-meddelelse"
 
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Vælg en målmappe til at importere data"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Vælg en målmappe til at importere data"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Opret en ny mappe"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Specificér hvor mappen skal oprettes:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Kunne ikke slette mappe `%s': %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Skal mappen \"%s\" virkelig fjernes?"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Slet \"%s\""
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Ændr navn på mappe \"%s\" til:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-msgid "Rename Folder"
-msgstr "Ændr navn på mappe"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Specificeret mappenavn er ikke gyldigt: %s"
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Skrifttypeegenskaber"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Egenskaber"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "_Mappenavn:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Vis"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Åbn i nyt vindue"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Flyt"
-
-#: mail/mail-component.c:2087
-msgid "_New Folder..."
-msgstr "_Ny mappe..."
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "Omdøb"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "Egenska_ber..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Identitet"
 
@@ -12539,11 +13428,11 @@ msgstr ""
 "angav samles til en Evolution-epostkonto. Angiv et navn for denne konto "
 "nedenfor. Dette navn anvendes kun til visning."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Tjekker tjeneste"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Kobler til server..."
 
@@ -12625,26 +13514,35 @@ msgid "C_olors"
 msgstr "F_arver"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Ser efter nye beskeder"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "Kontrollér stavning mens jeg skri_ver"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Ser efter nye beskeder"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "Farve på _fejlstavede ord:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Redigerer meddelelser"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12660,273 +13558,278 @@ msgstr ""
 "\n"
 "Klik på \"Fuldfør\" for at gemme dine indstillinger."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "_Forvalgt"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Standardopførsel"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "Standardtegn_kodning: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Fjerner post"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Altid signér udgående beskeder når denne konto bruges"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "Citér ikke originalmeddelelse"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Signér ikke _mødeindkaldelser (for kompatibilitet med Outlook)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Færdig"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "Udkast_mappe:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "A_ktivér"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "E-post-konti"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "E-post-_adresse:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "Tøm _affaldsmappe ved afslutning"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Certifikat-ID:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Kør kommando..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "Fast _bredde:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "<< Færre alternativer"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "Skrifttypeegenskaber"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "Formatér meddelelser i _HTML"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "Markér _citat med"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Indlejret"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Etiketter og farver"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Indlæser billeder"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "E-post-konfiguration"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Placering af postboks"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Meddelelseredigeringsværktøj"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Meddelelsesvisning"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 msgid "Message Fonts"
 msgstr "Beskedsskrifttype"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Notifikation om ny post"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Bemærk: du bliver ikke spurgt om adgangskoden før du tilslutter første gange"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Yderligere information"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "Or_ganisation:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-_nøgleid:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Vælg en farve"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Spørg når der sendes meddelelser kun med blindkopimodtagere"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Udskrevne skrifttyper"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "Citér originalmeddelelse"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Citeret"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "H_usk denne adgangskode"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "Sva_r-til:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Modtager e-post"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "_Modtagelsesmuligheder"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "Husk denne _adgangskode"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Nødvendig information"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "Genetablér standardalternativ"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "S_ikkerhed"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "Sikker MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr "Vælg HTML-skrifttype med fast bredde"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr "Vælg HTML-skrifttype med fast bredde til udskrivning"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr "Vælg HTML-skrifttype med variabel bredde"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr "Vælg HTML-skrifttype med variabel bredde til udskrift"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Sender e-post"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Mappe til sendte _beskeder:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Sendte beskeder og udkast"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Server kræver _godkendelse"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Server_type: "
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Selvsigneret certifikat i kæden"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "Angiv _filnavn:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "Stave_kontrol"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Standard-Unix mbox"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12936,7 +13839,7 @@ msgstr ""
 "din signatur. Navnet du angiver vil bare\n"
 "anvendas for visning."
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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 "
@@ -12945,7 +13848,7 @@ msgstr ""
 "Denne side lader dig konfigurere opførsel af stavekontrol og sprog. Listen "
 "med sprog her viser kun de sprog for hvilke en ordbog er installeret."
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12953,11 +13856,15 @@ msgstr ""
 "Indtast navnet via hvilket du vil referere til denne konto.\n"
 "For eksempel: \"Job\" eller \"Personlig\"."
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "V_ariabel bredde:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12967,169 +13874,178 @@ msgstr ""
 "\n"
 "Klik \"Næste\" for at begynde. "
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "_Tilføj signatur"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "_Altid indlæs billeder fra nettet"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 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:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "_Autenticeringstype: "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "_Godkendelsesstype: "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr "Hent nye beskeder _automatisk hver(t)"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "Indsæt _automatisk smiley-billeder"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "_Bib når ny post ankommer"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "_Bekræft når en folder udrenses"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "_Standardsignatur:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "_Standardværdier"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Notificér mig ikke når ny post ankommer"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "_Aktivér"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "_Videresendelsesformat:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "_Fulde navn:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "_HTML-brev"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "_Identitet"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Juni"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "_Indlæs billeder hvis afsender er i adressebogen"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "_Gør dette til min standardkonto"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "_Markér meddelelser som læste efter"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "Indlæs aldrig billeder fra _nettet"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "_Spil lydfil når ny post ankommer"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Spørg når HTML-meddelelser sendes til kontakter som ikke vil have dem"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Spørg når meddelelser sendes med en _tom emnelinie"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "_Modtager post"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "_Svarsstil:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "_Genskab standardalternativer"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Slet..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "_Afsendelse af post"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "_Vis animerede billeder"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Signaturer"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr "_Standard-skrifttype:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr "_Terminalskrifttype:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "_Brug sikker anslutning (SSL):"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr "Br_ug de samme skrifttyper som andre programmer"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "beskrivelse"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13138,7 +14054,7 @@ msgstr ""
 "Fejl under '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13147,7 +14063,7 @@ msgstr ""
 "Fejl under udførsel af operation:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Arbejder"
 
@@ -13159,118 +14075,118 @@ msgstr "Filtrerer mappe"
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Kunne ikke gemme post i midlertidig fil %s: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Kunne ikke gemme post i midlertidig fil %s: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender \"%s\""
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender besked %d af %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fejlet på besked %d af %d"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Fuldført."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Gemmer besked til mappe"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter beskeder til %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer beskeder til %s"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Videresendte beskeder"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Åbner mappe %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "Åbner lager %s"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Gemmer mappe '%s'"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Opfrisker mappe"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Fjerner slettede beskeder fra mappe"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Importerer %s som %s"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter besked %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Henter %d beskeder"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Gemmer %d beskeder"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13279,7 +14195,7 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13288,11 +14204,11 @@ msgstr ""
 "Fejl under gemning af beskeder til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Gemmer bilag"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13301,21 +14217,25 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s igen"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Skeln mellem store og små bogstaver"
@@ -13332,59 +14252,74 @@ msgstr "Find:"
 msgid "Search"
 msgstr "Søgning"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Redigér signatur"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Undtagelser"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Kontoinformation"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Afbryder..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Type: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Sti: %s, Type: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Send & modtag e-post"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 msgid "Cancel _All"
 msgstr "Afbryd _alle"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Opdaterer..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Operation afbrudt af bruger."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Indtast adgangskode for %s"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Indtast adgangskode"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "Husk denne adgangs_kode"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Husk denne adgangskode for resten af denne session"
 
@@ -13423,26 +14358,31 @@ msgstr "Angiv et navn for denne signatur."
 msgid "Name:"
 msgstr "Navn:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt besked - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Videresendt besked"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Åbner mappe %s"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Opsætter vmappe: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Opdaterer vfoldere for URI: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13455,88 +14395,88 @@ msgstr ""
 "    '%s'\n"
 "Og er blevet opdateret."
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "Virtuelle mapper "
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Rediger Virtuel mappe"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Prøver at redigere en vfolder '%s' som ikke eksisterer."
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Ny Virtuel mappe"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Ulæst"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Læst"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Besvaret"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Flere ulæste beskeder"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Flere beskeder"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Lavest"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Lavere"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Højere"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Højest"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "I dag %H:%M"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "I går %H:%M"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H:%M"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Genererer beskedsliste"
 
@@ -13592,11 +14532,11 @@ msgstr "Videresend"
 msgid "No Response Necessary"
 msgstr "Intet svar krævet"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Svar til alle"
 
@@ -13648,41 +14588,139 @@ msgstr "_Abonnér"
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr "Konfigurér opførsel for specialmapper og frakoblede mapper her"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Evolution skallen"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Mappeindstillinger"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "380"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Omdøb denne genvejsgruppe"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Slå visning af mappelinjen fra/til"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Skjul genvejslinjen"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Standardprioritet:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Standardprioritet:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Evolution e-post-opsætningsgrænseflade"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+#, fuzzy
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "Markér bilaget til at blive vist indlejret som standard."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
 msgstr ""
-"Kan ikke overføre mappe:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Tilføj en mappe"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Skitser"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Indbakke"
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "Åbner standardopgavemappen"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Åbner standardopgavemappen"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Åbner standardopgavemappen"
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Udboks"
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Sendt"
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Åbner standardopgavemappen"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Slå visning af mappelinjen fra/til"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Slå visning af genvejslinjen fra/til"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "E-post"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Kunne ikke opdatere filerne."
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13693,7 +14731,7 @@ msgstr ""
 "%s\n"
 "Fejl: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13702,7 +14740,7 @@ msgstr ""
 "En fejl opstod under kopiering af filer til\n"
 "`%s'."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13713,7 +14751,7 @@ msgstr ""
 "Venligst flyt dette for at tillade installation\n"
 "af Evolution's brugerfiler."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13811,10 +14849,11 @@ msgstr ""
 "Kunne ikke ændre navn på mappe:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+msgid "The specified folder name is not valid: %s"
+msgstr "Specificeret mappenavn er ikke gyldigt: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -13838,19 +14877,15 @@ msgstr ""
 "Kan ikke oprette specificeret katalog:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Opret ny mappe"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Uden navn)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Vælg type importerer som skal køres:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13864,11 +14899,11 @@ msgstr ""
 "Du kan vælge \"Automatisk\" hvis du ikke véd, så vil Evolution prøve at "
 "finde ud af hvilken type det er for dig."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Venligst vælg information du ønsker at importere:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13876,7 +14911,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13885,21 +14920,21 @@ msgstr ""
 "Importerer %s\n"
 "Importerer opføring %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "Vælg importør"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "Filen %s eksisterer ikke"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Evolution fejl"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -13908,11 +14943,11 @@ msgstr ""
 "Ingen importerer som kan håndtere\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Importerer"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -13921,17 +14956,17 @@ msgstr ""
 "Importerer %s.\n"
 "Starter %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Fejl under start af %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Fejl under indlæsning af %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13940,35 +14975,35 @@ msgstr ""
 "Importerer %s\n"
 "Importerer opføring 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Filnavn:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Vælg en fil"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Filtype:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Importer data og indstillinger fra andre programmer"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Importer en enkelt fil"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -13976,47 +15011,28 @@ msgstr ""
 "Venligst vent...\n"
 "Søger efter eksisterende opsætning"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Starter intelligent importering"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Vælg en målmappe til at importere data"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Importér"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Lukker forbindelser..."
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Fejl ved synkronisering af \"%s\":\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "Synkroniserer mappe"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Synkroniserer \"%s\" (%d af %d)..."
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Indstillinger for Evolution"
@@ -14051,7 +15067,7 @@ msgstr "Kunne ikke åbne den delte mappe: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Kan ikke oprette den angivne delte mappe."
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14060,17 +15076,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Assistent"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Ny"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Intet mappenavn angivet."
@@ -14129,62 +15139,49 @@ msgstr "Opret ny genvej"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vælg mappen du ønsker genvejen skal pege til:"
 
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "_Arbejd tilkoblet"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "Ar_bejd frakoblet"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Arbejd frakoblet"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Ingen mappe vist)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Ingen)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 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:2090
+#: shell/e-shell-window.c:331
 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:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution er frakoblet. Klik på denne knap for at arbejde tilkoblet."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere i OAF"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatabase ikke fundet"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Generisk fejl"
 
@@ -14297,74 +15294,18 @@ msgstr "_Fjern"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne genvej fra genvejslinjen"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Fejl ved gemning af genveje."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Indbakke"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Genveje"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Ingen fejl"
-
-#: 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:575
-msgid "The specified folder type is not valid"
-msgstr "Specificeret mappetype er ikke gyldig"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "I/U-fejl"
-
-#: 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:581
-msgid "The folder is not empty"
-msgstr "Mappen er ikke tom"
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "Specificeret mappe blev ikke fundet"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "Funktionen er ikke implementeret i dette lager"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "Operationen er ikke understøttet"
-
-#: 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:593
-msgid "The specified folder cannot be modified or removed"
-msgstr "Specificeret mappe kan ikke ændres eller fjernes"
-
-#: 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:597
-msgid "Cannot create a folder with that name"
-msgstr "Kan ikke oprette en mappe med det navn"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Denne handling kan ikke udføres i frakoblet tilstand"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Afkrydsningsboks"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14375,6 +15316,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fuldført)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Ny"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "\"%s\" i \"%s\""
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14412,74 +15364,6 @@ msgstr ""
 "Fejlen fra aktiveringssystemet er:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "CORBA-fejl"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Afbrudt"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Ugyldige argumenter"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Har en ejer allerede"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Ingen ejer"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Ikke fundet"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "En ikke-understøttet type"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Et ikke understøttet skema"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "En ikke-understøttet handling"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Intern fejl"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Eksisterer"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "Ugyldig URI"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Har undermapper"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Ingen plads tilbage"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "Tidligere ejer er død FIXME"
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Testtype"
-
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr "Evolutions testkomponent"
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr "Aktive opkoblinger"
@@ -14508,10 +15392,6 @@ msgstr "_E-post:"
 msgid "_Tasks:"
 msgstr "_Opgaver:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr "Mappe_navn:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder _type:"
 msgstr "Mappe_type:"
@@ -14574,22 +15454,6 @@ msgstr ""
 "\n"
 "Klik på knappen \"Afslut\" for at gemme dine indstillinger. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "Konfigurér opførsel for specialmapper og frakoblede mapper her"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Evolution skallen"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution mappeindstillingsopsætnings-styreelement"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Mappeindstillinger"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Klik \"Importér\" for at starte import af filen til Evolution."
@@ -14628,7 +15492,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Importerere"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Importér"
 
@@ -14644,16 +15508,16 @@ msgstr "Spørg mig ikke igen"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importere data fra følgende filer:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Evolution afslutter nu..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14692,7 +15556,7 @@ msgstr ""
 "vi\n"
 "venter med spænding på dine bidrag!\n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -14700,36 +15564,48 @@ msgstr ""
 "Tack\n"
 "Ximians Evolution-hold\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr "Fortæl mig det ikke igen"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan ikke tilgå Ximian Evolution-skallen."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan ikke initiere Ximian Evolution-skallen: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Start i frakoblet tilstand"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Start i opkoblet tilstand"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Send fejlsøgingsudskrift for alle komponenterne til en fil."
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14738,31 +15614,60 @@ msgstr ""
 "%s: --online og --offline kan ikke bruges sammen.\n"
 "  Brug %s --help for mere information.\n"
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Vælg importør"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Certifikat-ID:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "Fremgang"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Udtryk"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "E-post-adresse:"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"Certifikatet er udløbet: %s\n"
+"Udsteder: %s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14820,91 +15725,376 @@ msgid "Backup All"
 msgstr "Blackpool"
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "_Certifikat-ID:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Certifikat utroværdigt"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "_Certifikat-ID:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Normalt navn"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "_Certifikat-ID:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "R_edigér"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Fejl under verificering af certifikater."
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Udtryk"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Organisation"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Organisationsenhed"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Vis"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "_Certifikat-ID:"
+
+#: smime/gui/smime-ui.glade.h:42
+#, fuzzy
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr "Ugyldig certifikatmyndighed (CA)"
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "_Certifikat-ID:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Importér"
+msgid "Certificate already exists"
+msgstr "Kort-ID eksisterer allerede"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m-%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Vermont"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "O.k."
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "_Certifikat-ID:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "_Certifikat-ID:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "Certifikat utroværdigt"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "ID"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Emne er %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Kan ikke behandle spool-mappen"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "Ugyldig certifikatmyndighed (CA)"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Ugyldig certifikatmyndighed (CA)"
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Ingen information"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "bilag"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "_Certifikat-ID:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Curitiba"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "North Carolina"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Udtryk"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s ved %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Certifikatsignaturfejl"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "_Indsæt"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Emne er %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Certifikatsignaturfejl"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Indtast adgangskode for %s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "_Certifikat-ID:"
 
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
@@ -14955,7 +16145,7 @@ msgstr "Kopier udvalget"
 msgid "Copy to Folder..."
 msgstr "Kopiér til mappe..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Klip udvalget ud"
 
@@ -14971,7 +16161,7 @@ msgstr "Flyt kontakter til en anden mappe..."
 msgid "Move to Folder..."
 msgstr "Flyt til mappe..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Indsæt fra klippebordet"
 
@@ -14979,8 +16169,8 @@ msgstr "Indsæt fra klippebordet"
 msgid "Previews the contacts to be printed"
 msgstr "Forhåndsviser kontakterne som skal skrives ud"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Forhåndsvisning af udskrift"
@@ -15025,13 +16215,13 @@ msgstr "Stop indlæsning"
 msgid "View the current contact"
 msgstr "Vis den aktuelle kontakt"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "H_andlinger"
 
@@ -15061,142 +16251,110 @@ msgstr "_Send meddelelse til kontakt..."
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "Opret et nyt heldagsmøde"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Opret en ny aftale"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "Opret en ny mappe"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Opret en ny mødeindkaldelse"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Opret en ny opgave"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Dag"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Slet _alle hændelser"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Slet aftalen"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Slet denne hændelse"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Slet denne hændelse"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Gå til"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Gå tilbage"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Gå fremad"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Gå til _dato"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Gå til en specifik dato"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Gå til i dag"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "Liste"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Måned"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Ny _aftale"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Ny-kaledonia"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Nyt møde"
-
-#: ui/evolution-calendar.xml.h:27
-#, fuzzy
-msgid "New _Task"
-msgstr "Ny opgave"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Forhåndsviser kalenderen som skal skrives ud"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Udskriv denne kalender"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Udgiv ledig/optaget information for denne kalender"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Bourges"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Offentlig mappe som indeholder mødelser og hændelser"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Vis detaljer"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Vis en dag"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Vis en måned"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Vis en uge"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Vis arbejdsugen"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Uge"
 
@@ -15261,7 +16419,7 @@ msgstr "Gem denne opføring på disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Fil"
 
@@ -15478,7 +16636,7 @@ msgstr "Markér alle som l_æst"
 msgid "Mark all visible messages as read"
 msgstr "Markér alle synlige beskeder som læst"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "Indsæt meddelelsen fra klippebord"
 
@@ -15534,16 +16692,6 @@ msgstr "Re_versér udvalg"
 msgid "_Threaded Message List"
 msgstr "Beskedsliste med _tråde"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Luk dette vindue"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "L_uk"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "_Tilføj afsenderen i adressebogen"
@@ -15701,257 +16849,282 @@ msgstr "Videresend den valgte besked til nogen som et bilag"
 msgid "Increase the text size"
 msgstr "Forøg tekstens størrelse"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Indlæs b_illeder"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Markér som _vigtig"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Markér som _ulæst"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Markér som uv_igtig"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "Markér de valgte beskeder som læste"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "Markér de valgte beskeder som vigtige"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Markér de valgte beskeder som uvigtige"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Markér de valgte beskeder som ulæste"
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Markér de valgte beskeder som ulæste"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Markér de valgte beskeder som uvigtige"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Markér de valgte beskeder for sletning"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Flyt"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "Flyt de valgte beskeder til en anden mappe"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Næste"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "Næste _vigtige meddelelse"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "Næste _tråd"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "Næste _ulæste meddelelse"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Ikke fundet"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Åbn valgt besked i et nyt vindue"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Åbn valgt besked i redigeringsvinduet for at sende den igen"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Oprindelig _størrelse"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "F_oregående ulæste meddelelse"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Post et svar"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr "Post et svar til en meddelelse i en offentlig mappe"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "Fo_regående vigtige meddelelse"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Forhåndsvis beskeden som skal skrives ud"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Forrige"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Udskriv denne besked"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "_Omdirigér"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Omdirigér (bounce) den markerede meddelelse til nogen"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Nulstil tekststørrelsen til den oprindelige"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "Søg i b_esked..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "_Mindre"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Gem beskeden som en tekstfil"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Søg efter tekst i kroppen af vist besked"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr "Konfigurér sideindstillingerne for din aktuelle printer"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Vis e-post-kilde"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Vis brevets _kildetekst"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Søg efter tekst i kroppen af vist besked"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Vis besked i normal stíl"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Vis besked med fulde e-post-headere"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Vis e-post-beskeden i sin rå form"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "Tekst-større_lse"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Fortryd sletning af den valgte besked"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "Virtuel mappe for e-post-_liste..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "Virtuel mappe for afse_nder..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "Virtuel mappe for modtage_re..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "Virtuel mappe for e_mne..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "_Vedlagt"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "_Kopiér til mappe"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "_Opret filter fra besked"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "_Videresend besked"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "_Gå til"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "_Inlejret"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "_Større"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "_Beskedsvisning"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Flyt til mappe"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "_Næste meddelelse"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "_Normal visning"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "_Åbn besked"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "_Foregående meddelelse"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "_Citeret"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "Send igen..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "_Værktøjer"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "Fortryd sletning"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Luk dette vindue"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "L_uk"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Vedlæg"
@@ -16230,12 +17403,13 @@ msgid "Change Evolution's settings"
 msgstr "Ændr Evolutions indstillinger"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "A_fslut"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Opret en ny mødeindkaldelse"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "Evolution _vindue"
+msgid "E_xit"
+msgstr "A_fslut"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16247,61 +17421,74 @@ msgstr "Importér data fra andre programmer"
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "Evolution _vindue"
+msgid "Open a new window"
+msgstr "Åbn i nyt vindue"
 
 #: ui/evolution.xml.h:11
 msgid "Pi_lot Settings..."
 msgstr "Pi_lotindstillinger..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Send / modtag"
+
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr "Send køede objekter og hent nye objekter"
+
+#: ui/evolution.xml.h:14
 msgid "Set up Pilot configuration"
 msgstr "Konfigurér Pilotkonfiguration"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Vis information om Ximian Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Indsend fejlrapport"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "Indsen_d fejlrapport"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Indsend en fejlrapport med Bug Buddy"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Skift"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Skift til frakoblet arbejdsmodus."
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _OSS"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "_Om Ximian Evolution..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "_Hjælp"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "_Importér..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Ny"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Send / modtag"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "_Søg nu"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Udskriv sammendrag"
@@ -16432,12 +17619,12 @@ msgstr "Definér visninger..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -16570,7 +17757,7 @@ msgstr "_Søg"
 msgid "_Find Now"
 msgstr "_Søg nu"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "_Tøm"
 
@@ -16586,24 +17773,259 @@ msgstr "Underobjekt-ID"
 msgid "Text"
 msgstr "Tekst"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Tøm"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Find nu "
 
+#~ msgid "Account Name"
+#~ msgstr "Kontonavn"
+
+#~ msgid "Server Name"
+#~ msgstr "Servernavn"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "LDAP understøttes ikke i denne udgave af Evolution"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Andre kontakter"
+
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "Konfigurer adgang til LDAP-katalogservere her"
+
+#~ msgid "Directory Servers"
+#~ msgstr "Katalogservere"
+
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Evolution adressebog - LDAP-opsætningsstyring"
+
+#~ msgid "Add LDAP Server"
+#~ msgstr "Tilføj LDAP-server"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Skridt 4: Viser navn"
+
+#~ msgid "Find contact in"
+#~ msgstr "Søg kontakt i"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Klik her for at tilføje en kontakt *"
+
+#~ msgid "Business Address"
+#~ msgstr "Arbejdsadresse"
+
+#~ msgid "Department"
+#~ msgstr "Afdeling"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "Fri-ledig URL"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Profession"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Åbner lager %s"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Send alligevel?"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Afbryd aktiv e-post-operation"
+#~ msgid "Folder _name"
+#~ msgstr "Mappe_navn:"
+
+#~ 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."
+
+#~ msgid "Connecting..."
+#~ msgstr "Tilslutter..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Denne mappe kan ikke indeholde beskeder."
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Kunne ikke åbne den delte mappe: %s."
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Vælg en målmappe til at importere data"
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan ikke overføre mappe:\n"
+#~ "%s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "Tilføj en mappe"
+
+#~ msgid "Drafts"
+#~ msgstr "Skitser"
+
+#~ msgid "Outbox"
+#~ msgstr "Udboks"
+
+#~ msgid "Sent"
+#~ msgstr "Sendt"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Fejl ved synkronisering af \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "Synkroniserer mappe"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Synkroniserer \"%s\" (%d af %d)..."
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Ingen mappe vist)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(Ingen)"
+
+#~ msgid "No error"
+#~ msgstr "Ingen fejl"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "En mappe med samme navn eksisterer allerede"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Specificeret mappetype er ikke gyldig"
+
+#~ msgid "I/O error"
+#~ msgstr "I/U-fejl"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Ikke nok plads til at oprette mappen"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Mappen er ikke tom"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Specificeret mappe blev ikke fundet"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Funktionen er ikke implementeret i dette lager"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Operationen er ikke understøttet"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Specificeret type er ikke understøttet for dette lager"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Specificeret mappe kan ikke ændres eller fjernes"
+
+#~ 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"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Kan ikke oprette en mappe med det navn"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Denne handling kan ikke udføres i frakoblet tilstand"
+
+#~ msgid "Checkbox"
+#~ msgstr "Afkrydsningsboks"
+
+#~ msgid "CORBA error"
+#~ msgstr "CORBA-fejl"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Ugyldige argumenter"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Har en ejer allerede"
+
+#~ msgid "No owner"
+#~ msgstr "Ingen ejer"
+
+#~ msgid "Unsupported type"
+#~ msgstr "En ikke-understøttet type"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Et ikke understøttet skema"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "En ikke-understøttet handling"
+
+#~ msgid "Internal error"
+#~ msgstr "Intern fejl"
+
+#~ msgid "Exists"
+#~ msgstr "Eksisterer"
+
+#~ msgid "Invalid URI"
+#~ msgstr "Ugyldig URI"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Har undermapper"
+
+#~ msgid "No space left"
+#~ msgstr "Ingen plads tilbage"
+
+#~ msgid "Old owner has died"
+#~ msgstr "Tidligere ejer er død FIXME"
+
+#~ msgid "Test type"
+#~ msgstr "Testtype"
+
+#~ msgid "Evolution Test Component"
+#~ msgstr "Evolutions testkomponent"
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "Importér"
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Feltnavn"
+#~ msgid "Create a new all-day event"
+#~ msgstr "Opret et nyt heldagsmøde"
 
-#~ msgid "Family Name"
-#~ msgstr "Efternavn"
+#~ msgid "New _Appointment"
+#~ msgstr "Ny _aftale"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Nyt møde"
+
+#, fuzzy
+#~ msgid "New _Task"
+#~ msgstr "Ny opgave"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "Evolution _vindue"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "Evolution _vindue"
+
+#~ msgid "Toggle"
+#~ msgstr "Skift"
+
+#~ msgid "Clear"
+#~ msgstr "Tøm"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Afbryd aktiv e-post-operation"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -16696,9 +18118,6 @@ msgstr "Find nu "
 #~ msgid "VCard (.vcf, .gcrd)"
 #~ msgstr "VCard (.vcf, .gcrd)"
 
-#~ msgid "Loading..."
-#~ msgstr "Indlæser..."
-
 #~ msgid "Searching..."
 #~ msgstr "Søger..."
 
@@ -16750,10 +18169,6 @@ msgstr "Find nu "
 #~ msgstr "EBook ikke indlæst\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "Kort-ID eksisterer allerede"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Operation afbrudt"
 
@@ -16901,9 +18316,6 @@ msgstr "Find nu "
 #~ msgid "Callback"
 #~ msgstr "Ring tilbage"
 
-#~ msgid "Company"
-#~ msgstr "Firma"
-
 #~ msgid "Comp"
 #~ msgstr "Datamaskine"
 
@@ -16970,9 +18382,6 @@ msgstr "Find nu "
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
 #~ msgid "Birth date"
 #~ msgstr "Fødselsdato"
 
@@ -16985,9 +18394,6 @@ msgstr "Find nu "
 #~ msgid "Arbitrary"
 #~ msgstr "Tilfældig"
 
-#~ msgid "ID"
-#~ msgstr "ID"
-
 #~ msgid "Last Use"
 #~ msgstr "Seneste anvendelse"
 
@@ -17000,9 +18406,6 @@ msgstr "Find nu "
 #~ msgid "Folder containing contact information"
 #~ msgstr "Mappe som indeholder kontaktinformation"
 
-#~ msgid "LDAP Server"
-#~ msgstr "LDAP-server"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "LDAP-server som indeholder kontaktinformation"
 
@@ -17012,18 +18415,6 @@ msgstr "Find nu "
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Offentlig folder som indeholder kontaktinformation"
 
-#~ msgid "_Contact"
-#~ msgstr "_Kontakt"
-
-#~ msgid "Create a new contact"
-#~ msgstr "Opret en ny kontakt"
-
-#~ msgid "New Contact List"
-#~ msgstr "Ny kontaktliste"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "Opret en ny kontaktliste"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "URIen som mappe-skimmeren vil vise"
 
@@ -17039,9 +18430,6 @@ msgstr "Find nu "
 #~ msgid "Is New Card"
 #~ msgstr "Er nyt kort"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TTD"
-
 #~ msgid "No cards"
 #~ msgstr "Ingen kort"
 
@@ -17090,30 +18478,6 @@ msgstr "Find nu "
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "Offentlig mappe som indeholder gøremål"
 
-#~ msgid "New appointment"
-#~ msgstr "Nyt møde"
-
-#~ msgid "_Appointment"
-#~ msgstr "_Møde"
-
-#~ msgid "New meeting"
-#~ msgstr "Nyt møde"
-
-#~ msgid "M_eeting"
-#~ msgstr "Mød_e"
-
-#~ msgid "New task"
-#~ msgstr "Nyt gøremål"
-
-#~ msgid "_Task"
-#~ msgstr "_Opgave"
-
-#~ msgid "New All Day Appointment"
-#~ msgstr "Nyt heldagsmøde"
-
-#~ msgid "All _Day Appointment"
-#~ msgstr "Hel_dagsmøde"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "Kunne ikke opdatera ugyldigt objekt"
 
@@ -17159,9 +18523,6 @@ msgstr "Find nu "
 #~ msgid "Opening calendar at %s"
 #~ msgstr "Åbner kalender ved %s"
 
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Åbner standardopgavemappen"
-
 #~ msgid "Evaluation of the search expression did not yield a boolean value"
 #~ msgstr "Evaluering af søgeudtrykket gav ikke en boolsk værdi"
 
@@ -17199,9 +18560,6 @@ msgstr "Find nu "
 #~ "Evolution har fundet GnomeCard filer.\n"
 #~ "Vil du importere dem til Evolution?"
 
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Evolution e-post-opsætningsgrænseflade"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "Mappe som indeholder e-post"
 
@@ -17217,9 +18575,6 @@ msgstr "Find nu "
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Virtuel affaldsmappe"
 
-#~ msgid "Properties..."
-#~ msgstr "Egenskaber ..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Ændr denne mappes egenskaber"
 
@@ -17229,15 +18584,6 @@ msgstr "Find nu "
 #~ msgid "You have unsent messages, do you wish to quit anyway?"
 #~ msgstr "Du har usendte meddelelser, vil du afslutte alligevel?"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Ny e-post-besked"
-
-#~ msgid "_Mail Message"
-#~ msgstr "Send _besked"
-
-#~ msgid "Compose a new mail message"
-#~ msgstr "Skriv en ny e-post-meddelelse"
-
 #~ msgid "New Message Post"
 #~ msgstr "Postning af ny meddelelse"
 
@@ -19044,9 +20390,6 @@ msgstr "Find nu "
 #~ msgid "Cumberland"
 #~ msgstr "Cumberland"
 
-#~ msgid "Curitiba"
-#~ msgstr "Curitiba"
-
 #~ msgid "Curitiba Apt"
 #~ msgstr "Curitiba Apt"
 
@@ -22038,9 +23381,6 @@ msgstr "Find nu "
 #~ msgid "North Bend"
 #~ msgstr "North Bend"
 
-#~ msgid "North Carolina"
-#~ msgstr "North Carolina"
-
 #~ msgid "North Conway"
 #~ msgstr "North Conway"
 
@@ -23652,9 +24992,6 @@ msgstr "Find nu "
 #~ msgid "State College"
 #~ msgstr "State College"
 
-#~ msgid "Stauning"
-#~ msgstr "Stauning"
-
 #~ msgid "Staunton"
 #~ msgstr "Staunton"
 
@@ -24243,9 +25580,6 @@ msgstr "Find nu "
 #~ msgid "United Arab Emirates "
 #~ msgstr "De forenede arabiske emirater"
 
-#~ msgid "Unst"
-#~ msgstr "Unst"
-
 #~ msgid "Upington"
 #~ msgstr "Upington"
 
@@ -24354,12 +25688,6 @@ msgstr "Find nu "
 #~ msgid "Veracruz"
 #~ msgstr "Veracruz"
 
-#~ msgid "Vermillion"
-#~ msgstr "Vermillion"
-
-#~ msgid "Vermont"
-#~ msgstr "Vermont"
-
 #~ msgid "Vernal"
 #~ msgstr "Vernal"
 
@@ -24891,9 +26219,6 @@ msgstr "Find nu "
 #~ msgid " F"
 #~ msgstr " F"
 
-#~ msgid " C"
-#~ msgstr " C"
-
 #~ msgid "knots"
 #~ msgstr "knob"
 
@@ -25512,10 +26837,6 @@ msgstr "Find nu "
 #~ msgid "Freezing haze"
 #~ msgstr "Frysende dis"
 
-# Spray betyder støvregn men her bruges det om regn
-#~ msgid "Spray"
-#~ msgstr "Støvregn"
-
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Støvregn i området"
 
@@ -25885,18 +27206,6 @@ msgstr "Find nu "
 #~ msgid "Remove a folder added with \"Open Other User's Folder\""
 #~ msgstr "Fjern en mappe som tilføjedes med \"Åbn en anden brugers mappe\""
 
-#~ msgid "Send / Receive"
-#~ msgstr "Send / modtag"
-
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Send køede objekter og hent nye objekter"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Slå visning af mappelinjen fra/til"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Slå visning af genvejslinjen fra/til"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Vis den valgte mappe"
 
@@ -25924,9 +27233,6 @@ msgstr "Find nu "
 #~ msgid "_Rename..."
 #~ msgstr "_Omdøb..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Send / modtag"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "_Genvejslinje"
 
@@ -25969,9 +27275,6 @@ msgstr "Find nu "
 #~ msgid "Font Preferences"
 #~ msgstr "Skrifttypeindstillinger"
 
-#~ msgid "Automatically _detect links"
-#~ msgstr "_Detektera automatisk lænker"
-
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 
@@ -26068,18 +27371,12 @@ msgstr "Find nu "
 #~ msgid "1234"
 #~ msgstr "1234"
 
-#~ msgid "380"
-#~ msgstr "380"
-
 #~ msgid "666"
 #~ msgstr "666"
 
 #~ msgid "<- _Remove"
 #~ msgstr "<- _Fjern"
 
-#~ msgid "<< Fewer Options"
-#~ msgstr "<< Færre alternativer"
-
 #~ msgid "Add (or Edit) Attribute Mappings"
 #~ msgstr "Tilføj (eller rediger) attributmappninger"
 
diff --git a/po/de.po b/po/de.po
index 8624de2e58..decf74631c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.3.5\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-07-22 20:27+0200\n"
 "Last-Translator: Christian Neumair <chris@gnome-de.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -38,51 +38,184 @@ msgstr "%s konnte nicht geladen werden: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Adress-Anwendungsblock des konnte Pilot nicht gelesen werden"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Ordner für Auto-Vervollständigung"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "Kennung des _Zertifikats:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Hier können Sie Ihre E-Mail-Konten konfigurieren"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Kontakte"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
+msgstr "Evolution-Adressbuch"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution-Adressbuch-Adress-Popup-Fenster"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution-Adressbuch-Adressbetrachter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution-Adressbuch-Minikarten-Betrachter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook component"
+msgstr "Evolution-Adressbuch-Komponente"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution-Adressbuch-Ordnerbetrachter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evoltion-E-Mail-Einstellungen-Bedienelement"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Bedienelement zur Konfiguration von Evolution-Ordner"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Adressbuch"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Eigenschaften..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Löschen"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "_Umbenennen"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Neuer Kontakt:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "Einen neuen Kontakt anlegen"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Neu Kontaktliste"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "Neu Kontaktliste"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "Eine neue Kontaktliste anlegen"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Persönlich"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Arbeit"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "LDAP-Server:"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Verzeichnis %s konnte nicht angelegt werden: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "Verbindung zum LDAP-Server ist fehlgeschlagen"
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "Legitimation beim IMAP-Server ist fehlgeschlagen"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "Abfrage auf Root DSE konnte nicht ausgeführt werden"
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "Der Server antwortete mit nicht unterstützen Suchbasen"
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Dieser Server unterstützt keine LDAPv3 Schema-Information"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "Fehler beim Abrufen der Schema-Informationen"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 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:1636
-msgid "Account Name"
-msgstr "Kontoname"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Servername"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP wurde in diesem Build von Evolution nicht aktiviert"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Andere Kontakte"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -90,7 +223,7 @@ msgstr ""
 "Dieses Adressbuch konnte nicht geöffnet werden. Bitte prüfen Sie\n"
 "nach, ob der Pfad existiert und ob Sie darauf zugreifen dürfen."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -100,7 +233,7 @@ msgstr ""
 "bedeutet entweder, dass Sie einen ungültigen URI eingegeben\n"
 "haben oder dass der LDAP-Server nicht erreichbar ist."
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -113,7 +246,7 @@ msgstr ""
 "nachdem Sie sich von der Adresse unten OpenLDAP besorgt\n"
 "haben.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -127,44 +260,43 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Das Adressbuch konnte nicht geöffnet werden"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "Anonymer Zugriff auf LDAP-Server"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "Legitimation fehlgeschlagen.\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sPasswort für %s (Benutzer %s) eingeben"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "Name beginnt mit"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "E-Mail-Adresse beginnt mit"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Kategorie ist"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Irgend ein Feld enthält"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Komplex..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -176,7 +308,7 @@ msgstr ""
 "oder erhöhen Sie das Zeitlimit in den Einstellungen des\n"
 "Verzeichnis-Servers für dieses Adressbuch."
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -188,92 +320,45 @@ msgstr ""
 "Bitte präzisieren Sie Ihre Suche oder erhöhen Sie das Zeitlimit in den\n"
 "Einstellungen des Verzeichnis-Servers für dieses Adressbuch."
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "Die Hintergrundkomponente für dieses Adressbuch konnte diese Abfrage nicht "
 "verarbeiten."
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "Die Hintergrundkomponente für dieses Adressbuch konnte diese Abfrage nicht "
 "ausführen."
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "Diese Abfrage konnte nicht erfolgreich ausgeführt werden"
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Beliebige Kategorie"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "Der URI, den der Kalender anzeigen wird"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "Kennung des _Zertifikats:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "Hier können Sie den Zugriff auf LDAP-Verzeichnis-Server konfigurieren"
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Kontakte"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "Verzeichnis-Server"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolution-Adressbuch"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Bedienelement zur LDAP-Konfiguration des Evolution-Adressbuchs"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution-Adressbuch-Adress-Popup-Fenster"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution-Adressbuch-Adressbetrachter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution-Adressbuch-Minikarten-Betrachter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr "Evolution-Adressbuch-Komponente"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution-Adressbuch-Ordnerbetrachter"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evoltion-E-Mail-Einstellungen-Bedienelement"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -296,6 +381,7 @@ msgstr "  Unterstützte Basen _anzeigen"
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -329,8 +415,9 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "LDAP-Server hinzufügen"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "LDAP-Konfigurationsassistent"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -346,9 +433,9 @@ msgid "Anonymously"
 msgstr "Anonym"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -359,50 +446,51 @@ msgstr ""
 "Bitte klicken sie den »Fertigstellen«-Knopf an, um die von Ihnen hier "
 "vorgenommenen Einstellungen zu speichern."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "Verbindung wird hergestellt"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "Eindeutiger _Name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr "LDAP-Server bearbeiten"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
 msgstr "E-Mail-Adresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 "Evolution verwendet diesen eindeutigen Namen, um Sie beim Server zu "
 "legitimieren"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution verwendet diese E-Mail-Adresse, um Sie beim Server zu legitimieren"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "Beendet"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Allgemein"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "LDAP-Konfigurationsassistent"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "Gruppe"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Nie"
 
@@ -432,8 +520,8 @@ msgid "S_earch scope: "
 msgstr "Suchb_ereich: "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Suchen"
 
@@ -495,28 +583,32 @@ msgstr ""
 "festlegen."
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 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:48
-msgid "Step 1: Server Information"
-msgstr "Schritt 1: Server Informationen"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "SChritt 2: Verbindung zum Server"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "Schritt 1: Server Informationen"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "Schritt 3: Das Verzeichnis durchsuchen"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "SChritt 2: Verbindung zum Server"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "Schritt 4: Name"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Schritt 3: Das Verzeichnis durchsuchen"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -528,19 +620,6 @@ msgstr "Unterstützte Such-Basen"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"Der erste Schritt beim Konfigurieren eines LDAP-Server ist seinen Namen und "
-"Ihre\n"
-"Anmeldeinformationen anzugeben. Bitte fragen Sie Ihren System-Administrator, "
-"wenn\n"
-"Sie unsicher bei diesen Einstellungen sind."
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -551,7 +630,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:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -564,7 +643,7 @@ msgstr ""
 "Verzeichnis-\n"
 "baums beginnen."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -581,14 +660,14 @@ msgstr ""
 "unterhalb\n"
 "des Ausgangspunktes der Suche einschließen.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
+#, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "Dieser Assistent wird Ihnen dabei helfen, auf Online-Verzeichnisdienste\n"
 "zuzugreifen, die LDAP (Lightweight Directory Access Protocoll)\n"
@@ -599,7 +678,7 @@ msgstr ""
 "Administrator, wenn Sie dabei Hilfe benötigen, diese Informationen zu\n"
 "bekommen."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -607,7 +686,7 @@ msgstr ""
 "Dies ist der vollständige Name des LDAP-Servers. Zum Beispiel: »ldap."
 "meinefirma.de«."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -616,7 +695,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:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -626,7 +705,7 @@ msgstr ""
 "Beachten Sie, dass ein anonymer Zugriff auf den LDAP-Server erforderlich "
 "ist, wenn Sie dies auf »E-Mail-Adresse« einstellen."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -636,6 +715,16 @@ msgstr ""
 "angezeigt wird.\n"
 "Er ist nur für Anzeigezwecke. "
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Dies ist der Name für diesen Server, der in der Ordnerliste von Evolution "
+"angezeigt wird.\n"
+"Er ist nur für Anzeigezwecke. "
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -665,21 +754,35 @@ msgid "Using email address"
 msgstr "E-Mail-Adresse verwenden"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Immer, wenn möglich"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+"Der erste Schritt beim Konfigurieren eines LDAP-Server ist seinen Namen und "
+"Ihre\n"
+"Anmeldeinformationen anzugeben. Bitte fragen Sie Ihren System-Administrator, "
+"wenn\n"
+"Sie unsicher bei diesen Einstellungen sind."
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "_Name, der angezeigt wird:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "_Downloadbegrenzung:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -687,54 +790,52 @@ msgstr "_Downloadbegrenzung:"
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "Methode zur _Anmeldung:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "_Port-Nummer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "Such_basis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "_Servername:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "_Zeitüberschreitung (Minuten):"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "Karten"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr "searching-tab"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Name"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Oberfläche zur Auswahl eines Namens für Evolution-Adressbücher"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Alle Entfernen"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Entfernen"
@@ -761,23 +862,21 @@ msgstr "Zu Kontakten hinzufügen"
 msgid "Unnamed Contact"
 msgstr "Namenloser Kontakt"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Name"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Quelle"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Kontakte aus Adressbuch wählen"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "Kontakt finden in"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Oberfläche zur Auswahl eines Namens für Evolution-Adressbücher"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Suchen"
@@ -854,7 +953,8 @@ msgid "D_epartment:"
 msgstr "_Abteilung:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Details"
 
@@ -921,12 +1021,12 @@ msgid "_Categories..."
 msgstr "Ka_tegorien..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "Löschen"
@@ -2050,7 +2150,7 @@ msgid "Esq."
 msgstr "Esq."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Voller Name"
 
@@ -2145,11 +2245,28 @@ msgstr "Kontaktlisten-Editor"
 msgid "Save List as VCard"
 msgstr "Liste als VCard speichern"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Geänderter Kontakt:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Kontakt in Konflikt:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Doppelt vorhandener Kontakt entdeckt"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Die geänderte E-Mail-Adresse bzw. den geänderten Namen dieses\n"
+"Kontakts gibt es bereits in diesem Ordner. Möchten Sie ihn\n"
+"trotzdem hinzufügen?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Neuer Kontakt:"
@@ -2166,23 +2283,6 @@ msgstr ""
 "Den Namen oder die E-Mail-Adresse dieses Kontakts gibt es\n"
 "bereits in diesem Ordner. Möchten Sie ihn trotzdem hinzufügen?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Geänderter Kontakt:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Kontakt in Konflikt:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"Die geänderte E-Mail-Adresse bzw. den geänderten Namen dieses\n"
-"Kontakts gibt es bereits in diesem Ordner. Möchten Sie ihn\n"
-"trotzdem hinzufügen?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2281,9 +2381,9 @@ msgstr "Kontakt weiterleiten"
 msgid "Send Message to Contact"
 msgstr "Nachricht an Kontakt schicken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Drucken"
@@ -2305,9 +2405,12 @@ msgstr "In Ordner verschieben..."
 msgid "Cut"
 msgstr "Ausschneiden"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopieren"
 
@@ -2316,16 +2419,8 @@ msgstr "Kopieren"
 msgid "Paste"
 msgstr "Einfügen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Löschen"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "Aktuelle Ansicht"
 
@@ -2342,166 +2437,170 @@ msgstr ""
 "können"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "* Click here to add a contact *"
-msgstr "* Klicken Sie hier, um einen Kontakt hinzuzufügen *"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Geschäftliches Fax"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Geschäftliches Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Geschäftliches Telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Rückruf-Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Autotelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategorien"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Firmentelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Abteilung"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "E-Mail"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "E-Mail 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "E-Mail 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Familienname"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Einsortieren unter"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "Verfügbarkeitsadresse"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Adresse zu Hause"
+#, fuzzy
+msgid "Given Name"
+msgstr "Name des Feldes"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Fax zu Hause"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Telefon zu Hause"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Telefon zu Hause 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Jordan"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Vorgesetzter"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Notiz"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Büro"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Andere Adresse"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Anderes Fax"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Anderes Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Primäres Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Beruf"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Funk"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Position"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Ehepartner"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "Telex"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TTD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Titel"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Unst"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Website"
 
@@ -2594,11 +2693,19 @@ msgstr "Mitglieder"
 msgid "Job Title"
 msgstr "_Tätigkeit:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Adresse zu Hause"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Adresse zu Hause"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Andere Adresse"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2611,113 +2718,110 @@ msgstr "Fax zu Hause"
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Erfolg"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Repository offline"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Karte nicht gefunden"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Kartenkennung existiert bereits"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Protokoll nicht unterstützt"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Storniert"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "Legitimation fehlgeschlagen"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "Legitimation erforderlich"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS nicht verfügbar"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "Adressbuch existiert nicht"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Anderer Fehler"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Wollen Sie die Änderungen speichern?"
 
 # CHECK
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr "_Verwerfen"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Fehler beim Hinzufügen der Liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Fehler beim Hinzufügen einer Karte"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Fehler beim Ändern einer Liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Fehler beim Ändern einer Karte"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Fehler beim Entfernen einer Liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Fehler beim Entfernen einer Karte"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2727,7 +2831,7 @@ msgstr ""
 "%d zusätzliche Fenster auf ihrem Bildschirm angezeigt werden.\n"
 "Wollen Sie wirklich alle Karten anzeigen lassen?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2736,49 +2840,49 @@ msgstr ""
 "%s gibt es bereits\n"
 "Möchten Sie sie überschreiben?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "Überschreiben"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Fehler beim Speichern von %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Karte verschieben nach"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Karte kopieren nach"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Karten verschieben nach"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Karten kopieren nach"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Mehrere VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard für %s"
@@ -2973,7 +3077,7 @@ msgstr "Ränder"
 msgid "Number of columns:"
 msgstr "Anzahl Spalten:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Optionen"
 
@@ -3160,18 +3264,18 @@ msgstr "Namenlose Liste"
 msgid "Split Multi-Day Events:"
 msgstr "Mehrtätige Ereignisse aufteilen:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Der Wombat-Server konnte nicht gestartet werden"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Wombat konnte nicht gestartet werden"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Calendar-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
@@ -3179,24 +3283,85 @@ msgstr "Calendar-Anwendungsblock des Pilot konnte nicht gelesen werden"
 msgid "Default Priority:"
 msgstr "Vorgabepriorität:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "ToDo-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Kalender und Aufgaben"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+"Hier können Sie Ihre Zeitzone, den Kalender und die Aufgabenliste "
+"konfigurieren"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution Kalender und Aufgaben"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Bedienelement zur Konfiguration des Evolution-Kalenders"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution-Kalender-Terminplan-Nachrichtenbetrachter"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Evolution-Kalenderbetrachter"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution-Kalender/Aufgaben-Editor"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Evolution-Aufgabenbetrachter"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolution-Komponente für Kalender und Aufgaben"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolution-Test-Komponente"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Aufgaben"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution-Kalender-Alarmbenachrichtigungsdienst"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Beginnt:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Endent:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Evolution-Alarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm am %s"
@@ -3272,44 +3437,173 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Mich über dieses Programm nicht mehr fragen."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution-Kalender-Alarmbenachrichtigungsdienst"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo konnte nicht initialisiert werden"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs konnte nicht initialisiert werden"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Fabrik für Alarm-Benachrichtigungsdienst konnte nicht angelegt werden"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "ungültige Zeit"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "iCalendar-Fehler"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Farbe für heute fällige Aufgaben"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Farbe für heute fällige Aufgaben"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "_Endzeiten von Aufgaben in Wochen- und Monatsansichten anzeigen"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Eine Vorschau auf den zu druckenden Kalender anzeigen"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "Beim Löschen von Objekten um Bestätigung _anfragen"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "Beim Löschen von Objekten um Bestätigung _anfragen"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Die abgeschlossenen Aufgaben löschen"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "_Wochennummern im Datumsnavigator anzeigen"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Zusammenfassung enthält"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Beschreibung enthält"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Kommentar enthält"
 
 # CHECK
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Nicht einsortiert"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -3320,80 +3614,109 @@ msgstr ""
 "nicht wiederherstellen."
 
 # CHECK
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 msgid "Purge events older than"
 msgstr "Ereignisse säubern nach"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "Tage"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A, %d. %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d. %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Diesen Kalender drucken"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Neukaledonien"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "Neuer Termin"
+
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "_Termin"
+
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Einen neuen Termin anlegen"
+
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "Neue Besprechung"
+
+#: calendar/gui/calendar-component.c:640
+msgid "M_eeting"
+msgstr "_Besprechung"
+
+#: calendar/gui/calendar-component.c:641
 #, fuzzy
-msgid "Rename"
-msgstr "_Umbenennen"
+msgid "Create a new meeting request"
+msgstr "Eine neue Besprechungsanfrage anlegen"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Neuer Ganztags-Termin"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Persönlich"
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr "_Ganztags-Termin"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Arbeit"
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Einen neuen Termin anlegen"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3510,7 +3833,7 @@ msgstr "Schicken an:"
 msgid "With these arguments:"
 msgstr "Mit diesen Argumenten:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr "Dialog1"
 
@@ -3526,6 +3849,10 @@ msgstr "Stunden"
 msgid "minutes"
 msgstr "Minuten"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3558,8 +3885,8 @@ msgstr "Eine E-Mail verschicken"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Zusammenfassung:"
 
@@ -3588,7 +3915,7 @@ msgstr "Ende des Termins"
 msgid "hour(s)"
 msgstr "Stunde(n)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "Minute(n)"
 
@@ -3642,7 +3969,7 @@ msgstr "Tage"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Freitag"
 
@@ -3656,7 +3983,7 @@ msgstr "Minuten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Montag"
 
@@ -3666,7 +3993,7 @@ msgstr "_So"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Samstag"
 
@@ -3680,7 +4007,7 @@ msgstr "_Wochennummern im Datumsnavigator anzeigen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Sonntag"
 
@@ -3698,7 +4025,7 @@ msgstr "Aufgabenliste"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Donnerstag"
 
@@ -3716,7 +4043,7 @@ msgstr "Zeitformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Dienstag"
 
@@ -3726,12 +4053,12 @@ msgstr "W_oche beginnt:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Mittwoch"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Werkwoche"
 
@@ -3768,7 +4095,7 @@ msgid "_Fri"
 msgstr "_Fr"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Allgemein"
 
@@ -3808,7 +4135,7 @@ msgstr "M_i"
 msgid "before every appointment"
 msgstr "vor jedem Termin"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
@@ -3816,12 +4143,12 @@ msgstr ""
 "Das zu löschende Ereignis ist eine Besprechung. Soll eine "
 "Stornierungsnachricht an die betroffene(n) Person(en) verschickt werden?"
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 "Sind Sie sicher, dass Sie diese Besprechung absagen und löschen wollen?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
@@ -3829,11 +4156,11 @@ msgstr ""
 "Die zu löschende Aufgabe wurde bereits jemandem zugewiesen. Soll eine "
 "Stornierungsnachricht an die betroffene(n) Person(en) verschickt werden?"
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Sind Sie sicher, dass Sie diese Aufgabe stornieren und löschen wollen?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -3841,56 +4168,56 @@ msgstr ""
 "Der zu löschende Journaleintrag wurde bereits veröffentlicht. Soll eine "
 "Stornierungsnachricht verschickt werden?"
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 "Sind Sie sicher, dass Sie diesen Journaleintrag stornieren und löschen "
 "wollen?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Dieses Ereignis wurde gelöscht."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Diese Aufgabe wurde gelöscht."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Dieser Journaleintrag wurde gelöscht."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Sie haben Änderungen vorgenommen. Diese vergessen und den Editor "
 "schließen?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor schließen?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Dieses Ereignis wurde geändert."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Diese Aufgabe wurde geändert."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Dieser Journaleintrag wurde geändert."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Sie haben Änderungen vorgenommen. Diese vergessen und den Editor "
 "aktualisieren?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor aktualisieren?"
@@ -3900,176 +4227,181 @@ msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor aktualisieren?"
 msgid "Validation error: %s"
 msgstr "Validierungsfehler: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " bis "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Abgeschlossen "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Abgeschlossen "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Fällig am "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Fällig am "
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "Objekt konnte nicht aktualisiert werden"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Termin bearbeiten"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Aufgabe - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaleintrag - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Keine Zusammenfassung"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Speichern unter..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "An diesem Objekt vorgenommene Änderungen verfallen möglicherweise, sobald "
 "Aktualisierungen eintreffen"
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Aktuelle Version konnte nicht ermittelt werden!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Geben Sie einen Zielordner für das Importieren dieser Daten an"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Sind Sie sicher, dass Sie den Termin »%s« löschen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Sind Sie sicher, dass Sie diesen unbenannten Termin löschen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Sind Sie sicher, dass Sie die Aufgabe »%s« löschen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Sind Sie sicher, dass Sie diese unbenannte Aufgabe löschen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Sind Sie sicher, dass Sie den Journaleintrag »%s« löschen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 "Sind Sie sicher, dass Sie diesen unbenannten Journaleintrag löschen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Sind Sie sicher, dass Sie %d Termine löschen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Sind Sie sicher, dass Sie %d Aufgaben löschen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Sind Sie sicher, dass Sie %d Journaleinträge löschen wollen?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 "Das Ereignis konnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "Die Aufgabekonnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 "Der Journaleintrag konnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Das Objekt konnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 "Das Ereignis konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 "Die Aufgabe konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 "Der Journaleintrag konnte nicht gelöscht werden, da der Zugriff verweigert "
 "wurde"
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 "Das Objekt konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr ""
 "Das Ereignis konnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Die Aufgabekonnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr ""
 "Der Journaleintrag konnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Das Objekt konnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
@@ -4086,43 +4418,43 @@ msgstr "Delegieren an:"
 msgid "Enter Delegate"
 msgstr "Delegaten eingeben"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Termin"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Erinnerung"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Wiederholung"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Planung"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Besprechung"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "Das Anfangsdatum ist falsch"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "Das Enddatum ist falsch"
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "Die Anfangszeit ist falsch"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "Die Endzeit ist falsch"
 
@@ -4192,31 +4524,31 @@ msgid "_Start time:"
 msgstr "Anfangszeit:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Keine"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr "Dem gewählten Organizer ist kein Konto mehr zugeordnet."
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "Es ist ein Organisator erforderlich."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "Es ist mindestens ein Teilnehmer erforderlich."
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Delegieren an..."
 
@@ -4257,21 +4589,15 @@ msgid "Member"
 msgstr "Mitglied"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "UAwg"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Position"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -4291,6 +4617,7 @@ msgid "_Invite Others..."
 msgstr "Andere einladen..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4323,6 +4650,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Verzeichnis %s konnte nicht angelegt werden: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "Es muss ein Organisator festgelegt werden."
@@ -4352,39 +4680,64 @@ msgstr "Kalenderinformationen"
 msgid "Calendar Name"
 msgstr "Kalender"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Verzeichnis %s konnte nicht angelegt werden: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Kalenderinformationen"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Aufgabenliste"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Aufgabenliste"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Aufgabenliste"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 "Sie führen Änderungen an einem wiederkehrenden Ereignis durch. Was möchten "
 "Sie verändern?"
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 "Sie führen Änderungen an einer wiederkehrenden Aufgabe durch. Was möchten "
 "Sie verändern?"
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 "Sie führen Änderungen an einer wiederkehrenden Journaleintrag durch. Was "
 "möchten Sie verändern?"
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr "Nur diese Instanz"
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Diese und zukünftige Instanzen"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr "Diese und zukünftige Instanzen"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr "Alle Instanzen"
 
@@ -4434,10 +4787,15 @@ msgstr "Tag"
 msgid "on the"
 msgstr "am"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "Auftreten"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Datum/Zeit:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "_Hinzufügen"
@@ -4502,7 +4860,7 @@ msgstr "Woche(n)"
 msgid "year(s)"
 msgstr "Jahr(e)"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
@@ -4513,36 +4871,36 @@ msgstr ""
 "Möchten Sie Ihre Änderungen speichern?"
 
 # CHECK
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "Änderungen _verwerfen"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 msgid "Save Event"
 msgstr "Ereignis·speichern"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Die Besprechungsinformationen wurden erstellt. Jetzt verschicken?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 "Die Besprechungsinformationen haben sich geändert. Eine aktualisierte "
 "Version verschicken?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "Die Aufgabeninformationen wurden erstellt. Jetzt verschicken?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 "Die Aufgabeninformationen haben sich geändert. Eine aktualisierte Version "
 "verschicken?"
 
 # CHECK
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Das Fertiggestellt-Datum ist falsch"
 
@@ -4552,43 +4910,43 @@ msgid "% _Complete"
 msgstr "% _abgeschlossen"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Abgeschlossen"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Hoch"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Niedrig"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Nicht begonnen"
 
@@ -4597,7 +4955,7 @@ msgid "Progress"
 msgstr "Fortschritt"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Undefiniert"
 
@@ -4617,21 +4975,21 @@ msgstr "Status:"
 msgid "_Web Page:"
 msgstr "_Website:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Grundlegend"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Arbeitsauftrag"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "Das Fälligkeitsdatum ist falsch"
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4639,9 +4997,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "_Vertraulich"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Beschreibung:"
 
@@ -4746,26 +5104,21 @@ msgstr "%s um %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s für einen unbekannten Auslösertyp."
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Öffentlich"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Vertraulich"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategorien"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4778,28 +5131,26 @@ msgid "Start Date"
 msgstr "Anfangsdatum"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "Farbe"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Termin"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Frei"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Beschäftigt"
 
@@ -4811,7 +5162,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "O"
 
@@ -4819,7 +5170,7 @@ msgstr "O"
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4829,7 +5180,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4837,7 +5188,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4845,17 +5196,17 @@ msgstr "Nein"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -4867,180 +5218,178 @@ msgstr "Wiederkehrend"
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Objekte werden aktualisiert"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Gewählte Objekte werden gelöscht"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Objekte werden aktualisiert"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Neuer _Termin..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Neues _ganztägiges Ereignis"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "Neue Besprechung"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Neue Aufgabe"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Drucken..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "Einfügen"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Zum _heutigen Tag"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "_Gehe zu Datum..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "Ver_fügbarkeitsinformationen veröffentlichen"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "_Einstellungen..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "Ö_ffnen"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Speichern _unter..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "Kopieren"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "Besprechung _ansetzen..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "Als i_Calendar weiterleiten..."
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Dieses _Auftreten löschen"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Jedes _Auftreten löschen"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "_Einstellungen..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 msgid "Open _Web Page"
 msgstr "_Website öffnen"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "_Aufgabe zuweisen"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "Als i_Calendar weiterleiten"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "Als abgeschlossen _markieren"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Gewählte Aufgaben als abgeschlossen _markieren"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "Gewählte Aufgaben _löschen"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klicken Sie hier, um eine Aufgabe hinzuzufügen"
@@ -5054,8 +5403,8 @@ msgstr "% abgeschlossen"
 msgid "Alarms"
 msgstr "Alarme"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Abgeschlossen"
 
@@ -5084,18 +5433,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a, %d. %m %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5114,7 +5463,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
@@ -5127,127 +5476,127 @@ msgstr "%d. %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "AM"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "PM"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja (Komplexe Wiederholung)."
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "Täglich"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "Alle %d Tage"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "Wöchentlich"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "Alle %d Wochen"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr "Wöchentlich am "
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Alle %d Wochen am "
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " und "
 
 # CHECK - muss mit erste(r), zweite(r) usw. übereinstimmen
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr "%s Tag des "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s des "
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "monatlich"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr "alle %d Monate"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "Jährlich"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "Alle %d Jahre"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr " insgesamt %d Mal"
 
 # CHECK
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ", endet am "
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>Beginnt:</b> "
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Endet:</b>"
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>Abgeschlossen:</b>"
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>Fällig:</b>"
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "iCalendar-Informationen"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "iCalendar-Fehler"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Eine unbekannte Person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5255,323 +5604,322 @@ 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:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Keine</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "Standort: "
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Vorläufig angenommen"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Eine Aktion wählen:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Annehmen"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Vorläufig annehmen"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Ablehnen"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Verfügbarkeitsinformationen übermitteln"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Status des Antwortenden aktualisieren"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Neueste Informationen übermitteln"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> hat Besprechungsinformationen veröffentlicht."
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Besprechungsinformationen"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> wünscht die Anwesenheit von %s bei einer Besprechung"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Besprechungsvorschlag"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Besprechungsaktualisierung"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Besprechungs-Aktualisierungsanfrage"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, 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:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Besprechungsantwort"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> hat eine Besprechung widerrufen."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Besprechungswiderruf"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> hat eine unverständliche Nachricht verschickt."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Fehlerhafte Besprechungsmitteilung"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> hat Aufgabeninformationen veröffentlicht."
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Aufgabeninformationen"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> fordert %s auf, eine Aufgabe auszuführen."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, 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:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Aufgabenvorschlag"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, 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:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Aufgabenaktualisierung"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, 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:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Aufgaben-Aktualisierungsanfrage"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, 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:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Aufgaben-Antwort"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> hat eine Aufgabe widerrufen."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Aufgabenwiderruf"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Fehlerhafte Aufgabenmitteilung"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, 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:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Verfügbarkeitsinformationen"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, 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:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Verfügbarkeitsanfrage"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> hat auf eine Verfugbarkeitsanfrage geantwortet."
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Verfügbarkeitsantwort"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Fehlerhafte Verfügbarkeitsmitteilung"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr "Diese Nachricht scheint falsch formatiert zu sein"
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "Diese Nachricht enthält ausschließlich nicht unterstützte Anfragen."
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 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:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr "Die Anlage hat keine anzeigbaren Kalenderinformationen"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderdatei konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Aktualisierung abgeschlossen\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Anwesenheitsstatus konnte nicht aktualisiert werden, da der Eintrag nicht "
 "mehr existiert"
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 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:1911
+#: calendar/gui/e-itip-control.c:1909
 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:1923
+#: calendar/gui/e-itip-control.c:1921
 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:1942
+#: calendar/gui/e-itip-control.c:1940
 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:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr "Objekt konnte nicht gefunden werden\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 "Sie haben nicht die nötige Berechtigung, um den Kalender zu aktualisieren\n"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Anwesenheitsstatus aktualisiert\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "Teilnehmerstatus konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Entfernen abgeschlossen"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Eintrag verschickt!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Der Eintrag konnte nicht verschickt werden!\n"
 
@@ -5731,7 +6079,7 @@ msgstr "%a, %d.%m.%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
@@ -5795,45 +6143,40 @@ msgstr "Anfang der Besprechung:"
 msgid "Meeting _end time:"
 msgstr "Ende der Besprechung:"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 msgid "Start Date:"
 msgstr "Anfangsdatum:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 msgid "Due Date:"
 msgstr "Fällig am:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 msgid "Priority:"
 msgstr "Priorität:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 msgid "Web Page:"
 msgstr "Website:"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Aufgaben bei %s werden geöffnet"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Die Aufgaben in »%s« konnten nicht geladen werden"
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Die zum Laden von »%s« erfoderliche Methode wird nicht unterstützt"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, 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:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5842,48 +6185,39 @@ msgstr ""
 "Fehler bei %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "Aufgaben werden abgeschlossen..."
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "Gewählte Objekte werden gelöscht..."
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "Wird gesäubert"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Aufgaben"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, 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:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Die zum Öffnen von »%s« erforderliche Methode wird nicht unterstützt"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarme für %s werden hinzugefügt"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5895,7 +6229,7 @@ msgstr ""
 "ist abgestürzt. Sie müssen Evolution neu starten, um sie wieder verwenden zu "
 "können"
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5907,59 +6241,10 @@ msgstr ""
 "ist abgestürzt. Sie müssen Evolution neu starten, um sie wieder verwenden zu "
 "können"
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 msgid "Purging"
 msgstr "Entfernen"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalender und Aufgaben"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Kalender"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-"Hier können Sie Ihre Zeitzone, den Kalender und die Aufgabenliste "
-"konfigurieren"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution Kalender und Aufgaben"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Bedienelement zur Konfiguration des Evolution-Kalenders"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution-Kalender-Terminplan-Nachrichtenbetrachter"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution-Kalenderbetrachter"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution-Kalender/Aufgaben-Editor"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution-Aufgabenbetrachter"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolution-Komponente für Kalender und Aufgaben"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolution-Test-Komponente"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6016,297 +6301,333 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Es muss ein Organisator festgelegt werden."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Es ist mindestens ein Teilnehmer erforderlich"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Ereignisinformationen"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Aufgabeninformationen"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Journalinformationen"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Verfügbarkeitsinformationen"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Kalenderinformationen"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Aktualisieren"
 
 # CHECK
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "Gegenvorschlag"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Verfügbarkeitsinformationen (%s bis %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "iCalendar-Informationen"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Sie müssen ein Teilnehmer des Ereignisses sein."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "So"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Mo"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Di"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Mi"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Do"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Fr"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Gewählter Tag (%a, %d. %b %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a, %d. %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a, %d. %b %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Gewählte Woche (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Gewählter Monat (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Gewähltes Jahr (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Aufgabe"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorität: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prozent abgeschlossen: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorien: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Kontakte: "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Druckvorschau"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Eintrag drucken"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Druckeinstellungen"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Diese Verknüpfung umbenennen"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Aufgabenliste"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Neue Aufgabe"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Aufgabe"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Eine neue Aufgabe anlegen"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "Der URI, den der Aufgabenordner anzeigen wird"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6319,11 +6640,11 @@ msgstr ""
 "\n"
 "Sollen die Aufgaben wirklich entfernt werden?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Mich nicht mehr fragen."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "Aufgaben drucken"
 
@@ -6351,15 +6672,15 @@ msgstr "iCalendar-Dateien (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar-Dateien (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "Erinnerung!!"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "Kalender-Ereignisse"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6367,7 +6688,7 @@ msgstr ""
 "Evolution hat Gnome Calendar-Dateien gefunden.\n"
 "Möchten Sie sie in Evolution importieren?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
@@ -7900,27 +8221,27 @@ msgstr "Pazifik/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pazifik/Yap"
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "Signieren wird von dieser Verschlüsselung  nicht unterstützt"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "Prüfen wird von dieser Verschlüsselung nicht unterstützt"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Verschlüsseln wird von dieser Verschlüsselung nicht unterstützt"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Entziffern wird von dieser Verschlüsselung nicht unterstützt"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr "Sie dürfen keine Schlüssel mit dieser Verschlüsselung importieren"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr "Sie dürfen keine Schlüssel mit dieser Verschlüsselung exportieren"
 
@@ -7972,86 +8293,86 @@ msgstr "Ordner »%s« wird für den Offline-Modus vorbereitet"
 msgid "You must be working online to complete this operation"
 msgstr "Sie müssen online arbeiten, um diesen Vorgang zu Ende zu bringen"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Weiterleitung zu »%s« konnte nicht erstellt werden: %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Kindprozess »%s« konnte nicht erstellt werden: %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ungültiger Nachrichten-Datenstrom von %s empfangen: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Ordner werden synchronisiert"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fehler beim Verarbeiten des Filters: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fehler beim Ausführen des Filters: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Der Spool-Ordner konnte nicht geöffnet werden"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Der Spool-Ordner konnte nicht verarbeitet werden"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Nachricht %d wird abgerufen (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Nachricht konnte nicht geöffnet werden"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Fehlgeschlagen bei Nachricht %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Ordner wird synchronisiert"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Nachricht %d von %d wird abgerufen"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Nachricht konnte nicht abgerufen werden"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr "Ungültige Argumente bei (system-flag)"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr "Ungültige Argumente bei (user-tag)"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fehler beim Ausführen einer Filtersuche: %s: %s"
@@ -8083,35 +8404,35 @@ msgstr "(match-all) verlangt einen einzelnen Wahrheitswert als Ergebnis"
 msgid "Performing query on unknown header: %s"
 msgstr "Abfrage wird auf unbekannte Kopfzeile ausgeführt: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nicht unterstützte Operation: Nachricht anhängen: für %s"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nicht unterstützte Operation: Suche nach Ausdruck: für %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nicht unterstützte Operation: nach UIDs suchen: für %s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Nachrichten werden verschoben"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr "Nachrichten werden kopiert"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "%d Nachricht(en) werden/wird abgerufen"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8122,15 +8443,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr "Der gpg-Wink auf die Benutzerkennung konnte nicht verarbeitet werden"
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr "Der gpg-Wink auf das Passwort konnte nicht verarbeitet werden"
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8139,34 +8460,34 @@ msgstr ""
 "Für das Entsperren des Schlüssels für den\n"
 "Benutzer %s ist ein Passwort erforderlich."
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Storniert"
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Geheimschlüssel konnte nicht entsperrt werden: 3 falsche Passwörter "
 "eingegeben."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Unerwartete GnuPG-Antwort: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr "Keine Daten angegeben"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 "Nachricht konnte nicht verschlüsselt werden: keine gültigen Empfänger "
 "angegeben."
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8177,51 +8498,65 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "GPG %s fehlgeschlagen: %s\n"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Daten konnten nicht geschrieben werden: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg konnte nicht ausgeführt werden: %s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr "gpg konnte nicht ausgeführt werden."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "Dies ist ein digital signierter Nachrichtenteil"
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr ""
+"Die Nachrichtensignatur konnte nicht verifiziert werden: Temporäre Datei "
+"konnte nicht erstellt werden: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Die Nachrichtensignatur konnte nicht verifiziert werden: Temporäre Datei "
 "konnte nicht erstellt werden: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Daten konnten nicht geschrieben werden: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Dies ist ein digital signierter Nachrichtenteil"
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Rumpfinhalt indizieren"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Nachricht konnte nicht vom Editor erhalten werden"
@@ -8322,15 +8657,15 @@ msgstr "Fehler beim Schreiben der temporären E-Mail-Datei: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Fehler beim Kopieren der temporären E-Mail-Datei: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME-Teil konnte nicht entschlüsselt werden: Protokollfehler"
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "MIME-Teil konnte nicht entschlüsselt werden: Ungültige Struktur"
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "Fehler beim Verarbeiten"
 
@@ -8666,12 +9001,12 @@ msgstr "E-Mail-Quelle: Virtueller Ordner"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Zum Lesen von E-Mails in Form einer Abfrage über andere Ordner"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Keine Quelle für Protokoll »%s« verfügbar"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8680,74 +9015,85 @@ msgstr ""
 "Verzeichnis %s konnte nicht angelegt werden:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Passwort für %s eingeben"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Undefiniert"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Signatur bearbeiten"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Signatur bearbeiten"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Selbst signiertes Zertifikat in der Kette"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "Zertifikat nicht vertrauenswürdig"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Signatur speichern"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Fehler beim Verarbeiten"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Server: %s, Typ: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "Auf Ordner konnte nicht zugegriffen werden: Ungültige Aktion auf diesem "
 "Speicher"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Ordner konnte nicht angelegt werden: Ungültige Aktion auf diesem Speicher"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Müll"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "Juni"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "Das Zertifikat des Ausstellers konnte nicht abgerufen werden"
@@ -8958,7 +9304,7 @@ msgstr ""
 "Zertifikat-Rückrufliste nicht mehr gültig: %s\n"
 "Aussteller: %s"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL »%s« konnte nicht verarbeitet werden"
@@ -8978,22 +9324,22 @@ msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 "Nachrichten können nicht in virtuelle Ordner kopiert oder verschoben werden"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ordner konnte nicht gelöscht werden: %s: Ungültige Aktion"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ordner konnte nicht gelöscht werden: %s: Ordner gibt es nicht"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ordner konnte nicht umbenannt werden: %s: Ungültige Aktion"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ordner konnte umbenannt werden: %s: Ordner gibt es nicht"
@@ -9073,7 +9419,7 @@ msgstr "Nachricht konnte nicht abgerufen werden: %s"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9087,7 +9433,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Keine solche Nachricht"
@@ -9125,54 +9471,69 @@ msgid "Failed to cache %s: %s"
 msgstr "%s konnte nicht in den Zwischenspeicher geladen werden: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Verbindung zu Server..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Verbindung zum LDAP-Server ist fehlgeschlagen"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "Firma"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Nach neuen E-Mails sehen"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Check for new messages in all folders"
 msgstr "In allen Ordnern nach neuen E-Mails sehen"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Ordner"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Nur abonnierte Ordner anzeigen"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "Über vom Server vorgegebenen Ordner-Namensraum hinwegsetzen"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Namensraum"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Filter auf neue Nachrichten in INBOX dieses Servers anwenden"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Automatisch nach neuen E-Mails sehen alle"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Zum Lesen und Speichern von E-Mails auf IMAP-Servern."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Passwort"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9428,7 +9789,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Ordner %s konnte nicht in %s umbenannt werden: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "»%s« konnte nicht umbenannt werden: %s"
@@ -9545,29 +9906,29 @@ msgstr "Suchen nach neuen Nachrichten"
 msgid "Storing folder"
 msgstr "Ordner wird gespeichert"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ordnersperre auf %s konnte nicht erzeugt werden: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Postfach konnte nicht geöffnet werden: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "Anhängen der E-Mail abgebrochen"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nachricht konnte nicht an mbox-Datei angehängt werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9576,11 +9937,11 @@ msgstr ""
 "Nachricht konnte nicht erhalten werden: %s aus Ordner %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Dieser Ordner scheint nicht-wiederherstellbar korrupt zu sein."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Erstellen der Nachricht fehlgeschlagen: Fehlerhaftes Postfach?"
 
@@ -9648,12 +10009,17 @@ msgstr "Verzeichnis %s konnte nicht angelegt werden: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "Ordner konnte nicht abgerufen werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "Kartenkennung existiert bereits"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Ordner %s konnte nicht in %s umbenannt werden: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Der angegebene Ordnername ist nicht gültig: %s"
@@ -9699,7 +10065,7 @@ msgstr "Quellordner %s konnte nicht geschlossen werden: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Temporärer Ordner konnte nicht geschlossen werden: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Ordner konnte nicht umbenannt werden: %s"
@@ -9989,7 +10355,7 @@ msgstr "Nach %s Tag(en) löschen"
 msgid "Disable support for all POP3 extensions"
 msgstr "Jegliche·Unterstützung·von·POP3-Erweiterungen·deaktivieren"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -10079,7 +10445,7 @@ msgid "No such folder `%s'."
 msgstr "Ordner »%s« gibt es nicht."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10135,7 +10501,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "E-Mail-Zustellung über das Programm sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10306,7 +10672,7 @@ msgid "Cannot send message: sender address not valid."
 msgstr ""
 "Nachricht konnte nicht verschickt werden: Absenderadresse nicht gültig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Nachricht wird verschickt"
 
@@ -10431,7 +10797,7 @@ msgstr "%.0f MB"
 msgid "%.0fG"
 msgstr "%.0f GB"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "anlage"
 
@@ -10475,14 +10841,14 @@ msgstr "MIME-Typ:"
 msgid "Suggest automatic display of attachment"
 msgstr "Automatische Anzeige der Anlage vorschlagen"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Sie müssen ein Konto einrichten,\n"
 "bevor Sie E-Mails verfassen können."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Klicken Sie hier, um das Adressbuch zu öffnen"
 
@@ -10493,46 +10859,46 @@ msgstr "Klicken Sie hier, um das Adressbuch zu öffnen"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Antwort an:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Von:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "An:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Geben Sie die Empfänger der Nachricht ein"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Kopie an:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 "Geben Sie die Adressen ein, die eine Kopie der Nachricht erhalten sollen"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Blindkopie an:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10543,14 +10909,19 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Ablegen in:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr "Zielordner"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Der Nachricht eine Datei beilegen"
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Datei(en) beilegen"
@@ -10585,21 +10956,21 @@ msgstr "Datei existiert, überschreiben?"
 msgid "Error saving file: %s"
 msgstr "Fehler beim Speichern der Datei: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fehler beim Laden der Datei: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fehler beim Zugriff auf Datei: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Nachricht konnte nicht vom Editor erhalten werden"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10608,7 +10979,7 @@ msgstr ""
 "In Datei konnte nicht gesucht werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10617,7 +10988,7 @@ msgstr ""
 "Datei konnte nicht verkürzt werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10626,7 +10997,7 @@ msgstr ""
 "Dateideskriptor %s konnte nicht kopiert werden:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10635,7 +11006,7 @@ msgstr ""
 "Fehler beim automatischen Speichern der Nachricht: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10644,7 +11015,7 @@ msgstr ""
 "entdeckt.\n"
 "Möchten Sie eine Wiederherstellung versuchen?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10655,28 +11026,28 @@ msgstr ""
 "\n"
 "Wollen Sie die Änderungen speichern?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Warnung: Geänderte Nachricht"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Datei öffnen"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "Automatisch erzeugt"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Eine Nachricht verfassen"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10684,7 +11055,7 @@ msgstr ""
 "Das Editorfenster konnte nicht erzeugt werden:\n"
 "Adresswähler-Control konnte nicht aktiviert werden."
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10696,7 +11067,7 @@ msgstr ""
 "Bitte stellen Sie sicher, dass die korrekte gtkhtml- und\n"
 "libgtkhtml-Version installiert ist.\n"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10704,7 +11075,7 @@ msgstr ""
 "Das Editorfenster konnte nicht erzeugt werden:\n"
 "HTML-Editorkomponente konnte nicht aktiviert werden."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10713,11 +11084,13 @@ msgstr ""
 "bearbeitet werden kann.)<b>"
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Die Groupware-Suite Evolution"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10973,13 +11346,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11098,7 +11471,7 @@ msgstr "Dann"
 msgid "You must specify a folder."
 msgstr "Sie müssen einen Ordner angeben"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Ordner wählen"
@@ -11112,24 +11485,24 @@ msgstr ""
 "Fehler im regulären Ausdruck »%s«:\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Wichtig"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "Zu erledigen"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Später"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Test"
 
@@ -11231,7 +11604,7 @@ msgstr "in der Vergangenheit"
 msgid "months"
 msgstr "Monate"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "Sekunden"
 
@@ -11329,7 +11702,7 @@ msgstr "Ausdruck"
 msgid "Follow Up"
 msgstr "Folgenachricht"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "Etikett"
 
@@ -11399,112 +11772,118 @@ msgid "Source Account"
 msgstr "Herkunftskonto"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Sprühregen"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Bestimmte Kopfzeile"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Verarbeitung abbrechen"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Betreff"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "Status nicht setzen"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "enthält"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "enthält nicht"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "endet nicht auf"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "existiert nicht"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "does not return"
 msgstr "liefert nicht"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "klingt nicht wie"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "beginnt nicht mit"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "endet auf"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "existiert"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr "ist markiert"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr "ist nach"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "is before"
 msgstr "ist vor"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "ist größer als"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "ist kleiner als"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr "ist nicht markiert"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "ist nicht"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "ist"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr "liefert größer als"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr "liefert kleiner als"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr "liefert"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "klingt wie"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "beginnt mit"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Regelname »%s« ist nicht eindeutig. Wählen Sie einen anderen."
@@ -11529,18 +11908,81 @@ msgstr "Regelname "
 msgid "Score Rules"
 msgstr "Bewertungsregeln"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Der VOrdner muss benannt werden."
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr "Sie müssen mindestens einen Ordner als Quelle angeben."
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 msgid "VFolder source"
 msgstr "VOrdner-Quelle"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Editoreinstellungen"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Hier können Sie die E-Mail-Einstellungen einschließlich der Sicherheit und "
+"der Anzeige von Nachrichten festlegen"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Hier können Sie die Rechtschreibprüfung, Signaturen sowie den "
+"Nachrichteneditor konfigurieren"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Hier können Sie Ihre E-Mail-Konten konfigurieren"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolution E-Mail"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Bedienelement zur Konfiguration von Evolution-E-Mail-Konten"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Evolution-E-Mail-Komponente"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Evolution-E-Mail-Editor"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Bedienelement zur Konfiguration des Evolution-E-Mail-Editors"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution-E-Mail-Ordnerbetrachter"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evoltion-E-Mail-Einstellungen-Bedienelement"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "E-Mail"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "E-Mail-Konten"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "E-Mail-Einstellungen"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Sind Sie sicher, dass Sie dieses Konto löschen wollen?"
@@ -11582,7 +12024,7 @@ msgid "Protocol"
 msgstr "Protokoll"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr "Namenlose"
 
@@ -11606,20 +12048,17 @@ msgstr "Skript-Signatur hinzufügen"
 msgid "Signature(s)"
 msgstr "Signatur(en)"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "Sie verschicken eine HTML-formatierte Nachricht. Bitte stellen Sie sicher,\n"
 "dass die folgenden Empfänger HTML-Mails abrufen können und wollen:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Dennoch verschicken?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11627,7 +12066,7 @@ msgstr ""
 "Diese Nachricht hat keinen Betreff.\n"
 "Wirklich verschicken?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11636,11 +12075,11 @@ msgstr ""
 "ist, die Adressen der Liste zu verbergen, wird die Nachricht lediglich an "
 "Blindkopie-Empfängeradressen übermittlt."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Diese Nachricht enthält ausschließlich Blindkopie-Empfänger."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11650,11 +12089,11 @@ msgstr ""
 "er eine Apparently-To-Kopfzeile hinzufügt.\n"
 "Dennoch verschicken?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Sie müssen Empfänger angeben, um diese Nachricht zu verschicken."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11666,189 +12105,407 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "_Virtuellen Ordner aus Suche anlegen..."
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "E-Mail"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<Klicken Sie hier, um einen Ordner auszuwählen>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "»%s« in »%s«"
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Neuen Ordner anlegen"
 
-#: mail/em-folder-selector.c:267
-#, fuzzy
-msgid "Folder _name"
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Angeben, wo der Ordner angelegt werden soll:"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
 msgstr "Ordner_name:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Temporäres Verzeichnis konnte nicht angelegt werden: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Temporäres Verzeichnis konnte nicht angelegt werden: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Die temporäre Datei »%s« konnte nicht angelegt werden: %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Temporärer Ordner konnte nicht geschlossen werden: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Laden..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Ordner wählen"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Einen neuen Ordner anlegen"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Ordner »%s« konnte nicht gelöscht werden: %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Ordner »%s« wirklich löschen?"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "»%s« löschen"
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Den Ordner »%s« umbenennen in:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+msgid "Rename Folder"
+msgstr "Ordner umbenennen"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+"Es existiert bereits ein Ordner namens »%s«. Bitte verwenden Sie einen "
+"anderen Namen."
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Schriftart-Eigenschaften"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Eigenschaften"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "_Ordnername:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Ansicht"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "In neuem Fenster öffnen"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Verschieben"
+
+#: mail/em-folder-tree.c:1500
+msgid "_New Folder..."
+msgstr "Ordner a_nlegen..."
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "_Umbenennen"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "Ei_genschaften..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "Als neue Nachricht _bearbeiten..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "_Drucken"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "Antwort an Ab_sender"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "_Liste antworten"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "_Allen antworten"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr "Follo_w Up..."
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr "Als abgeschlossen _markieren"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "Markierung _löschen"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Als gelesen mar_kieren"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "Als _ungelesen markieren"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Als _wichtig markieren"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "Als unwichtig _markieren"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Als _ungelesen markieren"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Als _wichtig markieren"
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "Lösche_n rückgängig"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "In Ordner _verschieben..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "In Ordner kopieren..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "Absender zum Adress_buch hinzufügen"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "Filter _anwenden"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "_Regel aus Nachricht anlegen"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "VOrdner über _Betreff"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "VOrdner über Abse_nder"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "VOrdner über _Empfänger"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "VOrdner über Mailing_liste"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "VOrdner über Abse_nder"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Filter über _Betreff"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Filter über _Absender"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Filter über _Empfänger"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Filter über _Mailingliste"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filter über _Absender"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Vorgabe"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Nachricht drucken"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Linkziel kopieren"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Passt auf:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Zugewiesen"
+
+#: mail/em-format-html-display.c:597
+#, fuzzy
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr ""
+"Diese Nachricht ist digital unterzeichnet, aber konnte nicht als authentisch "
+"nachgewiesen werden."
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Signatur bearbeiten"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Signatur bearbeiten"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+#, fuzzy
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"Das Eingabe-Token »input_token« enthält eine ungültige oder nicht "
+"verifizierbare Signatur."
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Unterbrochen"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
 msgstr ""
-"Diese Nachricht ist digital signiert. Klicken Sie auf das Schlosssymbol, um "
-"weitere Informationen zu erhalten."
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "Mit PGP verschlüsseln"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr ""
+"Die MIME-Nachricht konnte nicht verarbeitet werden und wird daher als "
+"Quellxt angezeigt."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Nicht unterstütztes Schema"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Die Leaf-Signatur konnte nicht vertifiziert werden"
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "An Ort und Stelle anzeigen"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Verbergen"
@@ -11858,191 +12515,212 @@ msgstr "Verbergen"
 msgid "Page %d of %d"
 msgstr "Seite %d von %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Nachricht %s wird abgerufen"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Ungültiger external-body-Teil."
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Zeiger auf FTP-Site (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Zeiger auf lokale Datei (%s) gültig auf Site »%s«"
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Zeiger auf lokale Datei (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Zeiger auf Daten im Netz (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Zeiger auf unbekannte externe Daten (Typ »%s«)"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-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/em-format-html.c:906 mail/em-format.c:1217
-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/em-format-html.c:930 mail/em-format.c:1190
-msgid "No signature present"
-msgstr ""
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Bonobo konnte nicht initialisiert werden"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Nicht unterstütztes Schema"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Die MIME-Nachricht konnte nicht verarbeitet werden und wird daher als "
 "Quellxt angezeigt."
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Nachrichten werden verschoben"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Von"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "An"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Kopie"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Blindkopie"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "Mailer"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "%s-Anlage"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
+msgid "Session not initialised"
+msgstr "Bonobo konnte nicht initialisiert werden"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
-"Die MIME-Nachricht konnte nicht verarbeitet werden und wird daher als "
-"Quellxt angezeigt."
+"Diese Nachricht ist digital unterzeichnet und wurde als authentisch "
+"nachgewiesen."
 
-#: mail/em-popup.c:593
+#: mail/em-format.c:1212
+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/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Warten..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Ping zu %s wird ermittelt"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "%s konnte nicht in den Zwischenspeicher geladen werden: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Weiterleitung zu »%s« konnte nicht erstellt werden: %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Rechnername »%s« konnte nicht aufgelöst werden: %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Speichern unter..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Antwort an Ab_sender"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Link in Browser öffnen"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "_Nachricht an Liste schicken..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Den Absender zum Adressbuch hinzufügen"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Öffnen in %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "Dieser Server unterstützt keine LDAPv3 Schema-Information"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Abonnieren"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Ordner"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Bitte wählen Sie einen Server."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Es wurde kein Server gewählt"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Diese Meldung nicht mehr anzeigen."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12051,27 +12729,27 @@ msgstr ""
 "Fehler beim Laden von Filterinformation:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Weitergeleitete Nachricht"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "ein unbekannter Absender"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Am %a, %Y-%m-%d um %H.%M schrieb %%s:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12080,7 +12758,7 @@ msgstr ""
 "In »%s« konnte nicht gespeichert werden:\n"
 "  %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12089,25 +12767,26 @@ msgstr ""
 "»%s« ist bereits vorhanden.\n"
 "Soll es überschrieben werden?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Meldung"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Nachricht speichern unter..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Temporäres Verzeichnis konnte nicht angelegt werden: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Adresse"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12117,62 +12796,430 @@ msgstr ""
 "\n"
 "Sollen die Nachrichten wirklich entfernt werden?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Editoreinstellungen"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/em-utils.c:2288
+#, fuzzy
 msgid ""
-"Configure mail preferences, including security and message display, here"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
 msgstr ""
-"Hier können Sie die E-Mail-Einstellungen einschließlich der Sicherheit und "
-"der Anzeige von Nachrichten festlegen"
+"Dieser Vorgang wird alle als gelöscht markierten Nachrichten dauerhaft "
+"entfernen. Falls Sie fortfahren, werden Sie diese Nachrichten nicht "
+"wiederherstellen können.\n"
+"\n"
+"Sollen die Nachrichten wirklich entfernt werden?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/evolution-mail.schemas.in.in.h:1
+msgid "Automatic link recognition"
 msgstr ""
-"Hier können Sie die Rechtschreibprüfung, Signaturen sowie den "
-"Nachrichteneditor konfigurieren"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Hier können Sie Ihre E-Mail-Konten konfigurieren"
+#: mail/evolution-mail.schemas.in.in.h:2
+msgid "Automatic smiley recognition"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution E-Mail"
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Bedienelement zur Konfiguration von Evolution-E-Mail-Konten"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution-E-Mail-Komponente"
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution-E-Mail-Editor"
+#: mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
+msgid "Default charset in which to compose messages"
+msgstr "Vorgabebetreff für die Nachricht."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Bedienelement zur Konfiguration des Evolution-E-Mail-Editors"
+#: mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
+msgid "Default charset in which to compose messages."
+msgstr "Vorgabebetreff für die Nachricht."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution-E-Mail-Ordnerbetrachter"
+#: mail/evolution-mail.schemas.in.in.h:8
+#, fuzzy
+msgid "Default charset in which to display messages"
+msgstr "Im Rumpf der angezeigten Nachricht nach einem Text suchen"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evoltion-E-Mail-Einstellungen-Bedienelement"
+#: mail/evolution-mail.schemas.in.in.h:9
+#, fuzzy
+msgid "Default charset in which to display messages."
+msgstr "Im Rumpf der angezeigten Nachricht nach einem Text suchen"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/evolution-mail.schemas.in.in.h:10
+#, fuzzy
+msgid "Default forward style"
+msgstr "_Weiterleitungsstil:"
+
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default reply style"
+msgstr "_Antwortstil:"
+
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Empty Trash folders on exit"
+msgstr "Müllordner beim Beenden _leeren"
+
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Müllordner beim Beenden _leeren"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "E-Mail-Konten"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "E-Mail-Einstellungen"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "Aktionen ausführen"
+
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "E-Mail-Benachrichtigung"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "E-Mail-Benachrichtigung"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+"Beim Abschicken von HTML-Nachrichten an Kontakte, die keine wollen, "
+"_nachfragen"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr ""
+"Beim Abschicken von Nachrichten mit ausschließlich _Blindkopie-Empfängern "
+"nachfragen"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "HTML-Mail verschicken?"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "HTML-Mail verschicken?"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "_Animierte Bilder anzeigen"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "_Animierte Bilder anzeigen"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Nachricht im normalen Stil anzeigen"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "_Vorschaufläche"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "Beim Eintreffen neuer E-Mail _Klangdatei abspielen"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "_Rechtschreibprüfung"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "_Terminal-Schrift:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "HTML Variable-Breite-Schriftart zum Drucken wählen"
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Nachrichtenliste in Threads ordnen"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Nachrichtenliste in Threads ordnen"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "Dies zu meinem _Vorgabekonto machen"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "Variable Breite:"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution-Elm-Importeur"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+msgid "Evolution mbox importer"
+msgstr "Evolution-MBox-Importeur"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution-Netscape-E-Mail-Importeur"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution-Outlook Express 4-Importeur"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Pine importer"
+msgstr "Evolution-Pine-Importeur"
 
 #: mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
@@ -12212,34 +13259,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution-Elm-Importeur"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Evolution-MBox-Importeur"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution-Netscape-E-Mail-Importeur"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution-Outlook Express 4-Importeur"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Pine importer"
-msgstr "Evolution-Pine-Importeur"
-
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -12305,12 +13324,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importiert Ihre alten Netscape-Daten"
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Müll"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "E-Mail-Filter werden durchsucht"
@@ -12319,7 +13332,7 @@ msgstr "E-Mail-Filter werden durchsucht"
 msgid "Scanning directory"
 msgstr "Verzeichnis wird abgetastet"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Import beginnt"
 
@@ -12395,23 +13408,23 @@ msgid "You have not filled in all of the required information."
 msgstr "Sie haben nicht alle erforderlichen Felder ausgefüllt."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution-Konteneditor"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Rechner:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "_Benutzername:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Pfad:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Sie können keine zwei Konten mit demselben Namen anlegen."
 
@@ -12420,35 +13433,35 @@ msgstr "Sie können keine zwei Konten mit demselben Namen anlegen."
 msgid "Mail to %s"
 msgstr "E-Mail an %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Betreff ist %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "E-Mail von %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "Mailingliste %s"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Beantwortet"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Filterregel hinzufügen"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "Folgende Filterregel(n):\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12459,145 +13472,30 @@ msgstr ""
 "    »%s«\n"
 "Und wurden aktualisiert."
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "Verbindung wird hergestellt..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Dieser Ordner kann keine Nachrichten aufnehmen."
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Neue E-Mail-Nachricht"
 
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Gemeinschaftsordner konnte nicht geöffnet werden: %s."
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "E-_Mail-Nachricht"
 
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Temporäres Verzeichnis konnte nicht angelegt werden: %s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "Eine neue E-Mail-Nachricht verfassen"
 
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Die temporäre Datei »%s« konnte nicht angelegt werden: %s"
-
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Temporärer Ordner konnte nicht geschlossen werden: %s"
-
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Geben Sie einen Zielordner für das Importieren dieser Daten an"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Geben Sie einen Zielordner für das Importieren dieser Daten an"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Einen neuen Ordner anlegen"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Angeben, wo der Ordner angelegt werden soll:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Ordner »%s« konnte nicht gelöscht werden: %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Ordner »%s« wirklich löschen?"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "»%s« löschen"
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Den Ordner »%s« umbenennen in:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-msgid "Rename Folder"
-msgstr "Ordner umbenennen"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Der angegebene Ordnername ist nicht gültig: %s"
-
-#: mail/mail-component.c:1860
-#, fuzzy, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-"Es existiert bereits ein Ordner namens »%s«. Bitte verwenden Sie einen "
-"anderen Namen."
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Schriftart-Eigenschaften"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Eigenschaften"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "_Ordnername:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Ansicht"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "In neuem Fenster öffnen"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Verschieben"
-
-#: mail/mail-component.c:2087
-msgid "_New Folder..."
-msgstr "Ordner a_nlegen..."
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "_Umbenennen"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "Ei_genschaften..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Identität"
 
@@ -12662,11 +13560,11 @@ msgstr ""
 "dieses Konto ein.\n"
 "Dieser Name wird nur zur Anzeige auf dem Bildschirm verwendet."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Dienst wird überprüft"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Verbindung zu Server..."
 
@@ -12750,27 +13648,36 @@ msgid "C_olors"
 msgstr "_Farben"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Nach neuen E-Mails sehen"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr ""
 "Die Rechtschreibprüfung _unmittelbar beim Eingeben der Zeichen durchführen"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Nach neuen E-Mails sehen"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "_Farbe für falschgeschriebene Wörter:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Nachrichten verfassen"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12788,134 +13695,139 @@ msgstr ""
 "Klicken Sie auf »Anwenden«, um Ihre Einstellungen zu\n"
 "speichern."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "_Vorgabe"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Vorgabe-Verhalten"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "Voreingestellte Zeichen_kodierung:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "E-Mail wird gelöscht"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Bei Verwendung dieses Kontos ausgehende Nachrichten _immer signieren"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "Originalnachricht nicht zitieren"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 "_Besprechungsanfragen nicht unterzeichnen (zur Kompatibilität mit Outlook)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Fertig"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "_Entwürfe-Ordner:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "_Aktivieren"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "E-Mail-Konten"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "E-Mail-_Adresse:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "Müllordner beim Beenden _leeren"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "Kennung des _Zertifikats:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Evolution-Kontenassistent"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Befehl ausführen..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "_Feste Breite:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "Filter"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "Schriftart-Eigenschaften"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "Nachrichten in _HTML formatieren"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "Zitate _hervorheben mit"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "An Ort und Stelle"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Etikette und Farben"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Bilder laden"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "E-Mail-Konfiguration"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Ort des Postfachs"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Nachrichten-Editor"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Nachrichtenanzeige"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 msgid "Message Fonts"
 msgstr "Nachrichtenschrift"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "E-Mail-Benachrichtigung"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -12923,142 +13835,142 @@ msgstr ""
 "Hinweis: Sie werden erst nach dem Passwort gefragt, wenn Sie das erste Mal "
 "eine Verbindung mit dem Server aufbauen"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Optionale Information"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "_Organisation:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-_Schlüsselkennung:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Eine Farbe auswählen"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Beim Abschicken von Nachrichten mit ausschließlich _Blindkopie-Empfängern "
 "nachfragen"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Druckschriftarten"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail-maildir "
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "Originalnachricht zitieren"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Zitiert"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "An dieses Passwort _erinnern"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "A_ntwort an:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Abrufen von E-Mail"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "Empfangs-_Optionen"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "Dieses Passwort s_peichern"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Benötigte Information"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "Vorgaben wiederherstellen"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "Sich_erheit"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "Sichere MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr "HTML Feste-Breite-Schriftart wählen"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr "HTML Feste-Breite-Schriftart zum Drucken wählen"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr "HTML Variable-Breite-Schriftart wählen"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr "HTML Variable-Breite-Schriftart zum Drucken wählen"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "E-Mail wird verschickt"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Ordner für verschickte _Nachrichten:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Nachrichten in »Verschickt« und »Entwürfe«"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Server erfordert _Legitimation"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Server-Konfiguration"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Server_typ: "
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Selbst signiertes Zertifikat in der Kette"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "_Dateiname angeben:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "_Rechtschreibprüfung"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Standard-UNIX-mbox"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13068,7 +13980,7 @@ msgstr ""
 "verwendet. Der von Ihnen angegebene Name\n"
 "wird lediglich zur Identifikation verwendet."
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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 "
@@ -13078,7 +13990,7 @@ msgstr ""
 "konfigurieren. Diese Liste der Sprachen enthält ausschließlich die Sprachen, "
 "für die ein Wörterbuch installiert ist."
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13086,11 +13998,15 @@ msgstr ""
 "Geben Sie einen Namen an, den Sie mit diesem Konto assoziieren,\n"
 "wie zum Beispiel »Arbeit« oder »Persönlich«."
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "Variable Breite:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13100,171 +14016,180 @@ msgstr ""
 "\n"
 "Klicken Sie auf »Weiter«, um zu beginnen."
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "Signatur _hinzufügen"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "Bilder _immer aus dem Netz laden"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Bei Verwendung dieses Kontos ausgehende Nachrichten _immer signieren"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "_Legitimations-Typ: "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "_Legitimations-Typ: "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr "_Automatisch nach neuen E-Mails sehen alle"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "_Automatisch Smiley-Bilder einfügen"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "Bei Eintreffen neuer E-Mail _Piepston ausgeben"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "Säubern eines Ordners _bestätigen"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "_Vorgabe-Signatur:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "_Vorgaben"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Bei Eintreffen neuer E-Mail nicht benachrichtigen"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "_Aktivieren"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "_Weiterleitungsstil:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "_Voller Name:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "_HTML-Mail"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "_Identität"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Juni"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "Bilder _laden, falls Absender im Adressbuch ist"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "Dies zu meinem _Vorgabekonto machen"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "_Nachrichten als gelesen markieren nach"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Name:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "Bilder _nie aus dem Netz laden"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "Beim Eintreffen neuer E-Mail _Klangdatei abspielen"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 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:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Beim Abschicken von Nachrichten mit _leerem Betreff nachfragen"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "_Abrufen von E-Mail"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "_Antwortstil:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "Vorgaben _wiederherstellen"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Löschen..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "_Verschicken von E-Mail"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "_Animierte Bilder anzeigen"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Signaturen"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr "_Standard-Schrift:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr "_Terminal-Schrift:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "Sichere Verbindung (_SSL) verwenden:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr "Dieselben Schriften wie die anderen Anwendungen _verwenden"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "Beschreibung"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping zu %s wird ermittelt"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13274,7 +14199,7 @@ msgstr ""
 "  %s:\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13283,7 +14208,7 @@ msgstr ""
 "Fehler bei folgendem Vorgangs:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "In Arbeit"
 
@@ -13295,118 +14220,118 @@ msgstr "Ordner wird gefiltert"
 msgid "Fetching Mail"
 msgstr "E-Mail wird abgerufen"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "E-Mail konnte nicht in temporärer Datei %s gespeichert werden: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "E-Mail konnte nicht in temporärer Datei %s gespeichert werden: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "»%s« wird verschickt"
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Nachricht %d von %d wird verschickt"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Nachricht wird in Ordner gespeichert"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Nachrichten werden nach %s verschoben"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Nachrichten werden nach %s kopiert"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Ordner in »%s« werden abgetastet"
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ordner %s wird geöffnet"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "Speicher %s wird geöffnet"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ordner %s wird entfernt"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ordner »%s« wird gespeichert"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Ordner wird aktualisiert"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Ordner wird gesäubert"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Müll in »%s« wird geleert"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Lokale Ordner"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Nachricht %s wird abgerufen"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d Nachricht(en) werden/wird abgerufen"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d Nachricht(en) werden/wird gespeichert"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13415,7 +14340,7 @@ msgstr ""
 "Ausgabedatei konnte nicht angelegt werden: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13424,11 +14349,11 @@ msgstr ""
 "Fehler beim Speichern der Nachrichten in: %s\n"
 "%s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Speichern der Anlage"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13437,21 +14362,25 @@ msgstr ""
 "Ausgabedatei konnte nicht angelegt werden: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Daten konnten nicht geschrieben werden: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbindung mit %s wird getrennt"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Verbindung mit %s wird neu aufgebaut"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Groß-/Kleinschreibung beachten"
@@ -13469,59 +14398,74 @@ msgstr "Suchen:"
 msgid "Search"
 msgstr "_Suchen"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Signatur bearbeiten"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Ausnahmen"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Kontoinformationen"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Stornieren..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Pfad: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "E-Mails abrufen und verschicken"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 msgid "Cancel _All"
 msgstr "_Alles abbrechen"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Aktualisieren..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Warten..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Benutzer hat Aktion abgebrochen."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Passwort für %s eingeben"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Geben Sie das Passwort ein"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "An dieses Passwort e_rinnern"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr "Für den Rest dieser Sitzung an dieses Passwort e_rinnern"
 
@@ -13561,26 +14505,31 @@ msgstr "Geben Sie einen Namen für diese Signatur ein."
 msgid "Name:"
 msgstr "Name:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Weitergeleitete Nachricht - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Weitergeleitete Nachricht"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Ordner %s wird geöffnet"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "VOrdner wird eingerichtet: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "VOrdner werden aktualisiert für URI: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13593,89 +14542,89 @@ msgstr ""
 "   »%s«\n"
 "Und wurden aktualisiert."
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "VOrdner"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "vOrdner"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "VOrdner bearbeiten"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 "Es wurde versucht, einen vOrdner »%s« zu editieren, der nicht existiert."
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Neuer VOrdner"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Gelesen"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Mehrere ungelesene Nachrichten"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Am niedrigsten"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Niedriger"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Höher"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Am höchsten"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b %H.%M"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Erzeugen der Nachrichtenliste"
 
@@ -13731,11 +14680,11 @@ msgstr "Weiterleiten"
 msgid "No Response Necessary"
 msgstr "Keine Antwort erforderlich"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Antworten"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Allen antworten"
 
@@ -13789,41 +14738,140 @@ msgstr "_Abonnieren"
 msgid "_Unsubscribe"
 msgstr "Ab_bestellen"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr "Hier können Sie spezielle Ordner und Offline-Ordner konfigurieren"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Evolution-Shell"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Ordnereinstellungen"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "80%"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Diese Verknüpfungsgruppe umbenennen"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Anzeige der Ordnerleiste an/aus"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Die Verknüpfungsleiste verbergen"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Vorgabepriorität:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Vorgabepriorität:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Evolution-E-Mail-Konfigurationsoberfläche"
+
+# CHECK
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+#, fuzzy
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "Anlage als an Ort und Stelle anzuzeigend markieren."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
 msgstr ""
-"Ordner konnte nicht übertragen werden:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Einen Ordner hinzufügen"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Entwürfe"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Eingang"
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "Vorgabe-Aufgabenordner wird geöffnet"
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Ausgang"
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Vorgabe-Aufgabenordner wird geöffnet"
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Verschickt"
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Vorgabe-Aufgabenordner wird geöffnet"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Vorgabe-Aufgabenordner wird geöffnet"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Anzeige der Ordnerleiste an/aus"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Anzeige der Verknüpfungsleiste an/aus"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "E-Mail"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Dateien konnte nicht korrekt aktualisiert werden"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13834,7 +14882,7 @@ msgstr ""
 "konnte nicht angelegt werden.\n"
 "Fehler: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13843,7 +14891,7 @@ msgstr ""
 "Ein Fehler trat auf beim Kopieren von Dateien nach\n"
 "»%s«."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13854,7 +14902,7 @@ msgstr ""
 "Bitte verschieben Sie es, damit Evolution seine\n"
 "Benutzerdateien installieren kann."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13953,12 +15001,11 @@ msgstr ""
 "Ordner konnte nicht umbenannt werden:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
-"Es existiert bereits ein Ordner namens »%s«. Bitte verwenden Sie einen "
-"anderen Namen."
+msgid "The specified folder name is not valid: %s"
+msgstr "Der angegebene Ordnername ist nicht gültig: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -13982,19 +15029,15 @@ msgstr ""
 "Der angegebene Ordner konnte nicht angelegt werden:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Neuen Ordner anlegen"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Namenlos)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Wählen Sie den Importeur, der ausgeführt werden soll"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -14008,11 +15051,11 @@ msgstr ""
 "Sie können »Automatisch« wählen, wenn Sie ihn nicht wissen, und Evolution "
 "wird versuchen, ihn selber zu bestimmen."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Bitte wählen Sie die Informationen, die Sie importieren wollen:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -14025,7 +15068,7 @@ msgstr ""
 "gefunden. Klicken Sie bitte den »Zurück«-Knopf an, falls\n"
 "Sie es noch einmal versuchen wollen.\n"
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14034,21 +15077,21 @@ msgstr ""
 "Importieren von %s\n"
 "Importiert wird Objekt %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "Wählen Sie einen Importeur"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "Datei %s existiert nicht"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Evolution-Fehler"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -14058,11 +15101,11 @@ msgstr ""
 "%s\n"
 "umgehen kann"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Importieren"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -14071,17 +15114,17 @@ msgstr ""
 "Importieren von %s.\n"
 "Starten von %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Fehler beim Starten von %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Fehler beim Laden von %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14090,35 +15133,35 @@ msgstr ""
 "Importieren von %s.\n"
 "Erstes Objekt wird importiert."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Dateiname:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Eine Datei wählen"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Dateityp:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Daten und Einstellungen aus älteren Programmen importieren"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Eine einzelne Datei importieren"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -14126,47 +15169,28 @@ msgstr ""
 "Bitte warten...\n"
 "Suche nach existierenden Einstellungen"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Intelligente Importeure werden gestartet"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "Von %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Geben Sie einen Zielordner für das Importieren dieser Daten an"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Importieren"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Verbindungen werden geschlossen..."
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Fehler beim Synchronisieren von »%s«:\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "Ordner wird synchronisiert"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "»%s« wird synchronisiert (%d von %d)..."
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Evolution-Einstellungen "
@@ -14201,7 +15225,7 @@ msgstr "Gemeinschaftsordner konnte nicht geöffnet werden: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Der angegebene Gemeinschaftsordner konnte nicht gefunden werden."
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14210,17 +15234,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Assistent"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Neu"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Kein Ordnername angegeben."
@@ -14280,64 +15298,51 @@ msgstr "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:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "_Online arbeiten"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "_Offline arbeiten"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Offline arbeiten"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Kein Ordner angezeigt)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(keine)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution ist im Augenblick online. Klicken Sie auf diesen Knopf, um "
 "offline zu arbeiten."
 
-#: shell/e-shell-view.c:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution geht gerade offline."
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution ist im Augenblick offline. Klicken Sie auf diesen Knopf, um "
 "online zu arbeiten."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Ungültige Argumente"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Registrierung bei OAF konnte nicht stattfinden"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatenbank nicht gefunden"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Allgemeiner Fehler"
 
@@ -14451,74 +15456,18 @@ msgstr "_Entfernen"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Diese Verknüpfung aus der Verknüpfungsleiste entfernen"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Fehler beim Speichern von Verknüpfungen."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Eingang"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Verknüpfungen"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Kein Fehler"
-
-#: shell/e-storage.c:573
-msgid "A folder with the same name already exists"
-msgstr "Es existiert bereits ein ein Ordner mit diesem Namen"
-
-#: shell/e-storage.c:575
-msgid "The specified folder type is not valid"
-msgstr "Der angegebene Ordnertyp ist ungültig"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "E-/A-Fehler"
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr "Nicht genügend Platz, um den Ordner anzulegen"
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr "Der Ordner ist nicht leer"
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "Der angegebene Ordner wurde nicht gefunden"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "Funktion für diese Speicherweise nicht implementiert"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "Operation nicht unterstützt"
-
-#: 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:593
-msgid "The specified folder cannot be modified or removed"
-msgstr "Der angegebene Ordner kann weder geändert noch entfernt werden"
-
-#: 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:597
-msgid "Cannot create a folder with that name"
-msgstr "Ein Ordnersperre mit diesem Namen konnte nicht erzeugt werden"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Diese Aktion kann im Offline-Modus nicht ausgeführt werden"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Kontrollkästchen"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14529,6 +15478,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (zu %d%% abgeschlossen)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Neu"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "»%s« in »%s«"
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14566,74 +15526,6 @@ msgstr ""
 "Der Fehler vom Aktivierungssystem ist:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "CORBA-Fehler"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Unterbrochen"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Ungültiges Argument"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Hat bereits einen Besitzer"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Kein Besitzer"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Nicht gefunden"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Nicht unterstützter Typ"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Nicht unterstütztes Schema"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Nicht unterstützte Aktion"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Interner Fehler"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Existiert"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "Ungültiger URI"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Hat Unterordner"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Keine Platz mehr frei"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "Alter Besitzer ist gestorben"
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Testtyp"
-
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr "Evolution-Test-Komponente"
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr "Aktive Verbindungen"
@@ -14663,10 +15555,6 @@ msgstr "_Mail:"
 msgid "_Tasks:"
 msgstr "_Aufgaben:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr "Ordner_name:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder _type:"
 msgstr "Ordner_typ:"
@@ -14729,22 +15617,6 @@ msgstr ""
 "\n"
 "Klicken Sie auf »Anwenden«, um Ihre Einstellungen zu speichern."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "Hier können Sie spezielle Ordner und Offline-Ordner konfigurieren"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Evolution-Shell"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Bedienelement zur Konfiguration von Evolution-Ordner"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Ordnereinstellungen"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -14785,7 +15657,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Importeure"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Importieren"
 
@@ -14801,16 +15673,16 @@ msgstr "Mich nicht mehr fragen"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kann Daten aus den folgenden Dateien importieren:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Evolution wird beendet..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14853,7 +15725,7 @@ msgstr ""
 "Wir hoffen, dass Ihnen das Ergebnis unsrer harten Arbeit\n"
 "gefällt und freuen uns auf Ihren Beitrag zu diesem Projekt!\n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -14861,36 +15733,48 @@ msgstr ""
 "Vielen Dank\n"
 "Das Ximian Evolution-Team\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr "Nicht mehr anzeigen"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Auf die Ximian-Evolution-Shell konnte nicht zugegriffen werden."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Die Ximian-Evolution-Shell konnte nicht initialisiert werden: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Im Offline-Modus starten"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Im Online-Modus starten"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr "Alle Evolution-Komponenten dazu zwingen, herunterzufahren"
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Die Diagnoseausgabe aller Komponenten in eine Datei umleiten."
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14899,31 +15783,60 @@ msgstr ""
 "%s: --online und --offline können nicht gemeinsam übergeben werden.\n"
 " Verwenden Sie %s --help, um weitere Informationen zu erhalten.\n"
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Wählen Sie einen Importeur"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "Kennung des _Zertifikats:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "Fortschritt"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Ausdruck"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "E-Mail-Adresse einfließen lassen"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"Zertifikat nicht mehr gültig: %s\n"
+"Aussteller: %s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14981,91 +15894,376 @@ msgid "Backup All"
 msgstr "Blackpool"
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "Kennung des _Zertifikats:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Zertifikat nicht vertrauenswürdig"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "Kennung des _Zertifikats:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Gemeinsamer Name"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "Kennung des _Zertifikats:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "_Bearbeiten"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Zertifikate konnten nicht verifiziert werden."
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Ausdruck"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Organisation"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Organisationseinheit"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Ansicht"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "Kennung des _Zertifikats:"
+
+#: smime/gui/smime-ui.glade.h:42
+#, fuzzy
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr "Ungültige Zertifizierungsstelle (CA)"
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "Kennung des _Zertifikats:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Importieren"
+msgid "Certificate already exists"
+msgstr "Kartenkennung existiert bereits"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d.%m.%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Vermont"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "OK"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "Kennung des _Zertifikats:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "Kennung des _Zertifikats:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "Zertifikat nicht vertrauenswürdig"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "Kennung"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Betreff ist %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Der Spool-Ordner konnte nicht verarbeitet werden"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "Ungültige Zertifizierungsstelle (CA)"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Ungültige Zertifizierungsstelle (CA)"
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Keine Information"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "anlage"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "Kennung des _Zertifikats:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Curitiba"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "North Carolina"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Ausdruck"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s um %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Zertifikat-Signatur fehlerhaft"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "Einfügen"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Betreff ist %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Zertifikat-Signatur fehlerhaft"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Passwort für %s eingeben"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "Kennung des _Zertifikats:"
 
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
@@ -15117,7 +16315,7 @@ msgstr "Die Auswahl kopieren"
 msgid "Copy to Folder..."
 msgstr "In Ordner kopieren..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Die Auswahl ausschneiden"
 
@@ -15133,7 +16331,7 @@ msgstr "Kontakt(e) in einen anderen Ordner verschieben..."
 msgid "Move to Folder..."
 msgstr "In Ordner verschieben..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Inhalt der Zwischenablage einfügen"
 
@@ -15141,8 +16339,8 @@ msgstr "Inhalt der Zwischenablage einfügen"
 msgid "Previews the contacts to be printed"
 msgstr "Eine Vorschau auf die zu druckenden Kontakte anzeigen"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Druck_vorschau"
@@ -15187,13 +16385,13 @@ msgstr "Laden abbrechen"
 msgid "View the current contact"
 msgstr "Den aktuellen Kontakt anzeigen"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "A_ktionen"
 
@@ -15223,140 +16421,108 @@ msgstr "Nachricht an Kontakt _schicken..."
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "Einen neuen ganztätigen Termin anlegen"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Einen neuen Termin anlegen"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "Einen neuen Ordner anlegen"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Eine neue Besprechungsanfrage anlegen"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Eine neue Aufgabe anlegen"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Tag"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Jedes Auftreten löschen"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Diesen Termin löschen"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Dieses Auftreten löschen"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Dieses Auftreten löschen"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Gehe zu"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Zurückgehen"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Vorangehen"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Gehe zu _Datum"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Zu einem bestimmten Datum gehen"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Zum heutigen Tag gehen"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "Liste"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Monat"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Neuer _Termin"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Neukaledonien"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Neue Besprechung"
-
-#: ui/evolution-calendar.xml.h:27
-#, fuzzy
-msgid "New _Task"
-msgstr "Neue Aufgabe"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Eine Vorschau auf den zu druckenden Kalender anzeigen"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Diesen Kalender drucken"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Verfügbarkeitsinformationen für diesen Kalender veröffentlichen"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 msgid "Purg_e"
 msgstr "_Säubern"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 msgid "Purge old appointments and meetings"
 msgstr "Alte Termine und Treffen säubern"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Details anzeigen"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Einen Tag anzeigen"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Einen Monat anzeigen"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Eine Woche anzeigen"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Die Werkwoche anzeigen"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Woche"
 
@@ -15421,7 +16587,7 @@ msgstr "Diesen Eintrag auf Platte speichern"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Datei"
 
@@ -15639,7 +16805,7 @@ msgstr "Alle als _gelesen markieren"
 msgid "Mark all visible messages as read"
 msgstr "Alle sichtbaren Nachrichten als gelesen markieren"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "Die in der Zwischenablage befindliche(n) Nachricht(en) einfügen"
 
@@ -15696,16 +16862,6 @@ msgstr "Auswahl _umkehren"
 msgid "_Threaded Message List"
 msgstr "Nachrichtenliste nach _Threads ordnen"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Dieses Fenster schließen"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "Schließen"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "Absender zum Adressbuch _hinzufügen"
@@ -15862,258 +17018,283 @@ msgstr "Die markierte Nachricht an jemanden als Anlage weiterleiten"
 msgid "Increase the text size"
 msgstr "Die Textgröße heraufsetzen"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "_Bilder laden"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Als _wichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Als ungelesen markieren"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Als _unwichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "Die markierte(n) Nachricht(en) als gelesen markieren"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "Die markierte(n) Nachricht(en) als wichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Die markierte(n) Nachricht(en) als unwichtig markieren"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Die markierte(n) Nachricht(en) als ungelesen markieren"
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Die markierte(n) Nachricht(en) als ungelesen markieren"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Die markierte(n) Nachricht(en) als unwichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Alle sichtbaren Nachrichten zum Löschen vorsehen"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Verschieben"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "Die markierte(n) Nachricht(en) in einen anderen Ordner verschieben"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Weiter"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "Nächste _wichtige Nachricht"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "Nächster _Thread"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "Nächste _ungelesene Nachricht"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Nicht gefunden"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Die markierte Nachricht in einem neuen Fenster öffnen"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 "Die markierte Nachrichte im E-Mail-Editor öffnen, um sie nochmals zu "
 "verschicken"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Original_größe"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "_Letzte ungelesene Nachricht"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Eine Antwort verfassen"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr "Eine Antwort auf eine Nachricht in einem öffentlichen Ordner verfassen"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "V_orherige wichtige Nachricht"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Eine Vorschau auf die zu druckende Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Zurück"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Diese Nachricht drucken"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "_Weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Die markierte Nachricht an jemanden weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Den Text auf seine Originalgröße zurücksetzen"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "Nachricht durch_suchen..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "_Kleiner"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Die Nachricht als Textdatei speichern"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Im Rumpf der angezeigten Nachricht nach einem Text suchen"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr "Die Seiteneinstellungen für Ihren aktuellen Drucker festlegen"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "E-Mail-_Quelltext anzeigen"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Alle _Kopfzeilen anzeigen"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Im Rumpf der angezeigten Nachricht einen blinkenden Cursor anzeigen"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Nachricht im normalen Stil anzeigen"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Nachricht mit allen E-Mail-Kopfzeilen anzeigen"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Den zugrunde liegenden E-Mail-Quelltext dieser Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "Te_xtgröße"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Löschen der markierten Nachrichten rückgängig machen"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "VOrdner über Mailing_liste..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "VOrdner über _Absender..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "VOrdner über _Empfänger..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "VOrdner über _Betreff..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "_Beigelegt"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "In Ordner _kopieren"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "Filter aus Nachricht _erzeugen"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "Nachricht _weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "_Gehe zu"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "An _Ort und Stelle"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "_Größer"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "_Nachrichtenanzeige"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "In Ordner _verschieben"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "_Nächste Nachricht"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "_Normal anzeigen"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "Nachricht ö_ffnen"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "_Vorherige Nachricht"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "_Zitiert"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "E_rneut verschicken..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "_Werkzeuge"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "Löschen rückgängig"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Dieses Fenster schließen"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "Schließen"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Beilegen"
@@ -16392,12 +17573,13 @@ msgid "Change Evolution's settings"
 msgstr "Die Evolution-Einstellungen festlegen"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "_Beenden"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Eine neue Besprechungsanfrage anlegen"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "Evolution-_Fenster"
+msgid "E_xit"
+msgstr "_Beenden"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16409,61 +17591,74 @@ msgstr "Daten aus anderen Programmen importieren"
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "Evolution-_Fenster"
+msgid "Open a new window"
+msgstr "In neuem Fenster öffnen"
 
 #: ui/evolution.xml.h:11
 msgid "Pi_lot Settings..."
 msgstr "_Pilot-Einstellungen..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Verschicken / Abrufen"
+
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr "Objekte in der Warteschlange verschicken und neue Objekte abrufen"
+
+#: ui/evolution.xml.h:14
 msgid "Set up Pilot configuration"
 msgstr "Die Pilot-Einstellungen festlegen"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Informationen über Ximian Evolution anzeigen"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Fehlerbericht einschicken"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "Fehlerbericht einschicken"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Einen Fehlerbericht mit Bug Buddy einschicken"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Ein/Aus"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Offline-Arbeitsmodus an/aus."
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian-Evolution-_FAQ"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "_Info zu Ximian Evolution..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "_Importieren..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Neu"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Verschicken / Abrufen"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "Jetzt _suchen"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Zusammenfassung drucken"
@@ -16592,12 +17787,12 @@ msgstr "Ansichten definieren..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "MDMDFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -16731,7 +17926,7 @@ msgstr "_Suchen"
 msgid "_Find Now"
 msgstr "Jetzt _suchen"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "_Löschen"
 
@@ -16747,24 +17942,266 @@ msgstr "Kennung des Unterobjekts"
 msgid "Text"
 msgstr "Text"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Löschen"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Jetzt suchen"
 
+#~ msgid "Account Name"
+#~ msgstr "Kontoname"
+
+#~ msgid "Server Name"
+#~ msgstr "Servername"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "LDAP wurde in diesem Build von Evolution nicht aktiviert"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Andere Kontakte"
+
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr ""
+#~ "Hier können Sie den Zugriff auf LDAP-Verzeichnis-Server konfigurieren"
+
+#~ msgid "Directory Servers"
+#~ msgstr "Verzeichnis-Server"
+
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Bedienelement zur LDAP-Konfiguration des Evolution-Adressbuchs"
+
+#~ msgid "Add LDAP Server"
+#~ msgstr "LDAP-Server hinzufügen"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Schritt 4: Name"
+
+#~ msgid "Find contact in"
+#~ msgstr "Kontakt finden in"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Klicken Sie hier, um einen Kontakt hinzuzufügen *"
+
+#~ msgid "Business Address"
+#~ msgstr "Geschäftliche Adresse"
+
+#~ msgid "Department"
+#~ msgstr "Abteilung"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "Verfügbarkeitsadresse"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Beruf"
+
+#~ msgid "TTY"
+#~ msgstr "Telex"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Aufgaben bei %s werden geöffnet"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Dennoch verschicken?"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Den aktuellen E-Mail-Vorgang abbrechen"
+#~ msgid "Folder _name"
+#~ msgstr "Ordner_name:"
+
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "Diese Nachricht ist digital signiert. Klicken Sie auf das Schlosssymbol, "
+#~ "um weitere Informationen zu erhalten."
+
+#~ msgid "Connecting..."
+#~ msgstr "Verbindung wird hergestellt..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Dieser Ordner kann keine Nachrichten aufnehmen."
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Name des Feldes"
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Gemeinschaftsordner konnte nicht geöffnet werden: %s."
 
-#~ msgid "Family Name"
-#~ msgstr "Familienname"
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Geben Sie einen Zielordner für das Importieren dieser Daten an"
+
+#, fuzzy
+#~ msgid "A folder named \"%s\" already exists.  Please use a different name."
+#~ msgstr ""
+#~ "Es existiert bereits ein Ordner namens »%s«. Bitte verwenden Sie einen "
+#~ "anderen Namen."
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ordner konnte nicht übertragen werden:\n"
+#~ "%s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "Einen Ordner hinzufügen"
+
+#~ msgid "Drafts"
+#~ msgstr "Entwürfe"
+
+#~ msgid "Outbox"
+#~ msgstr "Ausgang"
+
+#~ msgid "Sent"
+#~ msgstr "Verschickt"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Fehler beim Synchronisieren von »%s«:\n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "Ordner wird synchronisiert"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "»%s« wird synchronisiert (%d von %d)..."
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Kein Ordner angezeigt)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(keine)"
+
+#~ msgid "No error"
+#~ msgstr "Kein Fehler"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Es existiert bereits ein ein Ordner mit diesem Namen"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Der angegebene Ordnertyp ist ungültig"
+
+#~ msgid "I/O error"
+#~ msgstr "E-/A-Fehler"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Nicht genügend Platz, um den Ordner anzulegen"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Der Ordner ist nicht leer"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Der angegebene Ordner wurde nicht gefunden"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Funktion für diese Speicherweise nicht implementiert"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Operation nicht unterstützt"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Der angegebene Typ wird für diese Speicherweise nicht unterstützt"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Der angegebene Ordner kann weder geändert noch entfernt werden"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "Ein Ordner kann nicht das Kinder eines seiner Nachkommen werden"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Ein Ordnersperre mit diesem Namen konnte nicht erzeugt werden"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Diese Aktion kann im Offline-Modus nicht ausgeführt werden"
+
+#~ msgid "Checkbox"
+#~ msgstr "Kontrollkästchen"
+
+#~ msgid "CORBA error"
+#~ msgstr "CORBA-Fehler"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Ungültiges Argument"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Hat bereits einen Besitzer"
+
+#~ msgid "No owner"
+#~ msgstr "Kein Besitzer"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Nicht unterstützter Typ"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Nicht unterstütztes Schema"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Nicht unterstützte Aktion"
+
+#~ msgid "Internal error"
+#~ msgstr "Interner Fehler"
+
+#~ msgid "Exists"
+#~ msgstr "Existiert"
+
+#~ msgid "Invalid URI"
+#~ msgstr "Ungültiger URI"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Hat Unterordner"
+
+#~ msgid "No space left"
+#~ msgstr "Keine Platz mehr frei"
+
+#~ msgid "Old owner has died"
+#~ msgstr "Alter Besitzer ist gestorben"
+
+#~ msgid "Test type"
+#~ msgstr "Testtyp"
+
+#~ msgid "Evolution Test Component"
+#~ msgstr "Evolution-Test-Komponente"
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "Importieren"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Einen neuen ganztätigen Termin anlegen"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Neuer _Termin"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Neue Besprechung"
+
+#, fuzzy
+#~ msgid "New _Task"
+#~ msgstr "Neue Aufgabe"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "Evolution-_Fenster"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "Evolution-_Fenster"
+
+#~ msgid "Toggle"
+#~ msgstr "Ein/Aus"
+
+#~ msgid "Clear"
+#~ msgstr "Löschen"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Den aktuellen E-Mail-Vorgang abbrechen"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -16858,9 +18295,6 @@ msgstr "Jetzt suchen"
 #~ msgid "VCard (.vcf, .gcrd)"
 #~ msgstr "VCard (.vcf, .gcrd)"
 
-#~ msgid "Loading..."
-#~ msgstr "Laden..."
-
 #~ msgid "Searching..."
 #~ msgstr "Suchen..."
 
@@ -16912,10 +18346,6 @@ msgstr "Jetzt suchen"
 #~ msgstr "EBook nicht geladen\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "Kartenkennung existiert bereits"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Vorgang abgebrochen"
 
@@ -17067,9 +18497,6 @@ msgstr "Jetzt suchen"
 #~ msgid "Callback"
 #~ msgstr "Rückruf"
 
-#~ msgid "Company"
-#~ msgstr "Firma"
-
 #~ msgid "Comp"
 #~ msgstr "Fa."
 
@@ -17137,9 +18564,6 @@ msgstr "Jetzt suchen"
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
 #~ msgid "Birth date"
 #~ msgstr "Geburtsdatum"
 
@@ -17153,9 +18577,6 @@ msgstr "Jetzt suchen"
 #~ msgid "Arbitrary"
 #~ msgstr "Beliebig"
 
-#~ msgid "ID"
-#~ msgstr "Kennung"
-
 #~ msgid "Last Use"
 #~ msgstr "Zuletzt verwendet"
 
@@ -17168,9 +18589,6 @@ msgstr "Jetzt suchen"
 #~ msgid "Folder containing contact information"
 #~ msgstr "Ordner mit Kontaktinformationen"
 
-#~ msgid "LDAP Server"
-#~ msgstr "LDAP-Server:"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "LDAP-Server mit Kontaktinformationen"
 
@@ -17180,18 +18598,6 @@ msgstr "Jetzt suchen"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Öffentlicher Ordner mit Kontaktinformationen"
 
-#~ msgid "_Contact"
-#~ msgstr "_Kontakt"
-
-#~ msgid "Create a new contact"
-#~ msgstr "Einen neuen Kontakt anlegen"
-
-#~ msgid "New Contact List"
-#~ msgstr "Neu Kontaktliste"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "Eine neue Kontaktliste anlegen"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "Die URI, die der Suchdienst anzeigen wird"
 
@@ -17207,9 +18613,6 @@ msgstr "Jetzt suchen"
 #~ msgid "Is New Card"
 #~ msgstr "Ist neue Karte"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TTD"
-
 #~ msgid "No cards"
 #~ msgstr "Keine Karten"
 
@@ -17259,30 +18662,6 @@ msgstr "Jetzt suchen"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "Öffentlicher Ordner mit To-Do-Einträgen"
 
-#~ msgid "New appointment"
-#~ msgstr "Neuer Termin"
-
-#~ msgid "_Appointment"
-#~ msgstr "_Termin"
-
-#~ msgid "New meeting"
-#~ msgstr "Neue Besprechung"
-
-#~ msgid "M_eeting"
-#~ msgstr "_Besprechung"
-
-#~ msgid "New task"
-#~ msgstr "Neue Aufgabe"
-
-#~ msgid "_Task"
-#~ msgstr "_Aufgabe"
-
-#~ msgid "New All Day Appointment"
-#~ msgstr "Neuer Ganztags-Termin"
-
-#~ msgid "All _Day Appointment"
-#~ msgstr "_Ganztags-Termin"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "Ungültiges Objekt konnte nicht aktualisiert werden"
 
@@ -17327,9 +18706,6 @@ msgstr "Jetzt suchen"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "Kalender bei %s wird geöffnet"
 
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Vorgabe-Aufgabenordner wird geöffnet"
-
 #~ msgid "Purging event %s"
 #~ msgstr "Ereignis %s wird entfernt"
 
@@ -17375,9 +18751,6 @@ msgstr "Jetzt suchen"
 #~ "Evolution hat GnomeCard-Dateien gefunden.\n"
 #~ "Möchten Sie sie in Evolution importieren?"
 
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Evolution-E-Mail-Konfigurationsoberfläche"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "Ordner, der E-Mails enthält"
 
@@ -17393,9 +18766,6 @@ msgstr "Jetzt suchen"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Virtueller Müllordner"
 
-#~ msgid "Properties..."
-#~ msgstr "Eigenschaften..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Die Eigenschaften dieses Ordners festlegen"
 
@@ -17407,15 +18777,6 @@ msgstr "Jetzt suchen"
 #~ "Es sind noch nicht verschickte Nachrichten vorhanden. Wollen Sie "
 #~ "Evolution dennoch beenden?"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Neue E-Mail-Nachricht"
-
-#~ msgid "_Mail Message"
-#~ msgstr "E-_Mail-Nachricht"
-
-#~ msgid "Compose a new mail message"
-#~ msgstr "Eine neue E-Mail-Nachricht verfassen"
-
 #~ msgid "New Message Post"
 #~ msgstr "Neue Ordner-Nachricht"
 
@@ -19227,9 +20588,6 @@ msgstr "Jetzt suchen"
 #~ msgid "Cumberland"
 #~ msgstr "Cumberland"
 
-#~ msgid "Curitiba"
-#~ msgstr "Curitiba"
-
 #~ msgid "Curitiba Apt"
 #~ msgstr "Curitiba Flughafen"
 
@@ -22221,9 +23579,6 @@ msgstr "Jetzt suchen"
 #~ msgid "North Bend"
 #~ msgstr "North Bend"
 
-#~ msgid "North Carolina"
-#~ msgstr "North Carolina"
-
 #~ msgid "North Conway"
 #~ msgstr "North Conway"
 
@@ -23835,9 +25190,6 @@ msgstr "Jetzt suchen"
 #~ msgid "State College"
 #~ msgstr "State College"
 
-#~ msgid "Stauning"
-#~ msgstr "Stauning"
-
 #~ msgid "Staunton"
 #~ msgstr "Staunton"
 
@@ -24429,9 +25781,6 @@ msgstr "Jetzt suchen"
 #~ msgid "United Arab Emirates "
 #~ msgstr "Vereinigte Arabische Emirate"
 
-#~ msgid "Unst"
-#~ msgstr "Unst"
-
 #~ msgid "Upington"
 #~ msgstr "Upington"
 
@@ -24540,12 +25889,6 @@ msgstr "Jetzt suchen"
 #~ msgid "Veracruz"
 #~ msgstr "Veracruz"
 
-#~ msgid "Vermillion"
-#~ msgstr "Vermillion"
-
-#~ msgid "Vermont"
-#~ msgstr "Vermont"
-
 #~ msgid "Vernal"
 #~ msgstr "Vernal"
 
@@ -25074,9 +26417,6 @@ msgstr "Jetzt suchen"
 #~ msgid " F"
 #~ msgstr " F"
 
-#~ msgid " C"
-#~ msgstr " C"
-
 #~ msgid "knots"
 #~ msgstr "Knoten"
 
@@ -25695,9 +27035,6 @@ msgstr "Jetzt suchen"
 #~ msgid "Freezing haze"
 #~ msgstr "Eisiger Dunst"
 
-#~ msgid "Spray"
-#~ msgstr "Sprühregen"
-
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Sprühregen in der Umgebung"
 
@@ -26065,18 +27402,6 @@ msgstr "Jetzt suchen"
 #~ "Einen mit »Ordner eines anderen Benutzers öffnen« hinzugefügten Ordner "
 #~ "löschen"
 
-#~ msgid "Send / Receive"
-#~ msgstr "Verschicken / Abrufen"
-
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Objekte in der Warteschlange verschicken und neue Objekte abrufen"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Anzeige der Ordnerleiste an/aus"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Anzeige der Verknüpfungsleiste an/aus"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Den markierten Ordner anzeigen"
 
@@ -26104,9 +27429,6 @@ msgstr "Jetzt suchen"
 #~ msgid "_Rename..."
 #~ msgstr "_Umbenennen..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Verschicken / Abrufen"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "_Verknüpfungsleiste"
 
diff --git a/po/el.po b/po/el.po
index 9030c15725..1ad00392fe 100644
--- a/po/el.po
+++ b/po/el.po
@@ -26,7 +26,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.el\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-06-25 18:26-0200\n"
 "Last-Translator: Nikos Charonitakis <charosn@her.forthnet.gr>\n"
 "Language-Team: Greek <nls@hellug.gr>\n"
@@ -50,51 +50,184 @@ msgid "Could not read pilot's Address application block"
 msgstr ""
 "Δεν ήταν δυνατή η ανάγνωση του τμήματος Διεύθυνσης του υπολογιστή Παλάμης"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Φάκελοι αυτόματης συμπλήρωσης"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "_Πιστοποίηση Ταυτότητας:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Ρυθμίστε εδώ τους λογαριασμούς αλληλογραφίας σας"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Επαφές"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
+msgstr "Βιβλίου Διευθύνσεων του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address pop-up"
+msgstr "Προβολή μίνι-κάρτας του Βιβλίου Διευθύνσεων του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address viewer"
+msgstr "Εφαρμογή προβολής διευθύνσεων του Βιβλίου Διευθύνσεων"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook card viewer"
+msgstr "Εφαρμογή προβολής κάρτας του Βιβλίου Διευθύνσεων του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook component"
+msgstr "Στοιχείο βιβλίου διευθύνσεων του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook folder viewer"
+msgstr "Εφαρμογή προβολής φακέλου του Βιβλίου Διευθύνσεων του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Στοιχείο εκτελεστικής σύνοψης μηνυμάτων."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Βιβλίο Διευθύνσεων"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Ιδιότητες..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Διαγραφή"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "_Μετονομασία"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Νέα Επαφή:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Επαφή"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "Δημιουργία νέας επαφής"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Νέα Λίστα Επαφών"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "Νέα Λίστα Επαφών"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "Δημιουργία νέας λίστας επαφών"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Προσωπικό"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Εργασία"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "Διακομιστής LDAP"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Δεν ήταν δυνατή η δημιουργία του καταλόγου %s: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "Δεν είναι δυνατή η σύνδεση με τον διακομιστή LDAP."
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "Δεν ήταν δυνατή η πιστοποίηση στον διακομιστή  LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "Αδύνατη η δημιουργία ερωτήματος στο  Root DSE"
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "Ο διακομιστής αποκρίθηκε χωρίς υποστηριζόμενες βάσεις αναζήτησης"
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Αυτός ο διακομιστής δεν υποστηρίζει σχήμα πληροφοριών LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "Σφάλμα ανάκτησης σχήματος πληροφοριών"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr "Η απάντηση του διακομιστή  δεν περιείχε έγκυρο σχήμα πληροφοριών"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Όνομα Λογαριασμού"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Όνομα Διακομιστή"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "Το LDAP δεν ενεργοποιήθηκε σε αυτή την έκδοση του evolution"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Λοιπές Επαφές"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -102,7 +235,7 @@ msgstr ""
 "Δεν ήταν δυνατό το άνοιγμα του Βιβλίου Διευθύνσεων.  Παρακαλώ ελέγξτε αν\n"
 "η διαδρομή υπάρχει και ότι έχετε το δικαίωμα πρόσβασης σε αυτό."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -112,7 +245,7 @@ msgstr ""
 "σημαίνει ότι έχετε εισαγάγει λάθος URI, ή ότι ο εξυπηρετητής LDAP είναι\n"
 "εκτός λειτουργίας."
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -124,7 +257,7 @@ msgstr ""
 "συνθέσετε το πρόγραμμα από τις πηγές CVS αφού κάνετε\n"
 "λήψη του OpenLDAP από τον παρακάτω σύνδεσμο.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -138,44 +271,43 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Δεν ήταν δυνατό το άνοιγμα του Βιβλίου Διευθύνσεων"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "Ανώνυμη πρόσβαση διακομιστή  LDAP"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "Δεν ήταν δυνατή η πιστοποίηση.\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sΕισάγετε κωδικό πρόσβασης για %s (χρήστης %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "Όνομα αρχίζει με"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "Email αρχίζει με"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Η κατηγορία είναι"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Κάθε πεδίο περιέχει"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Για Προχωρημένους..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -187,7 +319,7 @@ msgstr ""
 "ή αυξήστε το όριο αποτελεσμάτων στις προτιμήσεις διακομιστή καταλόγου\n"
 "για αυτό το ευρετήριο διευθύνσεων."
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -201,92 +333,45 @@ msgstr ""
 "ή αυξήστε το όριο αποτελεσμάτων στις προτιμήσεις διακομιστή καταλόγου\n"
 "για αυτό το ευρετήριο διευθύνσεων. "
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "Το backend για αυτό το ευρετήριο διευθύνσεων αδυνατεί να αναλύσει αυτό το "
 "ερώτημα."
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "Το backend για αυτό το ευρετήριο διευθύνσεων αρνήθηκε να αναλύσει αυτό το "
 "ερώτημα."
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "Αυτό το ερώτημα δεν ολοκληρώθηκε επιτυχώς."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Κάθε Κατηγορία"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "Το URI που θα εμφανίσει το ημερολόγιο"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "_Πιστοποίηση Ταυτότητας:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "Ρυθμίστε εδώ την πρόσβαση στους διακομιστές καταλόγου  LDAP"
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Επαφές"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "Εξυπηρετητές καταλόγου"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Βιβλίου Διευθύνσεων του Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Ρύθμιση Βιβλίου Διευθύνσεων LDAP του Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "Προβολή μίνι-κάρτας του Βιβλίου Διευθύνσεων του Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "Εφαρμογή προβολής διευθύνσεων του Βιβλίου Διευθύνσεων"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Εφαρμογή προβολής κάρτας του Βιβλίου Διευθύνσεων του Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr "Στοιχείο βιβλίου διευθύνσεων του Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook folder viewer"
-msgstr "Εφαρμογή προβολής φακέλου του Βιβλίου Διευθύνσεων του Evolution"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Στοιχείο εκτελεστικής σύνοψης μηνυμάτων."
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -309,6 +394,7 @@ msgstr "Ε_μφάνιση υποστηριζόμενων βάσεων"
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -342,8 +428,9 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "Προσθήκη διακομιστή LDAP"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "Βοηθός ρύθμισης LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -359,9 +446,9 @@ msgid "Anonymously"
 msgstr "Ανώνυμα"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -372,51 +459,52 @@ msgstr ""
 "Πατήστε το πλήκτρο \"Τέλος\" για να αποθηκεύσετε τις ρυθμίσεις που έχετε "
 "εισάγει εδώ."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "Σύνδεση"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "Διακεκριμένο ό_νομα"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr "Επεξεργασία διακομιστή LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
 msgstr "Διεύθυνση Email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 "Το Evolution θα χρησιμοποίησει αυτό το DN για την πιστοποίησή σας στον "
 "διακομιστή"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Το Evolution θα χρησιμοποίηση αυτήν τη διεύθυνση για την πιστοποίησή σας "
 "στον διακομιστή"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "Ολοκληρώθηκε"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Γενικά"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "Βοηθός ρύθμισης LDAP"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "Ομάδα"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Ποτέ"
 
@@ -446,8 +534,8 @@ msgid "S_earch scope: "
 msgstr "Βάθος ανα_ζήτησης:"
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Γίνεται αναζήτηση"
 
@@ -508,28 +596,32 @@ msgstr ""
 "αναζητήσεις LDAP και την δημιουργία και επεξεργασία επαφών."
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 "Ο καθορισμός ενός ονόματος εμφάνισης είναι το τελευταίο απαιτούμενο βήμα "
 "στην ρύθμιση ενός διακομιστή LDAP."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "Βήμα 1: Πληροφορίες διακομιστή"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "Βήμα 2: Σύνδεση στον διακομιστή"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "Βήμα 1: Πληροφορίες διακομιστή"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "Βήμα 3: Αναζήτηση στο κατάλογο"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Βήμα 2: Σύνδεση στον διακομιστή"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "Βήμα 4: Όνομα Εμφάνισης"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Βήμα 3: Αναζήτηση στο κατάλογο"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -541,18 +633,6 @@ msgstr "Υποστηριζόμενες βάσεις αναζήτησης"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"Το πρώτο βήμα για την ρύθμιση ενός διακομιστή LDAP είναι να καταχωρήσετε το "
-"όνομα του και τις\n"
-"πληροφορίες εισόδου σας. Ζητήστε από τον διαχειριστή τις απαραίτητες "
-"πληροφορίες αν δεν είστε σίγουροι."
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -565,7 +645,7 @@ msgstr ""
 "διαχειριστή του συστήματος σας\n"
 "αν θέλετε να αλλάξετε αυτές τις επιλογές."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -577,7 +657,7 @@ msgstr ""
 "αναζητήσεις σας. Αν αφήσετε αυτό κενό, η αναζήτηση θα ξεκινά από τον ριζικό "
 "κατάλογο του δέντρου. "
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -593,14 +673,14 @@ msgstr ""
 "Μια αναζήτηση με \"ένα\"  θα περιλαμβάνει μόνο τις καταχωρήσεις που "
 "βρίσκονται μόνο ένα επίπεδο κάτω.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
+#, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "Ο βοηθός θα σας βοηθήσει να έχετε πρόσβαση στις υπηρεσίες καταλόγου\n"
 "με την χρήση διακομιστών LDAP (Lightweight Directory Access Protocol). \n"
@@ -609,7 +689,7 @@ msgstr ""
 "τον διακομιστή. Επικοινωνήστε με τον διαχειριστή του συστήματος σας αν "
 "θέλετε βοήθεια για να βρείτε αυτές τις πληροφορίες."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -617,7 +697,7 @@ msgstr ""
 "Αυτό είναι το πλήρες όνομα του διακομιστή ldap. Για παράδειγμα , \"ldap."
 "mycompany.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -627,7 +707,7 @@ msgstr ""
 "μεγάλου αριθμού \n"
 "θα κάνει αργό το ευρετήριο διευθύνσεων σας."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -637,7 +717,7 @@ msgstr ""
 "σας.  Σημειώστε ότι η ρύθμιση σε \"Διεύθυνση Email\" απαιτεί ανώνυμη "
 "πρόσβαση στον διακομιστή ldap. "
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -647,6 +727,16 @@ msgstr ""
 "του Evolution.\n"
 " Είναι μόνο για λόγους εμφάνισης."
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Αυτό είναι το όνομα για τον διακομιστή και θα εμφανιστεί στη λίστα φακέλων "
+"του Evolution.\n"
+" Είναι μόνο για λόγους εμφάνισης."
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -678,21 +768,34 @@ msgid "Using email address"
 msgstr "Χρήση  διεύθυνσης ταχυδρομείου"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Όταν είναι δυνατόν"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+"Το πρώτο βήμα για την ρύθμιση ενός διακομιστή LDAP είναι να καταχωρήσετε το "
+"όνομα του και τις\n"
+"πληροφορίες εισόδου σας. Ζητήστε από τον διαχειριστή τις απαραίτητες "
+"πληροφορίες αν δεν είστε σίγουροι."
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "_Όνομα εμφάνισης:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "Όριο _μεταφόρτωσης:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -700,54 +803,52 @@ msgstr "Όριο _μεταφόρτωσης:"
 msgid "_Edit"
 msgstr "_Επεξεργασία"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "Μέθοδος _πιστοποίησης:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "Αριθμός _Θύρας:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "Βάση  _αναζήτησης:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "Όνομα _διακομιστή:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "_Χρόνος λήξης (λεπτά)"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "κάρτες"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr "στήλη-σύνδεσης"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr "στήλη-γενικών"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr "στήλη-αναζήτησης"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Όνομα"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Διασύνδεση επιλογής ονομάτων του Βιβλίου Διευθύνσεων του Evolution."
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Αφαίρεση Όλων"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Αφαίρεση"
@@ -774,23 +875,21 @@ msgstr "Προσθήκη στις Επαφές"
 msgid "Unnamed Contact"
 msgstr "Επαφή Χωρίς Τίτλο"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Όνομα"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Πηγή"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Επιλέξτε Επαφές από το Βιβλίο Διευθύνσεων"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "Εύρεση επαφής σε"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Διασύνδεση επιλογής ονομάτων του Βιβλίου Διευθύνσεων του Evolution."
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Εύρεση"
@@ -867,7 +966,8 @@ msgid "D_epartment:"
 msgstr "Τ_μήμα:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Λεπτομέρειες"
 
@@ -934,12 +1034,12 @@ msgid "_Categories..."
 msgstr "_Κατηγορίες..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Διαγραφή"
@@ -2062,7 +2162,7 @@ msgid "Esq."
 msgstr "Αξιότ."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Πλήρες Όνομα"
 
@@ -2156,11 +2256,27 @@ msgstr "Επεξεργαστής Λίστας Επαφών"
 msgid "Save List as VCard"
 msgstr "Αποθήκευση Λίστας ως Vcard"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Αλλαγμένη Επαφή:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Διένεξη με την Επαφή:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Βρέθηκε Διπλή Επαφή"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Το αλλαγμένο όνομα ή η διεύθυνση e-mail αυτής της επαφής υπάρχει\n"
+"ήδη σε αυτόν τον φάκελο.  Θέλετε οπωσδήποτε να προστεθεί;"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Νέα Επαφή:"
@@ -2177,22 +2293,6 @@ msgstr ""
 "Το όνομα ή η διεύθυνση e-mail αυτής της επαφής υπάρχει\n"
 "ήδη σε αυτόν τον φάκελο.  Θέλετε οπωσδήποτε να προστεθεί;"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Αλλαγμένη Επαφή:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Διένεξη με την Επαφή:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"Το αλλαγμένο όνομα ή η διεύθυνση e-mail αυτής της επαφής υπάρχει\n"
-"ήδη σε αυτόν τον φάκελο.  Θέλετε οπωσδήποτε να προστεθεί;"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2291,9 +2391,9 @@ msgstr "Προώθηση Επαφής"
 msgid "Send Message to Contact"
 msgstr "Αποστολή Μηνύματος στη Επαφή"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Εκτύπωση"
@@ -2315,9 +2415,12 @@ msgstr "Μετακίνηση στο Φάκελο..."
 msgid "Cut"
 msgstr "Αποκοπή"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Αντιγραφή"
 
@@ -2326,16 +2429,8 @@ msgstr "Αντιγραφή"
 msgid "Paste"
 msgstr "Επικόλληση"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Διαγραφή"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "Τρέχουσα Προβολή"
 
@@ -2352,166 +2447,170 @@ 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:2
 msgid "Assistant"
 msgstr "Βοηθός"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Φαξ Εργασίας"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Τηλέφωνο Εργασίας"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Τηλέφωνο Εργασίας 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Τηλέφωνο Επικοινωνίας"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Τηλέφωνο Αυτοκινήτου"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Κατηγορίες"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Τηλέφωνο Εταιρείας"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Τμήμα"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "Email 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "Email 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Οικογενειακό Όνομα"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Αρχειοθέτηση Ως"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "Διεύθυνση κοινοποίησης διαθεσιμότητας"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Διεύθυνση Οικίας"
+#, fuzzy
+msgid "Given Name"
+msgstr " Όνομα πεδίου"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Φαξ Οικίας"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Τηλέφωνο Οικίας"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Τηλέφωνο Οικίας 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Τηλέφωνο"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Ιορδανία"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Διευθυντής"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Κινητό Τηλέφωνο"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Ψευδώνυμο"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Σημείωση"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Γραφείο"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Οργανισμός"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Άλλη Διεύθυνση"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Άλλο Φαξ"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Άλλο Τηλέφωνο"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Ειδοποιητής"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Πρωτεύον Τηλέφωνο"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Επάγγελμα"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Ραδιόφωνο"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Ρόλος"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Σύζυγος"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Τηλέτυπο"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Τίτλος"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Χωρίς τίτλο"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Ιστοσελίδα"
 
@@ -2604,11 +2703,19 @@ msgstr "Μέλη"
 msgid "Job Title"
 msgstr "_Τίτλος εργασίας:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Διεύθυνση Οικίας"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Διεύθυνση Οικίας"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Άλλη Διεύθυνση"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2621,112 +2728,109 @@ msgstr "Φαξ Οικίας"
 msgid "Blog"
 msgstr "Μπόργκερ"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Επιτυχία"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Άγνωστο Σφάλμα"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Αρχείο φύλαξης εκτός δικτύου"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Δεν επιτρέπεται η πρόσβαση"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Η κάρτα δεν βρέθηκε"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Το αναγνωριστικό κάρτας υπάρχει ήδη"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Δεν υποστηρίζεται το πρωτόκολλο"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Ακυρώθηκε"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "Η πιστοποίηση απέτυχε."
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "Απαιτείται πιστοποίηση"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS δεν είναι διαθέσιμο"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "Το ευρετήριο διευθύνσεων δεν υπάρχει"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Άλλο σφάλμα"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Θέλετε να αποθηκεύσετε τις αλλαγές;"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr "Α_πόρριψη"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Σφάλμα προσθήκης λίστας"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Σφάλμα προσθήκης κάρτας"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Σφάλμα τροποποίησης λίστας"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Σφάλμα τροποποίησης κάρτας"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Σφάλμα κατάργησης λίστας"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Σφάλμα αφαίρεσης κάρτας"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2735,7 +2839,7 @@ msgstr ""
 "Το άνοιγμα %d καρτών θα ανοίξει και %d νέα παράθυρα.\n"
 "Θέλετε πραγματικά να εμφανίσετε όλες αυτές τις κάρτες?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2744,49 +2848,49 @@ msgstr ""
 "Το %s υπάρχει ήδη.\n"
 "Θέλετε να αντικατασταθεί;"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "Αντικατάσταση"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Σφάλμα αποθήκευσης  %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "λίστα"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Μετακίνηση κάρτας σε"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Αντιγραφή κάρτας σε"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Μετακίνηση καρτών σε"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Αντιγραφή καρτών σε"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Πολλαπλές Εκάρτες"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard για %s"
@@ -2981,7 +3085,7 @@ msgstr "Περιθώρια"
 msgid "Number of columns:"
 msgstr "Αριθμός στηλών:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Επιλογές"
 
@@ -3168,18 +3272,18 @@ msgstr "Λίστα Χωρίς Τίτλο"
 msgid "Split Multi-Day Events:"
 msgstr "Διαχωρισμός Γεγονότων Multi-Day:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Δεν ήταν δυνατή η εκκίνηση του διακομιστή wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Δεν ήταν δυνατή η εκκίνηση του wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 "Δεν ήταν δυνατή η ανανέωση του τμήματος ημερολογίου του Υπολογιστή Παλάμης"
@@ -3188,25 +3292,84 @@ msgstr ""
 msgid "Default Priority:"
 msgstr "Εξ ορισμού Προτεραιότητα"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 "Δεν ήταν δυνατή η ανανέωση του τμήματος Εκκρεμοτήτων του Υπολογιστή Παλάμης"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Ημερολόγιο και Εργασίες"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Ημερολόγιο"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Ρυθμίστε εδώ την Ζώνη ώρας, Ημερολόγιο και Λίστα Εργασιών σας."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Ημερολόγιο και Εργασίες του Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Έλεγχος ρυθμίσεων του ημερολογίου του Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Εφαρμογή προβολής μυνημάτων ραντεβού του ημερολογίου του Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Εφαρμογή προβολής ημερολογίου Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Επεξεργαστής ημερολογίου/εργασιών του Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Εφαρμογή προβολής εργασιών του Evolution "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Στοιχείο ημερολογίου και εργασιών του Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Στοιχείο δοκιμής του Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Εργασίες"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Υπηρεσία υπενθύμισης ειδοποίησης του ημερολογίου του Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Εκκίνηση:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Τέλος:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Συναγερμός Evolution "
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Ειδοποίηση στις %s"
@@ -3281,43 +3444,172 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Να μην ξαναγίνει η ερώτηση για αυτό το πρόγραμμα."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Υπηρεσία υπενθύμισης ειδοποίησης του ημερολογίου του Evolution"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Δεν ήταν δυνατή η αρχικοποίηση του Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Δεν ήταν δυνατή η προετοιμασία του gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Δεν ήταν δυνατή η δημιουργία του εργοστασίου της υπηρεσίας ειδοποίησης"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "μη-έγκυρη ώρα"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "Σφάλμα iCalendar"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Χρώμα για τις εργασίες που λήγουν σήμερα"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Χρώμα για τις εργασίες που λήγουν σήμερα"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "Ε_μφάνιση χρόνων τέλους ραντεβού στις προβολές εβδομάδας και μήνα"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Προεπισκόπηση του ημερολογίου προς εκτύπωση"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "_Ερώτηση επαλήθευσης για τα στοιχεία που διαγράφονται"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "_Ερώτηση επαλήθευσης για τα στοιχεία που διαγράφονται"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Διαγραφή ολοκληρωμένων εργασιών"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Εμφάνιση _αριθμών εβδομάδων στον περιηγητή ημερολογίου"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Η Περίληψη περιέχει"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Η περιγραφή περιέχει"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Το σχόλιο περιέχει"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Αταίριαστο"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3330,81 +3622,110 @@ msgstr ""
 "\n"
 "Είστε βέβαιοι για την διαγραφή των μηνυμάτων;"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "επιστρέφει λιγότερο από"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "ημέρες"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%d %a %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Εκτύπωση αυτού του ημερολογίου"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Νέα Καληδονία"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "Νέο Ραντεβού"
+
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "Ρ_αντεβού"
+
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Δημιουργία νέου ραντεβού"
+
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "Νέα συνάντηση"
+
+#: calendar/gui/calendar-component.c:640
+msgid "M_eeting"
+msgstr "Συ_νάντηση"
+
+#: calendar/gui/calendar-component.c:641
 #, fuzzy
-msgid "Rename"
-msgstr "_Μετονομασία"
+msgid "Create a new meeting request"
+msgstr "Δημιουργία νέας αίτησης συνάντησης"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Νέο All Day Ραντεβού"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Προσωπικό"
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr "All _Day Ραντεβού"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Εργασία"
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Δημιουργία νέου ραντεβού"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3521,7 +3842,7 @@ msgstr "Αποστολή σε:"
 msgid "With these arguments:"
 msgstr "Με αυτές τις παραμέτρους:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr "διάλογος1"
 
@@ -3537,6 +3858,10 @@ msgstr "ώρες"
 msgid "minutes"
 msgstr "λεπτά"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3569,8 +3894,8 @@ msgstr "Αποστολή e-mail"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Περίληψη:"
 
@@ -3599,7 +3924,7 @@ msgstr "τέλος του ραντεβού"
 msgid "hour(s)"
 msgstr "ώρα(ες)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "λεπτό(ά)"
 
@@ -3653,7 +3978,7 @@ msgstr "Ημέρες"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Παρασκευή"
 
@@ -3667,7 +3992,7 @@ msgstr "Λεπτά"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Δευτέρα"
 
@@ -3677,7 +4002,7 @@ msgstr "_Κυρ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Σάββατο"
 
@@ -3691,7 +4016,7 @@ msgstr "Εμφάνιση _αριθμών εβδομάδων στον περιη�
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Κυριακή"
 
@@ -3709,7 +4034,7 @@ msgstr "Λίστα Εργασιών"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Πέμπτη"
 
@@ -3727,7 +4052,7 @@ msgstr "Μορφή ώρας:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Τρίτη"
 
@@ -3737,12 +4062,12 @@ msgstr "Ε_βδομάδα ξεκινάει:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Τετάρτη"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Εργάσιμη Εβδομάδα"
 
@@ -3779,7 +4104,7 @@ msgid "_Fri"
 msgstr "_Παρ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Γενικά"
 
@@ -3819,7 +4144,7 @@ msgstr "_Τετ"
 msgid "before every appointment"
 msgstr "πριν από κάθε ραντεβού"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
@@ -3827,11 +4152,11 @@ msgstr ""
 "Το γεγονός που διαγράφηκε ήταν μια συνάντηση, θέλετε να στείλετε μια "
 "ειδοποίηση ακύρωσης?"
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Είστε βέβαιοι για την ακύρωση και διαγραφή της συνάντησης;"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
@@ -3839,11 +4164,11 @@ msgstr ""
 "Η εργασία που διαγράφηκε είχε ανατεθεί, θέλετε να στείλετε μια ειδοποίηση "
 "ακύρωσης?"
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Είστε βέβαιοι για την ακύρωση και την διαγραφή της εργασίας;"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -3851,56 +4176,56 @@ msgstr ""
 "Η καταχώρηση που διαγράφηκε είχε δημοσιευθεί, θέλετε να στείλετε μια "
 "ειδοποίηση ακύρωσης?"
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 "Είστε βέβαιοι για την ακύρωση και την διαγραφή της καταχώρισης του "
 "ημερολογίου;"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Το συμβάν έχει διαγραφεί."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Η εργασία έχει διαγραφεί."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Η καταχώριση του ημερολογίου έχει διαγραφεί."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Έχετε κάνει αλλαγές. Να αγνοηθούν οι αλλαγές και να τερματιστεί ο "
 "επεξεργαστής;"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Δεν έχετε κάνει αλλαγές. Να τερματιστεί ο επεξεργαστής;"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Το συμβάν έχει αλλάξει."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Η εργασία έχει αλλάξει."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Η καταχώριση του ημερολογίου έχει αλλάξει."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Δεν έχετε κάνει αλλαγές. Να αγνοηθούν οι αλλαγές και να ανανεωθεί ο "
 "επεξεργαστής;"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Δεν έχετε κάνει αλλαγές. Να ανανεωθεί ο επεξεργαστής;"
@@ -3910,168 +4235,173 @@ msgstr "%s  Δεν έχετε κάνει αλλαγές. Να ανανεωθεί
 msgid "Validation error: %s"
 msgstr "Άγνωστο πιστοποίησης: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " με "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr "(Ολοκληρωμένο"
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Ολοκληρωμένο "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr "(Λήξη"
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Λήξη "
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "Δεν ήταν δυνατή η ενημέρωση του αντικειμένου"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Επεξεργασία Ραντεβού"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Ραντεβού - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Εργασία - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Ημερολογιακή καταχώριση - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Χωρίς περίληψη"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Αποθήκευση ως..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Οι αλλαγές που έγιναν σε αυτό το αντικείμενο μπορεί να απορριφθούν αν "
 "καταφθάσει μια ενημέρωση"
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Δεν ήταν δυνατό να αποκτηθεί η τρέχουσα έκδοση!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Επιλέξτε έναν φάκελο προορισμού για την εισαγωγή αυτών των δεδομένων"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Είστε βέβαιοι για την διαγραφή του ραντεβού`%s';"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Είστε βέβαιοι για την διαγραφή του ραντεβού χωρίς όνομα;"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Είστε βέβαιοι για την διαγραφή της εργασίας`%s';"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Είστε βέβαιοι για την διαγραφή της εργασίας χωρίς όνομα;"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Είστε βέβαιοι για την διαγραφή της καταχώρισης ημερολογίου `%s';"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 "Είστε βέβαιοι για την διαγραφή της καταχώρισης ημερολογίου χωρίς τίτλο;"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Είστε βέβαιοι για την διαγραφή %d ραντεβού;"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Είστε βέβαιοι για την διαγραφή %d εργασιών;"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Είστε βέβαιοι για την διαγραφή %d καταχωρίσεων ημερολογίου ;"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "Δεν ήταν δυνατή η διαγραφή του γεγονότος λόγω σφάλματος cobra"
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "Δεν ήταν δυνατή η διαγραφή της εργασίας λόγω σφάλματος cobra"
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Δεν ήταν δυνατή η διαγραφή της καταχώρησης λόγω σφάλματος cobra"
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Δεν ήταν δυνατή η διαγραφή του αντικειμένου λόγω σφάλματος cobra"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "Δεν ήταν δυνατή η διαγραφή του γεγονότος λόγω άρνησης πρόσβασης"
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "Δεν ήταν δυνατή η διαγραφή της εργασίας λόγω άρνησης πρόσβασης"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 "Δεν ήταν δυνατή η διαγραφή της καταχώρησης ημερολογίου λόγω άρνησης πρόσβασης"
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "Δεν ήταν δυνατή η διαγραφή του αντικειμένου λόγω άρνησης πρόσβασης"
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Δεν ήταν δυνατή η διαγραφή του γεγονότος λόγω σφάλματος cobra"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Δεν ήταν δυνατή η διαγραφή της εργασίας λόγω σφάλματος cobra"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Δεν ήταν δυνατή η διαγραφή της καταχώρησης λόγω σφάλματος cobra"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Δεν ήταν δυνατή η διαγραφή του αντικειμένου λόγω σφάλματος cobra"
@@ -4088,43 +4418,43 @@ msgstr "Εξουσιοδότηση Σε:"
 msgid "Enter Delegate"
 msgstr "Εισαγωγή Αντιπροσώπου"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Ραντεβού"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Υπενθύμιση"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Επανεμφάνιση"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Δρομολόγηση"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Συνάντηση"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "Η ημερομηνία έναρξης είναι λανθασμένη"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "Η ημερομηνία λήξης είναι λάθος"
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "Η ώρα έναρξης είναι λανθασμένη"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "Η ώρα λήξης είναι λανθασμένη"
 
@@ -4194,31 +4524,31 @@ msgid "_Start time:"
 msgstr "Χρόνος Έ_ναρξης:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Κανένα"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "Χρειάζεται ένας διοργανωτής."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "Απαιτείται τουλάχιστον ένας παρευρισκόμενος."
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Εξουσιοδότηση Σε..."
 
@@ -4259,21 +4589,15 @@ msgid "Member"
 msgstr "Μέλος"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Ρόλος"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Κατάσταση"
@@ -4293,6 +4617,7 @@ msgid "_Invite Others..."
 msgstr "_Πρόσκληση Άλλων..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4325,6 +4650,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Δεν ήταν δυνατή η δημιουργία του καταλόγου %s: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "Πρέπει να ορίσετε έναν διοργανωτή."
@@ -4354,34 +4680,59 @@ msgstr "Πληροφορίες ημερολογίου"
 msgid "Calendar Name"
 msgstr "Ημερολόγιο"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Δεν ήταν δυνατή η δημιουργία του καταλόγου %s: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Πληροφορίες ημερολογίου"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Λίστα Εργασιών"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Λίστα Εργασιών"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Λίστα Εργασιών"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Νήσοι Γουάλις και Φουτούνα"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 #, fuzzy
 msgid "This and Future Instances"
 msgstr "Νήσοι Γουάλις και Φουτούνα"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 #, fuzzy
 msgid "All Instances"
 msgstr "Για Προχωρημένους"
@@ -4433,10 +4784,15 @@ msgstr "ημέρα"
 msgid "on the"
 msgstr "στο"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "εμφανίσεις"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Ημερομηνία/Ώρα:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "_Προσθήκη"
@@ -4501,7 +4857,7 @@ msgstr "εβδομάδα(ες)"
 msgid "year(s)"
 msgstr "χρόνος(ια)"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 #, fuzzy
 msgid ""
 "This event has been changed, but has not been saved.\n"
@@ -4512,35 +4868,35 @@ msgstr ""
 "\n"
 "Θέλετε να αποθηκεύσετε τις αλλαγές τώρα;"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "Α_πόρριψη αλλαγών"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 #, fuzzy
 msgid "Save Event"
 msgstr "Γεγονότα Ημερολογίου"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Η πληροφορίες της συνάντησης έχουν δημιουργηθεί. Να αποσταλούν?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 "Η πληροφορίες της συνάντησης έχουν αλλάζει. Να αποσταλεί ενημερωμένη έκδοση;"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr ""
 "Οι πληροφορίες της ανάθεσης εργασίας έχουν δημιουργηθεί. Να αποσταλούν;"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 "Η πληροφορίες της εργασία έχει αλλάξει. Να αποσταλεί ενημερωμένη έκδοση;"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Η συμπληρωμένη ημερομηνία είναι λανθασμένη"
 
@@ -4550,43 +4906,43 @@ msgid "% _Complete"
 msgstr "% Ολοκληρωμένο"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Ολοκληρώθηκε"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Υψηλή"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "Σε εξέλιξη"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Χαμηλή"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Κανονική"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Δεν έχει ξεκινήσει"
 
@@ -4595,7 +4951,7 @@ msgid "Progress"
 msgstr "Πρόοδος"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Αόριστο"
 
@@ -4617,21 +4973,21 @@ msgstr "_Κατάσταση:"
 msgid "_Web Page:"
 msgstr "_Διεύθυνση Ιστοσελίδας:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Βασικό"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Εργασία"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "Η ημερομηνία λήξης είναι λανθασμένη"
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4639,9 +4995,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "_Εμπιστευτικό"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Περιγραφή:"
 
@@ -4746,26 +5102,21 @@ msgstr "%s στις %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s για άγνωστο τύπο ενεργοποίησης"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Δημόσιο"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Ιδιωτικό"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Εμπιστευτικό"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Κατηγορίες"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4778,28 +5129,26 @@ msgid "Start Date"
 msgstr "Ημερομηνία Έναρξης"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Περίληψη"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr " χρώμα"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Ραντεβού"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Διαθέσιμη"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Απασχολημένη"
 
@@ -4811,7 +5160,7 @@ msgstr "Β"
 msgid "S"
 msgstr "Ν"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "Α"
 
@@ -4819,7 +5168,7 @@ msgstr "Α"
 msgid "W"
 msgstr "Δ"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4829,7 +5178,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4837,7 +5186,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Ναι"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4845,17 +5194,17 @@ msgstr "Όχι"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Άγνωστο"
 
@@ -4867,181 +5216,179 @@ msgstr "Επανάληψη"
 msgid "Assigned"
 msgstr "Ανάθεση"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Αναβάθμιση Αντικειμένων"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Διαγραφή επιλεγμένων αντικειμένων"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Αναβάθμιση Αντικειμένων"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Νέο _Ραντεβού..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Νέο _Γεγονός Ολόκληρης της Ημέρας"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "Νέα Συνάντηση"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Νέα Εργασία"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Εκτύπωση..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "Επι_κόλληση"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Μετάβαση στο _Σήμερα"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "_Μετάβαση στην Ημερομηνία..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "Δημο_σίευση πληροφοριών Διαθεσιμότητας"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "_Ρυθμίσεις..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Άνοιγμα"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Αποθήκευση _ως..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "Αντι_γραφή"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "Προγραμματισμός _Συνάντησης..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "Προώ_θηση ως iCalendar"
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Διαγραφή αυτής της _Εμφάνισης"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Διαγραφή Ό_λων των Εμφανίσεων"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "_Ρυθμίσεις..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Άνοιγμα Μηνύματος"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "_Ανάθεση Εργασίας"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "Προώ_θηση ως i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "_Σημείωση ως Ολοκληρωμένο"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Σημείωση επιλεγμένων εργασιών ως ολοκληρωμένες"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "_Διαγραφή Επιλεγμένων Εργασιών"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Κλικ εδώ για προσθήκη εργασίας"
@@ -5055,8 +5402,8 @@ msgstr "% Ολοκληρωμένο"
 msgid "Alarms"
 msgstr "Ειδοποιήσεις"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Ολοκληρώθηκε"
 
@@ -5085,18 +5432,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5115,7 +5462,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5128,130 +5475,130 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "πμ"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "μμ"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "_Απλή επανεμφάνιση"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
 msgid "Every day"
 msgstr "Κάθε"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, fuzzy, c-format
 msgid "Every %d days"
 msgstr "%d ημέρες"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 #, fuzzy
 msgid "Every week"
 msgstr "Κάθε"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, fuzzy, c-format
 msgid "Every %d weeks"
 msgstr "%d εβδομάδες"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, fuzzy, c-format
 msgid "Every %d weeks on "
 msgstr "%d εβδομάδες"
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " και"
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 #, fuzzy
 msgid "every month"
 msgstr "Ένας Μήνας"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 #, fuzzy
 msgid "Every year"
 msgstr "Κάθε"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>Ξεκινάει:</b> "
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Τελειώνει:</b> "
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>Ολοκληρώθηκε:</b> "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>Λήγει:</b> "
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "Πληροφορίες iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "Σφάλμα iCalendar"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Ένα άγνωστο άτομο"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5259,324 +5606,323 @@ msgstr ""
 "<br> Παρακαλώ διαβάστε τις παρακάτω πληροφορίες, και επιλέξτε μετά μια "
 "ενέργεια από το παρακάτω μενού."
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Κανένα</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "Τοποθεσία: "
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Κατάσταση:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Αποδοχή"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Δοκιμαστική αποδοχή"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Άρνηση πρόσβασης"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Επιλέξτε μια ενέργεια:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Ενημέρωση"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "ΟΚ"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Αποδοχή"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Δοκιμαστική αποδοχή"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Απόκρυψη"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Αποστολή πληροφοριών Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Ανανέωση κατάστασης απάντησης"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Αποστολή τελευταίων πληροφοριών"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> έχει δημοσιεύσει πληροφορίες συνάντησης."
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Πληροφορίες Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> παρακαλεί την παρουσία του %s σε μια συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> παρακαλεί την παρουσία σας σε μια συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Πρόταση Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> θα ήθελε να προσθέσει σε μια υπάρχουσα συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Ανανέωση Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> θα ήθελε να παραλάβει τις τελευταίες πληροφορίες συνάντησης."
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Αίτη_ση Ανανέωσης Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> έχει απαντήσει σε μία πρόσκληση σε συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Απάντηση Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> ακύρωσε μια συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Ακύρωση Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "ο/η <b>%s</b> έστειλε ένα ακατανόητο μήνυμα."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Εσφαλμένο Μήνυμα Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> έχει δημοσιεύσει πληροφορίες εργασιών."
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Πληροφορίες Εργασιών"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> ζητάει από τον %s να εκτελέσει μια εργασία."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> σας έχει ζητήσει να εκτελέσετε μια εργασία"
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Πρόταση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> θα ήθελε να προσθέσει σε μια υπάρχουσα εργασία."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Ανανέωση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> θα ήθελε την τελευταία πληροφορία εργασιών."
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Αίτηση _Ανανέωση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> απάντησε σε μια ανάθεση εργασίας"
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Απάντηση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> έχει ακυρώσει μια εργασία."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Ακύρωση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr " Μήνυμα κακής εργασίας"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> έχει δημοσίευση πληροφορίες διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Πληροφορίες Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "ο/η <b>%s</b> ζητά πληροφορίες διαθεσιμότητας."
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Αίτηση Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "ο/η <b>%s</b> απάντησε στην αίτηση διαθεσιμότητας."
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Απάντηση Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Εσφαλμένο Μήνυμα Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr "Αυτό το μήνυμα δεν φαίνεται να έχει συνταχθεί σωστά."
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "Το μήνυμα περιέχει μόνο αιτήσεις που δεν υποστηρίζονται"
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Το επισυναπτόμενο αρχείο δεν περιέχει έγκυρο αρχείο ημερολογίου"
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 "Το επισυναπτόμενο αρχείο περιέχει στοιχεία που δεν μπορούν να προβληθούν"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "Δεν ήταν δυνατό να ανανεωθεί\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Η ανανέωση ολοκληρώθηκε\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Δεν ήταν δυνατή η ανανέωση της κατάστασης παρευρισκομένων επειδή το στοιχείο "
 "δεν υπάρχει πλέον"
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Το αντικείμενο δεν είναι έγκυρο και δεν μπορεί να ενημερωθεί\n"
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Αυτή η απάντηση δεν είναι από ένα τρέχοντα παρευρισκόμενο. Να προστεθεί?"
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Δεν ήταν δυνατή η ανανεωθεί της κατάστασης παρευρισκομένων λόγο μιας μη "
 "έγκυρης κατάστασης\n"
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr "Υπήρξε σφάλμα στο σύστημα CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr "Δεν ήταν εύρεση του αντικειμένου\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Δεν έχετε τα απαραίτητα δικαιώματα για να ενημερώσετε το ημερολόγιο\n"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Η κατάσταση παρευρισκομένων ανανεώθηκε\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "Δεν ήταν δυνατή η ανανέωση της κατάστασης παρευρισκομένων\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Η Αφαίρεση Ολοκληρώθηκε"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Το στοιχείο στάλθηκε!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Δεν ήταν δυνατή η αποστολή του στοιχείου!\n"
 
@@ -5736,7 +6082,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -5800,49 +6146,44 @@ msgstr "Χρόνος έ_ναρξης συνάντησης:"
 msgid "Meeting _end time:"
 msgstr "Χρόνος _περάτωσης συνάντησης:"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "Ημερομηνία Έ_ναρξης:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "Ημερομηνία _Λήξης:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "_Προτεραιότητα"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Σελίδα"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Άνοιγμα ενεργειών στο %s"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Αδύνατη η φόρτωση ενεργειών στο `%s'"
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Η μέθοδος που απαιτείται για την φόρτωση του '%s' δεν υποστηρίζεται"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Δεν έχετε τα απαραίτητα δικαιώματα για να ανοίξετε τον φάκελο στο`%s'"
 
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5851,48 +6192,39 @@ msgstr ""
 "Σφάλμα στο  %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "Ολοκλήρωση εργασιών..."
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "Διαγραφή επιλεγμένων αντικειμένων..."
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "Εξάλειψη"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Εργασίες"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Ημερολόγιο"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Αδύνατο το άνοιγμα φακέλου στο `%s'"
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Η μέθοδος που απαιτείται για την άνοιγμα του '%s' δεν υποστηρίζεται"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Προσθήκη ειδοποιήσεων για %s"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5904,7 +6236,7 @@ msgstr ""
 "έχει κολλήσει. Θα πρέπει να επανεκκινήσετε το Evolution για να το "
 "χρησιμοποιήσετε ξανά"
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5916,58 +6248,11 @@ msgstr ""
 "έχει κολλήσει. Θα πρέπει να επανεκκινήσετε το Evolution για να το "
 "χρησιμοποιήσετε ξανά"
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Τουρίν"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Ημερολόγιο και Εργασίες"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Ημερολόγιο"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Ρυθμίστε εδώ την Ζώνη ώρας, Ημερολόγιο και Λίστα Εργασιών σας."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Ημερολόγιο και Εργασίες του Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Έλεγχος ρυθμίσεων του ημερολογίου του Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Εφαρμογή προβολής μυνημάτων ραντεβού του ημερολογίου του Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Εφαρμογή προβολής ημερολογίου Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Επεξεργαστής ημερολογίου/εργασιών του Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Εφαρμογή προβολής εργασιών του Evolution "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Στοιχείο ημερολογίου και εργασιών του Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Στοιχείο δοκιμής του Evolution."
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Απρίλιος"
@@ -6024,296 +6309,332 @@ msgstr "Οκτώβριος"
 msgid "September"
 msgstr "Σεπτέμβριος"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Πρέπει να ορίσετε έναν διοργανωτή."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Απαιτείται τουλάχιστον ένας παρευρισκόμενος"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Πληροφορίες Γεγονότος"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Πληροφορίες Εργασιών"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Πληροφορίες Ημερολογίου"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Πληροφορία Διαθεσιμότητας"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Πληροφορίες ημερολογίου"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Ενημερώθηκε"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Ανανέωση"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "Αντιπρόταση"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Πληροφορία Διαθεσιμότητας (%s έως %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "Πληροφορίες iCalendar"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Πρέπει να είστε παρευρισκόμενος για αυτό το γεγονός."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1η"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2η"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3η"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4η"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5η"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6η"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7η"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8η"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9η"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10η"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11η"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12η"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13η"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14η"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15η"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16η"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17η"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18η"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19η"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20η"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21η"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22η"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23η"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24η"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25η"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26η"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27η"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28η"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29η"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30η"
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31η"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Κυ"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Δε"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Τρ"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Τε"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Πε"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Πα"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Σα"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Επιλεγμένη ημέρα (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Επιλεγμένη εβδομάδα (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Επιλεγμένος μήνας (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Επιλεγμένο έτος (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Εργασία"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "_Κατάσταση: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Προτεραιότητα: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "%i Ολοκληρωμένο"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Κατηγορίες: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Επαφές: "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Προεπισκόπηση Εκτύπωσης"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Εκτύπωση Στοιχείου"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Ρυθμίσεις Εκτύπωσης"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Μετονομασία Συντόμευσης"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Λίστα Εργασιών"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Νέα Εργασία"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Εργασία"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Δημιουργία νέας εργασίας"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "Το URI του φακέλου ενεργειών προς εμφάνιση"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6326,11 +6647,11 @@ msgstr ""
 "\n"
 "Είστε βέβαιοι για την διαγραφή των μηνυμάτων;"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Να μην ξαναγίνει η ερώτηση."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "Εργασίες Εκτύπωσης"
 
@@ -6363,15 +6684,15 @@ msgstr "Μήνυμα Ημερολογίου"
 msgid "vCalendar files (.vcf)"
 msgstr "αρχεία vCalendar (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "Υπενθύμιση!!"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "Γεγονότα Ημερολογίου"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6379,7 +6700,7 @@ msgstr ""
 "Το Evolution βρήκε μηνύματα αρχεία Ημερολογίου του  Gnome \n"
 "Θέλετε να εισαχθούν στο Evolution;"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Ημερολόγιο του Gnome"
 
@@ -7912,27 +8233,27 @@ msgstr "Ειρηνικός/Γουάλις"
 msgid "Pacific/Yap"
 msgstr "Ειρηνικός/ Γιάπ"
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "Η υπογραφή δεν υποστηρίζεται από αυτό το cipher"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "Η επαλήθευση δεν υποστηρίζεται από αυτό το cipher"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Η κρυπτογράφηση δεν υποστηρίζεται από αυτό το cipher"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Η αποκρυπτογράφηση δεν υποστηρίζεται από αυτό το cipher"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr "Δεν μπορεί να εισάγετε κλειδιά αυτό το cipher"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr "Δεν μπορεί να εξάγετε κλειδιά αυτό το cipher"
 
@@ -7985,86 +8306,86 @@ msgid "You must be working online to complete this operation"
 msgstr ""
 "Πρέπει να είστε συνδεμένοι στο δίκτυο για να ολοκληρωθεί αυτή η διαδικασία"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Δεν ήταν δυνατή η δημιουργία σωλήνωσης σε  '%s': %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Δεν ήταν δυνατή η  δημιουργία θυγατρικης διεργασίας  '%s': %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Αδυναμία ανάγνωσης χαιρετισμού από %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Συγχρονισμός φακέλων"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Σφάλμα στην ανάλυση φίλτρου: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Σφάλμα στην εκτέλεση φίλτρου: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Αδυναμία ανοίγματος φακέλου spool"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Αδυναμία ανάλυσης φακέλου spool"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Λήψη μηνύματος %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Δεν ήταν δυνατό το άνοιγμα του μηνύματος"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Αποτυχία στο μήνυμα %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Συγχρονισμός φακέλου"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Λήψη μηνύματος %d από %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Αποτυχία στο μήνυμα %d από %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Αποτυχία ανάκτησης μηνύματος."
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr "Μη έγκυρες παράμετροι σε  (system-flag)"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr "Μη έγκυρη παράμετρος σε (user-tag)"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Σφάλμα στην εκτέλεση αναζήτησης φίλτρου: %s: %s"
@@ -8096,36 +8417,36 @@ msgstr "(ταίρισμα-όλων) απαιτεί ένα single bool result"
 msgid "Performing query on unknown header: %s"
 msgstr "Γίνεται επερώτηση σε άγνωστη επικεφαλίδα: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Μη υποστηριζόμενη λειτουργία : προθήκη μηνύματος: για  %s"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Μη υποστηριζόμενη λειτουργία: αναζήτηση βάσει έκφρασης: για %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Μη υποστηριζόμενη λειτουργία: αναζήτηση βάσει ταυτοτήτων χρήστη: για %s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Μετακίνηση μηνυμάτων"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr "Αντιγραφή μηνυμάτων"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Παραλαμβάνονται %d μήνυμα(τα)"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8136,15 +8457,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr "Αποτυχία ανάλυσης gpg userid hint."
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr "Αποτυχία ανάλυσης gpg passphrase request."
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8153,32 +8474,32 @@ msgstr ""
 "Χρειάζεστε μια φράση εισόδου για το ξεκλείδωμα του κλειδιού για\n"
 "χρήστη: \"%s\" "
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Ακυρώθηκε."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Αποτυχία ξεκλειδώματος μυστικού κλειδιού: Δόθηκαν 3 εσφαλμένες φράσεις "
 "εισόδου."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Αναπάντεχη απάντηση από GnuPG: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr "Δεν έχουν δοθεί δεδομένα"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Δεν ήταν δυνατή η κρυπτογράφηση: δεν έχουν οριστεί έγκυροι παραλήπτες"
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8189,51 +8510,65 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Αποτυχία GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Δεν ήταν δυνατή η εγγραφή δεδομένων:%s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Αποτυχία εκτέλεσης gpg: %s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr "Αποτυχία εκτέλεσης gpg"
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "Αυτό το σημείο του μηνύματος είναι ψηφιακά υπογεγραμμένο"
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr ""
+"Δεν ήταν δυνατή η επαλήθευση υπογραφής μηνύματος: δεν ήταν δυνατή η "
+"δημιουργία προσωρινού αρχείου: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Δεν ήταν δυνατή η επαλήθευση υπογραφής μηνύματος: δεν ήταν δυνατή η "
 "δημιουργία προσωρινού αρχείου: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Δεν ήταν δυνατή η εγγραφή δεδομένων:%s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Αυτό το σημείο του μηνύματος είναι ψηφιακά υπογεγραμμένο"
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Περιεχόμενα Σώματος"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Αδύνατη η ανάκτηση του μηνύματος από τον επεξεργαστή"
@@ -8334,15 +8669,15 @@ msgstr "Σφάλμα κατά την εγγραφή του μηνύματος σ
 msgid "Error copying mail temp file: %s"
 msgstr "Σφάλμα κατά την αντιγραφή του μηνύματος στο πρόχειρο αρχείο: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Αποτυχία αποκρυπτογράφησης τμήματος MIME: σφάλμα πρωτοκόλλου"
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "Αποτυχία αποκρυπτογράφησης τμήματος MIME: μη έγκυρη δομή"
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "σφάλμα ανάλυσης"
 
@@ -8667,12 +9002,12 @@ msgstr "Παροχέας ταχυδρομείου για τον Εικονικό
 msgid "For reading mail as a query of another set of folders"
 msgstr "Για την ανάγνωση μηνυμάτων ως ερώτηση για κάποιους άλλους φακέλους"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Δεν υπάρχει διαθέσιμος παροχέας για το πρωτόκολλο `%s'"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8681,73 +9016,84 @@ msgstr ""
 "Δεν ήταν δυνατή η δημιουργία του καταλόγου %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Εισάγετε κωδικό πρόσβασης για %s"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Αόριστο"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Επεξεργασία υπογραφής"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Επεξεργασία υπογραφής"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Αυτο-υπογεγραμμένο πιστοποιητικό στην αλυσίδα"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "Μη έμπιστο πιστοποιητικό"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Αποθήκευση υπογραφής"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Σφάλμα ανάλυσης"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Διακομιστής: %s, Είδος: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "Δεν είναι δυνατό να γίνει η λήψη του φακέλου: Μη έγκυρη σε αυτή την αποθήκη"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Δεν είναι δυνατό να δημιουργηθεί ο φακέλος: Μη έγκυρη σε αυτή την αποθήκη"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Απορρίμματα"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "Ιούνιος"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "Αποτυχία κατά την λήψη πιστοποιητικού εκδότη"
@@ -8956,7 +9302,7 @@ msgstr ""
 "Η λίστα ανάκτησης πιστοποιητικών έχει λήξει: %s\n"
 "Εκδότης: %s"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Αδυναμία ανάλυσης URL `%s'"
@@ -8975,22 +9321,22 @@ msgstr "Κανένα τέτοιο μήνυμα %s στο %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Αδυναμία αντιγραφής ή μετακίνησης μηνυμάτων σε ένα εικονικό φάκελο"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου %s: Άκυρη λειτουργία"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου %s: Δεν υπάρχει ο φάκελος"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλου %s: Άκυρη λειτουργία"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
@@ -9071,7 +9417,7 @@ msgstr "Αδυναμία ανάκτησης μηνύματος: %s "
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9085,7 +9431,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Δεν υπάρχει τέτοιο μήνυμα"
@@ -9123,55 +9469,70 @@ msgid "Failed to cache %s: %s"
 msgstr "Αποτυχία cache %s: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Σύνδεση στον διακομιστή..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Δεν είναι δυνατή η σύνδεση με τον διακομιστή LDAP."
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "Εταιρεία"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Έλεγχος για νέα μηνύματα"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Check for new messages in all folders"
 msgstr "Έλεγχος για νέα μηνύματα σε όλους τους φακέλους"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Φάκελοι"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Εμφάνιση μόνο των φακέλων με συνδρομή"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "Παράκαμψη φακέλου namespace που παρέχεται από τον διακομιστή"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Namespace"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 "Εφαρμογή φίλτρων στα νέα μηνύματα στα ΕΙΣΕΡΧΟΜΕΝΑ σ' αυτόν τον διακομιστή"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Αυτόματος έλεγχος για νέα μηνύματα"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Για ανάγνωση και αποθήκευση μηνυμάτων σε διακομιστές IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Κωδικός Πρόσβασης"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9429,7 +9790,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλου %s στο %s: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Δεν ήταν δυνατή η μετονομασία '%s': %s"
@@ -9545,29 +9906,29 @@ msgstr "Έλεγχος για νέα μηνύματα"
 msgid "Storing folder"
 msgstr "Φάκελος αποθήκευσης"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Δεν ήταν δυνατό το κλείδωμα του φακέλου στο %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Δεν είναι δυνατό το άνοιγμα του mailbox: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "Ακύρωση πρόσθεσης μηνυμάτων"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Δεν είναι δυνατή η προσθήκη του μηνύματος στο αρχείο mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9576,11 +9937,11 @@ msgstr ""
 "Δεν είναι δυνατή η λήψη του μηνύματος: %s από τον φάκελο %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Ο φάκελος φαίνεται να έχει ανεπανόρθωτη ζημιά."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Αποτυχία δημιουργίας μηνύματος: Κατεστραμμένο  mailbox;"
 
@@ -9648,12 +10009,17 @@ msgstr "Δεν ήταν δυνατή η δημιουργία του καταλό
 msgid "Cannot create folder: %s: %s"
 msgstr "Δεν είναι δυνατή η λήψη του φακέλου: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "Το αναγνωριστικό κάρτας υπάρχει ήδη"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλου %s στο %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Το συγκεκριμένο όνομα φακέλου δεν είναι έγκυρο: %s"
@@ -9698,7 +10064,7 @@ msgstr "Δεν ήταν δυνατό το κλείσιμο του φακέλου
 msgid "Could not close temp folder: %s"
 msgstr "Δεν ήταν δυνατό το κλείσιμο του προσωρινού φακέλου:%s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλου : %s"
@@ -9987,7 +10353,7 @@ msgstr "Διαγραφή μετά από %s ημέρα(ες)"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -10078,7 +10444,7 @@ msgid "No such folder `%s'."
 msgstr "Δεν υπάρχει ο φάκελος `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10135,7 +10501,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Παράδοση μηνυμάτων μέσω του προγράμματος sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10312,7 +10678,7 @@ msgstr ""
 "Δεν είναι δυνατή η αποστολή του μηνύματος: η διεύθυνση αποστολέα δεν είναι "
 "έγκυρη."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Γίνεται αποστολή μηνύματος"
 
@@ -10438,7 +10804,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "συννημένο"
 
@@ -10483,14 +10849,14 @@ msgstr "Τύπος MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Πρόταση για αυτόματη προβολή της επισύναψης"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Πρέπει να ρυθμίσετε έναν λογαριασμό\n"
 "πριν από την συγγραφή μηνύματος"
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Κλικ εδώ για το βιβλίου διευθύνσεων"
 
@@ -10501,45 +10867,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Απάντηση Σε:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Από:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Θέμα:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Προς:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Εισάγετε τους παραλήπτες του μηνύματος"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Κοινοποίηση:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Εισάγετε τις διευθύνσεις όπου θα σταλεί αντίγραφο του μηνύματος"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Κρυφή κοινοποίηση:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10550,14 +10916,19 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Αποστολή σε:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr "Προορισμός αποστολής"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Επισύναψη αρχείου στο μήνυμα"
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Επισύναψη αρχείου"
@@ -10592,21 +10963,21 @@ msgstr "Το αρχείο υπάρχει, να γίνει επικάλυψη;"
 msgid "Error saving file: %s"
 msgstr "Σφάλμα κατά την αποθήκευση του αρχείου: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Σφάλμα κατά το φόρτωμα του αρχείου: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Σφάλμα κατά την προσπέλαση του αρχείου: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Αδύνατη η ανάκτηση του μηνύματος από τον επεξεργαστή"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10615,7 +10986,7 @@ msgstr ""
 "Αδύνατη η αναζήτηση στο αρχείο: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10624,7 +10995,7 @@ msgstr ""
 "Αδυναμία  truncate αρχείου: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10633,7 +11004,7 @@ msgstr ""
 "Αδυναμία αντιγραφής περιγραφέα αρχείου: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10642,7 +11013,7 @@ msgstr ""
 "Σφάλμα κατά την αυτόματη αποθήκευση του μηνύματος: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10651,7 +11022,7 @@ msgstr ""
 "προηγούμενη συνεδρία.\n"
 "Θέλετε να γίνει προσπάθεια ανάκτηση τους;"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10662,28 +11033,28 @@ msgstr ""
 "\n"
 "Θέλετε να αποθηκεύσετε τις αλλαγές;"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Προειδοποίηση: Τροποποιημένο Μήνυμα"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Άνοιγμα αρχείου"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "Υπογραφή"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "Αυτόματη δημιουργία"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Συγγραφή νέου μηνύματος"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10691,7 +11062,7 @@ msgstr ""
 "Δεν ήταν δυνατή ή δημιουργία του παραθύρου του επεξεργαστή:\n"
 "Αδύνατη η ενεργοποίηση του συστατικού ελέγχου του επιλογέα διευθύνσεων."
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10703,7 +11074,7 @@ msgstr ""
 "Βεβαιωθείτε ότι έχετε εγκατεστημένη την σωστή έκδοση\n"
 "gtkhtml και libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10711,7 +11082,7 @@ msgstr ""
 "Δεν ήταν δυνατή ή δημιουργία του παραθύρου του επεξεργαστή:\n"
 "Αδύνατη η ενεργοποίηση του συστατικού του επεξεργαστή HTML."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10720,11 +11091,13 @@ msgstr ""
 "οποίο δεν είναι δυνατή η επεξεργασία.)<b>"
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Η σουίτα εφαρμογών Evolution "
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10978,13 +11351,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11110,7 +11483,7 @@ msgstr "Τότε"
 msgid "You must specify a folder."
 msgstr "Πρέπει να καθορίσετε ένα κατάλογο."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Επιλογή Φακέλου"
@@ -11124,24 +11497,24 @@ msgstr ""
 "Σφάλμα στην κανονική έκφραση '%s':\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Σημαντικό"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "Πρός Τακτοποίηση"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Αργότερα"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Δοκιμή"
 
@@ -11241,7 +11614,7 @@ msgstr "πριν"
 msgid "months"
 msgstr "μήνες"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "δευτερόλεπτα"
 
@@ -11338,7 +11711,7 @@ msgstr "Έκφραση"
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "Ετικέτα"
 
@@ -11408,112 +11781,118 @@ msgid "Source Account"
 msgstr "Πηγαίος Λογαριασμός"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Ψεκάδες"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Ακριβής επικεφαλίδα"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Τερματισμός Επεξεργασίας"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Θέμα"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "Ορισμός Κατάστασης"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "περιέχει"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "δεν περιέχει"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "δεν τελειώνει με"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "δεν υπάρχει"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "does not return"
 msgstr "δεν επιστρέφει"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "δεν φαίνεται να είναι"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "δεν ξεκινά με"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "τελείωνε με"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "υπάρχει"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr "έχει σημαία"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr "ήταν μετά"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "is before"
 msgstr "ήταν πριν"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "είναι μεγαλύτερο από"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "είναι μικρότερο από"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr "δεν έχει σημαία"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "δεν είναι"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "είναι"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr "επιστρέφει μεγαλύτερο από"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr "επιστρέφει λιγότερο από"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr "επιστρέφει"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "φαίνεται να είναι"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "ξεκινά με"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Το όνομα κανόνα '%s' δεν είναι μοναδικό, επιλέξτε ένα άλλο."
@@ -11538,18 +11917,87 @@ msgstr "'Όνομα κανόνα: "
 msgid "Score Rules"
 msgstr "Κανόνες Σκορ"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Πρέπει να δώσετε όνομα στον eφάκελο."
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr "Πρέπει να δηλώσετε τουλάχιστον έναν φάκελο σαν πηγή."
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 msgid "VFolder source"
 msgstr "Πηγή εΦακέλων"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Προτιμήσεις Επεξεργαστή"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Ρύθμιστε εδώ τις προτιμήσεις αλληλογραφίας, συμπεριλαμβανομένης της "
+"ασφάλειας και της προβολής μηνυμάτων"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Ρύθμιστε εδώ τον έλεγχο ορθογραφίας, υπογραφές και τον επεξεργαστή μηνυμάτων"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Ρυθμίστε εδώ τους λογαριασμούς αλληλογραφίας σας"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Επεξεργαστής Λογαριασμού Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Επεξεργαστής μηνυμάτων του Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Επεξεργαστής μηνυμάτων του Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Επεξεργαστής μηνυμάτων του Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Συστατικό για την προβολή φακέλου μηνυμάτων του Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Στοιχείο εκτελεστικής σύνοψης μηνυμάτων."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Μηνύματα"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Λογαριασμοί αλληλογραφίας"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "Προτιμήσεις Αλληλογραφίας"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Είστε βέβαιοι για την διαγραφή αυτού του λογαριασμού;"
@@ -11591,7 +12039,7 @@ msgid "Protocol"
 msgstr "Πρωτόκολλο"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr "Χωρίς Τίτλο"
 
@@ -11615,20 +12063,17 @@ msgstr "Προσθήκη δέσμης ενεργειών υπογραφής"
 msgid "Signature(s)"
 msgstr "Υπογραφή"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "Θα στείλετε μήνυμα σε μορφή HTML. Παρακαλώ βεβαιωθείτε ότι\n"
 " παρακάτω παραλήπτες επιθυμούν μηνύματα σε μορφή HTML:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Να σταλεί οπωσδήποτε;"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11636,7 +12081,7 @@ msgstr ""
 "Αυτό το μήνυμα δεν έχει θέμα.\n"
 "Να σταλεί;"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11645,12 +12090,12 @@ msgstr ""
 "διευθύνσεις, αυτό το μήνυμα θα περιέχει μόνο παραλήπτες στην Ιδιαίτερη "
 "κοινοποίηση(Bcc)."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr ""
 "Αυτό το μήνυμα περιέχει μόνο παραλήπτες στο Ιδιαίτερης κοινοποίησηςBcc)."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11660,11 +12105,11 @@ msgstr ""
 "προσθήκη μια εμφανή επικεφαλίδα Προς.\n"
 "Να σταλεί ούτως η άλλως;"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Πρέπει να ορίσετε παραλήπτες προκειμένου να στείλετε αυτό το μήνυμα."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11678,189 +12123,400 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Δημιουργία Ει_κονικού Φακέλου Από το Μήνυμα"
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "Μηνύματα"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<κάντε κλικ εδώ για να επιλέξετε φάκελο>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" σε  \"%s\""
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Δημιουργία Νέου Φακέλου.."
 
-#: mail/em-folder-selector.c:267
-#, fuzzy
-msgid "Folder _name"
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Ορίστε που θα δημιουργηθεί ο φάκελος:"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
 msgstr "_Όνομα φακέλου:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Δεν είναι δυνατή η δημιουργία του προσωρινού καταλόγου: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Δεν είναι δυνατή η δημιουργία του προσωρινού καταλόγου: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Δεν είναι δυνατή η δημιουργία προσωρινού αρχείου '%s': %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Δεν ήταν δυνατό το κλείσιμο του προσωρινού φακέλου:%s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Γίνεται φόρτωση..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Επιλογή Φακέλου"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Δημιουργία νέου φακέλου"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου `%s': %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Αλήθεια να γίνει διαγραφή του φακέλου \"%s\"?"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Διαγραφή \"%s\""
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Μετονομασία φακέλου \"%s\" σε:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+msgid "Rename Folder"
+msgstr "Μετονομασία Φακέλου"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Ιδιότητες Γραμματοσειράς"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Ιδιότητες"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "Όνομα _Φακέλου:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Προβολή"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Άνοιγμα σε Νέο Παράθυρο"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Μετακίνηση"
+
+#: mail/em-folder-tree.c:1500
+msgid "_New Folder..."
+msgstr "_Νέος Φάκελος..."
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "_Μετονομασία"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "_Ιδιότητες..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "_Επεξεργασία ως Νέο Μήνυμα..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "_Εκτύπωση"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Απάντηση στον Αποστολέα"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Απάντηση στη _Λίστα"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Απάντηση σε _Όλους"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "_Προώθηση"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr "Ση_μαία Ολοκληρώθηκε"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "Εκκα_θάριση Σημαίας"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Σήμανση _ως Αναγνωσμένα"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "Σήμανση ως _Μη Αναγνωσμένα"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Σήμανση ως _Σημαντικά"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "Σή_μανση ως Μη Σημαντικά"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Σήμανση ως _Μη Αναγνωσμένα"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Σήμανση ως _Σημαντικά"
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "Α_κύρωση Διαγραφής"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "Με_τακίνηση στο Φάκελο..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Αντιγραφή στο Φάκελο..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "Προσθήκη Αποστολέα στο _Βιβλίο Διευθύνσεων"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "Εφαρμο_γή Φίλτρων"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "Δη_μιουργία Κανόνα Από το Μήνυμα"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "ΕΦάκελος στο _Θέμα"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "ΕΦάκελος στον _Αποστολέα"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "ΕΦάκελος στους _Παραλήπτες"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "ΕΦάκελος στη Λίστα _Ταχυδρομείου"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "ΕΦάκελος στον _Αποστολέα"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Φίλτρο στο _Θέμα"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Φίλτρο στον Α_ποστολέα"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Φίλτρο στους Παρα_λήπτες"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Φίλτρο στη Λίστα _Ταχυδρομείου"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Φίλτρο στον Α_ποστολέα"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Εξ ορισμού"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Εκτύπωση Μηνύματος"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Αντιγραφή Θέσης Συντόμευσης"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Ταιριάζει με:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Ανάθεση"
+
+#: mail/em-format-html-display.c:597
+#, fuzzy
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr ""
+"Αυτό το μήνυμα είναι ψηφιακά υπογεγραμμένο και δεν βρέθηκε να είναι "
+"αυθεντικό."
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Επεξεργασία υπογραφής"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Επεξεργασία υπογραφής"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Έγινε Διακοπή"
+
+#: mail/em-format-html-display.c:606
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
 msgstr ""
-"Αυτό το μήνυμα είναι ψηφιακά υπογεγραμμένο. Κάντε κλικ στο εικονίδιο με το "
-"λουκέτο για περισσότερες πληροφορίες."
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "Κρυπτογράφηση PGP"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Δεν ήταν δυνατή η ανάλυση του μηνύματος MIME. Προβολή ως πηγή."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Μη υποστηριζόμενο σχήμα"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Αδυναμία επαλήθευσης υπογραφής leaf"
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Προβολή μέσα στο μήνυμα"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Απόκρυψη"
@@ -11870,186 +12526,209 @@ msgstr "Απόκρυψη"
 msgid "Page %d of %d"
 msgstr "Σελίδα %d από %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Παραλαμβάνεται το μήνυμα %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Κακοδιατυπωμένο εξωτερικό μέρος μηνύματος."
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Δείκτης σε σελίδα FTP (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Δείκτης σε τοπικό αρχείο (%s) έγκυρο στην σελίδα \"%s\""
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Δείκτης σε τοπικό αρχείο (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Δείκτης σε απομακρυσμένα δεδομένα (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Δείκτης σε άγνωστα εξωτερικά δεδομένα (τύπος \"%s\")"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-"Αυτό το μήνυμα είναι ψηφιακά υπογεγραμμένο και δεν βρέθηκε να είναι "
-"αυθεντικό."
-
-#: mail/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-"Αυτό το μήνυμα είναι ψηφιακά υπογεγραμμένο και βρέθηκε να είναι αυθεντικό."
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-msgid "No signature present"
-msgstr ""
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Δεν ήταν δυνατή η αρχικοποίηση του Bonobo"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Μη υποστηριζόμενο σχήμα"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Δεν ήταν δυνατή η ανάλυση του μηνύματος MIME. Προβολή ως πηγή."
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Μετακίνηση μηνυμάτων"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Από"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Απάντηση Σε"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Προς"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Αντίγραφο:"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Ιδιαίτερη Κοινοποίηση"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "Πρόγραμμα αλληλογραφίας"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Ημερομηνία"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr " %s επισύναψη"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Δεν ήταν δυνατή η ανάλυση του μηνύματος MIME. Προβολή ως πηγή."
+msgid "Session not initialised"
+msgstr "Δεν ήταν δυνατή η αρχικοποίηση του Bonobo"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+"Αυτό το μήνυμα είναι ψηφιακά υπογεγραμμένο και βρέθηκε να είναι αυθεντικό."
+
+#: mail/em-format.c:1212
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"Αυτό το μήνυμα είναι ψηφιακά υπογεγραμμένο και δεν βρέθηκε να είναι "
+"αυθεντικό."
+
+#: mail/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
 
-#: mail/em-popup.c:593
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Αναμονή..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Pinging %s"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Αποτυχία cache %s: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Δεν ήταν δυνατή η δημιουργία σωλήνωσης σε  '%s': %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Δεν ήταν δυνατή η δημιουργία σωλήνωσης σε  '%s': %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Αποθήκευση Ως..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Απάντηση στον Αποστολέα"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Άνοιγμα Συνδέσμου στον Περιηγητή"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Αποστολή _μηνύματος στη λίστα..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Προσθήκη Αποστολέα στο Βιβλίο Διευθύνσεων"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Άνοιγμα με %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "Αυτός ο διακομιστής δεν υποστηρίζει σχήμα πληροφοριών LDAPv3"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Συνδρομή"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Φάκελος"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Παρακαλώ επιλέξτε διακομιστή."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Δεν έχει επιλεγεί διακομιστής"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Να μην ξαναεμφανιστεί αυτό το μήνυμα"
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12058,27 +12737,27 @@ msgstr ""
 "Σφάλμα κατά το φόρτωμα των πληροφοριών:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Φίλτρα"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Προωθημένο Μήνυμα"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "ένας άγνωστος αποστολέας"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Στις %d/%b/%Y, ημέρα %A και ώρα %H:%M, ο/η %%s έγραψε:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12087,7 +12766,7 @@ msgstr ""
 "Αδυναμία αποθήκευσης σε `%s'\n"
 " %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12096,25 +12775,26 @@ msgstr ""
 "Το %s υπάρχει ήδη.\n"
 "Θέλετε να αντικατασταθεί;"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Μήνυμα"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Αποθήκευση Μηνύματος Ως..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Δεν είναι δυνατή η δημιουργία του προσωρινού καταλόγου: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Διεύθυνση:"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12124,106 +12804,398 @@ msgstr ""
 "\n"
 "Είστε βέβαιοι για την διαγραφή των μηνυμάτων;"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Προτιμήσεις Επεξεργαστή"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/em-utils.c:2288
+#, fuzzy
 msgid ""
-"Configure mail preferences, including security and message display, here"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
 msgstr ""
-"Ρύθμιστε εδώ τις προτιμήσεις αλληλογραφίας, συμπεριλαμβανομένης της "
-"ασφάλειας και της προβολής μηνυμάτων"
+"Με αυτή την λειτουργία θα διαγράψετε μόνιμα όλα τα μηνύματα που έχετε "
+"σημειώσει ως διαγραμμένα,\n"
+"και δεν θα μπορέσετε να τα ανακτήσετε.\n"
+"\n"
+"Είστε βέβαιοι για την διαγραφή των μηνυμάτων;"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/evolution-mail.schemas.in.in.h:1
+msgid "Automatic link recognition"
 msgstr ""
-"Ρύθμιστε εδώ τον έλεγχο ορθογραφίας, υπογραφές και τον επεξεργαστή μηνυμάτων"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Ρυθμίστε εδώ τους λογαριασμούς αλληλογραφίας σας"
+#: mail/evolution-mail.schemas.in.in.h:2
+msgid "Automatic smiley recognition"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:6
+msgid "Default charset in which to compose messages"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:7
+msgid "Default charset in which to compose messages."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Επεξεργαστής Λογαριασμού Evolution"
+msgid "Default charset in which to display messages"
+msgstr "Εύρεση κειμένου στο σώμα του μηνύματος που φαίνεται"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
-msgid "Evolution Mail component"
-msgstr "Επεξεργαστής μηνυμάτων του Evolution."
+msgid "Default charset in which to display messages."
+msgstr "Εύρεση κειμένου στο σώμα του μηνύματος που φαίνεται"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Επεξεργαστής μηνυμάτων του Evolution."
+msgid "Default forward style"
+msgstr " Στυλ προώ_θησης:"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Επεξεργαστής μηνυμάτων του Evolution."
+msgid "Default reply style"
+msgstr "Στυλ α_πάντησης:"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
 #, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Συστατικό για την προβολή φακέλου μηνυμάτων του Evolution."
+msgid "Empty Trash folders on exit"
+msgstr "Άδειασμα των φακέλων απορριμμά_των στην έξοδο"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Στοιχείο εκτελεστικής σύνοψης μηνυμάτων."
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Άδειασμα των φακέλων απορριμμά_των στην έξοδο"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "Λογαριασμοί αλληλογραφίας"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "Προτιμήσεις Αλληλογραφίας"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
 
-#: mail/importers/elm-importer.c:105
-msgid "Evolution is importing your old Elm mail"
-msgstr "Evolution εισάγει τα παλαιά σας Elm μηνύματα"
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
-msgid "Importing..."
-msgstr "Γίνεται εισαγωγή..."
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
-msgid "Please wait"
-msgstr "Παρακαλώ περιμένετε"
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Εισάγεται %s ως %s"
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
 
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Γίνεται σάρωση του %s"
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "Εκτέλεση ενεργειών"
 
-#: mail/importers/elm-importer.c:547
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Ειδοποίηση Νέου Μηνύματος"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Ειδοποίηση Νέου Μηνύματος"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
-"Το Evolution βρήκε μηνύματα Elm\n"
-"Θέλετε να γίνει εισαγωγή στο Evolution;"
 
-#: mail/importers/elm-importer.c:568
-msgid "Elm"
-msgstr "Elm"
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr "Ερώ_τηση στην αποστολή μηνυμάτων HTML σε επαφές που δεν το θέλουν"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr ""
+"Ερώτηση στην αποστολή μηνυμάτων όπου έχουν οριστεί μόνο παραλήπτες στην "
+"κρυφή _κοινοποίηση (Bcc)"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "Να αποσταλεί το μήνυμα HTML;"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "Να αποσταλεί το μήνυμα HTML;"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "Εμφάνι_ση κινούμενων εικόνων"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "Εμφάνι_ση κινούμενων εικόνων"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Εμφάνιση μηνύματος σε κανονική μορφή"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "_Οθόνη Προεπισκόπησης"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "Ανα_παραγωγή ήχου κατά την άφιξη νέου μηνύματος"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "Έλεγχος Ορ_θογραφίας"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "Αρχική Επαφή:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "Επιλογή γραμματοσειράς HTML μεταβλητού πλάτους για εκτύπωση"
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Λίστα μηνυμάτων κατά θέμα"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Λίστα μηνυμάτων κατά θέμα"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "Αυτός είναι ο _εξ ορισμού λογαριασμός"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "Μετ_αβλητού πλάτους:"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 #, fuzzy
@@ -12257,6 +13229,44 @@ msgstr "Outlook Express 4 (.mbx)"
 msgid "Evolution Pine importer"
 msgstr "Επεξεργαστής μηνυμάτων του Evolution."
 
+#: mail/importers/elm-importer.c:105
+msgid "Evolution is importing your old Elm mail"
+msgstr "Evolution εισάγει τα παλαιά σας Elm μηνύματα"
+
+#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
+#: mail/importers/pine-importer.c:115
+msgid "Importing..."
+msgstr "Γίνεται εισαγωγή..."
+
+#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
+#: mail/importers/pine-importer.c:117
+msgid "Please wait"
+msgstr "Παρακαλώ περιμένετε"
+
+#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
+#: mail/importers/pine-importer.c:288
+#, c-format
+msgid "Importing %s as %s"
+msgstr "Εισάγεται %s ως %s"
+
+#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
+#: mail/importers/pine-importer.c:425
+#, c-format
+msgid "Scanning %s"
+msgstr "Γίνεται σάρωση του %s"
+
+#: mail/importers/elm-importer.c:547
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Το Evolution βρήκε μηνύματα Elm\n"
+"Θέλετε να γίνει εισαγωγή στο Evolution;"
+
+#: mail/importers/elm-importer.c:568
+msgid "Elm"
+msgstr "Elm"
+
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -12314,12 +13324,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Το Evolution εισάγει τα παλαιά σας δεδομένα Netscape"
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Απορρίμματα"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Ανάγνωση νέων μηνυμάτων"
@@ -12328,7 +13332,7 @@ msgstr "Ανάγνωση νέων μηνυμάτων"
 msgid "Scanning directory"
 msgstr "Σαρώνεται ο κατάλογος"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Εκκίνηση εισαγωγής"
 
@@ -12403,23 +13407,23 @@ msgid "You have not filled in all of the required information."
 msgstr "Δεν έχετε συμπληρώσει όλα τις απαιτούμενες πληροφορίες."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Επεξεργαστής Λογαριασμού Evolution"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Σύστημα:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "_Όνομα Χρήστη:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Θέση:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Δεν επιτρέπεται να δημιουργήσετε δύο λογαριασμούς με το ίδιο όνομα."
 
@@ -12428,35 +13432,35 @@ msgstr "Δεν επιτρέπεται να δημιουργήσετε δύο λ�
 msgid "Mail to %s"
 msgstr "Μήνυμα σε %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Το θέμα είναι %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Μήνυμα από τον/την %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s λίστα ταχυδρομείου"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Απαντημένα στους"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Προσθήκη Κανόνα Φίλτρου"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "Οι ακόλουθοι κανόνες φίλτρων:\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12467,143 +13471,30 @@ msgstr ""
 "    '%s'\n"
 "Και έχει ανανεωθεί."
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "Σύνδεση..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Αυτός ο φάκελος δεν μπορεί να περιέχει μηνύματα."
-
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Δεν ήταν δυνατό το άνοιγμα κοινόχρηστου φακέλου : %s"
-
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Δεν είναι δυνατή η δημιουργία του προσωρινού καταλόγου: %s"
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Νέο Μήνυμα Ταχυδρομείου"
 
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Δεν είναι δυνατή η δημιουργία προσωρινού αρχείου '%s': %s"
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "_Αποστολή Μηνύματος"
 
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Δεν ήταν δυνατό το κλείσιμο του προσωρινού φακέλου:%s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "Συγγραφή νέου μηνύματος"
 
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Επιλέξτε έναν φάκελο προορισμού για την εισαγωγή αυτών των δεδομένων"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Επιλέξτε έναν φάκελο προορισμού για την εισαγωγή αυτών των δεδομένων"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Δημιουργία νέου φακέλου"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Ορίστε που θα δημιουργηθεί ο φάκελος:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου `%s': %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Αλήθεια να γίνει διαγραφή του φακέλου \"%s\"?"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Διαγραφή \"%s\""
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Μετονομασία φακέλου \"%s\" σε:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-msgid "Rename Folder"
-msgstr "Μετονομασία Φακέλου"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Το συγκεκριμένο όνομα φακέλου δεν είναι έγκυρο: %s"
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Ιδιότητες Γραμματοσειράς"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Ιδιότητες"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "Όνομα _Φακέλου:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Προβολή"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Άνοιγμα σε Νέο Παράθυρο"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Μετακίνηση"
-
-#: mail/mail-component.c:2087
-msgid "_New Folder..."
-msgstr "_Νέος Φάκελος..."
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "_Μετονομασία"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Ιδιότητες..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Ταυτότητα"
 
@@ -12668,11 +13559,11 @@ msgstr ""
 "ταχυδρομείου Evolution. Παρακαλώ εισάγετε ένα όνομα στο παρακάτω κενό.Το "
 "όνομα είναι μόνο για να προβάλει τον λογαριασμό."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Γίνεται Έλεγχος Υπηρεσίας"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Σύνδεση στον διακομιστή..."
 
@@ -12760,26 +13651,35 @@ msgid "C_olors"
 msgstr "Χ_ρώματα"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Έλεγχος για Νέα Μηνύματα"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "Έλεγχος αλληλογραφίας κατά την πληκ_τρολόγηση"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Έλεγχος για Νέα Μηνύματα"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "Χρώμα για ανορ_θόγραφες λέξεις:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Συγγραφή μηνυμάτων"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Ρυθμίσεις"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -12796,277 +13696,282 @@ msgstr ""
 "\n"
 "Επιλέξτε \"Τερματισμός\" για να αποθηκεύσετε τις ρυθμίσεις σας."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "Εξ ορισμού"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Εξ ορισμού Συμπεριφορά"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "Εξ ορισμού κω_δικοποίηση χαρακτήρων: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Διαγραφή Αλληλογραφίας"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Να _υπογράφονται πάντα τα μηνύματα στην χρήση αυτού του λογαριασμού"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "Να μην γίνεται παράθεση αρχικού μηνύματος"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 "Να μην υπογράφονται αιτήσεις _συναντήσεων (για συμβατότητα με το Outlook)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Τέλος"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "_Φάκελος προχείρων:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "_Ενεργοποίηση"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "Λογαριασμοί Email"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "Διεύ_θυνση Email:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "Άδειασμα των φακέλων απορριμμά_των στην έξοδο"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Πιστοποίηση Ταυτότητας:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Βοηθός Λογαριασμού Evolution"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Εκτέλεση εντολής..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "Στα_θερού_πλάτους:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "Φίλτρα"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "Ιδιότητες Γραμματοσειράς"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "Μορφοποίηση μυνημάτων σε _HTML"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "Επισήμανση παρα_θέσεων με"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Μέσα στο μήνυμα"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Ετικέτες και Χρώματα"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Φόρτωση Εικόνων"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Ρυθμίσεις Ταχυδρομείου"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Θέση Mailbox"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Επεξεργαστής Μηνύματος"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Προβολή Μηνύματος"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Fonts"
 msgstr "Μήνυμα περιέχει"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Ειδοποίηση Νέου Μηνύματος"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Σημείωση: θα σας γίνει ερώτηση για κωδικό μέχρι να συνδεθείτε για πρώτη φορά"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Προαιρετικές Πληροφορίες"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "Ορ_γανισμός:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Διαλέξτε χρώμα"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Ερώτηση στην αποστολή μηνυμάτων όπου έχουν οριστεί μόνο παραλήπτες στην "
 "κρυφή _κοινοποίηση (Bcc)"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Εκτυπωμένες γραμματοσειρές"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "Παράθεση αρχικού μηνύματος"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Με παράθεση"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "_Απομνημόνευση αυτού του κωδικού πρόσβασης"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "Α_πάντηση Σε:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Γίνεται Λήψη Μηνύματος"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "Επιλ_ογές Λήψης"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "Απομνημόνευση αυτού του κωδικού _πρόσβασης"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Απαιτούμενες Πληροφορίες"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "Επαναφορά Εξ' ορισμού"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "Ασφάλ_εια"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "Ασφαλές MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr "Επιλογή γραμματοσειράς HTML σταθερού πλάτους "
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr "Επιλογή γραμματοσειράς HTML σταθερού πλάτους για εκτύπωση"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr "Επιλογή γραμματοσειράς HTML μεταβλητού πλάτους "
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr "Επιλογή γραμματοσειράς HTML μεταβλητού πλάτους για εκτύπωση"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Αποστέλλονται τα μηνύματα"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Φάκελος _απεσταλμένων μηνυμάτων:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Απεσταλμένα και Πρόχειρα Μηνύματα"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Ο _διακομιστής απαιτεί πιστοποίηση"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Ρυθμίσεις Διακομιστή"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Είδος _Διακομιστή: "
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Αυτο-υπογεγραμμένο πιστοποιητικό στην αλυσίδα"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "Ορισμός όνοματος αρ_χείου:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "Έλεγχος Ορ_θογραφίας"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Standard Unix mbox"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13076,7 +13981,7 @@ msgstr ""
 "η υπογραφή σας. Το όνομα που θα καθορίσετε θα χρησιμοποιηθεί\n"
 "μόνο για την εμφάνιση."
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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 "
@@ -13086,7 +13991,7 @@ msgstr ""
 "ελέγχου και της γλώσσας. Η λίστα των γλωσσών εδώ αντικατοπτρίζει μόνο τις "
 "γλώσσες για τις οποίες έχετε εγκαταστήσει το αντίστοιχο λεξικό."
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13094,11 +13999,15 @@ msgstr ""
 "Πληκτρολογήστε το όνομα με το οποίο θα αναφέρεστε για τον λογαριασμό.\n"
 "Για παράδειγμα: \"Work\" or \"Personal\" "
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "Μετ_αβλητού πλάτους:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -13109,172 +14018,181 @@ msgstr ""
 "\n"
 "Επιλέξτε \"Επόμενο\" για να συνεχίσετε. "
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "_Προσθήκη Υπογραφής"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "Να γίνεται _πάντα φόρτωμα των εικόνων από το δικτύου"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Να _υπογράφονται πάντα τα μηνύματα στην χρήση αυτού του λογαριασμού"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "Τύπος _Πιστοποίησης: "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "Τύπος _πιστοποίησης: "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "_Αυτόματος έλεγχος για νέα μηνύματα"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "_Αυτόματη εισαγωγή εικονιδίων φατσούλας"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "_Ήχος κατά την άφιξη νέου μηνύματος"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "Επι_βεβαίωση στην εξάλειψη από έναν φάκελο"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "_Εξ ορισμού υπογραφή:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "_Εξ ορισμού"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Να μην ειδοποιούμαι για νέα μηνύματα"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "_Ενεργοποίηση"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr " Στυλ προώ_θησης:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "Π_λήρες όνομα:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "Αλληλογραφία _HTML"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "Τα_υτότητα"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Ιούνιος"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "_Φόρτωση εικόνων αν ο αποστολέας υπάρχει στο βιβλίο διευθύνσεων"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "Αυτός είναι ο _εξ ορισμού λογαριασμός"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "_Σήμανση μηνυμάτων ως αναγνωσμένα μετά από"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Όνομα:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "_Να μην φορτώνονται ποτέ εικόνες από το δίκτυο"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "Ανα_παραγωγή ήχου κατά την άφιξη νέου μηνύματος"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Ερώ_τηση στην αποστολή μηνυμάτων HTML σε επαφές που δεν το θέλουν"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Ε_ρώτηση στην αποστολή μηνυμάτων με άδειο θέμα"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "_Λήψη Μηνυμάτων"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "Στυλ α_πάντησης:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "_Επαναφορά Εξ ορισμού"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Δέσμη ενεργειών"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Διαγραφή..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "Απο_στολή Αλληλογραφίας"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "Εμφάνι_ση κινούμενων εικόνων"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Υπογραφές"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Standard Font:"
 msgstr "Άγιος Μαρίνος"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Terminal Font:"
 msgstr "Αρχική Επαφή:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "_Χρήση ασφαλούς σύνδεσης (SSL):"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "Περιγραφή"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13283,7 +14201,7 @@ msgstr ""
 "Σφάλμα κατά '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13292,7 +14210,7 @@ msgstr ""
 "Σφάλμα κατά την εκτέλεση της λειτουργίας:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Εργάζεται"
 
@@ -13304,118 +14222,118 @@ msgstr "Φιλτράρισμα Φακέλου"
 msgid "Fetching Mail"
 msgstr "Λήψη Μηνύματος"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Δεν ήταν δυνατή η αποθήκευση του προσωρινού αρχείο μηνυμάτων %s: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Δεν ήταν δυνατή η αποθήκευση του προσωρινού αρχείο μηνυμάτων %s: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Αποστέλλεται \"%s\""
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Αποστολή μηνύματος %d από %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Αποτυχία στο μήνυμα %d από %d"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Ολοκληρώθηκε."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Αποθήκευση μηνύματος στον φάκελο"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Μετακίνηση μηνυμάτων στο %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Αντιγραφή μηνυμάτων στο %s"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Σάρωση φακέλων στο \"%s\""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Προωθημένα μηνύματα"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Άνοιγμα φακέλου %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "Άνοιγμα αποθήκης %s"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Αφαιρείται ο φακέλος %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Αποθηκεύεται ο φακέλος '%s'"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Ανανεώνεται ο φακέλος"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Εξαλείφεται ο φακέλος"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Εισάγεται ως %s"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Τοπικοί Φάκελοι"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Παραλαμβάνεται το μήνυμα %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Παραλαμβάνονται %d μήνυμα(τα)"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Αποθήκευση %d μηνυμάτων"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13424,7 +14342,7 @@ msgstr ""
 "Δεν είναι δυνατή η δημιουργία του αρχείου εξόδου: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13433,11 +14351,11 @@ msgstr ""
 "Σφάλμα κατά την αποθήκευση μηνυμάτων στο %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Αποθήκευση συννημένου"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13446,21 +14364,25 @@ msgstr ""
 "Δεν είναι δυνατή η δημιουργία αρχείου εξόδου: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Δεν ήταν δυνατή η εγγραφή δεδομένων:%s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Αποσύνδεση από το %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Επανασύνδεση στο %s"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Διάκριση πεζών κεφαλαίων"
@@ -13478,60 +14400,75 @@ msgstr "Εύρεση:"
 msgid "Search"
 msgstr "Ανα_ζήτηση"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Επεξεργασία υπογραφής"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Εξαιρέσεις"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Πληροφορίες Λογαριασμού"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Γίνεται Ακύρωση..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Διακομιστής: %s, Είδος: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Θέση: %s, Τύπος: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Τύπος: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Αποστολή & Λήψη Μηνυμάτων"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Ακύρωση Όλων"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Ανανέωση..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Αναμονή..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Ο χρήστης ακύρωσε την λειτουργία."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Εισάγετε κωδικό πρόσβασης για %s"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Εισάγετε κωδικό πρόσβασης"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "_Απομνημόνευση αυτού του κωδικού"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 "Απο_μνημόνευση αυτού του κωδικού πρόσβασης για το υπόλοιπο της συνεδρίας"
@@ -13571,26 +14508,31 @@ msgstr "Εισάγετε ένα όνομα για αυτήν την υπογρα
 msgid "Name:"
 msgstr "Όνομα:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Προωθημένο μήνυμα - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Προωθημένο μήνυμα"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Άνοιγμα φακέλου %s"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Ρύθμιση εφακέλου: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Αναβάθμιση εφακέλων για το uri: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13603,88 +14545,88 @@ msgstr ""
 "    '%s'\n"
 "Και έχει ανανεωθεί."
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "ΕΦάκελοι"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "εΦάκελοι"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Επεξεργασία ΕΦακέλου"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Προσπάθεια επεξεργασίας εφακέλου '%s' που δεν υπάρχει."
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Νέος ΕΦάκελος"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Απαντημένα"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Πολλαπλά Μηνύματα"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Χαμηλότερα"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Χαμηλά"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Υψηλά"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Υψηλότερα"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Σήμερα %l:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Χθες %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%l:%M %p %a"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Δημιουργία λίστας μηνυμάτων"
 
@@ -13740,11 +14682,11 @@ msgstr "Προώθηση"
 msgid "No Response Necessary"
 msgstr "Δεν είναι απαραίτητη απάντηση"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Απάντηση"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Απάντηση σε Όλους"
 
@@ -13797,41 +14739,139 @@ msgstr "_Συνδρομή"
 msgid "_Unsubscribe"
 msgstr "_Κατάργηση Συνδρομής"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Κέλυφος Evolution."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Ρυθμίσεις φακέλων"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "80%"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Μετονομασία ομάδας συντομεύσεων"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Εναλλαγή της εμφάνισης της γραμμής συντομεύσεων"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Απόκρυψη γραμμής συντομεύσεων"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Εξ ορισμού Προτεραιότητα"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Εξ ορισμού Προτεραιότητα"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Διεπαφή ρυθμίσεων Μηνυμάτων"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
 msgstr ""
-"Αδύνατη η μεταφορά του φακέλου:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Προσθήκη ενός φακέλου"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Πρόχειρα"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Εισερχόμενα"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Εξερχόμενα"
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "Άνοιγμα φακέλου εξ ορισμού εργασιών"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Άνοιγμα φακέλου εξ ορισμού εργασιών"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Άνοιγμα φακέλου εξ ορισμού εργασιών"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Άνοιγμα φακέλου εξ ορισμού εργασιών"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Απεσταλμένα"
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Εναλλαγή της εμφάνισης της γραμμής συντομεύσεων"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Εναλλαγή της εμφάνισης της γραμμής συντομεύσεων"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "Email"
 
-#: shell/e-setup.c:145
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Δεν είναι δυνατή η σωστή ενημέρωση των αρχείων"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13842,7 +14882,7 @@ msgstr ""
 "%s\n"
 "Σφάλμα: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13851,7 +14891,7 @@ msgstr ""
 "Συνέβη ένα σφάλμα κατά την αντιγραφεί αρχείων στο\n"
 "`%s'."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13862,7 +14902,7 @@ msgstr ""
 "Παρακαλώ να το μεταφέρετε για να συνεχιστεί\n"
 "η εγκατάσταση των αρχείων χρήστη του Evolution."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13961,10 +15001,11 @@ msgstr ""
 "Δεν ήταν δυνατή η μετονομασία του φακέλου :\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+msgid "The specified folder name is not valid: %s"
+msgstr "Το συγκεκριμένο όνομα φακέλου δεν είναι έγκυρο: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -13988,19 +15029,15 @@ msgstr ""
 "Δεν ήταν δυνατή η δημιουργία του συγκεκριμένου φακέλου:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Δημιουργία Νέου Φακέλου.."
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Χωρίς Τίτλο)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Επιλέξτε τον τύπο του εισαγωγέα που θα εκτελεστεί: "
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -14014,11 +15051,11 @@ msgstr ""
 "Μπορείτε να επιλέξτε \"Αυτόματη\" αν δεν ξέρετε, και το Evolution θα "
 "δοκιμάσει να βρει την λίστα."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Παρακαλώ επιλέξτε την πληροφορία που θέλετε να εισάγετε:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -14026,7 +15063,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14035,21 +15072,21 @@ msgstr ""
 "Εισάγεται το %s\n"
 "Εισάγεται το στοιχείο%d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "Επιλογή εισαγωγής"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "Το αρχείο %s δεν υπάρχει"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Σφάλμα Evolution"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -14058,11 +15095,11 @@ msgstr ""
 "Δεν υπάρχει εισαγωγέας που να μπορεί να χειριστεί το\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Εισάγεται"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -14071,17 +15108,17 @@ msgstr ""
 "Εισάγεται το %s.\n"
 "Ξεκίνα το %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Σφάλμα κατά την εκκίνηση του %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Σφάλμα κατά το φόρτωμα του %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14090,35 +15127,35 @@ msgstr ""
 "Εισάγεται το %s\n"
 "Εισάγεται το στοιχείο 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Αυτόματη"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Όνομα Αρχείου:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Επιλέξτε ένα αρχείο"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Τύπος αρχείου:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Εισαγωγή δεδομένων και ρυθμίσεις από παλαιότερα προγράμματα"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Εισαγωγή μοναδικού αρχείου"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -14126,47 +15163,28 @@ msgstr ""
 "Παρακαλώ περιμένετε...\n"
 "Γίνεται σάρωση για υπάρχουσες εγκαταστάσεις"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Εκκίνηση των Έξυπνων Εισαγωγέων"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "Από %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Επιλέξτε έναν φάκελο προορισμού για την εισαγωγή αυτών των δεδομένων"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Εισαγωγή"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Κλείσιμο συνδέσεων..."
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Σφάλμα συγχρονισμού \"%s\":\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "Συγχρονισμός φακέλου"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Συγχρονισμός \"%s\" (%d από %d) ..."
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Ρυθμίσεις Evolution "
@@ -14201,7 +15219,7 @@ msgstr "Δεν ήταν δυνατό το άνοιγμα κοινόχρηστο�
 msgid "Cannot find the specified shared folder."
 msgstr "Δεν ήταν δυνατή η εύρεση του συγκεκριμένου κοινόχρηστου φακέλου."
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14210,17 +15228,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Βοηθός"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Νέο"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Δεν έχει οριστεί όνομα φακέλου."
@@ -14282,64 +15294,51 @@ msgstr "Δημιουργία νέας συντόμευσης"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Επιλέξτε τον φάκελο που θα συνδεθεί με την συντόμευση:"
 
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "Εργασία εν_τός Δικτύου"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "Εργασία εκ_τός Δικτύου"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Χρήση Χωρίς Σύνδεση"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Δεν εμφανίζεται φάκελος)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Κενό)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Το Ximian Evolution είναι συνδεμένο στο δίκτυο. Κάντε κλικ στο πλήκτρο για "
 "να αποσυνδεθείτε."
 
-#: shell/e-shell-view.c:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Το Ximian Evolution είναι στην διαδικασία αποσύνδεσης από το δίκτυο."
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Το Ximian Evolution είναι εκτός δικτύου. Κάντε κλικ στο πλήκτρο για να "
 "συνδεθείτε."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Μη έγκυρη παράμετρος"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Δεν ήταν δυνατή η εγγραφή στο OAF"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Δεν βρέθηκε η βάση δεδομένων ρυθμίσεων"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Γενικό σφάλμα"
 
@@ -14456,76 +15455,18 @@ msgstr "_Αφαίρεση"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Αφαίρεση αυτής της συντόμευσης από την γραμμή συντομεύσεων"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Σφάλμα κατά την αποθήκευση των συντομεύσεων."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Εισερχόμενα"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Συντομεύσεις"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Χωρίς σφάλμα"
-
-#: shell/e-storage.c:573
-msgid "A folder with the same name already exists"
-msgstr "Υπάρχει ήδη φάκελος με αυτό το όνομα"
-
-#: shell/e-storage.c:575
-msgid "The specified folder type is not valid"
-msgstr "Ο καθορισμένος τύπος φακέλου δεν είναι έγκυρος"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "Σφάλμα Ι/Ο"
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr "Δεν υπάρχει αρκετός χώρος για την δημιουργία του φακέλου"
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr "Ο φάκελος δεν είναι άδειος"
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "Ο καθορισμένος φάκελος δεν βρέθηκε"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr " Η λειτουργία αύτη δεν έχει ενσωματωθεί σε αυτή την αποθήκη"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "Η λειτουργία δεν υποστηρίζεται"
-
-#: shell/e-storage.c:591
-msgid "The specified type is not supported in this storage"
-msgstr ""
-"Δεν υπάρχει υποστηρίξει για τον συγκεκριμένο τύπο σε αυτή τη αποθήκευση"
-
-#: shell/e-storage.c:593
-msgid "The specified folder cannot be modified or removed"
-msgstr ""
-"Δεν είναι δυνατό να μετονομαστεί η να μετακινηθεί ο συγκεκριμένος φάκελος "
-
-#: shell/e-storage.c:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr ""
-
-#: shell/e-storage.c:597
-msgid "Cannot create a folder with that name"
-msgstr "Δεν ήταν δυνατή η δημιουργία φακέλου με αυτό το όνομα"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr ""
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Checkbox"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14536,6 +15477,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% έχει ολοκληρωθεί)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Νέο"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "\"%s\" σε  \"%s\""
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14573,74 +15525,6 @@ msgstr ""
 "Το σφάλμα από το σύστημα ενεργοποίησης είναι:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "Σφάλμα CORBA"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Έγινε Διακοπή"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Μη έγκυρη παράμετρος"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Έχει ήδη ιδιοκτήτη"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Χωρίς ιδιοκτήτη"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Δεν βρέθηκε"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Ο τύπος δεν υποστηρίζεται"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Μη υποστηριζόμενο σχήμα"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Η λειτουργία δεν υποστηρίζεται"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Εσωτερικό σφάλμα"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Τερματίζει"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "Μη έγκυρο URI"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Έχει υποφακέλους"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Δεν έχει μείνει ελεύθερος χώρος"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "Ο παλαιός ιδιοκτήτης έχει πεθάνει"
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Τύπος δοκιμής:"
-
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr "Στοιχείο δοκιμής του Evolution."
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr "Ενεργές Συνδέσεις"
@@ -14671,10 +15555,6 @@ msgstr "_Ταχυδρομείο:"
 msgid "_Tasks:"
 msgstr "Ερ_γασίες:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr "_Όνομα φακέλου:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder _type:"
 msgstr "_Τύπος φακέλου:"
@@ -14739,23 +15619,6 @@ msgstr ""
 "\n"
 "Επιλέξτε \"Τερματισμός\" για να αποθηκεύσετε τις ρυθμίσεις. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Κέλυφος Evolution."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Ρυθμίσεις φακέλων"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -14796,7 +15659,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Εισαγωγείς"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Εισαγωγή"
 
@@ -14813,16 +15676,16 @@ msgid "Evolution can import data from the following files:"
 msgstr ""
 "Δεν ήταν δυνατό για το Evolution να εισάγει δεδομένα από τα παρακάτω αρχεία:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Το Evolution τώρα τερματίζεται..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14842,7 +15705,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -14850,69 +15713,110 @@ msgstr ""
 "Ευχαριστούμε\n"
 "Η ομάδα του Ximian Evolution\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr "Να μην ξαναγίνει η ερώτηση"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Δεν ήταν δυνατή η πρόσβαση στο περιβάλλον του Ximian Evolution."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr ""
 "Δεν ήταν δυνατή η αρχικοποίηση του περιβάλλοντος του Ximian Evolution: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Εκκίνηση σε λειτουργία χωρίς σύνδεση"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Εκκίνηση σε λειτουργία με σύνδεση"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 "Αποστολή όλων των εντοπισμένων σφαλμάτων από όλα τα συστατικά σε αρχείο."
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Επιλογή εισαγωγής"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Πιστοποίηση Ταυτότητας:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "Πρόοδος"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Έκφραση"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Συγχώνευση Διεύθυνσης E-mail"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"Το πιστοποιητικό έχει λήξει: %s\n"
+"Εκδότης: %s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14968,91 +15872,376 @@ msgid "Backup All"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "_Πιστοποίηση Ταυτότητας:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Μη έμπιστο πιστοποιητικό"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "_Πιστοποίηση Ταυτότητας:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Κοινό Όνομα"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "_Πιστοποίηση Ταυτότητας:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "_Επεξεργασία"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Αποτυχία κατά την επαλήθευση των πιστοποιητικών."
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Έκφραση"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Οργανισμός"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Μονάδα Οργανισμού"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Προβολή"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "_Πιστοποίηση Ταυτότητας:"
+
+#: smime/gui/smime-ui.glade.h:42
+#, fuzzy
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr "Μή έγκυρη Αρχή Πιστοποίησης (CA)"
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "_Πιστοποίηση Ταυτότητας:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Εισαγωγή"
+msgid "Certificate already exists"
+msgstr "Το αναγνωριστικό κάρτας υπάρχει ήδη"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Βερμόντ"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Βερμόντ"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Βερμόντ"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Βερμόντ"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "Β"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "ΟΚ"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "Β"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "_Πιστοποίηση Ταυτότητας:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "_Πιστοποίηση Ταυτότητας:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "Μη έμπιστο πιστοποιητικό"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "ID"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Το θέμα είναι %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Αδυναμία ανάλυσης φακέλου spool"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "Μή έγκυρη Αρχή Πιστοποίησης (CA)"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Μή έγκυρη Αρχή Πιστοποίησης (CA)"
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Ξεκινά:"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Χωρίς Πληροφόρηση"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "συννημένο"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "_Πιστοποίηση Ταυτότητας:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Κουριτίμπα"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "Βόρεια Καρολίνα"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Έκφραση"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s στις %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Αποτυχία υπογραφής πιστοποιητικού"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "_Εισαγωγή"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Το θέμα είναι %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Αποτυχία υπογραφής πιστοποιητικού"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Εισάγετε κωδικό πρόσβασης για %s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "_Πιστοποίηση Ταυτότητας:"
 
 #: tools/evolution-launch-composer.c:324
 #, fuzzy
@@ -15105,7 +16294,7 @@ msgstr "Αντιγραφή της επιλογής"
 msgid "Copy to Folder..."
 msgstr "Αντιγραφή σε Φάκελο..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Αποκοπή της επιλογής"
 
@@ -15121,7 +16310,7 @@ msgstr "Μετακίνηση επαφών σε άλλο φάκελο..."
 msgid "Move to Folder..."
 msgstr "Μετακίνηση στο Φάκελο..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Επικόλληση του προχείρου"
 
@@ -15129,8 +16318,8 @@ msgstr "Επικόλληση του προχείρου"
 msgid "Previews the contacts to be printed"
 msgstr "Προεπισκόπηση των επαφών προς εκτύπωση"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "_Προεπισκόπηση Εκτύπωσης"
@@ -15175,13 +16364,13 @@ msgstr "Τερματισμός Φόρτωσης"
 msgid "View the current contact"
 msgstr "Προβολή της τρέχουσας επαφής"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "Ε_νέργειες"
 
@@ -15211,145 +16400,113 @@ msgstr "Απο_στολή Μηνύματος σε Επαφή..."
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "Δημιουργία ένος νέου all-day ραντεβού"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Δημιουργία νέου ραντεβού"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "Δημιουργία νέου φακέλου"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Δημιουργία νέας αίτησης συνάντησης"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Δημιουργία νέας εργασίας"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Ημέρα"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 #, fuzzy
 msgid "Delete All Occurrences"
 msgstr "Διαγραφή Ό_λων των Εμφανίσεων"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Διαγραφή του ραντεβού"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "Διαγραφή αυτής της _Εμφάνισης"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "Διαγραφή αυτής της _Εμφάνισης"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Μετάβαση Στο"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Μετάβαση Πίσω"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Μετάβαση Μπροστά"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Μετάβαση σε _Ημερομηνία"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Μετάβαση σε συγκεκριμένη ημερομηνία"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Μετάβαση στο σήμερα"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "Λίστα"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Μήνας"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Νέο _Ραντεβού"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Νέα Καληδονία"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Νέα Συνάντηση"
-
-#: ui/evolution-calendar.xml.h:27
-#, fuzzy
-msgid "New _Task"
-msgstr "Νέα Εργασία"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Προεπισκόπηση του ημερολογίου προς εκτύπωση"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Εκτύπωση αυτού του ημερολογίου"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Δημοσίευση πληροφοριών Διαθεσιμότητας για αυτό το ημερολόγιο"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Μπούρζ"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Δημόσιος φάκελος που περιέχει ραντεβού και γεγονότα"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Εμφάνιση Λεπτομερειών"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Εμφάνιση μίας ημέρας"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Εμφάνιση ένας μήνα"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Εμφάνιση μίας εβδομάδας"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Εμφάνιση της εργάσιμης εβδομάδας"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Εβδομάδα"
 
@@ -15414,7 +16571,7 @@ msgstr "Αποθήκευσης αυτού του στοιχείου στον δ�
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Αρχείο"
 
@@ -15638,7 +16795,7 @@ msgstr "Σήμανση Ό_λων ως Αναγνωσμένα"
 msgid "Mark all visible messages as read"
 msgstr "Σήμανση όλων των εμφανών μηνυμάτων ως αναγνωσμένα"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "Επικόλληση μηνύματος από το πρόχειρο"
 
@@ -15695,16 +16852,6 @@ msgstr "Αντιστρο_φή Επιλογής"
 msgid "_Threaded Message List"
 msgstr "Λίστα Μηνυμάτων κατά _Θέμα"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Κλείσιμο του παραθύρου"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "_Κλείσιμο"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "Προσ_θήκη Αποστολέα στο Βιβλίο Διευθύνσεων"
@@ -15866,260 +17013,285 @@ msgstr "Προώθηση του επιλεγμένου μηνύματος σε �
 msgid "Increase the text size"
 msgstr "Μεγέθυνση του κειμένου"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Φόρτωση _Εικόνων"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Σήμανση ως _Σημαντικό"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Σήμανση ως _Μη Αναγνωσμένα"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Σήμανση ως Ασ_ήμαντο"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "Σήμανση των επιλεγμένων μηνυμάτων ως αναγνωσμένα"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "Σήμανση των επιλεγμένων μηνυμάτων ως σημαντικά"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Σήμανση των επιλεγμένων μηνυμάτων ως μη σημαντικά"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Σήμανση των επιλεγμένων μηνυμάτων ως μη αναγνωσμένα"
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Σήμανση των επιλεγμένων μηνυμάτων ως μη αναγνωσμένα"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Σήμανση των επιλεγμένων μηνυμάτων ως μη σημαντικά"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Σήμανση των επιλεγμένων μηνυμάτων για διαγραφή"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Μετακίνηση"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "Μετακίνηση επιλεγμένων μηνυμάτων σε άλλο φάκελο"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Επόμενο"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "Επόμενο Σ_ημαντικό Μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "Επόμενη Α_λληλουχία"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "Επόμενο _Μη Αναγνωσμένο Μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Δεν βρέθηκε"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Άνοιγμα επιλεγμένου μηνύματος σε νέο παράθυρο"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Άνοιγμα του επιλεγμένου μηνύματος στον επεξεργαστή για να ξανά-σταλεί"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Αρχικό _Μέγεθος"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "Π_ροηγούμενο μη Αναγνωσμένο Μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Αποστολή μιας απάντησης"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "Έλεγχος για νέα μηνύματα σε όλους τους φακέλους"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "Πρ_οηγούμενο Σημαντικό Μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Προεπισκόπηση του μηνύματος προς εκτύπωση"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Προηγούμενο"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Εκτύπωση μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "Ανα_δρομολόγηση"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Προώθηση του επιλεγμένου μηνύματος σε κάποιον"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Επαναφορά του κειμένου στο κανονικό μέγεθος"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "Ανα_ζήτηση Μηνύματος..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "_Μικρότερο"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Αποθήκευση του μηνύματος ως αρχείο κειμένου"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Εύρεση κειμένου στο σώμα του μηνύματος που φαίνεται"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "Set up the page settings for your current printer"
 msgstr "Ρυθμίστε την διαμόρφωση σελίδας για τον τρέχοντα εκτυπωτή"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Εμφάνιση _Πηγής Μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Εμφάνιση Όλων των _Επικεφαλίδων"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Εύρεση κειμένου στο σώμα του μηνύματος που φαίνεται"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Εμφάνιση μηνύματος σε κανονική μορφή"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Εμφάνιση μηνύματος με όλες τις επικεφαλίδες ηλεκτρονικού ταχυδρομείου"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Απλή εμφάνιση της πηγής του μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "_Μέγεθος Κειμένου"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Ακύρωση διαγραφής των επιλεγμένων μηνυμάτων"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "ΕΦάκελος στην _Λίστα Ταχυδρομείου..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "ΕΦάκελος στον _Αποστολέα..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "ΕΦάκελος στους _Παραλήπτες..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "ΕΦάκελος στο _Θέμα..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "Ε_πισύναψη"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "_Αντιγραφή σε Φάκελο"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "_Δημιουργία Φίλτρου Από το Μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "_Προώθηση Μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "_Μετάβαση σε"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "Μέσα στο _μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "_Μεγαλύτερο"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "_Προβολή Μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Μετακίνηση σε φάκελο"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "Επόμε_νο Μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "_Κανονική Προβολή"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "_Άνοιγμα Μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "_Προηγούμενο Μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "Σε παρά_θεση"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "_Αποστολή ξανά..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "Εργα_λεία"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "Α_ναίρεση Διαγραφής"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Κλείσιμο του παραθύρου"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "_Κλείσιμο"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Επισύναψη"
@@ -16399,12 +17571,13 @@ msgid "Change Evolution's settings"
 msgstr "Αλλαγή ρυθμίσεων Evolution "
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "Έξ_οδος"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Δημιουργία νέας αίτησης συνάντησης"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "Παράθυρο του _Evolution"
+msgid "E_xit"
+msgstr "Έξ_οδος"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16416,61 +17589,74 @@ msgstr "Εισαγωγή δεδομένων από άλλα προγράμματ
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "Παράθυρο του _Evolution"
+msgid "Open a new window"
+msgstr "Άνοιγμα σε Νέο Παράθυρο"
 
 #: ui/evolution.xml.h:11
 msgid "Pi_lot Settings..."
 msgstr "Ρυθμίσεις Pi_lot ..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Αποστολή / Λήψη"
+
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr "Αποστολή μηνυμάτων σε αναμονή και λήψη νέων"
+
+#: ui/evolution.xml.h:14
 msgid "Set up Pilot configuration"
 msgstr "Ρύθμιση Pilot "
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Εμφάνιση πληροφοριών σχετικά με το Ximian Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Στείλτε Αναφορά Προβλήματος"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "Στείλτε _Αναφορά Προβλήματος"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Δηλώστε ένα πρόβλημα με χρήση του Bug Buddy"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Εναλλαγή"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Εναλλαγή της σύνδεσης στο δίκτυο."
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "_Συχνές ερωτήσεις για το Evolution"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "_Περί του Ximian Evolution..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "_Βοήθεια"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "Ει_σαγωγή..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Νέο"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Αποστολή / Λήψη"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "Εύ_ρεση Τώρα"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Εκτύπωση Περίληψης"
@@ -16601,12 +17787,12 @@ msgstr "Καθορισμός Προβολών"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "ΔΤΤΠΠΣΚ"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -16739,7 +17925,7 @@ msgstr "Ανα_ζήτηση"
 msgid "_Find Now"
 msgstr "Εύ_ρεση Τώρα"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "_Καθαρισμός"
 
@@ -16755,24 +17941,256 @@ msgstr "Ταυτότητα υποαντικειμένου"
 msgid "Text"
 msgstr "Κείμενο"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Καθαρισμός"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Εύρεση Τώρα"
 
+#~ msgid "Account Name"
+#~ msgstr "Όνομα Λογαριασμού"
+
+#~ msgid "Server Name"
+#~ msgstr "Όνομα Διακομιστή"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "Το LDAP δεν ενεργοποιήθηκε σε αυτή την έκδοση του evolution"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Λοιπές Επαφές"
+
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "Ρυθμίστε εδώ την πρόσβαση στους διακομιστές καταλόγου  LDAP"
+
+#~ msgid "Directory Servers"
+#~ msgstr "Εξυπηρετητές καταλόγου"
+
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Ρύθμιση Βιβλίου Διευθύνσεων LDAP του Evolution"
+
+#~ msgid "Add LDAP Server"
+#~ msgstr "Προσθήκη διακομιστή LDAP"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Βήμα 4: Όνομα Εμφάνισης"
+
+#~ msgid "Find contact in"
+#~ msgstr "Εύρεση επαφής σε"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Κάντε κλικ εδώ για να προσθέσετε μια επαφή *"
+
+#~ msgid "Business Address"
+#~ msgstr "Διεύθυνση Εργασίας"
+
+#~ msgid "Department"
+#~ msgstr "Τμήμα"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "Διεύθυνση κοινοποίησης διαθεσιμότητας"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Επάγγελμα"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Άνοιγμα ενεργειών στο %s"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Να σταλεί οπωσδήποτε;"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Ακύρωση της τρέχουσας λειτουργίας ταχυδρομείου"
+#~ msgid "Folder _name"
+#~ msgstr "_Όνομα φακέλου:"
+
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "Αυτό το μήνυμα είναι ψηφιακά υπογεγραμμένο. Κάντε κλικ στο εικονίδιο με "
+#~ "το λουκέτο για περισσότερες πληροφορίες."
+
+#~ msgid "Connecting..."
+#~ msgstr "Σύνδεση..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Αυτός ο φάκελος δεν μπορεί να περιέχει μηνύματα."
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr " Όνομα πεδίου"
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Δεν ήταν δυνατό το άνοιγμα κοινόχρηστου φακέλου : %s"
 
-#~ msgid "Family Name"
-#~ msgstr "Οικογενειακό Όνομα"
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr ""
+#~ "Επιλέξτε έναν φάκελο προορισμού για την εισαγωγή αυτών των δεδομένων"
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Αδύνατη η μεταφορά του φακέλου:\n"
+#~ "%s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "Προσθήκη ενός φακέλου"
+
+#~ msgid "Drafts"
+#~ msgstr "Πρόχειρα"
+
+#~ msgid "Outbox"
+#~ msgstr "Εξερχόμενα"
+
+#~ msgid "Sent"
+#~ msgstr "Απεσταλμένα"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Σφάλμα συγχρονισμού \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "Συγχρονισμός φακέλου"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Συγχρονισμός \"%s\" (%d από %d) ..."
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Δεν εμφανίζεται φάκελος)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(Κενό)"
+
+#~ msgid "No error"
+#~ msgstr "Χωρίς σφάλμα"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Υπάρχει ήδη φάκελος με αυτό το όνομα"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Ο καθορισμένος τύπος φακέλου δεν είναι έγκυρος"
+
+#~ msgid "I/O error"
+#~ msgstr "Σφάλμα Ι/Ο"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Δεν υπάρχει αρκετός χώρος για την δημιουργία του φακέλου"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Ο φάκελος δεν είναι άδειος"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Ο καθορισμένος φάκελος δεν βρέθηκε"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr " Η λειτουργία αύτη δεν έχει ενσωματωθεί σε αυτή την αποθήκη"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Η λειτουργία δεν υποστηρίζεται"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr ""
+#~ "Δεν υπάρχει υποστηρίξει για τον συγκεκριμένο τύπο σε αυτή τη αποθήκευση"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr ""
+#~ "Δεν είναι δυνατό να μετονομαστεί η να μετακινηθεί ο συγκεκριμένος φάκελος "
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Δεν ήταν δυνατή η δημιουργία φακέλου με αυτό το όνομα"
+
+#~ msgid "Checkbox"
+#~ msgstr "Checkbox"
+
+#~ msgid "CORBA error"
+#~ msgstr "Σφάλμα CORBA"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Μη έγκυρη παράμετρος"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Έχει ήδη ιδιοκτήτη"
+
+#~ msgid "No owner"
+#~ msgstr "Χωρίς ιδιοκτήτη"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Ο τύπος δεν υποστηρίζεται"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Μη υποστηριζόμενο σχήμα"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Η λειτουργία δεν υποστηρίζεται"
+
+#~ msgid "Internal error"
+#~ msgstr "Εσωτερικό σφάλμα"
+
+#~ msgid "Exists"
+#~ msgstr "Τερματίζει"
+
+#~ msgid "Invalid URI"
+#~ msgstr "Μη έγκυρο URI"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Έχει υποφακέλους"
+
+#~ msgid "No space left"
+#~ msgstr "Δεν έχει μείνει ελεύθερος χώρος"
+
+#~ msgid "Old owner has died"
+#~ msgstr "Ο παλαιός ιδιοκτήτης έχει πεθάνει"
+
+#~ msgid "Test type"
+#~ msgstr "Τύπος δοκιμής:"
+
+#~ msgid "Evolution Test Component"
+#~ msgstr "Στοιχείο δοκιμής του Evolution."
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "Εισαγωγή"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Δημιουργία ένος νέου all-day ραντεβού"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Νέο _Ραντεβού"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Νέα Συνάντηση"
+
+#, fuzzy
+#~ msgid "New _Task"
+#~ msgstr "Νέα Εργασία"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "Παράθυρο του _Evolution"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "Παράθυρο του _Evolution"
+
+#~ msgid "Toggle"
+#~ msgstr "Εναλλαγή"
+
+#~ msgid "Clear"
+#~ msgstr "Καθαρισμός"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Ακύρωση της τρέχουσας λειτουργίας ταχυδρομείου"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -16865,9 +18283,6 @@ msgstr "Εύρεση Τώρα"
 #~ msgid "VCard (.vcf, .gcrd)"
 #~ msgstr "VCard (.vcf, .gcrd)"
 
-#~ msgid "Loading..."
-#~ msgstr "Γίνεται φόρτωση..."
-
 #~ msgid "Searching..."
 #~ msgstr "Γίνεται αναζήτηση..."
 
@@ -16919,10 +18334,6 @@ msgstr "Εύρεση Τώρα"
 #~ msgstr "To ΕΒοοk δεν φορτώθηκε\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "Το αναγνωριστικό κάρτας υπάρχει ήδη"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Η λειτουργία ακυρώθηκε"
 
@@ -17075,9 +18486,6 @@ msgstr "Εύρεση Τώρα"
 #~ msgid "Callback"
 #~ msgstr "Επικοινωνία"
 
-#~ msgid "Company"
-#~ msgstr "Εταιρεία"
-
 #~ msgid "Comp"
 #~ msgstr "Εταιρ."
 
@@ -17144,9 +18552,6 @@ msgstr "Εύρεση Τώρα"
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#~ msgid "Phone"
-#~ msgstr "Τηλέφωνο"
-
 #~ msgid "Birth date"
 #~ msgstr "Ημερομηνία Γέννησης"
 
@@ -17159,9 +18564,6 @@ msgstr "Εύρεση Τώρα"
 #~ msgid "Arbitrary"
 #~ msgstr "Τυχαίο"
 
-#~ msgid "ID"
-#~ msgstr "ID"
-
 #~ msgid "Last Use"
 #~ msgstr "Τελευταία χρήση"
 
@@ -17174,9 +18576,6 @@ msgstr "Εύρεση Τώρα"
 #~ msgid "Folder containing contact information"
 #~ msgstr "Φάκελος που περιέχει πληροφορίες επαφών"
 
-#~ msgid "LDAP Server"
-#~ msgstr "Διακομιστής LDAP"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "Διακομιστής LDAP που περιέχει πληροφορίες επαφών"
 
@@ -17186,18 +18585,6 @@ msgstr "Εύρεση Τώρα"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Κοινόχρηστος φάκελος που περιέχει πληροφορίες επαφών"
 
-#~ msgid "_Contact"
-#~ msgstr "_Επαφή"
-
-#~ msgid "Create a new contact"
-#~ msgstr "Δημιουργία νέας επαφής"
-
-#~ msgid "New Contact List"
-#~ msgstr "Νέα Λίστα Επαφών"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "Δημιουργία νέας λίστας επαφών"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "Το URI που θα εμφανίσει η Αναζήτηση Φακέλων"
 
@@ -17213,9 +18600,6 @@ msgstr "Εύρεση Τώρα"
 #~ msgid "Is New Card"
 #~ msgstr "Είναι νέα κάρτα"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "Καμία κάρτα"
 
@@ -17266,30 +18650,6 @@ msgstr "Εύρεση Τώρα"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "Φάκελος που περιέχει στοιχεία προς-υλοποίηση"
 
-#~ msgid "New appointment"
-#~ msgstr "Νέο Ραντεβού"
-
-#~ msgid "_Appointment"
-#~ msgstr "Ρ_αντεβού"
-
-#~ msgid "New meeting"
-#~ msgstr "Νέα συνάντηση"
-
-#~ msgid "M_eeting"
-#~ msgstr "Συ_νάντηση"
-
-#~ msgid "New task"
-#~ msgstr "Νέα Εργασία"
-
-#~ msgid "_Task"
-#~ msgstr "_Εργασία"
-
-#~ msgid "New All Day Appointment"
-#~ msgstr "Νέο All Day Ραντεβού"
-
-#~ msgid "All _Day Appointment"
-#~ msgstr "All _Day Ραντεβού"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "Δεν ήταν δυνατή μη έγκυρου αντικειμένου"
 
@@ -17342,9 +18702,6 @@ msgstr "Εύρεση Τώρα"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "Άνοιγμα ημερολογίου στο %s"
 
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Άνοιγμα φακέλου εξ ορισμού εργασιών"
-
 #~ msgid "Evaluation of the search expression did not yield a boolean value"
 #~ msgstr "Η εκτίμηση της έκφρασης αναζήτησης δεν επέφερε τιμή boolean"
 
@@ -17383,10 +18740,6 @@ msgstr "Εύρεση Τώρα"
 #~ "Το Evolution βρήκε μηνύματα Elm\n"
 #~ "Θέλετε να εισαχθούν στο Evolution;"
 
-#, fuzzy
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Διεπαφή ρυθμίσεων Μηνυμάτων"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "Φάκελος που περιέχει μηνύματα"
 
@@ -17402,9 +18755,6 @@ msgstr "Εύρεση Τώρα"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Εικονικός Φάκελος Απορριμμάτων"
 
-#~ msgid "Properties..."
-#~ msgstr "Ιδιότητες..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Αλλαγή των ιδιοτήτων του φακέλου"
 
@@ -17415,15 +18765,6 @@ msgstr "Εύρεση Τώρα"
 #~ msgstr ""
 #~ "Έχετε μηνύματα που δεν έχουν αποσταλεί, θέλετε να βγείτε οπωσδήποτε? "
 
-#~ msgid "New Mail Message"
-#~ msgstr "Νέο Μήνυμα Ταχυδρομείου"
-
-#~ msgid "_Mail Message"
-#~ msgstr "_Αποστολή Μηνύματος"
-
-#~ msgid "Compose a new mail message"
-#~ msgstr "Συγγραφή νέου μηνύματος"
-
 #~ msgid "New Message Post"
 #~ msgstr "Αποστολή  νέου μηνύματος"
 
@@ -18543,9 +19884,6 @@ msgstr "Εύρεση Τώρα"
 #~ msgid "Cumana"
 #~ msgstr "Κουμάνα"
 
-#~ msgid "Curitiba"
-#~ msgstr "Κουριτίμπα"
-
 #~ msgid "Custer"
 #~ msgstr "Κάστερ"
 
@@ -20194,9 +21532,6 @@ msgstr "Εύρεση Τώρα"
 #~ msgid "North Bend"
 #~ msgstr "Βόρειος"
 
-#~ msgid "North Carolina"
-#~ msgstr "Βόρεια Καρολίνα"
-
 #, fuzzy
 #~ msgid "North Conway"
 #~ msgstr "Νορβηγία"
@@ -21208,10 +22543,6 @@ msgstr "Εύρεση Τώρα"
 #~ msgstr "Ολοκληρώθηκε την:"
 
 #, fuzzy
-#~ msgid "Stauning"
-#~ msgstr "Ξεκινά:"
-
-#, fuzzy
 #~ msgid "Staverton"
 #~ msgstr "Ξεκινά:"
 
@@ -21565,9 +22896,6 @@ msgstr "Εύρεση Τώρα"
 #~ msgid "Venice"
 #~ msgstr "Βενετία"
 
-#~ msgid "Vermont"
-#~ msgstr "Βερμόντ"
-
 #~ msgid "Vernal"
 #~ msgstr "Βερνάλ"
 
@@ -21833,9 +23161,6 @@ msgstr "Εύρεση Τώρα"
 #~ msgid " F"
 #~ msgstr " F"
 
-#~ msgid " C"
-#~ msgstr " C"
-
 #~ msgid "knots"
 #~ msgstr "κόμβοι"
 
@@ -22454,9 +23779,6 @@ msgstr "Εύρεση Τώρα"
 #~ msgid "Freezing haze"
 #~ msgstr "Παγωμένη καταχνιά"
 
-#~ msgid "Spray"
-#~ msgstr "Ψεκάδες"
-
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Τοπικές ψεκάδες"
 
@@ -22824,18 +24146,6 @@ msgstr "Εύρεση Τώρα"
 #~ msgid "Remove a folder added with \"Open Other User's Folder\""
 #~ msgstr "Δημιουργία _Νέου Φακέλου.."
 
-#~ msgid "Send / Receive"
-#~ msgstr "Αποστολή / Λήψη"
-
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Αποστολή μηνυμάτων σε αναμονή και λήψη νέων"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Εναλλαγή της εμφάνισης της γραμμής συντομεύσεων"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Εναλλαγή της εμφάνισης της γραμμής συντομεύσεων"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Προβολή επιλεγμένου φακέλου"
 
@@ -22863,9 +24173,6 @@ msgstr "Εύρεση Τώρα"
 #~ msgid "_Rename..."
 #~ msgstr "_Μετονομασία..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Αποστολή / Λήψη"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "_Γραμμή Συντομεύσεων"
 
diff --git a/po/en_AU.po b/po/en_AU.po
index e4e2e60ce3..f0d7d70c0e 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: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Michael Zucchi <notzed@ximian.com>\n"
 "Language-Team: \n"
@@ -28,65 +28,199 @@ msgstr "Cannot initialise Evolution's mail component."
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:205
-msgid "Failed to connect to LDAP server"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Autocompletion"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:230
-msgid "Failed to authenticate with LDAP server"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Certificates"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:258
-msgid "Could not perform query on Root DSE"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Configure autocomple here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:681
-msgid "The server responded with no supported search bases"
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1192
-msgid "This server does not support LDAPv3 schema information"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address pop-up"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1214
-msgid "Error retrieving schema information"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address viewer"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1222
-msgid "Server did not respond with valid schema information"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook card viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook folder viewer"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution S/Mime Certificate Management Control"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:178
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "Synchronising folder"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "_Other Organiser"
+
+#: addressbook/gui/component/addressbook-component.c:218
+#, fuzzy
+msgid "_Contact"
+msgstr "_Other Organiser"
+
+#: addressbook/gui/component/addressbook-component.c:219
+#, fuzzy
+msgid "Create a new contact"
+msgstr "_Other Organiser"
+
+#: addressbook/gui/component/addressbook-component.c:224
+#, fuzzy
+msgid "New Contact List"
+msgstr "_Other Organiser"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "_Other Organiser"
+
+#: addressbook/gui/component/addressbook-component.c:226
 #, fuzzy
-msgid "Other Contacts"
+msgid "Create a new contact list"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr ""
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr ""
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+msgid "On LDAP Servers"
+msgstr ""
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Could not close temporary folder: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
+msgid "Failed to connect to LDAP server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:440
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:468
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:792
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1203
+msgid "This server does not support LDAPv3 schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1225
+msgid "Error retrieving schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1233
+msgid "Server did not respond with valid schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is unreachable."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -94,7 +228,7 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -105,45 +239,44 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr "Could not close temporary folder: %s"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -151,7 +284,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -159,88 +292,40 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1102
-msgid "URI of the contacts that the control will display"
+#: addressbook/gui/component/addressbook.c:1063
+msgid "UID of the contacts source that the view will display"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Certificates"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr ""
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook folder viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -263,6 +348,7 @@ msgstr ""
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -296,7 +382,7 @@ msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
+msgid "Addressbook Creation Assistant"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:12
@@ -314,55 +400,54 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address:"
 msgstr "Chile"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "Group:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr ""
 
@@ -385,8 +470,8 @@ msgid "S_earch scope: "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr ""
 
@@ -430,24 +515,24 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:47
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
+msgid "Step 1: Folder Characteristics"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
+msgid "Step 2: Server Information"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
+msgid "Step 3: Connecting to Server"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
+msgid "Step 4: Searching the Directory"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:52
@@ -460,14 +545,6 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -475,7 +552,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -483,7 +560,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -493,43 +570,48 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 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:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 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:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 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:74
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -555,21 +637,29 @@ msgid "Using email address"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -577,46 +667,44 @@ msgstr ""
 msgid "_Edit"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
 msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
@@ -624,7 +712,7 @@ msgid "Remove All"
 msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr ""
@@ -652,23 +740,21 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr ""
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr ""
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr ""
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr ""
@@ -744,7 +830,8 @@ msgid "D_epartment:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr ""
 
@@ -808,12 +895,12 @@ msgid "_Categories..."
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr ""
@@ -1936,7 +2023,7 @@ msgid "Esq."
 msgstr ""
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr ""
 
@@ -2029,11 +2116,25 @@ msgstr ""
 msgid "Save List as VCard"
 msgstr ""
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr ""
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr ""
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr ""
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr ""
@@ -2048,20 +2149,6 @@ msgid ""
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr ""
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr ""
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2160,9 +2247,9 @@ msgstr ""
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr ""
@@ -2184,9 +2271,12 @@ msgstr ""
 msgid "Cut"
 msgstr ""
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr ""
 
@@ -2195,16 +2285,8 @@ msgstr ""
 msgid "Paste"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr ""
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr ""
 
@@ -2217,166 +2299,167 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "* Click here to add a contact *"
+msgid "Assistant"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant"
+msgid "Assistant Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Assistant Phone"
+msgid "Business Fax"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Address"
+msgid "Business Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Business Fax"
+msgid "Business Phone 2"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-msgid "Business Phone"
+msgid "Callback Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
-msgid "Business Phone 2"
+msgid "Car Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-msgid "Callback Phone"
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
 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:11
-msgid "Department"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
+#, fuzzy
+msgid "Given Name"
+msgstr "Synchronising folder"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Fax"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
+msgid "Home Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Fax"
+msgid "Home Phone 2"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "Home Phone"
+msgid "ISDN Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
-msgid "Home Phone 2"
-msgstr ""
+#, fuzzy
+msgid "Journal"
+msgstr "Comoros"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisation"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr ""
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
+msgid "Other Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
-msgid "Other Fax"
+msgid "Pager"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
-msgid "Other Phone"
+msgid "Primary Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
-msgid "Pager"
+msgid "Radio"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-msgid "Primary Phone"
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
+msgid "Spouse"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
-msgid "Radio"
+msgid "TTYTDD"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
+msgid "Telex"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
+msgid "Title"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-msgid "Telex"
+msgid "Unit"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr ""
 
@@ -2458,11 +2541,19 @@ msgstr ""
 msgid "Job Title"
 msgstr ""
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr ""
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Chile"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr ""
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 msgid "Home page"
@@ -2473,163 +2564,160 @@ msgstr ""
 msgid "Blog"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Contact not found"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Contact ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Error adding contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 msgid "Error removing contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -2822,7 +2910,7 @@ msgstr ""
 msgid "Number of columns:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr ""
 
@@ -3004,18 +3092,18 @@ msgstr ""
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -3023,25 +3111,87 @@ msgstr ""
 msgid "Default Priority:"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Calendars"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr ""
@@ -3106,122 +3256,271 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr ""
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Could not initialise gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+msgid "Calendars to run alarms for"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Colours for display"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Colours for display"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+msgid "Show where events end in week and month views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+msgid "The view showing when the calendar starts"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+msgid "Whether to hide completed tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+msgid "Whether to show week numbers in date navigator"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
 "events."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 msgid "Purge events older than"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr ""
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%m/%d/%Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+msgid "Rename this calendar to"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:428
 msgid "New Calendar"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:639
 #, fuzzy
-msgid "Rename"
-msgstr "Synchronising folder"
+msgid "New meeting"
+msgstr "Synchronising folders"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
+#: calendar/gui/calendar-component.c:640
+#, fuzzy
+msgid "M_eeting"
+msgstr "Organisation"
+
+#: calendar/gui/calendar-component.c:641
+msgid "Create a new meeting request"
 msgstr ""
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
+#: calendar/gui/calendar-component.c:646
+msgid "New all day appointment"
 msgstr ""
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:648
+msgid "Create a new all-day appointment"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3337,7 +3636,7 @@ msgstr ""
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr ""
 
@@ -3353,6 +3652,10 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3385,8 +3688,8 @@ msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr ""
 
@@ -3415,7 +3718,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr ""
 
@@ -3469,7 +3772,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr ""
 
@@ -3483,7 +3786,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr ""
 
@@ -3493,7 +3796,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr ""
 
@@ -3507,7 +3810,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr ""
 
@@ -3526,7 +3829,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr ""
 
@@ -3544,7 +3847,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr ""
 
@@ -3554,12 +3857,12 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr ""
 
@@ -3596,7 +3899,7 @@ msgid "_Fri"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr ""
 
@@ -3636,76 +3939,76 @@ msgstr ""
 msgid "before every appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
@@ -3715,162 +4018,166 @@ msgstr ""
 msgid "Validation error: %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 #, fuzzy
 msgid "Could not update object"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+msgid "Select destination source"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 msgid "The journal entry could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr ""
 
@@ -3886,43 +4193,43 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr ""
 
@@ -3991,31 +4298,31 @@ msgid "_Start time:"
 msgstr ""
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr ""
 
@@ -4056,21 +4363,15 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr ""
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr ""
@@ -4090,6 +4391,7 @@ msgid "_Invite Others..."
 msgstr ""
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4122,6 +4424,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Could not close temporary folder: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 msgid "A group must be selected"
 msgstr ""
 
@@ -4146,32 +4449,54 @@ msgstr "Organisation"
 msgid "Calendar Name"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Could not close temporary folder: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+msgid "<b>Task List Options</b>"
+msgstr ""
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Chile"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+msgid "Task List Group"
+msgstr ""
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+msgid "Task List Name"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 msgid "This and Prior Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr ""
 
@@ -4220,10 +4545,14 @@ msgstr ""
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr ""
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+msgid "Date/Time"
+msgstr ""
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr ""
@@ -4288,38 +4617,38 @@ msgstr ""
 msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 msgid "Save Event"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr ""
 
@@ -4329,43 +4658,43 @@ msgid "% _Complete"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr ""
 
@@ -4374,7 +4703,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr ""
 
@@ -4394,21 +4723,21 @@ msgstr ""
 msgid "_Web Page:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4416,9 +4745,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr ""
 
@@ -4523,26 +4852,21 @@ msgstr ""
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr ""
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Description"
@@ -4554,28 +4878,26 @@ msgid "Start Date"
 msgstr ""
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr "Colours"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 msgid "component"
 msgstr ""
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr ""
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr ""
 
@@ -4587,7 +4909,7 @@ msgstr ""
 msgid "S"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr ""
 
@@ -4595,14 +4917,14 @@ msgstr ""
 msgid "W"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4610,7 +4932,7 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4618,17 +4940,17 @@ msgstr ""
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr ""
 
@@ -4640,180 +4962,178 @@ msgstr ""
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
+msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
-msgid "Deleting selected objects"
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 msgid "Open _Web Page"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
@@ -4827,8 +5147,8 @@ msgstr ""
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr ""
 
@@ -4857,18 +5177,18 @@ msgid "URL"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4884,7 +5204,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr ""
 
@@ -4897,444 +5217,443 @@ msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 #, fuzzy
 msgid "Location:"
 msgstr "Organisation"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 #, 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:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -5494,7 +5813,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -5558,95 +5877,81 @@ msgstr ""
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "_Other Organiser"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "_Other Organiser"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 msgid "Priority:"
 msgstr ""
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 msgid "Web Page:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, 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:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5654,7 +5959,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5662,60 +5967,10 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 msgid "Purging"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Calendars"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Cannot initialise Evolution's mail component."
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr ""
@@ -5772,296 +6027,331 @@ msgstr ""
 msgid "September"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr ""
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr ""
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr ""
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr ""
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr ""
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr ""
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+msgid "Rename this task list to"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "_Other Organiser"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6069,11 +6359,11 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr ""
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr ""
 
@@ -6103,21 +6393,21 @@ msgstr ""
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr ""
 
@@ -7651,27 +7941,27 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr ""
 
@@ -7717,86 +8007,86 @@ msgstr "Synchronising \"%s\""
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Synchronising folders"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Can not open message"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Synchronising folder"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr ""
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -7826,36 +8116,36 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr ""
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 #, fuzzy
 msgid "Copying messages"
 msgstr "Can not open message"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Can not open message"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -7863,46 +8153,46 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr ""
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Can not encrypt this message: no recipients specified"
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -7910,48 +8200,59 @@ msgid ""
 "%s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr "Can not verify this message: could not create temporary file: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, 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"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+msgid "Encrypted content"
+msgstr ""
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr ""
@@ -8052,15 +8353,15 @@ msgstr ""
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr ""
 
@@ -8356,76 +8657,86 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr ""
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 msgid "Unverified"
 msgstr ""
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 msgid "Good signature"
 msgstr ""
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 msgid "Bad signature"
 msgstr ""
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 msgid "Signing certificate not found"
 msgstr ""
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 msgid "Signing certificate not trusted"
 msgstr ""
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 msgid "Malformed signature"
 msgstr ""
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 msgid "Processing error"
 msgstr ""
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr ""
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Can not get folder: Invalid operation on this store"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Can not create folder: Invalid operation on this store"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr ""
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+msgid "Junk"
+msgstr ""
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr ""
@@ -8611,7 +8922,7 @@ msgid ""
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
@@ -8631,22 +8942,22 @@ msgstr ""
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "You can not copy messages from this rubbish bin."
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Can not delete folder: %s: Invalid operation"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Can not delete folder: %s: No such folder"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Can not rename folder: %s: Invalid operation"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Can not rename folder: %s: No such folder"
@@ -8726,7 +9037,7 @@ msgstr ""
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -8740,7 +9051,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr ""
@@ -8778,53 +9089,66 @@ msgid "Failed to cache %s: %s"
 msgstr "Could not close temporary folder: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
-msgid "Checking for new mail"
+msgid "Connection to Server"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+msgid "Command:"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:50
+msgid "Checking for new mail"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 msgid "Automatically synchronize remote mail locally"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9065,7 +9389,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Could not close temporary folder: %s"
@@ -9176,29 +9500,29 @@ msgstr ""
 msgid "Storing folder"
 msgstr "Synchronising folder"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Can not create folder lock on %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Can not open mailbox: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Can not append message to mbox file: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9207,11 +9531,11 @@ msgstr ""
 "Can not get message: %s from folder %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -9271,12 +9595,16 @@ msgstr "Can not create folder lock on %s: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "Can not get folder: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+msgid "Folder already exists"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 msgid "The new folder name is illegal."
 msgstr ""
 
@@ -9319,7 +9647,7 @@ msgstr ""
 msgid "Could not close temp folder: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
@@ -9600,7 +9928,7 @@ msgstr ""
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr ""
 
@@ -9680,7 +10008,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr ""
 
@@ -9732,7 +10060,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr ""
 
@@ -9895,7 +10223,7 @@ msgstr ""
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr ""
 
@@ -10017,7 +10345,7 @@ msgstr ""
 msgid "%.0fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr ""
 
@@ -10061,11 +10389,11 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr ""
 
@@ -10076,45 +10404,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr ""
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10123,14 +10451,18 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr ""
 
+#: composer/e-msg-composer-hdrs.c:548
+msgid "Choose a folder to post the message to."
+msgstr ""
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr ""
@@ -10163,55 +10495,55 @@ msgstr ""
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10219,34 +10551,34 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr ""
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10254,25 +10586,26 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
-msgstr ""
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
+msgstr "Can not initialise the Ximian Evolution shell."
 
 #: data/evolution.desktop.in.in.h:2
 #, fuzzy
-msgid "Ximian Evolution"
+msgid "Ximian Evolution (Unstable)"
 msgstr "Can not initialise the Ximian Evolution shell."
 
 #: data/evolution.keys.in.h:1
@@ -10512,13 +10845,13 @@ msgstr ""
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr ""
 
@@ -10638,7 +10971,7 @@ msgstr ""
 msgid "You must specify a folder."
 msgstr ""
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr ""
@@ -10650,24 +10983,24 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr ""
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr ""
 
@@ -10761,7 +11094,7 @@ msgstr ""
 msgid "months"
 msgstr ""
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr ""
 
@@ -10858,7 +11191,7 @@ msgstr ""
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr ""
 
@@ -10928,112 +11261,117 @@ msgid "Source Account"
 msgstr ""
 
 #: filter/libfilter-i18n.h:35
+msgid "Spam"
+msgstr ""
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr ""
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "does not return"
 msgstr ""
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "is before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr ""
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr ""
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
@@ -11058,18 +11396,82 @@ msgstr ""
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr ""
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 msgid "VFolder source"
 msgstr ""
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail folder viewer"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr ""
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr ""
@@ -11111,7 +11513,7 @@ msgid "Protocol"
 msgstr ""
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr ""
 
@@ -11135,45 +11537,42 @@ msgstr ""
 msgid "Signature(s)"
 msgstr ""
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr ""
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11183,183 +11582,382 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr ""
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr ""
+
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr ""
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
 #, c-format
-msgid "\"%s\" in \"%s\""
+msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/em-folder-selector.c:267
-msgid "Folder _name"
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Could not close temporary folder: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Could not close temporary folder: %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Could not close temporary folder: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
 msgstr ""
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr ""
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Synchronising folder"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Could not close temporary folder: %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Can not delete folder: %s: No such folder"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr ""
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr ""
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+#, fuzzy
+msgid "Rename Folder"
+msgstr "Synchronising folder"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+msgid "Folder properties"
+msgstr ""
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr ""
+
+#: mail/em-folder-tree.c:1384
+msgid "Folder Name"
+msgstr ""
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr ""
+
+#: mail/em-folder-tree.c:1492
+msgid "Open in _New Window"
+msgstr ""
+
+#: mail/em-folder-tree.c:1497
+msgid "_Move"
+msgstr ""
+
+#: mail/em-folder-tree.c:1500
+#, fuzzy
+msgid "_New Folder..."
+msgstr "Synchronising folders"
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr ""
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr ""
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr ""
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr ""
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+msgid "Mark as _Junk"
+msgstr ""
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+msgid "Mark as _Not Junk"
+msgstr ""
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 msgid "VFolder on Thread"
 msgstr ""
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 msgid "Filter on Thread"
 msgstr ""
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr ""
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr ""
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Organisation"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, c-format
 msgid "Matches: %d"
 msgstr ""
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+msgid "Unsigned"
+msgstr ""
+
+#: mail/em-format-html-display.c:597
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr ""
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+msgid "Valid signature"
+msgstr ""
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+msgid "Invalid signature"
+msgstr ""
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
 msgstr ""
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+msgid "Unencrypted"
+msgstr ""
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+msgid "Encrypted"
+msgstr ""
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr ""
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+msgid "Unsupported signature format"
+msgstr ""
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+msgid "Unknown error verifying signature"
+msgstr ""
+
+#: mail/em-format-html-display.c:917
 msgid "_View Inline"
 msgstr ""
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 msgid "_Hide"
 msgstr ""
 
@@ -11368,201 +11966,225 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr ""
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, c-format
 msgid "Retrieving `%s'"
 msgstr ""
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-
-#: mail/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-msgid "No signature present"
-msgstr ""
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Could not initialise GNOME"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-msgid "Unsupported signature format"
-msgstr ""
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Can not open message"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr ""
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr ""
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr ""
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr ""
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr ""
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr ""
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/em-format.c:1259
-msgid "Could not parse S/MIME message: Unknown error"
+#: mail/em-format.c:1185
+#, fuzzy
+msgid "Session not initialised"
+msgstr "Could not initialise GNOME"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/em-popup.c:593
+#: mail/em-format.c:1212
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+msgid "Migrating..."
+msgstr ""
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, c-format
+msgid "Migrating `%s':"
+msgstr ""
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Could not close temporary folder: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Could not close temporary folder: %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Could not close temporary folder: %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr ""
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 msgid "_Reply to sender"
 msgstr ""
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 msgid "Se_nd message to..."
 msgstr ""
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 msgid "Subscribed"
 msgstr ""
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr ""
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr ""
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr ""
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr ""
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr ""
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -11571,127 +12193,393 @@ msgstr ""
 "Can not get message: %s\n"
 "  %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Can not open message"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 msgid "Save Message..."
 msgstr ""
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Chile"
+
+#: mail/em-utils.c:2262
 #, c-format
-msgid "Could not create temporary directory: %s"
+msgid ""
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
 msgstr ""
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2288
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
+#: mail/evolution-mail.schemas.in.in.h:1
+msgid "Automatic link recognition"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/evolution-mail.schemas.in.in.h:2
+msgid "Automatic smiley recognition"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:6
+msgid "Default charset in which to compose messages"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:7
+msgid "Default charset in which to compose messages."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
+msgid "Default charset in which to display messages"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:9
+msgid "Default charset in which to display messages."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:10
+msgid "Default forward style"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:11
+msgid "Default reply style"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+msgid "Empty Trash folders on exit"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:14
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid ""
-"Configure mail preferences, including security and message display, here"
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
+#: mail/evolution-mail.schemas.in.in.h:21
+msgid "List of accounts"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Cannot initialise Evolution's mail component."
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Cannot initialise Evolution's mail component."
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail component"
-msgstr "Cannot initialise Evolution's mail component."
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Cannot initialise Evolution's mail component."
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Cannot initialise Evolution's mail component."
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
+#: mail/evolution-mail.schemas.in.in.h:27
+msgid "Log filter actions"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/importers/elm-importer.c:105
-msgid "Evolution is importing your old Elm mail"
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
-msgid "Importing..."
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
-msgid "Please wait"
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/importers/elm-importer.c:547
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "New Mail Notify sound file"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
+msgid "New Mail Notify type"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/importers/elm-importer.c:568
-msgid "Elm"
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:44
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+msgid "Send HTML mail by default"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:52
+msgid "Send HTML mail by default."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:53
+msgid "Show Animations"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:54
+msgid "Show animated images as animations."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+msgid "Show deleted messages in the message-list"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:57
+msgid "Show the \"Preview\" pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+msgid "Sound file to play when new mail arrives."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+msgid "Spell check inline"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:62
+msgid "Terminal font"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+msgid "The variable width font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:65
+msgid "Thread the message list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:66
+msgid "Thread the message-list"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+msgid "UID string of the default account."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+msgid "Variable width font"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
 msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
@@ -11724,6 +12612,42 @@ msgstr ""
 msgid "Evolution Pine importer"
 msgstr ""
 
+#: mail/importers/elm-importer.c:105
+msgid "Evolution is importing your old Elm mail"
+msgstr ""
+
+#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
+#: mail/importers/pine-importer.c:115
+msgid "Importing..."
+msgstr ""
+
+#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
+#: mail/importers/pine-importer.c:117
+msgid "Please wait"
+msgstr ""
+
+#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
+#: mail/importers/pine-importer.c:288
+#, c-format
+msgid "Importing %s as %s"
+msgstr ""
+
+#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
+#: mail/importers/pine-importer.c:425
+#, c-format
+msgid "Scanning %s"
+msgstr ""
+
+#: mail/importers/elm-importer.c:547
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: mail/importers/elm-importer.c:568
+msgid "Elm"
+msgstr ""
+
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -11765,12 +12689,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr ""
-
 #: mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
@@ -11780,7 +12698,7 @@ msgstr "Synchronising folders"
 msgid "Scanning directory"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr ""
 
@@ -11848,23 +12766,23 @@ msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr ""
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -11873,35 +12791,35 @@ msgstr ""
 msgid "Mail to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, c-format
 msgid "Replies to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11909,139 +12827,33 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr ""
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr ""
-
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Could not close temporary folder: %s"
-
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Could not close temporary folder: %s"
+#: mail/mail-component.c:379
+#, fuzzy
+msgid "New Mail Message"
+msgstr "Can not open message"
 
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Could not close temporary folder: %s"
+#: mail/mail-component.c:380
+#, fuzzy
+msgid "_Mail Message"
+msgstr "Can not open message"
 
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Could not close temporary folder: %s"
+#: mail/mail-component.c:381
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Can not open message"
 
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-msgid "Select destination to copy folder into"
-msgstr ""
-
-#: mail/mail-component.c:1643
-msgid "Select destination to move folder into"
-msgstr ""
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Synchronising folder"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr ""
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Could not close temporary folder: %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Can not delete folder: %s: No such folder"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr ""
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr ""
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-#, fuzzy
-msgid "Rename Folder"
-msgstr "Synchronising folder"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr ""
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-msgid "Folder properties"
-msgstr ""
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr ""
-
-#: mail/mail-component.c:1979
-msgid "Folder Name"
-msgstr ""
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr ""
-
-#: mail/mail-component.c:2079
-msgid "Open in _New Window"
-msgstr ""
-
-#: mail/mail-component.c:2084
-msgid "_Move"
-msgstr ""
-
-#: mail/mail-component.c:2087
-#, fuzzy
-msgid "_New Folder..."
-msgstr "Synchronising folders"
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr ""
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr ""
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr ""
 
@@ -12089,11 +12901,11 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr ""
 
@@ -12175,27 +12987,35 @@ msgid "C_olors"
 msgstr "C_lose"
 
 #: mail/mail-config.glade.h:26
-msgid "Check spelling while I _type"
+msgid "Check _Incoming Mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:27
-msgid "Checking for New Mail"
+msgid "Check spelling while I _type"
 msgstr ""
 
 #: mail/mail-config.glade.h:28
+msgid "Checking for New Mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Colours for display"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12205,479 +13025,495 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Can not open message"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Encry_ption certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+msgid "Filter Options"
+msgstr ""
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 msgid "Message Fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_sation:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Quote original message"
 msgstr "Can not open message"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Si_gning certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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:121
+#: mail/mail-config.glade.h:124
 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:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+msgid "_Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr ""
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Organisation"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr ""
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr ""
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr ""
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr ""
 
@@ -12689,157 +13525,161 @@ msgstr ""
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr ""
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr ""
@@ -12856,59 +13696,71 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+msgid "Digital Signature"
+msgstr ""
+
+#: mail/mail-security.glade.h:3
+msgid "Encryption"
+msgstr ""
+
+#: mail/mail-security.glade.h:4
+msgid "Security Information"
+msgstr ""
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 msgid "Cancel _All"
 msgstr ""
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr ""
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -12944,26 +13796,31 @@ msgstr ""
 msgid "Name:"
 msgstr ""
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Can not get folder: %s: %s"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12972,88 +13829,88 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr ""
 
@@ -13110,11 +13967,11 @@ msgstr ""
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr ""
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr ""
 
@@ -13164,39 +14021,131 @@ msgstr ""
 msgid "_Unsubscribe"
 msgstr ""
 
-#: shell/e-folder-dnd-bridge.c:55
-#, fuzzy, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+msgid "480"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+msgid "Default shortcut group"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+msgid "Default width of the folder bar pane"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+msgid "Default width of the shortcut bar pane"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+msgid "Default window height"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+msgid "Default window width"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr "Can not get folder: %s: %s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
+msgstr ""
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
 msgstr ""
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "Synchronising folder"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Synchronising folder"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Synchronising folder"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
 msgstr ""
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
 msgstr ""
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Synchronising folder"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+msgid "Whether to show the folder bar"
 msgstr ""
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+msgid "Whether to show the shortcut bar"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "Chile"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13204,14 +14153,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13219,7 +14168,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13313,9 +14262,10 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
+msgid "The specified folder name is not valid: %s"
 msgstr ""
 
 #: shell/e-shell-folder-commands.c:584
@@ -13336,19 +14286,15 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr ""
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr ""
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr ""
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13357,11 +14303,11 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13369,131 +14315,113 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr ""
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 msgid "_Filename:"
 msgstr ""
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr ""
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 msgid "File _type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 msgid "Import a _single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr ""
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 msgid "_Import"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-
-#: shell/e-shell-offline-sync.c:232
-#, fuzzy
-msgid "Syncing Folder"
-msgstr "Synchronising folder"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, fuzzy, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Synchronising folder"
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr ""
@@ -13529,7 +14457,7 @@ msgstr "Could not close temporary folder: %s"
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -13538,16 +14466,10 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 msgid "Quit Assistant"
 msgstr ""
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr ""
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr ""
@@ -13606,60 +14528,47 @@ msgstr ""
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr ""
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr ""
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr ""
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr ""
 
@@ -13772,73 +14681,16 @@ msgstr ""
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:1096
-msgid "Shortcuts"
-msgstr ""
-
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr ""
-
-#: shell/e-storage.c:573
-msgid "A folder with the same name already exists"
-msgstr ""
-
-#: shell/e-storage.c:575
-msgid "The specified folder type is not valid"
-msgstr ""
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr ""
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr ""
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr ""
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr ""
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr ""
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr ""
-
-#: shell/e-storage.c:591
-msgid "The specified type is not supported in this storage"
-msgstr ""
-
-#: shell/e-storage.c:593
-msgid "The specified folder cannot be modified or removed"
-msgstr ""
-
-#: shell/e-storage.c:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr ""
-
-#: 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:599
-msgid "This operation cannot be performed in off-line mode"
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
 msgstr ""
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
+#: shell/e-shortcuts.c:1097
+msgid "Shortcuts"
 msgstr ""
 
 #: shell/e-task-widget.c:211
@@ -13851,6 +14703,17 @@ msgstr ""
 msgid "%s (%d%% complete)"
 msgstr ""
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr ""
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr ""
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -13877,75 +14740,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr ""
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr ""
-
-#: shell/evolution-test-component.c:703
-#, fuzzy
-msgid "Evolution Test Component"
-msgstr "Cannot initialise Evolution's mail component."
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr ""
@@ -13975,10 +14769,6 @@ msgstr ""
 msgid "_Tasks:"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr ""
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder _type:"
 msgstr ""
@@ -14032,24 +14822,6 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-#, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr ""
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -14085,7 +14857,7 @@ msgstr ""
 msgid "Importers"
 msgstr ""
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr ""
 
@@ -14101,16 +14873,16 @@ msgstr ""
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr ""
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14130,73 +14902,111 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:289
+#: shell/main.c:294
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Can not initialise the Ximian Evolution shell."
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Can not initialise the Ximian Evolution shell."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Can not initialise the Ximian Evolution shell."
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+msgid "Select a cert to import..."
+msgstr ""
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "Could not close temporary folder: %s"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "C_lose"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 msgid "Expires"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Chile"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr "Could not close temporary folder: %s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14246,84 +15056,344 @@ msgid "Backup All"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "Could not close temporary folder: %s"
+
+#: smime/gui/smime-ui.glade.h:15
+msgid "Certificate Authority Trust"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "Could not close temporary folder: %s"
+
+#: smime/gui/smime-ui.glade.h:17
 msgid "Common Name (CN)"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 msgid "Contact Certificates"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 msgid "Edit"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 msgid "Email Signer Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 msgid "Expires On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Organisation"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Organisation"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 msgid "View"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "Could not close temporary folder: %s"
+
+#: smime/gui/smime-ui.glade.h:42
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:36
-msgid "import"
+#: smime/lib/e-cert-db.c:494
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "Could not close temporary folder: %s"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+msgid "%d/%m/%Y"
+msgstr "%m/%d/%Y"
+
+#: smime/lib/e-cert.c:473
+msgid "Version"
 msgstr ""
 
+#: smime/lib/e-cert.c:488
+msgid "Version 1"
+msgstr ""
+
+#: smime/lib/e-cert.c:491
+msgid "Version 2"
+msgstr ""
+
+#: smime/lib/e-cert.c:494
+msgid "Version 3"
+msgstr ""
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+msgid "C"
+msgstr ""
+
+#: smime/lib/e-cert.c:588
+msgid "CN"
+msgstr ""
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+msgid "O"
+msgstr ""
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+msgid "DN"
+msgstr ""
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+msgid "ST"
+msgstr ""
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "Could not close temporary folder: %s"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "Could not close temporary folder: %s"
+
+#: smime/lib/e-cert.c:618
+msgid "Certificate Authority Key Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:621
+msgid "UID"
+msgstr ""
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+msgid "Subject's Public Key"
+msgstr ""
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+msgid "Error: Unable to process extension"
+msgstr ""
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+msgid "SSL Certificate Authority"
+msgstr ""
+
+#: smime/lib/e-cert.c:781
+msgid "Email Certificate Authority"
+msgstr ""
+
+#: smime/lib/e-cert.c:809
+msgid "Signing"
+msgstr ""
+
+#: smime/lib/e-cert.c:813
+msgid "Non-repudiation"
+msgstr ""
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+msgid "Data Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "Could not close temporary folder: %s"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Chile"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+msgid "Not Critical"
+msgstr ""
+
+#: smime/lib/e-cert.c:907
+msgid "Extensions"
+msgstr ""
+
+#: smime/lib/e-cert.c:978
+#, c-format
+msgid "%s = %s"
+msgstr ""
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Could not close temporary folder: %s"
+
+#: smime/lib/e-cert.c:1043
+msgid "Issuer"
+msgstr ""
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+msgid "Subject Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Could not close temporary folder: %s"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+msgid "Enter password for PKCS12 file:"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "Could not close temporary folder: %s"
+
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
 msgstr ""
@@ -14373,7 +15443,7 @@ msgstr ""
 msgid "Copy to Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr ""
 
@@ -14389,7 +15459,7 @@ msgstr ""
 msgid "Move to Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr ""
 
@@ -14397,8 +15467,8 @@ msgstr ""
 msgid "Previews the contacts to be printed"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr ""
@@ -14443,13 +15513,13 @@ msgstr ""
 msgid "View the current contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr ""
 
@@ -14478,134 +15548,106 @@ msgid "_Send Message to Contact..."
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:3
-msgid "Create a new all-day event"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:5
 msgid "Create a new calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a new meeting"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 msgid "New _Calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:26
-msgid "New _Meeting"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:27
-msgid "New _Task"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 msgid "Purg_e"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 msgid "Purge old appointments and meetings"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 msgid "Show as list"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr ""
 
@@ -14669,7 +15711,7 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr ""
 
@@ -14886,7 +15928,7 @@ msgstr ""
 msgid "Mark all visible messages as read"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr ""
 
@@ -14942,16 +15984,6 @@ msgstr ""
 msgid "_Threaded Message List"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr ""
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr ""
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr ""
@@ -15108,255 +16140,277 @@ msgstr ""
 msgid "Increase the text size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+msgid "Mark the selected message(s) as junk"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:57
+msgid "Mark the selected message(s) as not being junk"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+msgid "Not Junk"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 msgid "Post a Repl_y"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "You can not copy messages from this rubbish bin."
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 msgid "S_earch in Message..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr ""
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr ""
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr ""
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr ""
@@ -15634,11 +16688,11 @@ msgid "Change Evolution's settings"
 msgstr ""
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
+msgid "Create a new window"
 msgstr ""
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
+msgid "E_xit"
 msgstr ""
 
 #: ui/evolution.xml.h:7
@@ -15650,7 +16704,7 @@ msgid "Import data from other programs"
 msgstr ""
 
 #: ui/evolution.xml.h:10
-msgid "Open a new Evolution window"
+msgid "Open a new window"
 msgstr ""
 
 #: ui/evolution.xml.h:11
@@ -15658,53 +16712,65 @@ msgid "Pi_lot Settings..."
 msgstr ""
 
 #: ui/evolution.xml.h:12
-msgid "Set up Pilot configuration"
+msgid "Send / Receive"
 msgstr ""
 
 #: ui/evolution.xml.h:13
-msgid "Show information about Ximian Evolution"
+msgid "Send queued items and retrieve new items"
 msgstr ""
 
 #: ui/evolution.xml.h:14
-msgid "Submit Bug Report"
+msgid "Set up Pilot configuration"
 msgstr ""
 
 #: ui/evolution.xml.h:15
-msgid "Submit _Bug Report"
+msgid "Show information about Ximian Evolution"
 msgstr ""
 
 #: ui/evolution.xml.h:16
-msgid "Submit a bug report using Bug Buddy"
+msgid "Submit Bug Report"
 msgstr ""
 
 #: ui/evolution.xml.h:17
-msgid "Toggle"
+msgid "Submit _Bug Report"
 msgstr ""
 
 #: ui/evolution.xml.h:18
+msgid "Submit a bug report using Bug Buddy"
+msgstr ""
+
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr ""
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr ""
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr ""
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr ""
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr ""
+
+#: ui/evolution.xml.h:33
+msgid "_Window"
+msgstr ""
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr ""
@@ -15826,12 +16892,12 @@ msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr ""
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr ""
 
@@ -15964,7 +17030,7 @@ msgstr ""
 msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr ""
 
@@ -15980,17 +17046,43 @@ msgstr ""
 msgid "Text"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr ""
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+msgid "Find _Now"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Address List"
-#~ msgstr "Chile"
+#~ msgid "Other Contacts"
+#~ msgstr "_Other Organiser"
+
+#, fuzzy
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Could not close temporary folder: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr "Can not get folder: %s: %s"
+
+#, fuzzy
+#~ msgid "Syncing Folder"
+#~ msgstr "Synchronising folder"
+
+#, fuzzy
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Synchronising folder"
+
+#, fuzzy
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Can not create folder lock on %s: %s"
+
+#, fuzzy
+#~ msgid "Evolution Test Component"
+#~ msgstr "Cannot initialise Evolution's mail component."
 
 #, fuzzy
 #~ msgid "Organizational Unit"
@@ -16029,10 +17121,6 @@ msgstr ""
 #~ msgstr "_Other Organiser"
 
 #, fuzzy
-#~ msgid "Related Contacts"
-#~ msgstr "_Other Organiser"
-
-#, fuzzy
 #~ msgid "Could not update invalid object"
 #~ msgstr "Could not initialise Bonobo"
 
@@ -16041,22 +17129,10 @@ msgstr ""
 #~ msgstr "Could not close temporary folder: %s"
 
 #, fuzzy
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Synchronising folder"
-
-#, fuzzy
 #~ msgid "Could not create a PGP signature context"
 #~ msgstr "Could not close temporary folder: %s"
 
 #, fuzzy
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Post a new mail message"
-#~ msgstr "Can not open message"
-
-#, fuzzy
 #~ msgid "by %B %d, %Y, %l:%M %P"
 #~ msgstr "%a %d/%m/%Y %I:%M %p"
 
@@ -16123,10 +17199,6 @@ msgstr ""
 #~ msgstr "Chile"
 
 #, fuzzy
-#~ msgid "Chita"
-#~ msgstr "Chile"
-
-#, fuzzy
 #~ msgid "Colorado"
 #~ msgstr "Comoros"
 
@@ -16147,10 +17219,6 @@ msgstr ""
 #~ msgstr "Comoros"
 
 #, fuzzy
-#~ msgid "Corona"
-#~ msgstr "Comoros"
-
-#, fuzzy
 #~ msgid "Matamoros"
 #~ msgstr "Comoros"
 
@@ -16179,14 +17247,6 @@ msgstr ""
 #~ msgstr "Synchronising folder"
 
 #, fuzzy
-#~ msgid "miles"
-#~ msgstr "Chile"
-
-#, fuzzy
-#~ msgid "_New Feed"
-#~ msgstr "Synchronising folders"
-
-#, fuzzy
 #~ msgid "_Show full path for folders"
 #~ msgstr "Could not close temporary folder: %s"
 
@@ -16339,9 +17399,6 @@ msgstr ""
 #~ msgid "KBOS:EGAA:RJTT"
 #~ msgstr "YPAD:YBBN:YSCB:YMML:YPPH:YSSY"
 
-#~ msgid "%d/%m/%Y"
-#~ msgstr "%m/%d/%Y"
-
 #, fuzzy
 #~ msgid "Colors for Tasks"
 #~ msgstr "Colours for Tasks"
diff --git a/po/en_GB.po b/po/en_GB.po
index ac2cd771b5..064b12eba2 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: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Robert Brady <rwb197@zepler.org>\n"
 "Language-Team: \n"
@@ -28,65 +28,202 @@ msgstr "Cannot initialise the Evolution shell."
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:205
-msgid "Failed to connect to LDAP server"
-msgstr ""
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/component/addressbook-config.c:230
-msgid "Failed to authenticate with LDAP server"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Certificates"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:258
-msgid "Could not perform query on Root DSE"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Configure autocomple here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:681
-msgid "The server responded with no supported search bases"
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1192
-msgid "This server does not support LDAPv3 schema information"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Cannot initialise the Evolution shell."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address pop-up"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1214
-msgid "Error retrieving schema information"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address viewer"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1222
-msgid "Server did not respond with valid schema information"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook card viewer"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook folder viewer"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Cannot initialise the Evolution shell."
+
+#: addressbook/gui/component/addressbook-component.c:146
+#, fuzzy
+msgid "Properties..."
+msgstr "Synchronising \"%s\""
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:178
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "Synchronising \"%s\""
+
+#: addressbook/gui/component/addressbook-component.c:217
 #, fuzzy
-msgid "Other Contacts"
+msgid "New Contact"
 msgstr "Organisation:"
 
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook-component.c:218
+#, fuzzy
+msgid "_Contact"
+msgstr "Organisation:"
+
+#: addressbook/gui/component/addressbook-component.c:219
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Synchronising \"%s\""
+
+#: addressbook/gui/component/addressbook-component.c:224
+#, fuzzy
+msgid "New Contact List"
+msgstr "Organisation:"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "Organisation:"
+
+#: addressbook/gui/component/addressbook-component.c:226
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Synchronising \"%s\""
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr ""
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr ""
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+msgid "On LDAP Servers"
+msgstr ""
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/addressbook-config.c:416
+msgid "Failed to connect to LDAP server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:440
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:468
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:792
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1203
+msgid "This server does not support LDAPv3 schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1225
+msgid "Error retrieving schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1233
+msgid "Server did not respond with valid schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is unreachable."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -94,7 +231,7 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -105,45 +242,44 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -151,7 +287,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -159,89 +295,40 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1102
-msgid "URI of the contacts that the control will display"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Certificates"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr ""
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Cannot initialise the Evolution shell."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
+#: addressbook/gui/component/addressbook.c:1063
+msgid "UID of the contacts source that the view will display"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook folder viewer"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Cannot initialise Evolution's mail summary component."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -264,6 +351,7 @@ msgstr ""
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -297,8 +385,9 @@ msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr ""
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "Cannot initialise the Evolution shell."
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -315,57 +404,55 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 #, fuzzy
 msgid "Connecting"
 msgstr "Synchronise \"%s\""
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address:"
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-#, fuzzy
-msgid "LDAP Configuration Assistant"
-msgstr "Cannot initialise the Evolution shell."
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "Group:"
+msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr ""
 
@@ -388,8 +475,8 @@ msgid "S_earch scope: "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr ""
 
@@ -434,26 +521,27 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:47
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
+msgid "Step 1: Folder Characteristics"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-#, fuzzy
-msgid "Step 2: Connecting to Server"
-msgstr "Synchronise \"%s\""
+msgid "Step 2: Server Information"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr ""
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Synchronise \"%s\""
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr ""
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Synchronise \"%s\""
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -465,14 +553,6 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -480,7 +560,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -488,7 +568,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -498,43 +578,48 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 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:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 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:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 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:74
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -560,22 +645,30 @@ msgid "Using email address"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Display name:"
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -583,47 +676,45 @@ msgstr ""
 msgid "_Edit"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Synchronise \"%s\""
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
 msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
@@ -631,7 +722,7 @@ msgid "Remove All"
 msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr ""
@@ -659,23 +750,21 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr ""
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr ""
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr ""
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr ""
@@ -751,7 +840,8 @@ msgid "D_epartment:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr ""
 
@@ -816,12 +906,12 @@ msgid "_Categories..."
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr ""
@@ -1950,7 +2040,7 @@ msgid "Esq."
 msgstr ""
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr ""
 
@@ -2044,11 +2134,25 @@ msgstr ""
 msgid "Save List as VCard"
 msgstr ""
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr ""
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr ""
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr ""
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr ""
@@ -2063,20 +2167,6 @@ msgid ""
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr ""
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr ""
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2175,9 +2265,9 @@ msgstr ""
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr ""
@@ -2201,9 +2291,12 @@ msgstr "Synchronising \"%s\""
 msgid "Cut"
 msgstr ""
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr ""
 
@@ -2212,16 +2305,8 @@ msgstr ""
 msgid "Paste"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr ""
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr ""
 
@@ -2234,166 +2319,168 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "* Click here to add a contact *"
+msgid "Assistant"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant"
+msgid "Assistant Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Assistant Phone"
+msgid "Business Fax"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Address"
+msgid "Business Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Business Fax"
+msgid "Business Phone 2"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-msgid "Business Phone"
+msgid "Callback Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
-msgid "Business Phone 2"
+msgid "Car Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-msgid "Callback Phone"
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
 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:11
-msgid "Department"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#, fuzzy
+msgid "Family Name"
+msgstr "Synchronising \"%s\""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
+#, fuzzy
+msgid "Given Name"
+msgstr "Synchronising \"%s\""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Fax"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
+msgid "Home Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Fax"
+msgid "Home Phone 2"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "Home Phone"
+msgid "ISDN Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
-msgid "Home Phone 2"
-msgstr ""
+#, fuzzy
+msgid "Journal"
+msgstr "Colours"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisation"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr ""
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
+msgid "Other Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
-msgid "Other Fax"
+msgid "Pager"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
-msgid "Other Phone"
+msgid "Primary Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
-msgid "Pager"
+msgid "Radio"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-msgid "Primary Phone"
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
+msgid "Spouse"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
-msgid "Radio"
+msgid "TTYTDD"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
+msgid "Telex"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
+msgid "Title"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-msgid "Telex"
+msgid "Unit"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr ""
 
@@ -2477,11 +2564,19 @@ msgstr "Synchronising \"%s\""
 msgid "Job Title"
 msgstr ""
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr ""
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Colours"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr ""
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 msgid "Home page"
@@ -2492,163 +2587,160 @@ msgstr ""
 msgid "Blog"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Contact not found"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Contact ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Error adding contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 msgid "Error removing contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Organisation:"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Organisation:"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Organisation:"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Organisation:"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -2841,7 +2933,7 @@ msgstr ""
 msgid "Number of columns:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr ""
 
@@ -3024,18 +3116,18 @@ msgstr ""
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -3043,26 +3135,90 @@ msgstr ""
 msgid "Default Priority:"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Colours"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Cannot initialise the Evolution shell."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Cannot initialise the Evolution shell."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Cannot initialise the Evolution shell."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 #, fuzzy
 msgid "Starting:"
 msgstr "Synchronise \"%s\""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Cannot initialise the Evolution shell."
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr ""
@@ -3128,78 +3284,199 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+msgid "Calendars to run alarms for"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Colours for display"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Colours for display"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+msgid "Show where events end in week and month views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+msgid "The view showing when the calendar starts"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+msgid "Whether to hide completed tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+msgid "Whether to show week numbers in date navigator"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
 "events."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 msgid "Purge events older than"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr ""
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 #, fuzzy
 msgid "%d %B %Y"
 msgstr "%m/%d/%Y"
@@ -3207,47 +3484,76 @@ msgstr "%m/%d/%Y"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+msgid "Rename this calendar to"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Colours"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:639
 #, fuzzy
-msgid "Rename"
+msgid "New meeting"
+msgstr "Cannot initialise the Evolution shell."
+
+#: calendar/gui/calendar-component.c:640
+#, fuzzy
+msgid "M_eeting"
+msgstr "Cannot initialise the Evolution shell."
+
+#: calendar/gui/calendar-component.c:641
+#, fuzzy
+msgid "Create a new meeting request"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
+#: calendar/gui/calendar-component.c:646
+msgid "New all day appointment"
 msgstr ""
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
 msgstr ""
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Synchronising \"%s\""
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3367,7 +3673,7 @@ msgstr ""
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr ""
 
@@ -3383,6 +3689,10 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3415,8 +3725,8 @@ msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr ""
 
@@ -3445,7 +3755,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr ""
 
@@ -3500,7 +3810,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr ""
 
@@ -3514,7 +3824,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr ""
 
@@ -3524,7 +3834,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr ""
 
@@ -3538,7 +3848,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr ""
 
@@ -3557,7 +3867,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr ""
 
@@ -3575,7 +3885,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr ""
 
@@ -3585,12 +3895,12 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr ""
 
@@ -3627,7 +3937,7 @@ msgid "_Fri"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr ""
 
@@ -3667,76 +3977,76 @@ msgstr ""
 msgid "before every appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
@@ -3746,162 +4056,166 @@ msgstr ""
 msgid "Validation error: %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 #, fuzzy
 msgid "Could not update object"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+msgid "Select destination source"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 msgid "The journal entry could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr ""
 
@@ -3917,43 +4231,43 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr ""
 
@@ -4022,31 +4336,31 @@ msgid "_Start time:"
 msgstr ""
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr ""
 
@@ -4087,21 +4401,15 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr ""
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr ""
@@ -4123,6 +4431,7 @@ msgid "_Invite Others..."
 msgstr ""
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4155,6 +4464,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Cannot initialise Evolution's mail component."
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 msgid "A group must be selected"
 msgstr ""
 
@@ -4182,32 +4492,55 @@ msgstr "Colours"
 msgid "Calendar Name"
 msgstr "Colours"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+msgid "<b>Task List Options</b>"
+msgstr ""
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Colours"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+msgid "Task List Group"
+msgstr ""
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Synchronising \"%s\""
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 msgid "This and Prior Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr ""
 
@@ -4256,10 +4589,14 @@ msgstr ""
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr ""
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+msgid "Date/Time"
+msgstr ""
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr ""
@@ -4324,39 +4661,39 @@ msgstr ""
 msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 #, fuzzy
 msgid "Save Event"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr ""
 
@@ -4366,43 +4703,43 @@ msgid "% _Complete"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr ""
 
@@ -4411,7 +4748,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr ""
 
@@ -4431,21 +4768,21 @@ msgstr ""
 msgid "_Web Page:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4453,9 +4790,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr ""
 
@@ -4560,26 +4897,21 @@ msgstr ""
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr ""
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4592,28 +4924,26 @@ msgid "Start Date"
 msgstr ""
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr "Colours"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 msgid "component"
 msgstr ""
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr ""
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr ""
 
@@ -4625,7 +4955,7 @@ msgstr ""
 msgid "S"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr ""
 
@@ -4633,14 +4963,14 @@ msgstr ""
 msgid "W"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4648,7 +4978,7 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4656,17 +4986,17 @@ msgstr ""
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr ""
 
@@ -4678,181 +5008,179 @@ msgstr ""
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
+msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
-msgid "Deleting selected objects"
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-#, fuzzy
-msgid "_Settings..."
-msgstr "Cannot initialise the Evolution shell."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+#, fuzzy
+msgid "_Settings..."
+msgstr "Cannot initialise the Evolution shell."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 msgid "Open _Web Page"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
@@ -4866,8 +5194,8 @@ msgstr ""
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr ""
 
@@ -4896,18 +5224,18 @@ msgid "URL"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4923,7 +5251,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr ""
 
@@ -4936,444 +5264,443 @@ msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 #, fuzzy
 msgid "Location:"
 msgstr "Organisation"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -5535,7 +5862,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -5599,95 +5926,81 @@ msgstr ""
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "Organisation:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "Organisation:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 msgid "Priority:"
 msgstr ""
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 msgid "Web Page:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5695,7 +6008,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5703,61 +6016,10 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 msgid "Purging"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Colours"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Cannot initialise the Evolution shell."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Cannot initialise the Evolution shell."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Cannot initialise the Evolution shell."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Cannot initialise Evolution's mail summary component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Cannot initialise Evolution's mail component."
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr ""
@@ -5814,296 +6076,331 @@ msgstr ""
 msgid "September"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr ""
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr ""
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr ""
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr ""
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr ""
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr ""
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+msgid "Rename this task list to"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Organisation:"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6111,11 +6408,11 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr ""
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr ""
 
@@ -6146,21 +6443,21 @@ msgstr ""
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr ""
 
@@ -7694,27 +7991,27 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr ""
 
@@ -7760,88 +8057,88 @@ msgstr "Synchronising \"%s\""
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 #, fuzzy
 msgid "Syncing folders"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr ""
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -7869,34 +8166,34 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr ""
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr ""
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 msgid "Filtering new message(s)"
 msgstr ""
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -7904,45 +8201,45 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr ""
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -7950,48 +8247,58 @@ msgid ""
 "%s"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr ""
+
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+msgid "Encrypted content"
+msgstr ""
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Synchronising \"%s\""
@@ -8090,15 +8397,15 @@ msgstr ""
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr ""
 
@@ -8395,77 +8702,87 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr ""
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 msgid "Unverified"
 msgstr ""
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 msgid "Good signature"
 msgstr ""
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 msgid "Bad signature"
 msgstr ""
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 msgid "Signing certificate not found"
 msgstr ""
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 msgid "Signing certificate not trusted"
 msgstr ""
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 msgid "Malformed signature"
 msgstr ""
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 msgid "Processing error"
 msgstr ""
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr ""
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr ""
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+msgid "Junk"
+msgstr ""
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr ""
@@ -8650,7 +8967,7 @@ msgid ""
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
@@ -8669,22 +8986,22 @@ msgstr ""
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Synchronising \"%s\""
@@ -8762,7 +9079,7 @@ msgstr "Synchronising \"%s\""
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -8774,7 +9091,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr ""
@@ -8812,53 +9129,68 @@ msgid "Failed to cache %s: %s"
 msgstr "Synchronising \"%s\""
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Synchronise \"%s\""
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Synchronising \"%s\""
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "Colours"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 msgid "Automatically synchronize remote mail locally"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9099,7 +9431,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Synchronising \"%s\""
@@ -9211,40 +9543,40 @@ msgstr ""
 msgid "Storing folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -9304,12 +9636,16 @@ msgstr "Synchronising \"%s\""
 msgid "Cannot create folder: %s: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+msgid "Folder already exists"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 msgid "The new folder name is illegal."
 msgstr ""
 
@@ -9352,7 +9688,7 @@ msgstr ""
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
@@ -9631,7 +9967,7 @@ msgstr ""
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr ""
 
@@ -9711,7 +10047,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr ""
 
@@ -9763,7 +10099,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr ""
 
@@ -9926,7 +10262,7 @@ msgstr ""
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr ""
 
@@ -10047,7 +10383,7 @@ msgstr ""
 msgid "%.0fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr ""
 
@@ -10091,11 +10427,11 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr ""
 
@@ -10106,45 +10442,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr ""
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10153,14 +10489,18 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr ""
 
+#: composer/e-msg-composer-hdrs.c:548
+msgid "Choose a folder to post the message to."
+msgstr ""
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr ""
@@ -10192,55 +10532,55 @@ msgstr ""
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10248,34 +10588,34 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr ""
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10283,25 +10623,26 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
-msgstr ""
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
+msgstr "Cannot initialise the Evolution shell."
 
 #: data/evolution.desktop.in.in.h:2
 #, fuzzy
-msgid "Ximian Evolution"
+msgid "Ximian Evolution (Unstable)"
 msgstr "Cannot initialise the Evolution shell."
 
 #: data/evolution.keys.in.h:1
@@ -10550,13 +10891,13 @@ msgstr ""
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr ""
 
@@ -10679,7 +11020,7 @@ msgstr ""
 msgid "You must specify a folder."
 msgstr "Synchronising \"%s\""
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr ""
@@ -10691,24 +11032,24 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr ""
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr ""
 
@@ -10802,7 +11143,7 @@ msgstr ""
 msgid "months"
 msgstr ""
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr ""
 
@@ -10899,7 +11240,7 @@ msgstr ""
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr ""
 
@@ -10970,112 +11311,117 @@ msgid "Source Account"
 msgstr ""
 
 #: filter/libfilter-i18n.h:35
+msgid "Spam"
+msgstr ""
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr ""
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "does not return"
 msgstr ""
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "is before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr ""
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr ""
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
@@ -11100,20 +11446,86 @@ msgstr ""
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "Synchronising \"%s\""
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 #, fuzzy
 msgid "VFolder source"
 msgstr "Synchronising \"%s\""
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Cannot initialise the Evolution shell."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr ""
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr ""
@@ -11156,7 +11568,7 @@ msgid "Protocol"
 msgstr ""
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr ""
 
@@ -11181,45 +11593,42 @@ msgstr ""
 msgid "Signature(s)"
 msgstr ""
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr ""
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11229,188 +11638,389 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr ""
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Synchronising \"%s\""
+
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr ""
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
 #, c-format
-msgid "\"%s\" in \"%s\""
+msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/em-folder-selector.c:267
-#, fuzzy
-msgid "Folder _name"
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Synchronising \"%s\""
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Synchronising \"%s\""
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr ""
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 #, fuzzy
 msgid "Select folder"
 msgstr "Synchronising \"%s\""
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Synchronising \"%s\""
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Synchronising \"%s\""
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Synchronising \"%s\""
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr ""
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr ""
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+#, fuzzy
+msgid "Rename Folder"
+msgstr "Synchronising \"%s\""
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Synchronising \"%s\""
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr ""
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "Synchronising \"%s\""
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr ""
+
+#: mail/em-folder-tree.c:1492
+msgid "Open in _New Window"
+msgstr ""
+
+#: mail/em-folder-tree.c:1497
+msgid "_Move"
+msgstr ""
+
+#: mail/em-folder-tree.c:1500
+#, fuzzy
+msgid "_New Folder..."
+msgstr "Synchronising \"%s\""
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr ""
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr ""
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr ""
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr ""
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Colours"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+msgid "Mark as _Junk"
+msgstr ""
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+msgid "Mark as _Not Junk"
+msgstr ""
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "Synchronising \"%s\""
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 msgid "Filter on Thread"
 msgstr ""
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default"
 msgstr "Synchronising \"%s\""
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr ""
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Organisation"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, c-format
 msgid "Matches: %d"
 msgstr ""
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+msgid "Unsigned"
+msgstr ""
+
+#: mail/em-format-html-display.c:597
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr ""
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+msgid "Valid signature"
+msgstr ""
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+msgid "Invalid signature"
+msgstr ""
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+msgid "Unencrypted"
+msgstr ""
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+msgid "Encrypted"
+msgstr ""
+
+#: mail/em-format-html-display.c:608
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr ""
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+msgid "Unsupported signature format"
+msgstr ""
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+msgid "Unknown error verifying signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:917
 msgid "_View Inline"
 msgstr ""
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 msgid "_Hide"
 msgstr ""
 
@@ -11419,330 +12029,621 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr ""
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, c-format
 msgid "Retrieving `%s'"
 msgstr ""
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-
-#: mail/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-msgid "No signature present"
-msgstr ""
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Could not initialise Bonobo"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-msgid "Unsupported signature format"
-msgstr ""
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 msgid "Formatting message"
 msgstr ""
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr ""
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr ""
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr ""
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr ""
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr ""
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr ""
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/em-format.c:1259
-msgid "Could not parse S/MIME message: Unknown error"
+#: mail/em-format.c:1185
+#, fuzzy
+msgid "Session not initialised"
+msgstr "Could not initialise Bonobo"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/em-format.c:1212
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+msgid "Migrating..."
 msgstr ""
 
-#: mail/em-popup.c:593
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Synchronise \"%s\""
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Synchronising \"%s\""
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Synchronising \"%s\""
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Synchronising \"%s\""
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr ""
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 msgid "_Reply to sender"
 msgstr ""
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Synchronising \"%s\""
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Cannot initialise the Evolution shell."
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 msgid "Subscribed"
 msgstr ""
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr ""
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr ""
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr ""
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr ""
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr ""
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
 " %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Colours"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 msgid "Save Message..."
 msgstr ""
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Colours"
+
+#: mail/em-utils.c:2262
 #, c-format
-msgid "Could not create temporary directory: %s"
+msgid ""
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
 msgstr ""
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2288
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
+#: mail/evolution-mail.schemas.in.in.h:1
+msgid "Automatic link recognition"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+#: mail/evolution-mail.schemas.in.in.h:2
+msgid "Automatic smiley recognition"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Cannot initialise the Evolution shell."
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Cannot initialise Evolution's mail component."
+#: mail/evolution-mail.schemas.in.in.h:6
+msgid "Default charset in which to compose messages"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail component"
-msgstr "Cannot initialise Evolution's mail component."
+#: mail/evolution-mail.schemas.in.in.h:7
+msgid "Default charset in which to compose messages."
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Cannot initialise Evolution's mail component."
+#: mail/evolution-mail.schemas.in.in.h:8
+msgid "Default charset in which to display messages"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:9
+msgid "Default charset in which to display messages."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Cannot initialise Evolution's mail component."
+msgid "Default forward style"
+msgstr "Synchronising \"%s\""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
+msgid "Default reply style"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+msgid "Empty Trash folders on exit"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:14
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+msgid "List of accounts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
+msgid "Log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "New Mail Notify sound file"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
+msgid "New Mail Notify type"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:44
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+msgid "Send HTML mail by default"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:52
+msgid "Send HTML mail by default."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:53
+msgid "Show Animations"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:54
+msgid "Show animated images as animations."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+msgid "Show deleted messages in the message-list"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:57
+msgid "Show the \"Preview\" pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+msgid "Sound file to play when new mail arrives."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+msgid "Spell check inline"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:62
+msgid "Terminal font"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+msgid "The variable width font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Cannot initialise Evolution's mail summary component."
+msgid "Thread the message list."
+msgstr "Synchronising \"%s\""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Cannot initialise Evolution's mail summary component."
+msgid "Thread the message-list"
+msgstr "Synchronising \"%s\""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/importers/elm-importer.c:105
-msgid "Evolution is importing your old Elm mail"
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
-msgid "Importing..."
+#: mail/evolution-mail.schemas.in.in.h:70
+msgid "UID string of the default account."
 msgstr ""
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
-msgid "Please wait"
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
 msgstr ""
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, fuzzy, c-format
-msgid "Scanning %s"
-msgstr "Synchronise \"%s\""
+#: mail/evolution-mail.schemas.in.in.h:73
+msgid "Variable width font"
+msgstr ""
 
-#: mail/importers/elm-importer.c:547
-msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/importers/elm-importer.c:568
-msgid "Elm"
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
 msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
@@ -11777,6 +12678,42 @@ msgstr ""
 msgid "Evolution Pine importer"
 msgstr "Cannot initialise Evolution's mail component."
 
+#: mail/importers/elm-importer.c:105
+msgid "Evolution is importing your old Elm mail"
+msgstr ""
+
+#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
+#: mail/importers/pine-importer.c:115
+msgid "Importing..."
+msgstr ""
+
+#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
+#: mail/importers/pine-importer.c:117
+msgid "Please wait"
+msgstr ""
+
+#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
+#: mail/importers/pine-importer.c:288
+#, c-format
+msgid "Importing %s as %s"
+msgstr ""
+
+#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
+#: mail/importers/pine-importer.c:425
+#, fuzzy, c-format
+msgid "Scanning %s"
+msgstr "Synchronise \"%s\""
+
+#: mail/importers/elm-importer.c:547
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: mail/importers/elm-importer.c:568
+msgid "Elm"
+msgstr ""
+
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -11818,12 +12755,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr ""
-
 #: mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
@@ -11834,7 +12765,7 @@ msgstr "Synchronise \"%s\""
 msgid "Scanning directory"
 msgstr "Synchronising \"%s\""
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr ""
 
@@ -11902,23 +12833,23 @@ msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr ""
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -11927,35 +12858,35 @@ msgstr ""
 msgid "Mail to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, c-format
 msgid "Replies to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11963,141 +12894,32 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr ""
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr ""
-
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Synchronising \"%s\""
-
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Synchronising \"%s\""
-
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Synchronising \"%s\""
-
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Synchronising \"%s\""
-
-#: mail/mail-component.c:1014
-#, c-format
-msgid ""
-"The following error occured while migrating your mail data:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-component.c:1632
-msgid "Select destination to copy folder into"
-msgstr ""
-
-#: mail/mail-component.c:1643
-msgid "Select destination to move folder into"
-msgstr ""
-
-#: mail/mail-component.c:1707
+#: mail/mail-component.c:379
 #, fuzzy
-msgid "Create folder"
-msgstr "Synchronising \"%s\""
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr ""
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Synchronising \"%s\""
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Synchronising \"%s\""
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr ""
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr ""
+msgid "New Mail Message"
+msgstr "Colours"
 
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
+#: mail/mail-component.c:380
 #, fuzzy
-msgid "Rename Folder"
-msgstr "Synchronising \"%s\""
+msgid "_Mail Message"
+msgstr "Colours"
 
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/mail-component.c:1860
+#: mail/mail-component.c:472
 #, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Synchronising \"%s\""
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr ""
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "Synchronising \"%s\""
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr ""
-
-#: mail/mail-component.c:2079
-msgid "Open in _New Window"
-msgstr ""
-
-#: mail/mail-component.c:2084
-msgid "_Move"
-msgstr ""
-
-#: mail/mail-component.c:2087
-#, fuzzy
-msgid "_New Folder..."
-msgstr "Synchronising \"%s\""
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr ""
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
+msgid ""
+"The following error occured while migrating your mail data:\n"
+"%s"
 msgstr ""
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr ""
 
@@ -12146,11 +12968,11 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr ""
 
@@ -12232,27 +13054,35 @@ msgid "C_olors"
 msgstr "Colours"
 
 #: mail/mail-config.glade.h:26
-msgid "Check spelling while I _type"
+msgid "Check _Incoming Mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:27
-msgid "Checking for New Mail"
+msgid "Check spelling while I _type"
 msgstr ""
 
 #: mail/mail-config.glade.h:28
+msgid "Checking for New Mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Colours for display"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12262,483 +13092,500 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Encry_ption certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Composer"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Fonts"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organisation:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Synchronise \"%s\""
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Si_gning certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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:121
+#: mail/mail-config.glade.h:124
 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:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+msgid "_Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr ""
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr ""
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr ""
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Synchronise \"%s\""
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr ""
 
@@ -12751,158 +13598,162 @@ msgstr "Synchronising \"%s\""
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr ""
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Synchronise \"%s\""
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr ""
@@ -12919,59 +13770,72 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+msgid "Digital Signature"
+msgstr ""
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-security.glade.h:4
+msgid "Security Information"
+msgstr ""
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 msgid "Cancel _All"
 msgstr ""
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr ""
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -13007,26 +13871,31 @@ msgstr ""
 msgid "Name:"
 msgstr ""
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-vfolder.c:87
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13035,90 +13904,90 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 #, fuzzy
 msgid "vFolders"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr ""
 
@@ -13175,11 +14044,11 @@ msgstr ""
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr ""
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr ""
 
@@ -13232,41 +14101,133 @@ msgstr ""
 msgid "_Unsubscribe"
 msgstr ""
 
-#: shell/e-folder-dnd-bridge.c:55
-#, fuzzy, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Cannot initialise the Evolution shell."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+#, fuzzy
+msgid "Folder Settings"
+msgstr "Synchronising \"%s\""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+msgid "480"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Synchronising \"%s\""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+msgid "Default width of the folder bar pane"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+msgid "Default width of the shortcut bar pane"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+msgid "Default window height"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+msgid "Default window width"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-folder-list.c:338
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
-msgid "Add a Folder"
+msgid "Path to the default mail folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Synchronising \"%s\""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
 msgstr ""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
 msgstr ""
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
 msgstr ""
 
-#: shell/e-local-storage.c:182
+#: shell/apps_evolution_shell.schemas.in.in.h:19
 #, fuzzy
-msgid "Sent"
+msgid "Physical URI to the default tasks folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+msgid "Whether to show the folder bar"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+msgid "Whether to show the shortcut bar"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "Colours"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13274,14 +14235,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13289,7 +14250,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13387,9 +14348,10 @@ msgid ""
 "%s"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
+msgid "The specified folder name is not valid: %s"
 msgstr ""
 
 #: shell/e-shell-folder-commands.c:584
@@ -13410,20 +14372,15 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:318
-#, fuzzy
-msgid "Create New Folder"
-msgstr "Synchronising \"%s\""
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr ""
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr ""
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13432,11 +14389,11 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13444,134 +14401,116 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 #, fuzzy
 msgid "Select importer"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr ""
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 msgid "File _type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 msgid "Import a _single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr ""
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 msgid "_Import"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-
-#: shell/e-shell-offline-sync.c:232
-#, fuzzy
-msgid "Syncing Folder"
-msgstr "Synchronising \"%s\""
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, fuzzy, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Synchronising \"%s\""
-
 #: shell/e-shell-settings-dialog.c:346
 #, fuzzy
 msgid "Evolution Settings"
@@ -13608,7 +14547,7 @@ msgstr "Synchronising \"%s\""
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -13617,17 +14556,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr ""
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr ""
@@ -13686,60 +14619,47 @@ msgstr ""
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr ""
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr ""
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr ""
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr ""
 
@@ -13854,73 +14774,16 @@ msgstr ""
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:1096
-msgid "Shortcuts"
-msgstr ""
-
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr ""
-
-#: shell/e-storage.c:573
-msgid "A folder with the same name already exists"
-msgstr ""
-
-#: shell/e-storage.c:575
-msgid "The specified folder type is not valid"
-msgstr ""
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr ""
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr ""
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr ""
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr ""
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr ""
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr ""
-
-#: shell/e-storage.c:591
-msgid "The specified type is not supported in this storage"
-msgstr ""
-
-#: shell/e-storage.c:593
-msgid "The specified folder cannot be modified or removed"
-msgstr ""
-
-#: shell/e-storage.c:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr ""
-
-#: shell/e-storage.c:597
-#, fuzzy
-msgid "Cannot create a folder with that name"
-msgstr "Synchronising \"%s\""
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
 msgstr ""
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
+#: shell/e-shortcuts.c:1097
+msgid "Shortcuts"
 msgstr ""
 
 #: shell/e-task-widget.c:211
@@ -13933,6 +14796,17 @@ msgstr ""
 msgid "%s (%d%% complete)"
 msgstr ""
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr ""
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr ""
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -13959,76 +14833,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1215
-#, fuzzy
-msgid "Has subfolders"
-msgstr "Synchronising \"%s\""
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr ""
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr ""
-
-#: shell/evolution-test-component.c:703
-#, fuzzy
-msgid "Evolution Test Component"
-msgstr "Cannot initialise Evolution's mail component."
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "Active Connections"
@@ -14060,10 +14864,6 @@ msgstr ""
 msgid "_Tasks:"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr ""
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder _type:"
 msgstr ""
@@ -14118,25 +14918,6 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Cannot initialise the Evolution shell."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-#, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-#, fuzzy
-msgid "Folder Settings"
-msgstr "Synchronising \"%s\""
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -14172,7 +14953,7 @@ msgstr ""
 msgid "Importers"
 msgstr ""
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr ""
 
@@ -14188,16 +14969,16 @@ msgstr ""
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr ""
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14217,73 +14998,112 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:289
+#: shell/main.c:294
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Synchronising \"%s\""
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 msgid "Certificate Name"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "Colours"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 msgid "Expires"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Synchronising \"%s\""
 
+#: smime/gui/certificate-viewer.c:281
+#, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14333,83 +15153,334 @@ msgid "Backup All"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+msgid "Certificate"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:15
+msgid "Certificate Authority Trust"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:16
+msgid "Certificate details"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:17
 msgid "Common Name (CN)"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 msgid "Contact Certificates"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "Synchronising \"%s\""
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 msgid "Email Signer Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 msgid "Expires On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Organisation"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Organisation"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 msgid "View"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+msgid "View Certificate"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:42
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:36
-msgid "import"
+#: smime/lib/e-cert-db.c:494
+msgid "Certificate already exists"
+msgstr ""
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+msgid "%d/%m/%Y"
+msgstr "%m/%d/%Y"
+
+#: smime/lib/e-cert.c:473
+msgid "Version"
+msgstr ""
+
+#: smime/lib/e-cert.c:488
+msgid "Version 1"
+msgstr ""
+
+#: smime/lib/e-cert.c:491
+msgid "Version 2"
+msgstr ""
+
+#: smime/lib/e-cert.c:494
+msgid "Version 3"
+msgstr ""
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+msgid "C"
+msgstr ""
+
+#: smime/lib/e-cert.c:588
+msgid "CN"
+msgstr ""
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+msgid "O"
+msgstr ""
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+msgid "DN"
+msgstr ""
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+msgid "ST"
+msgstr ""
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+msgid "Certificate Key Usage"
+msgstr ""
+
+#: smime/lib/e-cert.c:615
+msgid "Netscape Certificate Type"
+msgstr ""
+
+#: smime/lib/e-cert.c:618
+msgid "Certificate Authority Key Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:621
+msgid "UID"
+msgstr ""
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+msgid "Subject's Public Key"
+msgstr ""
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+msgid "Error: Unable to process extension"
+msgstr ""
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+msgid "SSL Certificate Authority"
+msgstr ""
+
+#: smime/lib/e-cert.c:781
+msgid "Email Certificate Authority"
+msgstr ""
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Synchronise \"%s\""
+
+#: smime/lib/e-cert.c:813
+msgid "Non-repudiation"
+msgstr ""
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+msgid "Data Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+msgid "Certificate Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Organisation"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+msgid "Not Critical"
+msgstr ""
+
+#: smime/lib/e-cert.c:907
+msgid "Extensions"
+msgstr ""
+
+#: smime/lib/e-cert.c:978
+#, c-format
+msgid "%s = %s"
+msgstr ""
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+msgid "Certificate Signature Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:1043
+msgid "Issuer"
+msgstr ""
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+msgid "Subject Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1159
+msgid "Certificate Signature Value"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+msgid "Enter password for PKCS12 file:"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:379
+msgid "Imported Certificate"
 msgstr ""
 
 #: tools/evolution-launch-composer.c:324
@@ -14462,7 +15533,7 @@ msgstr ""
 msgid "Copy to Folder..."
 msgstr "Synchronising \"%s\""
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr ""
 
@@ -14478,7 +15549,7 @@ msgstr ""
 msgid "Move to Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr ""
 
@@ -14486,8 +15557,8 @@ msgstr ""
 msgid "Previews the contacts to be printed"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr ""
@@ -14532,13 +15603,13 @@ msgstr ""
 msgid "View the current contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr ""
 
@@ -14568,137 +15639,107 @@ msgstr ""
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "Synchronising \"%s\""
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "Synchronising \"%s\""
 
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a new meeting"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Colours"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Cannot initialise the Evolution shell."
-
-#: ui/evolution-calendar.xml.h:27
-msgid "New _Task"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 msgid "Purg_e"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 msgid "Purge old appointments and meetings"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 msgid "Show as list"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr ""
 
@@ -14764,7 +15805,7 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr ""
 
@@ -14982,7 +16023,7 @@ msgstr ""
 msgid "Mark all visible messages as read"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr ""
 
@@ -15038,17 +16079,6 @@ msgstr ""
 msgid "_Threaded Message List"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr ""
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-#, fuzzy
-msgid "_Close"
-msgstr "Colours"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr ""
@@ -15205,254 +16235,277 @@ msgstr ""
 msgid "Increase the text size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+msgid "Mark the selected message(s) as junk"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:57
+msgid "Mark the selected message(s) as not being junk"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+msgid "Not Junk"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 msgid "Post a Repl_y"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 msgid "S_earch in Message..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr ""
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr ""
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "_Close"
+msgstr "Colours"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr ""
@@ -15732,11 +16785,12 @@ msgid "Change Evolution's settings"
 msgstr "Cannot initialise the Evolution shell."
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr ""
+#, fuzzy
+msgid "Create a new window"
+msgstr "Synchronising \"%s\""
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
+msgid "E_xit"
 msgstr ""
 
 #: ui/evolution.xml.h:7
@@ -15748,7 +16802,7 @@ msgid "Import data from other programs"
 msgstr ""
 
 #: ui/evolution.xml.h:10
-msgid "Open a new Evolution window"
+msgid "Open a new window"
 msgstr ""
 
 #: ui/evolution.xml.h:11
@@ -15757,54 +16811,66 @@ msgid "Pi_lot Settings..."
 msgstr "Cannot initialise the Evolution shell."
 
 #: ui/evolution.xml.h:12
-msgid "Set up Pilot configuration"
+msgid "Send / Receive"
 msgstr ""
 
 #: ui/evolution.xml.h:13
-msgid "Show information about Ximian Evolution"
+msgid "Send queued items and retrieve new items"
 msgstr ""
 
 #: ui/evolution.xml.h:14
-msgid "Submit Bug Report"
+msgid "Set up Pilot configuration"
 msgstr ""
 
 #: ui/evolution.xml.h:15
-msgid "Submit _Bug Report"
+msgid "Show information about Ximian Evolution"
 msgstr ""
 
 #: ui/evolution.xml.h:16
-msgid "Submit a bug report using Bug Buddy"
+msgid "Submit Bug Report"
 msgstr ""
 
 #: ui/evolution.xml.h:17
-msgid "Toggle"
+msgid "Submit _Bug Report"
 msgstr ""
 
 #: ui/evolution.xml.h:18
+msgid "Submit a bug report using Bug Buddy"
+msgstr ""
+
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "Cannot initialise the Evolution shell."
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr ""
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr ""
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr ""
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr ""
+
+#: ui/evolution.xml.h:33
+msgid "_Window"
+msgstr ""
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr ""
@@ -15927,12 +16993,12 @@ msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr ""
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr ""
 
@@ -16066,7 +17132,7 @@ msgstr ""
 msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 #, fuzzy
 msgid "_Clear"
 msgstr "Colours"
@@ -16083,17 +17149,62 @@ msgstr ""
 msgid "Text"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:928
-#, fuzzy
-msgid "Clear"
-msgstr "Colours"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+msgid "Find _Now"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Address List"
+#~ msgid "Other Contacts"
+#~ msgstr "Organisation:"
+
+#, fuzzy
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Folder _name"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Add a Folder"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Sent"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Syncing Folder"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Has subfolders"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Evolution Test Component"
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Clear"
 #~ msgstr "Colours"
 
 #, fuzzy
@@ -16197,18 +17308,10 @@ msgstr ""
 #~ msgstr "Synchronising \"%s\""
 
 #, fuzzy
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
 #~ msgid "Could not create a PGP signature context"
 #~ msgstr "Synchronising \"%s\""
 
 #, fuzzy
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
 #~ msgid "by %B %d, %Y, %l:%M %P"
 #~ msgstr "%a %d/%m/%Y %I:%M %p"
 
@@ -16365,10 +17468,6 @@ msgstr ""
 #~ msgstr "Colours"
 
 #, fuzzy
-#~ msgid "Corona"
-#~ msgstr "Colours"
-
-#, fuzzy
 #~ msgid "Homer"
 #~ msgstr "Colours"
 
@@ -16417,10 +17516,6 @@ msgstr ""
 #~ msgstr "Synchronising \"%s\""
 
 #, fuzzy
-#~ msgid "Stauning"
-#~ msgstr "Synchronise \"%s\""
-
-#, fuzzy
 #~ msgid "Tabatinga"
 #~ msgstr "Organisation"
 
@@ -16453,10 +17548,6 @@ msgstr ""
 #~ msgstr "Colours"
 
 #, fuzzy
-#~ msgid "miles"
-#~ msgstr "Colours"
-
-#, fuzzy
 #~ msgid "Weather Settings"
 #~ msgstr "Synchronising \"%s\""
 
@@ -16702,9 +17793,6 @@ msgstr ""
 #~ msgid "Cannot initialize Evolution's Executive Summary component."
 #~ msgstr "Cannot initialise Evolution's mail component."
 
-#~ msgid "%d/%m/%Y"
-#~ msgstr "%m/%d/%Y"
-
 #, fuzzy
 #~ msgid "Colors for Tasks"
 #~ msgstr "Colours for display"
diff --git a/po/es.po b/po/es.po
index 38da3919ce..71d917da88 100644
--- a/po/es.po
+++ b/po/es.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.evolution-1-4-branch.es\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-08-01 03:05+0200\n"
 "Last-Translator: Francisco Javier F. Serrador <serrador@arrakis.es>\n"
 "Language-Team: Spanish <traductores@es.gnome.org>\n"
@@ -39,51 +39,184 @@ msgstr "No se pudo cargar %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "No se pudo leer el bloque de la aplicación de la Agenda del Pilot"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Carpetas para autocompletar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "ID del _certificado:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Configure sus cuentas de correo aquí"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Contactos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
+msgstr "Libreta de direcciones de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address pop-up"
+msgstr "Direcciones emergentes en la libreta de direcciones de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address viewer"
+msgstr "Visor de direcciones de la libreta de direcciones de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook card viewer"
+msgstr "Visor de minitarjetas de la libreta de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook component"
+msgstr "Componente de libreta de direcciones de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook folder viewer"
+msgstr "Visor de carpetas de la libreta de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Control de preferencias de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Control de configuración de preferencias de carpetas de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Agenda de direcciones"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Propiedades..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Borrar"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "_Renombrar"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Contacto nuevo:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Contacto"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "Crea un contacto nuevo"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Lista de contactos nueva"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "Lista de contactos nueva"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "Crea una lista de contactos nueva"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Privado"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Trabajo"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "Servidor LDAP"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "No se pudo crear el directorio %s: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "Falló al conectarse al servidor LDAP."
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "Falló al autenticarse con el servidor LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "No se pudo efectuar la consulta en la raíz DSE"
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "El servidor respondió con bases de búsqueda no soportadas"
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Este servidor no soporta el esquema de información LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "Error al obtener información del esquema"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr "El servidor no respondió con una información del esquema válida"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Nombre de la cuenta"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Nombre del servidor"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP no fue activado en la compilación de Evolution"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Otros contactos"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -91,7 +224,7 @@ msgstr ""
 "No pudimos abrir esta agenda de direcciones.  Por favor compruebe\n"
 "que existe la ruta y que tiene permisos para acceder a ella."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -101,7 +234,7 @@ msgstr ""
 "que ha introducido una URI errónea, o que el servidor LDAP está\n"
 "caído"
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -113,7 +246,7 @@ msgstr ""
 "de las fuentes del CVS una vez que haya obtenido LDAP del\n"
 "siguiente enlace.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -127,44 +260,43 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "No es posible abrir la agenda de direcciones"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "Accediendo al servidor LDAP anónimamente"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "Falló al autenticarme.\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s Introduzca la contraseña para %s (usuario %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "Nombre empieza con"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "La dirección de correo comienza con"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Categoría es"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Avanzado..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -177,7 +309,7 @@ msgstr ""
 "aumente el límite de resultados en las preferencias del servidor\n"
 "de directorios para esta libreta de direcciones."
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -192,91 +324,43 @@ msgstr ""
 "para esta libreta de \n"
 "direcciones."
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "El soporte de esta libreta de direcciones no pudo analizar esta consulta"
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "El soporte para esta libreta de direcciones rehusó a efectuar esta consulta"
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "Esta consulta no se completó con éxito"
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Cualquier categoría"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "La URI que mostrará la agenda"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "ID del _certificado:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "Configurar aquí el acceso a los servidores de directorios LDAP"
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Contactos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "Servidores de directorio"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Libreta de direcciones de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook LDAP Configuration Control"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
 msgstr ""
-"Control de configuración de la libreta de direcciones LDAP de Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "Direcciones emergentes en la libreta de direcciones de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "Visor de direcciones de la libreta de direcciones de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Visor de minitarjetas de la libreta de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr "Componente de libreta de direcciones de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook folder viewer"
-msgstr "Visor de carpetas de la libreta de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Control de preferencias de Evolution"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -299,6 +383,7 @@ msgstr " Mo_strar bases soportadas "
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -332,8 +417,9 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "Añadir servidor LDAP"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "Asistente de configuración LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -349,9 +435,9 @@ msgid "Anonymously"
 msgstr "Anónimamente"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -362,49 +448,50 @@ msgstr ""
 "Por favor, pulse el botón «Terminar» para guardar la configuración que ha "
 "entrado aquí"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "Conexión"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "_Nombre distintivo:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr "Editar servidor LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
 msgstr "Dirección de correo:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 "Evolution usará este Nombre Distintivo para autenticarle con el servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution usará esta dirección de correo para autenticarle con el servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "Terminar"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "Asistente de configuración LDAP"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "Grupo"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Nunca"
 
@@ -432,8 +519,8 @@ msgid "S_earch scope: "
 msgstr "Ámbito de bú_squeda: "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Búsqueda"
 
@@ -491,28 +578,32 @@ msgstr ""
 "y para crear y editar contactos."
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 "Especificar un nombre para mostrar es el último paso requerido para "
 "configurar un servidor LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "Paso 1 Información del servidor"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "Paso 2. Conectando al servidor..."
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "Paso 1 Información del servidor"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "Paso 3. Buscando el directorio"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Paso 2. Conectando al servidor..."
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "Paso 4. Mostrando el nombre"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Paso 3. Buscando el directorio"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -524,18 +615,6 @@ msgstr "Bases de búsqueda soportadas"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"El primer paso en configurar un servidor LDAP es proporcionar su nombre, y "
-"su información\n"
-"de inicio de sesión. Por favor pregunte a su administrador de sistemas si no "
-"está seguro de esta información."
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -547,7 +626,7 @@ msgstr ""
 "Pregunte a su administrador de sistemas si\n"
 "necesita cambias estas opciones."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -559,7 +638,7 @@ msgstr ""
 "Si deja esto en blanco, la búsqueda empezará en la raíz del árbol de "
 "directorios."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -576,14 +655,14 @@ msgstr ""
 "las entradas \n"
 "un nivel bajo su base.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
+#, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "Este asistente le ayudará a acceder a servicios de directorio en línea "
 "usando\n"
@@ -593,7 +672,7 @@ msgstr ""
 "sobre el servidor.Contacte con su administrador de sistemas si necesita "
 "ayudapara buscar esta información."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -601,7 +680,7 @@ msgstr ""
 "Este es el nombre completo del servidor LDAP. Por ejemplo, «ldap.micompañia."
 "com»."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -610,7 +689,7 @@ msgstr ""
 "Este es el máximo número de entradas a descargar.  Si pone este número "
 "demasiado alto ralentizará su agenda."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -620,7 +699,7 @@ msgstr ""
 "configurarlo como «Dirección de Correo» requiere acceso anónimo a su "
 "servidor ldap."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -629,6 +708,15 @@ msgstr ""
 "Este nombre será usado para identificar este servidor, Es sólo para poder "
 "mostrarlo en pantalla."
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Este nombre será usado para identificar este servidor, Es sólo para poder "
+"mostrarlo en pantalla."
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -659,21 +747,34 @@ msgid "Using email address"
 msgstr "Usando dirección de correo"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Cuando sea posible"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+"El primer paso en configurar un servidor LDAP es proporcionar su nombre, y "
+"su información\n"
+"de inicio de sesión. Por favor pregunte a su administrador de sistemas si no "
+"está seguro de esta información."
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "_Mostrar nombre:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "Límite de _descarga:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -681,54 +782,52 @@ msgstr "Límite de _descarga:"
 msgid "_Edit"
 msgstr "_Editar"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "Método de _inicio de sesión:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "Número de _puerto:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "Base de _búsqueda:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "Nombre del _servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "_Tiempo de expiración (minutos)"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "tarjetas"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr "Conexión"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr "búsqueda"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Nombre"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Interfaz de selección de nombre de la agenda de Evolution"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Eliminar todo"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Eliminar"
@@ -755,23 +854,21 @@ msgstr "Añadir a contactos"
 msgid "Unnamed Contact"
 msgstr "Contacto anónimo"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Nombre"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Fuente"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Seleccionas contactos de la Agenda"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "Buscar contacto en"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Interfaz de selección de nombre de la agenda de Evolution"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Buscar"
@@ -848,7 +945,8 @@ msgid "D_epartment:"
 msgstr "D_epartamento:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalles"
 
@@ -915,12 +1013,12 @@ msgid "_Categories..."
 msgstr "_Categorías..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Borrar"
@@ -2043,7 +2141,7 @@ msgid "Esq."
 msgstr "Esq."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Nombre completo"
 
@@ -2137,11 +2235,27 @@ msgstr "Editor de listas de contactos"
 msgid "Save List as VCard"
 msgstr "Guardar lista como VCard"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Contacto modificado:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Contacto en conflicto"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Detectado un contacto duplicado"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"La dirección o el nombre modificados de este contacto\n"
+"ya existen en esta carpeta.  ¿Quiere añadirlo de todos modos?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Contacto nuevo:"
@@ -2158,22 +2272,6 @@ msgstr ""
 "El nombre o la dirección de correo de este contacto ya existe\n"
 "en esta carpeta.  ¿Quiere añadirlo de todos modos?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Contacto modificado:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Contacto en conflicto"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"La dirección o el nombre modificados de este contacto\n"
-"ya existen en esta carpeta.  ¿Quiere añadirlo de todos modos?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2272,9 +2370,9 @@ msgstr "Reenviar contacto"
 msgid "Send Message to Contact"
 msgstr "Enviar un mensaje al contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimir"
@@ -2296,9 +2394,12 @@ msgstr "Mover a la carpeta..."
 msgid "Cut"
 msgstr "Cortar"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiar"
 
@@ -2307,16 +2408,8 @@ msgstr "Copiar"
 msgid "Paste"
 msgstr "Pegar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Borrar"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "Vista actual"
 
@@ -2332,166 +2425,170 @@ msgstr ""
 "se ha bloqueado. Tendrá que reiniciar Evolution para usarlo de nuevo"
 
 #: 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:2
 msgid "Assistant"
 msgstr "Secretario"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant Phone"
 msgstr "Teléfono del secretario"
 
-#: 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Fax del trabajo"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Teléfono del trabajo"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Teléfono del trabajo 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Teléfono para devolución de llamadas"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Teléfono del coche"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Categorías"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Teléfono de la compañía"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Departamento"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "Correo electrónico 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "Correo electrónico 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Apellido"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Archivar como"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "URL de disponibilidad"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Domicilio"
+#, fuzzy
+msgid "Given Name"
+msgstr "Nombre del campo"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Fax de casa"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Teléfono de casa"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Teléfono de casa 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "RDSI"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Teléfono"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Jordania"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Jefe"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Teléfono móvil"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Apodo"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Oficina"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organización"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Otra dirección"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Otro fax"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Otro teléfono"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Buscapersonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Teléfono principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Profesión"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Papel"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Cónyuge"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "Teletipo"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Télex"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Titulación"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Unst"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Sitio web"
 
@@ -2584,11 +2681,19 @@ msgstr "Miembros"
 msgid "Job Title"
 msgstr "_Puesto:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Domicilio"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Domicilio"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Otra dirección"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2601,112 +2706,109 @@ msgstr "Fax de casa"
 msgid "Blog"
 msgstr "Boloña"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Éxito"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Tarjeta no encontrada"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Ya existe el ID de la tarjeta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Protocolo no implementado"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "Falló en la autenticación"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "Autenticación Requerida"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS no Disponible"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "La libreta de direcciones no existe"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Otro error"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "¿Desea guardar los cambios?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Error añadiendo lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Error añadiendo tarjeta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Error modificando lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Error modificando tarjeta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Error eliminando lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Error eliminando tarjeta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2715,7 +2817,7 @@ msgstr ""
 "Abrir %d tarjetas abrirá %d ventanas nuevas también.\n"
 "¿Quiere realmente mostrar todas estas tarjetas?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2724,49 +2826,49 @@ msgstr ""
 "%s ya existe\n"
 "¿Quiere sobreescribirlo?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Error guardando %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "tarjeta.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Mover tarjeta a"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Copiar tarjeta a"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Mover tarjetas a"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Copiar tarjetas a"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "VCards múltiples"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard para %s"
@@ -2961,7 +3063,7 @@ msgstr "Márgenes"
 msgid "Number of columns:"
 msgstr "Número de columnas:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Opciones"
 
@@ -3148,18 +3250,18 @@ msgstr "Lista de anónimos"
 msgid "Split Multi-Day Events:"
 msgstr "Dividir eventos de días múltiples:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "No se ha podido iniciar el servidor wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "No se pudo inicializar wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "No se pudo leer información de la aplicación de calendario del Pilot"
 
@@ -3167,24 +3269,83 @@ msgstr "No se pudo leer información de la aplicación de calendario del Pilot"
 msgid "Default Priority:"
 msgstr "Prioridad predeterminada:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "No se pudo leer los datos de la aplicación ToDo del Pilot"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Calendario y tareas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Calendario"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configure su zona horaria, Calendario y Lista de Tareas aquí"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Calendario y tareas de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Control de configuración del Calendario de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Visor de menajes de horario del calendario de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Visor del calendario de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Editor de calendario/tareas de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Visor de tareas de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Componente calendario y tareas de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Componente de Prueba de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Tareas"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Servicio de notificación por alarma del Calendario de Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Comenzando:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Finalizando:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Alarma de Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarmas en %s"
@@ -3259,43 +3420,173 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "No me preguntes otra vez sobre este programa."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Servicio de notificación por alarma del Calendario de Evolution"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "No se pudo inicializar Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "No se pudo inicializar gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "No se pudo crear la fábrica del servicio de la alarma de notificación"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "tiempo no válido"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "Error de iCalendar"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Color para las tareas que vencen hoy"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Color para las tareas que vencen hoy"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr ""
+"Mostrar la hora del final de las citas en las vistas s_emanales y mensuales"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Previsualiza el calendario a imprimir"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "Pedir confirm_ación al borrar elementos"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "Pedir confirm_ación al borrar elementos"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Borrar las tareas completadas"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Mostrar los _números de las semanas en el navegador de fechas"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "El resumen contiene"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "La descripción contiene"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "El comentario contiene"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "No coincidente"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3307,81 +3598,110 @@ msgstr ""
 "\n"
 "¿Borrar realmente esas tareas?"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "devuelve menor que"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "días"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a, %d de %b de %Y"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d de %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Imprime este calendario"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Nueva Caledonia"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "Nueva cita"
+
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "Cit_a"
+
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Crear una nueva cita"
+
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "Reunión nueva"
+
+#: calendar/gui/calendar-component.c:640
+msgid "M_eeting"
+msgstr "R_eunión"
+
+#: calendar/gui/calendar-component.c:641
 #, fuzzy
-msgid "Rename"
-msgstr "_Renombrar"
+msgid "Create a new meeting request"
+msgstr "Crear una nueva petición de reunión"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Cita para todo el día"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Privado"
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr "Cita de todo el _día"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Trabajo"
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Crear una nueva cita"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3498,7 +3818,7 @@ msgstr "Enviar a:"
 msgid "With these arguments:"
 msgstr "Con estos argumentos:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr "diálogo1"
 
@@ -3514,6 +3834,10 @@ msgstr "horas"
 msgid "minutes"
 msgstr "minutos"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3546,8 +3870,8 @@ msgstr "Envía un correo"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Resumen:"
 
@@ -3576,7 +3900,7 @@ msgstr "fin de la cita"
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -3630,7 +3954,7 @@ msgstr "días"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Viernes"
 
@@ -3644,7 +3968,7 @@ msgstr "minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Lunes"
 
@@ -3654,7 +3978,7 @@ msgstr "_Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -3668,7 +3992,7 @@ 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:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -3686,7 +4010,7 @@ msgstr "Lista de tareas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Jueves"
 
@@ -3704,7 +4028,7 @@ msgstr "Formato de la hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Martes"
 
@@ -3714,12 +4038,12 @@ msgstr "La _semana empieza en:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Miércoles"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Semana laboral"
 
@@ -3756,7 +4080,7 @@ msgid "_Fri"
 msgstr "_Vie"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_General"
 
@@ -3797,7 +4121,7 @@ msgstr "M_ié"
 msgid "before every appointment"
 msgstr "antes de cada cita"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
@@ -3805,11 +4129,11 @@ msgstr ""
 "El evento que está borrando es una reunión, ¿quiere que envíe un aviso de "
 "cancelación?"
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "¿Seguro que quiere cancelar y borrar esta reunión?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
@@ -3817,11 +4141,11 @@ msgstr ""
 "La tarea que está siendo borrada está asignada, ¿quiere mandar un mensaje "
 "advirtiéndolo?"
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "¿Seguro que quiere cancelar y borrar esta tarea?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -3829,50 +4153,50 @@ msgstr ""
 "La entrada del diario que está borrando está publicada, ¿Quiere que envíe un "
 "aviso de cancelación?"
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "¿Seguro que quiere cancelar y borrar esta entrada del diario?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Este evento ha sido borrado."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Esta tarea ha sido borrada."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Esta entrada del diario ha sido borrada."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Ha hecho cambios. ¿Olvido los cambios y cierro el editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  No ha hecho cambios, ¿cerrar el editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Este evento ha cambiado."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Esta tarea a cambiado."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Esta entrada del diario ha cambiado."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Ha realizado cambios. ¿Olvido estos cambios y actualizo el editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  No ha realizado cambios, ¿actualizar el editor?"
@@ -3882,167 +4206,172 @@ msgstr "%s  No ha realizado cambios, ¿actualizar el editor?"
 msgid "Validation error: %s"
 msgstr "Error de validación: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " a "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr "(Completado "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Completado "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Vence "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Vence "
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "No se pudo actualizar el objeto"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Editar cita"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada del diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Sin resumen"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Guardar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Los cambios efectuados a este elemento pueden descartarse si llega una "
 "actualización por correo"
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Imposible obtener versión actual."
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Seleccionar una carpeta de destino donde importar estos datos"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "¿Seguro que quiere borrar la cita «%s»?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "¿Seguro que quiere borrar esta cita sin título?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "¿Seguro que quiere borrar la tarea «%s»?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "¿Seguro que quiere borrar esta tarea sin título?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "¿Seguro que quiere borrar la entrada del diario «%s»?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "¿Esta seguro que quiere borrar esta entrada del diario sin título?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "¿Seguro que quiere borrar %d citas?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "¿Seguro que quiere borrar %d tareas?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "¿Seguro que quiere borrar %d entradas del diario?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "El evento no pudo ser borrado debido a un error de corba"
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "La tarea no pudo ser borrada debido a un error de corba"
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "La entrada del diario no pudo ser borrada debido a un error de corba"
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "El elemento no pudo ser borrado debido a un error de corba"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "El evento no pudo ser borrado porque el permiso fue denegado"
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "La tarea no pudo ser borrada porque el permiso fue denegado"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 "La entrada del diario no pudo ser borrada porque el permiso fue denegado"
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "El elemento no pudo ser borrado porque el permiso fue denegado"
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "El evento no pudo ser borrado debido a un error de corba"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "La tarea no pudo ser borrada debido a un error de corba"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "La entrada del diario no pudo ser borrada debido a un error de corba"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "El elemento no pudo ser borrado debido a un error de corba"
@@ -4059,43 +4388,43 @@ msgstr "Delegar en:"
 msgid "Enter Delegate"
 msgstr "Escribir delegado"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Cita"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Recordatorio"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Repetición"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Planificación"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Reunión"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "La fecha de inicio está equivocada"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "La fecha de finalización  está equivocada"
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "La hora de inicio está equivocada"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "La  hora de finalización  está equivocada"
 
@@ -4165,31 +4494,31 @@ msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Ninguno"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr "El organizador seleccionado ya no tiene una cuenta por más tiempo."
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "Se requiere un organizador."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "Es necesario por lo menos un asistente."
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Delegado a..."
 
@@ -4230,21 +4559,15 @@ msgid "Member"
 msgstr "Miembro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Papel"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
@@ -4264,6 +4587,7 @@ msgid "_Invite Others..."
 msgstr "_Invitar a otros..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4296,6 +4620,7 @@ msgid "Could not create directory for new calendar"
 msgstr "No se pudo crear el directorio %s: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "Debe especificar un organizador."
@@ -4325,34 +4650,59 @@ msgstr "Información de calendario"
 msgid "Calendar Name"
 msgstr "Calendario"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "No se pudo crear el directorio %s: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Información de calendario"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Lista de tareas"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Lista de tareas"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Lista de tareas"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr "Está modificando un evento que se repite, ¿qué quiere modificar?"
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Está modificando una tarea que se repite, ¿qué quiere modificar?"
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 "Está modificando una entrada del diario que se repite, ¿qué quiere modificar?"
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr "Esta instancia únicamente"
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Esta instancia y las futuras"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr "Esta instancia y las futuras"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr "Todas las instancias"
 
@@ -4400,10 +4750,15 @@ msgstr "día"
 msgid "on the"
 msgstr "en el"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "ocurrencias"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Fecha/Hora:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "Aña_dir"
@@ -4468,7 +4823,7 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "año(s)"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
@@ -4478,32 +4833,32 @@ msgstr ""
 "\n"
 "¿Quiere guardar los cambios?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "_Descartar cambios"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 msgid "Save Event"
 msgstr "Guardar evento"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "La información de la reunión ha sido creada. ¿Desea enviarla?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "La información de la reunión ha cambiado. ¿Enviar versión actualizada?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr ""
 "La información de asignación de tareas ha sido creada. ¿Desea enviarla?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "La información de la tarea ha cambiado. ¿Enviar versión actualizada?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "La fecha de terminación es errónea"
 
@@ -4513,43 +4868,43 @@ msgid "% _Complete"
 msgstr "% Terminado"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Terminado"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Alta"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "En proceso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Baja"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Sin comenzar"
 
@@ -4558,7 +4913,7 @@ msgid "Progress"
 msgstr "Progreso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Sin definir"
 
@@ -4580,21 +4935,21 @@ msgstr "E_stado:"
 msgid "_Web Page:"
 msgstr "Dirección de la página _web:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Básico"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Asignación"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "La fecha de vencimiento es errónea"
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr "La fecha de vencimiento es anterior a la fecha de inicio."
 
@@ -4602,9 +4957,9 @@ msgstr "La fecha de vencimiento es anterior a la fecha de inicio."
 msgid "Con_fidential"
 msgstr "Con_fidencial"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Descripción:"
 
@@ -4709,26 +5064,21 @@ msgstr "%s a %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de disparador desconocido"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Público"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Categorías"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4741,28 +5091,26 @@ msgid "Start Date"
 msgstr "Fecha de inicio"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Resumen"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr " "
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Cita"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Libre"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Ocupado"
 
@@ -4774,7 +5122,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "E"
 
@@ -4782,7 +5130,7 @@ msgstr "E"
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4792,7 +5140,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4800,7 +5148,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Sí"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4808,17 +5156,17 @@ msgstr "No"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -4830,181 +5178,179 @@ msgstr "Repetición"
 msgid "Assigned"
 msgstr "Asignado"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Actualizando objetos"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Borrando los objetos seleccionados"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Actualizando objetos"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Nueva cit_a..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Nuevo _evento para todo el día"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "Nueva reunión"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Tarea nueva"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "Im_primir..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Ir a _hoy"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "_Ir a una fecha..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar la información de disponibilidad"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "_Configuración..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Guardar _como..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "Concertar una _reunión"
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "Reenviar como i_Calendar"
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _ocurrencia"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las ocurrencias"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "_Configuración..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Abrir mensaje"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "_Asignar tarea"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "Reenviar como i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "_Marcar como terminado"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar tareas seleccionadas como terminadas"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "_Borrar las tareas seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Pulse para añadir una tarea"
@@ -5018,8 +5364,8 @@ msgstr "% Terminado"
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Completo"
 
@@ -5048,18 +5394,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5078,7 +5424,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d de %B"
 
@@ -5091,125 +5437,125 @@ msgstr "%d de %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sí. (Repetición compuesta)"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "Cada día"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "Cada %d días"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "Cada semana"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "Cada %d semanas"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr "Cada semana en"
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Cada %d semanas en"
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " y "
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr "El %s día de "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr "El %s %s de"
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "cada mes"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr "Cada %d meses"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "Cada año"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "Cada %d años"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr " un total de %d veces"
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ", terminando en "
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>Empieza con:</b>"
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Termina: </b>"
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>Completado:</b> "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>Vencimiento:</b>"
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "Información del agenda"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "Error de iCalendar"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Una persona desconocida"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5217,321 +5563,320 @@ msgstr ""
 "<br> Por favor revise la siguiente información, y seleccione una acción del "
 "menú de abajo."
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Ninguna<i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "Lugar:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Estado:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Rechazado"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Elija una acción:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Actualizar"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Aceptar provisionalmente"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Rechazar"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Enviar información de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Actualizar el estado del remitente"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Enviar la última información"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ha publicado información de reunión."
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Información de reunió"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> solicita la presencia de %s en una reunión."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Propuesta de reunión"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Actualización de reunión"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> desea recibir la última información de la reunión."
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Petición de actualización de la reunión"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, 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:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Respuesta de reunión"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, 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:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Cancelación de reunión"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, 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:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Mensaje de reunión erróneo"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Información de la tarea"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> pide a %s que realice una tarea."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> le pide que realice una tarea."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Propuesta de tarea"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> desea añadirse a una tarea existente."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Actualización de tarea"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, 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:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Petición de actualización de tarea"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, 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:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Respuesta a una tarea"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> ha cancelado una tarea."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Cancelación de tarea"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Mensaje de tarea erróneo"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, 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:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Información de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, 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:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Petición de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, 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:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Respuesta sobre disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Mensaje de disponibilidad erróneo"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr "El mensaje no parece estar formado correctamente"
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "Este mensaje sólo contiene peticiones no soportadas."
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr "El adjunto no contiene un mensaje de calendario válido"
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr "El adjunto no tiene elementos de calendario visibles"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "El archivo del calendario no pudo ser actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Actualización terminada\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 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:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "El objeto es inválido y no puede ser actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Esta respuesta no es de un asistente. ¿Desea añadirlo como asistente?"
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 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:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr "Hubo un error en el sistema CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr "El objeto no pudo encontrarse\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "No tiene permiso para actualizar el calendario\n"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Estado de asistencia actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "El estado de asistencia no pudo ser actualizado.\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Eliminación terminada"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Elemento enviado.\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "El elemento no pudo ser enviado.\n"
 
@@ -5691,7 +6036,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -5755,49 +6100,44 @@ 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:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "Fecha de ini_cio:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "Fecha de _vencimiento:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "_Prioridad:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Página"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Abriendo tareas en %s"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "No se pudo cargar las tareas en «%s»"
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "El método necesario para cargar «%s» no está implementado"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "No tiene permiso para abrir la carpeta en «%s»"
 
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5806,48 +6146,39 @@ msgstr ""
 "Error en %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "Completando tareas..."
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "Borrando los objetos seleccionados..."
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "Purgando"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Tareas"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Calendario"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "No se pudo abrir la carpeta en «%s»"
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "El método necesario para abrir «%s» no está implementado"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Añadir alarmas para %s"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5858,7 +6189,7 @@ msgstr ""
 "%s\n"
 "se ha bloqueado. Tendrá que reiniciar Evolution para usarlo otra vez."
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5869,58 +6200,11 @@ msgstr ""
 "%s\n"
 "se ha bloqueado. Tendrá que reiniciar Evolution para usarlo de nuevo."
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Turín"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Calendario y tareas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Calendario"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configure su zona horaria, Calendario y Lista de Tareas aquí"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Calendario y tareas de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Control de configuración del Calendario de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Visor de menajes de horario del calendario de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Visor del calendario de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Editor de calendario/tareas de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Visor de tareas de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Componente calendario y tareas de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Componente de Prueba de Evolution"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Abril"
@@ -5977,296 +6261,332 @@ msgstr "Octubre"
 msgid "September"
 msgstr "Septiembre"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Debe especificar un organizador."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Es necesario por lo menos un asistente"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Información del evento"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Información de la tarea"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Información de la entrada de diario"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Información de disponibilidad"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Información de calendario"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Actualizado"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Regenerar"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "Contrapropuesta"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Información de disponibilidad (de %s a %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "Información de iCalendar"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un asistente del evento."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Mi"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Ju"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Vi"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Día seleccionado (%a %d de %b de %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %d de %b"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %d de %b de %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Semana seleccionada (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Mes seleccionado (%b de %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Año seleccionado (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Tarea"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridad: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaje completado: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorías: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Contactos: "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Vista previa"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Imprimir elemento"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Configurar impresión"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Renombrar este atajo"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Lista de tareas"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Nueva tarea"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Tarea"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Crear una nueva tarea"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "La URI que mostrará la carpeta de tareas"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6278,11 +6598,11 @@ msgstr ""
 "\n"
 "¿Borrar realmente esas tareas?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "No me preguntes otra vez."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "Imprimir tareas"
 
@@ -6310,15 +6630,15 @@ msgstr "Archivos iCalendar (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "Archivos vCalendar (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "¡¡Recuerde!!"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "Eventos de calendario"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6326,7 +6646,7 @@ msgstr ""
 "Evolution ha encontrado archivos de GNOME Calendar.\n"
 "¿Quiere importarlos a Evolution?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Calendario Gnome"
 
@@ -7859,27 +8179,27 @@ msgstr "Pacífico/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacífico/Yap"
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "Este método de encriptación no soporta firmas"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "Este método de encriptación no soporta verificación"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Este método de encriptación no soporta cifrado"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "La desencriptación no está soportada por este método de cifrado"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr "No puede importar claves con este método de cifrado"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr "No puede exportar claves con este método de cifrado"
 
@@ -7931,86 +8251,86 @@ msgstr "Preparando carpeta «%s» para desconexión"
 msgid "You must be working online to complete this operation"
 msgstr "Debe estar trabajando conectado para completar esta operación"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Falló al crear pipe a «%s»: %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Error al crear proceso hijo «%s»: %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Flujo de mensaje inválido recibido desde %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Sincronizando carpetas"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error analizando filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error ejecutando filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "No se pudo abrir la carpeta temporal"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "No se pudo procesar la carpeta temporal"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Obteniendo mensaje %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "No se pudo abrir el mensaje"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Error en el mensaje %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Sincronizando carpeta"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Obteniendo mensaje %d de %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Falló en el mensaje %d de %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Falló al obtener el mensaje."
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr "Argumentos inválidos a (system-flag)"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr "Argumentos inválidos a (user-tag)"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error ejecutando la búsqueda del filtro: %s: %s"
@@ -8042,35 +8362,35 @@ msgstr "(coincidir con todas) requiere un único resultado booleano"
 msgid "Performing query on unknown header: %s"
 msgstr "Realizando búsqueda en cabecera desconocida: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Operación no implementada: añadir mensaje: para %s"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Operación no implementada: búsqueda según la expresión %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Operación no implementada: búsqueda por uids: para %s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Moviendo mensajes"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr "Copiando mensajes"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Obteniendo %d mensajes(s)"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8081,15 +8401,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr "Falló al analizar el id del usuario gpg"
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr "Falló al analizar la petición de contraseña gpg"
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8098,30 +8418,30 @@ msgstr ""
 "Necesita una contraseña para desbloquear la clave para \n"
 "el usuario «%s»"
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Cancelado"
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Falló al desbloquear la clave secreta: se dieron 3 contraseñas falsas."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Respuesta inesperada del GNUPG: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr "No se proporcionaron datos"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "No se pudo cifrar este mensaje: no hay destinatarios."
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8132,51 +8452,65 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Error al  GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "No se pudo escribir datos: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Error al ejecutar gpg: %s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr "Falló al ejecutar gpg."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "Esta parte del mensaje está firmada digitalmente"
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr ""
+"No se pudo verificar la firma del mensaje: no pude crear un archivo "
+"temporal: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "No se pudo verificar la firma del mensaje: no pude crear un archivo "
 "temporal: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "No se pudo escribir datos: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Esta parte del mensaje está firmada digitalmente"
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Indexar contenido del cuerpo"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "No se pudo obtener los mensajes del editor"
@@ -8276,15 +8610,15 @@ msgstr "Error escribiendo en el archivo temporal de correo: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Error copiando el correo al archivo temporal: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Falló al descifrar la parte MIME: error del protocolo"
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "Falló al descifrar la parte MIME: estructura inválida"
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "error de análisis"
 
@@ -8610,12 +8944,12 @@ msgstr "Proveedor de correo de la carpeta virtual"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Para leer correo como una búsqueda de otras carpetas"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "No hay proveedor para el protocolo «%s»"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8624,71 +8958,82 @@ msgstr ""
 "No se pudo crear el directorio %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Introduzca su contraseña para %s"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Sin definir"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Editar firma"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Editar firma"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Certificado autofirmado en cadena"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "Certificado sin confianza"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Guardar firma"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Error de análisis"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Servidor: %s, Tipo: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "No se pudo obtener la carpeta: Operación no válida"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "No se pudo crear la carpeta: Operación no válida"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Papelera"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "Junio"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "No se pudo obtener el certificado del emisor."
@@ -8898,7 +9243,7 @@ msgstr ""
 "Lista de revocación de certificados caducada: %s\n"
 "Emisor: %s"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "No se pudo analizar la URL «%s»"
@@ -8917,22 +9262,22 @@ msgstr "No existe el mensaje %s en %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "No se pudo copiar o mover mensajes a una Carpeta Virtual"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "No se pudo borrar la carpeta: %s: Operación no válida"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "No se pudo borrar la carpeta: %s: No existe tal"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "No se pudo renombrar la carpeta: %s: Operación no válida"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "No se pudo cambiarle el nombre a la carpeta: %s: No existe"
@@ -9012,7 +9357,7 @@ msgstr "No se pudo descargar el mensaje: %s"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9026,7 +9371,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "No existe ese mensaje"
@@ -9064,55 +9409,70 @@ msgid "Failed to cache %s: %s"
 msgstr "Error al cachear %s: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Conectando al servidor..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Falló al conectarse al servidor LDAP."
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "Compañía"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Comprobación de correo nuevo"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 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:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Carpetas"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Mostrar solo las carpetas suscritas"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "Ignorar el espacio de nombres suministrado por el servidor"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Espacio de nombres"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 "Aplicar filtros a los mensajes nuevos en el buzón de entrada de este servidor"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "Comprobar el correo _automáticamente cada"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para leer y guardar correo en los servidores IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Contraseña"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Conectará con el servidor IMAP usando una contraseña de texto plano"
@@ -9364,7 +9724,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "No se pudo cambiarle el nombre de la carpeta %s a %s: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "No se pudo renombrar: «%s»: %s"
@@ -9480,29 +9840,29 @@ msgstr "Comprobando si hay mensajes nuevos"
 msgid "Storing folder"
 msgstr "Guardando carpeta"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "No se pudo crear un bloqueo de carpetas en %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "No se pudo abrir el buzón: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "Adición de mensaje cancelada"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "No se pudo añadir el mensaje al archivo mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9511,11 +9871,11 @@ msgstr ""
 "No se pudo obtener el mensaje; %s de la carpeta %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "La carpeta parece estar corrompida e irrecuperable."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Falló la construcción del mensaje: ¿Buzón corrompido?"
 
@@ -9583,12 +9943,17 @@ msgstr "No se pudo crear el directorio %s: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "No se pudo acceder a la carpeta: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "Ya existe el ID de la tarjeta"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "No se pudo cambiarle el nombre de la carpeta %s a %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "El nombre de carpeta especificado no es valido: %s"
@@ -9632,7 +9997,7 @@ msgstr "No se pudo cerrar la carpeta origen %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "No se pudo cerrar la carpeta temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "No se pudo cambiar el nombre a la carpeta: %s"
@@ -9920,7 +10285,7 @@ msgstr "Borrar tras %s día(s)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Desactivar soporte para todas las extensiones POP3"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -10010,7 +10375,7 @@ msgid "No such folder `%s'."
 msgstr "No existe la carpeta «%s»."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10063,7 +10428,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Entregar correo por medio de sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10232,7 +10597,7 @@ msgstr "Envío de correo SMTP vía %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "No se pudo enviar el mensaje: dirección del remitente no válida."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
@@ -10355,7 +10720,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "adjunto"
 
@@ -10399,14 +10764,14 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir mostrar adjuntos automáticamente"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Necesita configurar una cuenta para\n"
 "antes de poder escribir mensajes de correo."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Pulse aquí para acceder a la agenda"
 
@@ -10417,45 +10782,45 @@ msgstr "Pulse 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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Responder a:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 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:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Cco:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10466,14 +10831,19 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Publicar A:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr "Publicar destino"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Adjuntar un archivo al mensaje"
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Adjuntar archivo(s)"
@@ -10508,21 +10878,21 @@ msgstr "El archivo existe, ¿quiere sobreescribirlo?"
 msgid "Error saving file: %s"
 msgstr "Error guardando el archivo: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error cargando el archivo: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Error accediendo al archivo: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "No se pudo obtener los mensajes del editor"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10531,7 +10901,7 @@ msgstr ""
 "No se pudo buscar en el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10540,7 +10910,7 @@ msgstr ""
 "No se pudo truncar el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10549,7 +10919,7 @@ msgstr ""
 "No se pudo copiar el descriptor de archivo:  %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10558,7 +10928,7 @@ msgstr ""
 "Error auto guardando el mensaje: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10566,7 +10936,7 @@ msgstr ""
 "Ximian Evolution ha encontrado archivos no guardados de una sesión previa.\n"
 "¿Quiere tratar de recuperarlos?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10577,28 +10947,28 @@ msgstr ""
 "\n"
 "¿Quiere guardar los cambios?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Aviso: Mensaje modificado"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "Firma"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "Autogenerado"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Redactar un mensaje"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10606,7 +10976,7 @@ msgstr ""
 "No se pudo crear una ventana de composición:\n"
 "No se pudoactivar el control de selección de direcciones."
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10618,7 +10988,7 @@ msgstr ""
 "Por favor, asegúrese de que tiene la versión \n"
 "correcta de gtkhtml y libgtkthml instalada.\n"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10626,7 +10996,7 @@ msgstr ""
 "No se pudo crear una ventana de composición:\n"
 "No se pudoactivar el componente del editor HTML."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10634,11 +11004,13 @@ msgstr ""
 "<b>(El editor contiene un mensaje sin texto, que no puede editarse)</b>"
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "La herramienta de trabajo en grupo Evolution"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10893,13 +11265,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11018,7 +11390,7 @@ msgstr "Entonces"
 msgid "You must specify a folder."
 msgstr "Debe especificar una carpeta."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
@@ -11032,24 +11404,24 @@ msgstr ""
 "Error en la expresión regular «%s»:\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Importante"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "Tareas pendientes"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Más tarde"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Prueba"
 
@@ -11150,7 +11522,7 @@ msgstr "hace"
 msgid "months"
 msgstr "meses"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "segundos"
 
@@ -11247,7 +11619,7 @@ msgstr "Expresión"
 msgid "Follow Up"
 msgstr "Seguimiento"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "Etiquetar"
 
@@ -11317,112 +11689,118 @@ msgid "Source Account"
 msgstr "Cuenta origen"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Rocío"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Cabecera específica"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Parar el proceso"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Asunto"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "Sin estado"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "contiene"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "no contiene"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "no acaba en"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "no existe"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "does not return"
 msgstr "no devuelve"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "no suena como"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "no comienza por"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "acaba en"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "existe"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr "está marcado"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr "está después de"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "is before"
 msgstr "está antes de"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "es mayor que"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "es menor que"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr "no está marcado"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "no es"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "es"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr "devuelve mayor que"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr "devuelve menor que"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr "devuelve"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "suena como"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "comienza por"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "El nombre de la regla «%s» no es único, elija otro"
@@ -11447,18 +11825,79 @@ msgstr "Nombre de la regla:"
 msgid "Score Rules"
 msgstr "Reglas de puntuación"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Debes dar un nombre a esta carpeta virtual."
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr "Debes especificar al menos una carpeta como fuente."
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 msgid "VFolder source"
 msgstr "Origen de la carpeta virtual"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Preferencias del editor"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Configure las preferencias de correo incluyendo seguridad y visualización de "
+"mensajes, aquí"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Configure aquí la ortografía, firmas y la composición de mensajes."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Configure sus cuentas de correo aquí"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Correo de Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Control de configuración de cuentas de correo de Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Componente de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Redactor de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Control de configuración del redactor de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail folder viewer"
+msgstr "Componente del visor de carpetas de correo de Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Control de preferencias de Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Correo"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Cuentas de correo"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "Opciones de correo"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "¿Seguro que quiere borrar esta cuenta?"
@@ -11500,7 +11939,7 @@ msgid "Protocol"
 msgstr "Protocolo"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr "Sin nombre"
 
@@ -11524,21 +11963,18 @@ msgstr "Añadir script de firma"
 msgid "Signature(s)"
 msgstr "Firma(s)"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "Está enviando un mensaje formateado en HTML. Por favor, asegúrese de que los "
 "siguientes destinatarios desean y son capaces de recibir  mensajes "
 "formateados en HTML:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "¿Enviar de todos modos?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11546,7 +11982,7 @@ msgstr ""
 "Este mensaje no tiene asunto.\n"
 "¿Quiere enviarlo?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11555,11 +11991,11 @@ msgstr ""
 "esconder la lista de direcciones, este mensaje sólo contendrá destinatarios "
 "Cco."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Este mensaje solo contiene destinatarios Cco."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11569,11 +12005,11 @@ msgstr ""
 "cabecera Apparently-To.\n"
 "¿Enviar de todos modos?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Debes especificar destinatarios para poder enviar el mensaje."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11585,189 +12021,404 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crear una carpeta _virtual de la búsqueda..."
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "Correo"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<pinche aquí para seleccionar una carpeta>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "«%s» en «%s»..."
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Crear carpeta nueva"
 
-#: mail/em-folder-selector.c:267
-#, fuzzy
-msgid "Folder _name"
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Especifique donde crear la carpeta:"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
 msgstr "_Nombre de la carpeta:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "No se pudo crear el directorio temporal: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "No se pudo crear el directorio temporal: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "No se pudo crear el archivo temporal: «%s»: %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "No se pudo cerrar la carpeta temporal: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Cargando..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Crear una nueva carpeta"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "No se pudo borrar la carpeta «%s»: %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "¿Seguro que quiere borrar «%s»?"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Borrar «%s»"
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Renombrar carpeta «%s» a:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+msgid "Rename Folder"
+msgstr "Renombrar carpeta"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+"Ya existe una carpeta llamada «%s». por favor, use un nombre diferente."
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Propiedades de tipografías"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Propiedades"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "Nombre de la _carpeta:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Ver"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Abrir en una ventana nueva"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Mover"
+
+#: mail/em-folder-tree.c:1500
+msgid "_New Folder..."
+msgstr "_Carpeta nueva"
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "_Renombrar"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "_Propiedades..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "_Editar como un mensaje nuevo..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "Im_primir"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "Responder al _remitente"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Responder a la _lista"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "Reen_viar"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr "_Seguimiento..."
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr "Ma_rcar como terminado"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "_Quitar marca"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Mar_car como leído"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "Marcar como _no leído"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "Marcar como no im_portante"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Marcar como _no leído"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Marcar como _importante"
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "Mo_ver a la carpeta..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "Añadir remitente a la li_breta de direcciones"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "Aplicar _filtros"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "Crear re_gla desde el mensaje"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "Carpeta virtual según el a_sunto"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "Carpeta virtual según el re_mitente"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "Carpeta virtual según los des_tinatarios"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "Carpeta virtual según la li_sta de correo"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "Carpeta virtual según el re_mitente"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Filtro según el _asunto"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Filtro según el _remitente"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Filtro según los _destinatarios"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Filtro según la lista de _correo"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filtro según el _remitente"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Predeterminado"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Copiar dirección del enlace"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Coincide:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Asignado"
+
+#: mail/em-format-html-display.c:597
+#, fuzzy
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr ""
+"Este mensaje está firmado digitalmente pero no se puede verificar su "
+"autenticidad."
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Editar firma"
+
+#: mail/em-format-html-display.c:598
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
 msgstr ""
-"Este mensaje está firmado digitalmente. Pulsa en el icono del candado para "
-"más información."
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Editar firma"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+#, fuzzy
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"input_tolen contiene una firma inválida, o una firma que no pudo ser "
+"verificada."
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Interrumpido"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "Cifrar con PGP"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "No se pudo analizar el mensaje MIME. Mostrando la fuente."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Schema no soportado"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "No se pudo verificar la hoja de la firma."
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Ver incluido"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Ocultar"
@@ -11777,185 +12428,208 @@ msgstr "Ocultar"
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Obteniendo mensaje %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Puntero a archivo local (%s) valido en «%s»"
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo «%s»)"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-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/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Este mensaje está firmado digitalmente y es auténtico."
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-msgid "No signature present"
-msgstr ""
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "No se pudo inicializar Bonobo"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Schema no soportado"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No se pudo analizar el mensaje MIME. Mostrando la fuente."
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Moviendo mensajes"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "De"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "A"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Cco"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "Transporte"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Fecha"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "%s adjunto"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "No se pudo analizar el mensaje MIME. Mostrando la fuente."
+msgid "Session not initialised"
+msgstr "No se pudo inicializar Bonobo"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Este mensaje está firmado digitalmente y es auténtico."
+
+#: mail/em-format.c:1212
+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/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Esperando..."
 
-#: mail/em-popup.c:593
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Haciendo ping a %s"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Error al cachear %s: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Falló al crear pipe a «%s»: %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Falló al resolver host «%s»: %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Responder al _remitente"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Abrir enlace en el Navegador"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Enviar un _mensaje a la lista..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Añadir remitente a la agenda"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "Este servidor no soporta el esquema de información LDAPv3"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Suscribir"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Carpeta"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Por favor seleccione un servidor."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "No se ha seleccionado ningún servidor"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "No mostrar otra vez este mensaje."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11964,27 +12638,27 @@ msgstr ""
 "Error cargando la información del filtro:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Mensaje reenviado"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "un remitente desconocido"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "El %a, %d-%m-%Y a las %H:%M, %%s escribió:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -11993,7 +12667,7 @@ msgstr ""
 "No se pudo obtener el mensaje; «%s»\n"
 "  %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12002,25 +12676,26 @@ msgstr ""
 "«%s» ya existe\n"
 "¿Quiere sobreescribirlo?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Mensaje"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Guardar mensaje como..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "No se pudo crear el directorio temporal: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Dirección"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12029,60 +12704,427 @@ msgstr ""
 "\n"
 "¿Borrar realmente esos mensajes?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Preferencias del editor"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/em-utils.c:2288
+#, fuzzy
 msgid ""
-"Configure mail preferences, including security and message display, here"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
 msgstr ""
-"Configure las preferencias de correo incluyendo seguridad y visualización de "
-"mensajes, aquí"
+"Esta operación borrará permanentemente todos los mensajes marcados como "
+"borrados. Si continuas, no podrás recuperar esos mensajes.\n"
+"\n"
+"¿Borrar realmente esos mensajes?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Configure aquí la ortografía, firmas y la composición de mensajes."
+#: mail/evolution-mail.schemas.in.in.h:1
+#, fuzzy
+msgid "Automatic link recognition"
+msgstr "_Detectar enlaces automáticamente"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Configure sus cuentas de correo aquí"
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "_Detectar enlaces automáticamente"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Correo de Evolution"
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Control de configuración de cuentas de correo de Evolution"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Componente de correo de Evolution."
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Redactor de correo de Evolution."
+#: mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
+msgid "Default charset in which to compose messages"
+msgstr "Asunto predeterminado para el mensaje."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Control de configuración del redactor de correo de Evolution."
+#: mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
+msgid "Default charset in which to compose messages."
+msgstr "Asunto predeterminado para el mensaje."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Componente del visor de carpetas de correo de Evolution"
+#: mail/evolution-mail.schemas.in.in.h:8
+#, fuzzy
+msgid "Default charset in which to display messages"
+msgstr "Buscar un texto en el cuerpo del mensaje mostrado"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Control de preferencias de Evolution"
+#: mail/evolution-mail.schemas.in.in.h:9
+#, fuzzy
+msgid "Default charset in which to display messages."
+msgstr "Buscar un texto en el cuerpo del mensaje mostrado"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/evolution-mail.schemas.in.in.h:10
+#, fuzzy
+msgid "Default forward style"
+msgstr "_Estilo de reenvío:"
+
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default reply style"
+msgstr "Estilo de _respuesta:"
+
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Empty Trash folders on exit"
+msgstr "Vaciar _papelera al salir"
+
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Vaciar _papelera al salir"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "Cuentas de correo"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "Opciones de correo"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "Ejecutar acciones"
+
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Notificación de correo nuevo"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Notificación de correo nuevo"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr "_Preguntar al mandar mensajes en HTML a contactos que no los quieren"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "Preguntar al mandar mensajes que tan solo tengan definido el _Cco"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "¿Enviar correo en HTML?"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "¿Enviar correo en HTML?"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "Mo_strar imágenes animadas"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "Mo_strar imágenes animadas"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Mostrar mensajes en el estilo normal"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "Panel de _previsualización"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "Reproducir un archivo de _sonido cuando llegue correo nuevo"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "O_rtografía"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "Tipografía del _terminal"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "Selecciona letra de anchura variable en HTML para imprimir"
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Lista de mensajes encadenados"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Lista de mensajes encadenados"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "_Hacer que ésta sea mi cuenta predeterminada"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "An_chura variable:"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Importador de Elm de Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+msgid "Evolution mbox importer"
+msgstr "Importador de mbox de Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Netscape Mail importer"
+msgstr "Importador de correo de Netscape de Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Importador de Evolution para Outlook Express 4"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Pine importer"
+msgstr "Importador de Pine de Evolution."
 
 #: mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
@@ -12122,34 +13164,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Importador de Elm de Evolution."
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Importador de mbox de Evolution."
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Netscape Mail importer"
-msgstr "Importador de correo de Netscape de Evolution."
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Importador de Evolution para Outlook Express 4"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Pine importer"
-msgstr "Importador de Pine de Evolution."
-
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -12211,12 +13225,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution está importando su información antigua de Netscape"
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Papelera"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Examinando filtros de correo"
@@ -12225,7 +13233,7 @@ msgstr "Examinando filtros de correo"
 msgid "Scanning directory"
 msgstr "Analizando el directorio"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Comenzando a importar"
 
@@ -12301,23 +13309,23 @@ msgid "You have not filled in all of the required information."
 msgstr "No ha rellenado toda la información requerida."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Editor de cuentas de Evolution"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "_Nombre de usuario:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "R_uta:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "No puede crear dos cuentas con el mismo nombre."
 
@@ -12326,35 +13334,35 @@ msgstr "No puede crear dos cuentas con el mismo nombre."
 msgid "Mail to %s"
 msgstr "Enviar a %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Asunto es %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Correo de %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "lista de correo %s"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Respondió a"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Añadir regla de filtrado"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "La(s) siguiente(s) regla(s) de filtrado:\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12365,144 +13373,30 @@ msgstr ""
 "    «%s»\n"
 "Y han sido actualizadas."
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "Conectando..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Esta carpeta no contiene mensajes."
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Mensaje de correo nuevo"
 
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "No se pudo abrir la carpeta compartida: %s."
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "_Mensaje de correo"
 
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "No se pudo crear el directorio temporal: %s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "Redactar mensaje nuevo"
 
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "No se pudo crear el archivo temporal: «%s»: %s"
-
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "No se pudo cerrar la carpeta temporal: %s"
-
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Seleccionar una carpeta de destino donde importar estos datos"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Seleccionar una carpeta de destino donde importar estos datos"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Crear una nueva carpeta"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Especifique donde crear la carpeta:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "No se pudo borrar la carpeta «%s»: %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "¿Seguro que quiere borrar «%s»?"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Borrar «%s»"
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Renombrar carpeta «%s» a:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-msgid "Rename Folder"
-msgstr "Renombrar carpeta"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "El nombre de carpeta especificado no es valido: %s"
-
-#: mail/mail-component.c:1860
-#, fuzzy, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-"Ya existe una carpeta llamada «%s». por favor, use un nombre diferente."
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Propiedades de tipografías"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Propiedades"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "Nombre de la _carpeta:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Ver"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Abrir en una ventana nueva"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Mover"
-
-#: mail/mail-component.c:2087
-msgid "_New Folder..."
-msgstr "_Carpeta nueva"
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "_Renombrar"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Propiedades..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Identidad"
 
@@ -12564,11 +13458,11 @@ msgstr ""
 "Por favor escriba un nombre para esta cuenta en el espacio de abajo.Este "
 "nombre sólo se usará para mostrar información."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Comprobando el servicio"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Conectando al servidor..."
 
@@ -12650,26 +13544,35 @@ msgid "C_olors"
 msgstr "C_olores"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Comprobando si hay correo nuevo"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "Verificar orto_grafía mientras se escribe"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Comprobando si hay correo nuevo"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "Color para las palabras d_udosas"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Redacción de mensajes"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Configuración"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12685,272 +13588,277 @@ msgstr ""
 "\n"
 "Pulse «Finalizar» para guardar su configuración."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "_Predeterminada"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Comportamiento predefinido"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "_Codificación de caracteres predeterminada: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Borrado del correo"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Firm_ar siempre el correo saliente al usar esta cuenta"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "No citar el mensaje original"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "No _firmar las peticiones de reunión (para compatibilidad con Outlook)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Hecho"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "Carpeta de _borradores:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "_Habilitar"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "Cuentas de correo"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "Dir_ección de correo:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "Vaciar _papelera al salir"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "ID del _certificado:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Asistente de cuentas de Evolution"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Ejecutar comando..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "A_nchura fija:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "<< Menos Opciones"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "Propiedades de tipografías"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "Dar formato _HTML a los mensajes"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "_Resaltar texto citado con este color:"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Incluido en línea"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Etiquetas y colores"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Carga de imágenes"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Configuración del correo"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Localización del Mailbox"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Editor de mensajes"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Pantalla del mensaje"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 msgid "Message Fonts"
 msgstr "Tipografías del mensaje"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Notificación de correo nuevo"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Nota: No se le pedirá una contraseña hasta que conecte por primera vez"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Información opcional"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "Organi_zación:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "ID de c_lave GPG/PGP:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Elija un color"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Preguntar al mandar mensajes que tan solo tengan definido el _Cco"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Tipografías impresas"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Maildir estilo Qmail"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "Citar el mensaje original"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "Re_cuerda esta contraseña"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "Res_ponder a:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Recibiendo mensajes"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "_Opciones de recepción"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "Recuerda esta co_ntraseña"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Información requerida"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "Volver a predeterminados"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "S_eguridad"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME seguro (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr "Selecciona letra de anchura fija para HTML"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr "Selecciona letra de anchura fija en HTML para imprimir"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr "Selecciona letra de anchura variable en HTML"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr "Selecciona letra de anchura variable en HTML para imprimir"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Enviando correo"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Carpeta de _mensajes enviados:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Mensajes enviados y borradores"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "El ser_vidor requiere autenticación"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Configuración del servidor"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "_Tipo de servidor:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Certificado autofirmado en cadena"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "Especificar nombre de a_rchivo:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "O_rtografía"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Mailbox estándar de Unix"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12960,7 +13868,7 @@ msgstr ""
 "firma. El nombre que especifique será usado\n"
 "únicamente para mostrarlo por pantalla."
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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 "
@@ -12970,7 +13878,7 @@ msgstr ""
 "y el idioma. La lista de idiomas de abajo refleja únicamente los idiomas "
 "para los cuales hay instalado un diccionario."
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12978,11 +13886,15 @@ msgstr ""
 "Escriba el nombre por el que querría referirse a esta cuenta.\n"
 "Por ejemplo: «Trabajo» o «Personal»."
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "An_chura variable:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12992,169 +13904,178 @@ msgstr ""
 "\n"
 "Pulse «Siguiente» para comenzar. "
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "_Añadir firma"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "Siempre c_argar imágenes fuera de la red"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 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:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "Tipo de _autenticación: "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "Tipo de _autenticación: "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr "Comprobar el correo _automáticamente cada"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "Insertar emoticonos _automáticamente"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "E_mitir un pitido cuando llegue correo nuevo"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "Confirmar antes de p_urgar una carpeta"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "_Firma predeterminada:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "Pre_determinados"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "_No notificarme cuando llegue correo nuevo"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "_Habilitar"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "_Estilo de reenvío:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "Nombre _completo:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "Correo en _HTML"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "_Identidad"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Junio"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "Cargar imágenes si el _remitente está en la libreta de direcciones"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "_Hacer que ésta sea mi cuenta predeterminada"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensajes como leídos tras"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Nombre:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "_No cargar nunca imágenes desde la red"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "Reproducir un archivo de _sonido cuando llegue correo nuevo"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 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:159
+#: mail/mail-config.glade.h:165
 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:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "_Recepción de correo"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "Estilo de _respuesta:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "Volver a configuración p_redeterminada"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Guión:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Borrar..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "En_vío de correo"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "Mo_strar imágenes animadas"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Firmas"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr "Tipografía _estándar"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr "Tipografía del _terminal"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "U_sar conexiones seguras (SSL)"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar las mismas tipografías que en otras aplicaciones"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "descripción"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr "Haciendo ping a %s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13163,7 +14084,7 @@ msgstr ""
 "Error mientras «%s»':\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13172,7 +14093,7 @@ msgstr ""
 "Error al efectuar operación:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Trabajando"
 
@@ -13184,118 +14105,118 @@ msgstr "Filtrando carpeta"
 msgid "Fetching Mail"
 msgstr "Obteniendo mensajes"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Falló al guardar el correo en al archivo temporal %s: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Falló al guardar el correo en al archivo temporal %s: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando «%s»"
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensaje %d de %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Error en mensaje %d de %d"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Guardando mensajes en la carpeta"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moviendo mensajes a %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensajes a %s"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizando carpetas en «%s»"
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Mensaje reenviados"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "Abriendo sitio %s"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando carpeta %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Guardando carpeta «%s»"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Actualizando carpeta"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Purgando carpeta"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vaciando papelera en «%s»"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Carpetas locales"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Obteniendo mensaje %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Obteniendo %d mensajes(s)"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Guardando %d mensaje(s)"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13304,7 +14225,7 @@ msgstr ""
 "No se pudo crear el archivo de salida: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13313,11 +14234,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13326,21 +14247,25 @@ msgstr ""
 "No se pudo crear el archivo de salida: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No se pudo escribir datos: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectar a %s"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Sensible a mayúsculas"
@@ -13357,59 +14282,74 @@ msgstr "Buscar:"
 msgid "Search"
 msgstr "Buscar"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Editar firma"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Excepciones"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Información de la cuenta"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Cancelando..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Servidor: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Ruta: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Enviar y recibir correo"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 msgid "Cancel _All"
 msgstr "Cancelar _todo"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Esperando..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Operación cancelada por el usuario."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduzca su contraseña para %s"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Introduzca contraseña"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "_Recuerda esta contraseña"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Recordar esta clave durante el resto de esta sesión"
 
@@ -13448,26 +14388,31 @@ msgstr "Introduzca un nombre para esta firma."
 msgid "Name:"
 msgstr "Nombre:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Reenviado mensaje - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Mensaje reenviado"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Abriendo carpeta %s"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Configurando carpeta virtual: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Actualizando carpetas virtuales para la uri: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13480,88 +14425,88 @@ msgstr ""
 "    «%s»\n"
 "Y han sido actualizadas."
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "Carpetas virtuales"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "Carpetas virtuales"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Editar carpeta virtual"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Tratando de editar una carpeta virtual «%s» que no existe."
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Nueva carpeta virtual"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Contestado"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensajes sin leer"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Múltiples mensajes"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "La más baja"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Más baja"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Más alta"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "La más alta"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
@@ -13617,11 +14562,11 @@ msgstr "Reenviar"
 msgid "No Response Necessary"
 msgstr "No es necesaria una respuesta"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Responder a todos"
 
@@ -13673,41 +14618,141 @@ msgstr "_Suscribir"
 msgid "_Unsubscribe"
 msgstr "Des_uscribir"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+"Configure carpetas especiales y el comportamiento de las carpetas fuera de "
+"línea aquí"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Intérprete de Evolution."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Configuración de carpetas"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "380"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Renombrar este grupo de atajos"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Activar si se muestra la barra de carpetas"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Ocultar la barra de atajos"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Prioridad predeterminada:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Prioridad predeterminada:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Interfaz de configuración del correo de Evolution"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+#, fuzzy
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "Marcar adjunto para que sea mostrado en línea por omisión."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
 msgstr ""
-"No se pudo transferir la carpeta:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Añadir una carpeta"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Borradores"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Correo recibido"
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "Abriendo carpeta de tareas predeterminada"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Abriendo carpeta de tareas predeterminada"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Abriendo carpeta de tareas predeterminada"
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Correo para enviar"
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Enviado"
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Abriendo carpeta de tareas predeterminada"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Activar si se muestra la barra de carpetas"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Activar si se muestra la barra de atajos"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "Correo electrónico"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "No se pudieron actualizar correctamente los archivos"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13718,7 +14763,7 @@ msgstr ""
 "%s\n"
 "Error: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13727,7 +14772,7 @@ msgstr ""
 "Ha ocurrido un error mientras se copiaban archivos a\n"
 "«%s»."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13738,7 +14783,7 @@ msgstr ""
 "Por favor, muévalo para permitir la instalación\n"
 "de los archivos de usuario de Evolution."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13836,11 +14881,11 @@ msgstr ""
 "No se pudo renombrar la carpeta:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
-"Ya existe una carpeta llamada «%s». por favor, use un nombre diferente."
+msgid "The specified folder name is not valid: %s"
+msgstr "El nombre de carpeta especificado no es valido: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -13864,19 +14909,15 @@ msgstr ""
 "No se pudo crear la carpeta especificada:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Crear carpeta nueva"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Sin título)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Elija el tipo de importador a ejecutar:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13889,11 +14930,11 @@ msgstr ""
 "\n"
 "Si no lo sabe, puede elegir «Automático» y Evolution tratará de encargarse."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Por favor seleccione la información que quiera importar:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13905,7 +14946,7 @@ msgstr ""
 "pudieran ser importados. Si quiere intentarlo de nuevo, pulse\n"
 "el botón «Atrás».\n"
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13914,21 +14955,21 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "Seleccionar importador"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "El archivo %s no existe"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Error de Evolution"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -13937,11 +14978,11 @@ msgstr ""
 "No hay ninguna herramienta para importar datos que pueda encargarse de\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Importando"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -13950,17 +14991,17 @@ msgstr ""
 "Importando %s.\n"
 "Comenzando %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Error cargando %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Error cargando %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13969,35 +15010,35 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Automático"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Nombre de archivo:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Elija un archivo"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Tipo de archivo:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Importar datos y configuración de programas antiguos"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Importar un único archivo"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -14005,47 +15046,28 @@ msgstr ""
 "Por favor espere...\n"
 "Buscando configuraciones existentes"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Comenzando importadores inteligentes"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Seleccionar una carpeta de destino donde importar estos datos"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Importar"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Cerrando conexiones..."
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Error mientras se sincronizaba «%s»:\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "Sincronizando carpeta"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Sincronizando «%s» (%d de %d)..."
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Preferencias de Evolution"
@@ -14080,7 +15102,7 @@ msgstr "No se pudo abrir la carpeta compartida: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "No se pudo encontrar la carpeta compartida especificada"
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14089,17 +15111,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Secretario"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Nuevo"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "No ha especificado un nombre de carpeta."
@@ -14159,64 +15175,51 @@ msgstr "Crear 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:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "_Trabajar conectado"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "_Trabajar desconectado"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(No hay carpetas mostrándose)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(nada)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 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:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution está en proceso de desconectarse."
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution está desconectado.  Pulse este botón para trabajar "
 "conectado."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Argumentos inválidos"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "No se pudo registrar en OAF"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "No se encontró la base de datos de configuración"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Error genérico"
 
@@ -14329,74 +15332,18 @@ msgstr "Qui_tar"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Quitar este atajo de la lista de atajos"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Error guardando atajos."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Correo recibido"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Atajos"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Sin errores"
-
-#: 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:575
-msgid "The specified folder type is not valid"
-msgstr "Es tipo de archivo especificado no es válido"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "Error de E/S"
-
-#: 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:581
-msgid "The folder is not empty"
-msgstr "Esta carpeta no está vacía"
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "No se encontró la carpeta especificada"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "Función sin implementar en este almacenamiento"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "Operación no implementada"
-
-#: 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:593
-msgid "The specified folder cannot be modified or removed"
-msgstr "La carpeta especificada no puede ser modificado o borrado"
-
-#: shell/e-storage.c:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "No se pudo mover una carpeta dentro de uno de sus descendientes"
-
-#: shell/e-storage.c:597
-msgid "Cannot create a folder with that name"
-msgstr "No se pudo crear una carpeta con ese nombre"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Esta operación no puede efectuarse en modo desconectado"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Activar"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14407,6 +15354,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completado)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Nuevo"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "«%s» en «%s»..."
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14444,74 +15402,6 @@ msgstr ""
 "El error del sistema de activación es:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "Error CORBA"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Interrumpido"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Argumento inválido"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Ya tiene un dueño"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Sin dueño"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "No encontrado"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Tipo no soportado"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Schema no soportado"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Operación no soportada"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Error interno"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Salir"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "URI no válida"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Tiene subcarpetas"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "No queda sitio"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "El antiguo dueño a muerto"
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Tipo de pruebas"
-
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr "Componente de Prueba de Evolution"
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr "Conexiones activas"
@@ -14540,10 +15430,6 @@ msgstr "Co_rreo:"
 msgid "_Tasks:"
 msgstr "_Tareas"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr "_Nombre de la carpeta:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder _type:"
 msgstr "_Tipo de carpeta:"
@@ -14606,24 +15492,6 @@ msgstr ""
 "\n"
 "Pulse el botón «Aplicar» para guardar su configuración. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-"Configure carpetas especiales y el comportamiento de las carpetas fuera de "
-"línea aquí"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Intérprete de Evolution."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Control de configuración de preferencias de carpetas de Evolution"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Configuración de carpetas"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Pulse «Importar» para comenzar a importar el archivo en Evolution. "
@@ -14662,7 +15530,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Importadores"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Importar"
 
@@ -14678,16 +15546,16 @@ msgstr "No me preguntes más veces"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution puede importar datos de los siguiente s archivos:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Evolution está terminando ..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14725,7 +15593,7 @@ msgstr ""
 "esperamos que disfrute de nuestro duro trabajo, y esperamos su "
 "contribución.\n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -14733,36 +15601,48 @@ msgstr ""
 "Gracias\n"
 "El equipo de Ximian Evolution\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr "No preguntarme más veces"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "No se pudo acceder a la shell de Ximian Evolution."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "No se pudo inicializar la shell de Ximian Evolution: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Iniciar en modo desconectado"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr "Forzar el cierre de todos los componentes de evolution"
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Envía la salida de depurado de todos los componente a un archivo."
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14771,31 +15651,60 @@ msgstr ""
 "%s: --online y --offline no pueden usarse a la vez.\n"
 "  use %s --help para más información\n"
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Seleccionar importador"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "ID del _certificado:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "Progreso"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Expresión"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Dirección de correo:"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"Certificado caducado: %s\n"
+"Emisor: %s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14853,91 +15762,376 @@ msgid "Backup All"
 msgstr "Blackpool"
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "ID del _certificado:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Certificado sin confianza"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "ID del _certificado:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Nombre común"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "ID del _certificado:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "_Editar"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Error al verificar el certificado."
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Expresión"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Organización"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Unidad de organización"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Ver"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "ID del _certificado:"
+
+#: smime/gui/smime-ui.glade.h:42
+#, fuzzy
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr "Autoridad certificadora inválida (CA)"
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "ID del _certificado:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Importar"
+msgid "Certificate already exists"
+msgstr "Ya existe el ID de la tarjeta"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Vermont"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "Aceptar"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "ID del _certificado:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "ID del _certificado:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "Certificado sin confianza"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "ID"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Asunto es %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "No se pudo procesar la carpeta temporal"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "Autoridad certificadora inválida (CA)"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Autoridad certificadora inválida (CA)"
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Sin información"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "adjunto"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "ID del _certificado:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Curitiba"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "Carolina del Norte"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Expresión"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s a %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Falló en la firma del certificado"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "_Insertar"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Asunto es %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Falló en la firma del certificado"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Introduzca su contraseña para %s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "ID del _certificado:"
 
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
@@ -14988,7 +16182,7 @@ msgstr "Copia la selección"
 msgid "Copy to Folder..."
 msgstr "Copia a la carpeta..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Corta la selección"
 
@@ -15004,7 +16198,7 @@ msgstr "Mover contact(os) a otra carpeta..."
 msgid "Move to Folder..."
 msgstr "Mover a la carpeta..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Pega el contenido del porta papeles"
 
@@ -15012,8 +16206,8 @@ msgstr "Pega el contenido del porta papeles"
 msgid "Previews the contacts to be printed"
 msgstr "Previsualiza los contactos a imprimir"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Pre_visualizar la impresión"
@@ -15058,13 +16252,13 @@ msgstr "Parar la carga"
 msgid "View the current contact"
 msgstr "Ver el contacto actual"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "A_cciones"
 
@@ -15094,142 +16288,110 @@ msgstr "Enviar _mensaje al contacto..."
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "Crear una nueva cita para todo el día"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Crear una nueva cita"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "Crear una nueva carpeta"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Crear una nueva petición de reunión"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Crear una nueva tarea"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Día"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Borrar todas las ocurrencias"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Borrar la cita"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Borrar esta ocurrencia"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Borrar esta ocurrencia"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Ir a"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Volver"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Avanzar"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Ir a una _fecha"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Ir a una fecha específica"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Ir a hoy"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "Lista"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Mes"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Nueva cit_a"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Nueva Caledonia"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Nueva reunión"
-
-#: ui/evolution-calendar.xml.h:27
-#, fuzzy
-msgid "New _Task"
-msgstr "Tarea nueva"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Previsualiza el calendario a imprimir"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Imprime este calendario"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publica información de disponibilidad para este calendario"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Bourges"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Carpeta pública conteniendo citas y eventos"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Mostrar detalles"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Mostrar un día"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Mostrar un mes"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Mostrar una semana"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Mostrar la semana laboral"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Semana"
 
@@ -15294,7 +16456,7 @@ msgstr "Guarda este elemento a disco"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Archivo"
 
@@ -15512,7 +16674,7 @@ msgstr "Marcar todos como _leídos"
 msgid "Mark all visible messages as read"
 msgstr "Marca los mensajes visibles como leídos"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "Pega un(os) mensaje(s) desde el portapapeles"
 
@@ -15569,16 +16731,6 @@ msgstr "_Invertir selección"
 msgid "_Threaded Message List"
 msgstr "_Lista de mensajes encadenados"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Cerrar esta ventana"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "_Cerrar"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "Aña_dir remitente a la agenda"
@@ -15736,257 +16888,282 @@ msgstr "Reenvía a alguien el mensaje seleccionado como un adjunto"
 msgid "Increase the text size"
 msgstr "Incrementar el tamaño del texto"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Cargar _imágenes"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Marcar como i_mportante"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Marcar como _no leído"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Marcar como no imp_ortante"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "Marca el(los) mensaje(s) seleccionado(s) como leídos"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "Marca el(los)r mensaje(s) seleccionado(s) como importantes"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Marcar mensaje(s) seleccionado(s) como no importantes"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Marca el(los) mensaje(s) seleccionado(s) como no leídos"
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Marca el(los) mensaje(s) seleccionado(s) como no leídos"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Marcar mensaje(s) seleccionado(s) como no importantes"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar los mensajes seleccionados para borrar"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Mover"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "Mover mensaje(s) seleccionado(s) a otra carpeta"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Siguiente"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "Siguiente mensaje _importante"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "Siguiente _hilo"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "Siguiente m_ensaje no leído"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "No encontrado"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Abre el mensaje seleccionado en una nueva ventana"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Abre el mensaje seleccionado para reenviarlo"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Tamaño _original"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "Me_nsaje anterior no leído"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Publicar una respuesta"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr "Publica una respuesta a un mensaje en una carpeta pública"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "Mensaje importante an_terior"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Previsualiza el mensaje que va a ser impreso"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Anterior"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Imprimir este mensaje"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "Re_dirigir"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Reenviar (rebotar) el mensaje seleccionado a alguien"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Dejar el texto en su tamaño original"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "Bu_scar mensaje..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "_Menor"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Guardar el mensaje en un archivo de texto"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Buscar un texto en el cuerpo del mensaje mostrado"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr "Establecer la configuración de la página para la impresora actual"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Mostrar el _origen del mensaje"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Mostrar _cabeceras completas"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Buscar un texto en el cuerpo del mensaje mostrado"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Mostrar mensajes en el estilo normal"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Mostrar mensajes con todas las cabeceras"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Mostrar la fuente del mensaje en bruto"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "_Tamaño del texto"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Recuperar los mensajes seleccionados"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "Carpeta virtual según la _lista de correo..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "Carpeta virtual según el remite_nte..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "Carpeta virtual según los destinata_rios..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "Carpeta virtual según el a_sunto..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "_Adjunto"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "_Copiar a la carpeta"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "Crear un filtro del _mensaje"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "_Reenviar mensaje"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "_Ir a"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "_Incluido en línea"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "Ma_yor"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "_Mostrar mensaje"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Mover a la carpeta"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "Mensaje _siguiente"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "Vista _normal"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "_Abrir mensaje"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "Mensaje a_nterior"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "_Citado"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "_Reexpedir..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "_Herramientas"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "_Recuperar"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Cerrar esta ventana"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "_Cerrar"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Adjuntar"
@@ -16264,12 +17441,13 @@ msgid "Change Evolution's settings"
 msgstr "Cambiar la configuración de Evolution"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "_Salir"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Crear una nueva petición de reunión"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "_Ventana de Evolution"
+msgid "E_xit"
+msgstr "_Salir"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16281,61 +17459,74 @@ msgstr "Importar datos de otros programas"
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "_Ventana de Evolution"
+msgid "Open a new window"
+msgstr "Abrir en una ventana nueva"
 
 #: ui/evolution.xml.h:11
 msgid "Pi_lot Settings..."
 msgstr "Configuración del _Pilot..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Enviar / Recibir"
+
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr "Enviar el correo en la cola y obtener el nuevo"
+
+#: ui/evolution.xml.h:14
 msgid "Set up Pilot configuration"
 msgstr "Configuración del Pilot"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Mostrar información acerca de Ximian Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Remitir un informe de fallo"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "Remitir informe de un _fallo"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un informe de fallo usando Bug Buddy"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Activar"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Activar si se estamos trabajando desconectados o no."
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "_FAQ de Ximian Evolution"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "_Acerca de Ximian Evolution..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "A_yuda"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Nuevo"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Enviar / Recibir"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "_Buscar ahora"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Imprimir resumen"
@@ -16464,12 +17655,12 @@ msgstr "Definir vistas..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "LMXJVSD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -16602,7 +17793,7 @@ msgstr "_Buscar"
 msgid "_Find Now"
 msgstr "_Buscar ahora"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "_Vaciar"
 
@@ -16618,24 +17809,265 @@ msgstr "ID de subelemento"
 msgid "Text"
 msgstr "Texto"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Vaciar"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Buscar ahora"
 
+#~ msgid "Account Name"
+#~ msgstr "Nombre de la cuenta"
+
+#~ msgid "Server Name"
+#~ msgstr "Nombre del servidor"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "LDAP no fue activado en la compilación de Evolution"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Otros contactos"
+
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "Configurar aquí el acceso a los servidores de directorios LDAP"
+
+#~ msgid "Directory Servers"
+#~ msgstr "Servidores de directorio"
+
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr ""
+#~ "Control de configuración de la libreta de direcciones LDAP de Evolution"
+
+#~ msgid "Add LDAP Server"
+#~ msgstr "Añadir servidor LDAP"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Paso 4. Mostrando el nombre"
+
+#~ msgid "Find contact in"
+#~ msgstr "Buscar contacto en"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Pulse aquí para añadir un contacto *"
+
+#~ msgid "Business Address"
+#~ msgstr "Dirección del trabajo"
+
+#~ msgid "Department"
+#~ msgstr "Departamento"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "URL de disponibilidad"
+
+#~ msgid "ISDN"
+#~ msgstr "RDSI"
+
+#~ msgid "Profession"
+#~ msgstr "Profesión"
+
+#~ msgid "TTY"
+#~ msgstr "Teletipo"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Abriendo tareas en %s"
+
+#~ msgid "Send anyway?"
+#~ msgstr "¿Enviar de todos modos?"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Cancela la operación de correo actual"
+#~ msgid "Folder _name"
+#~ msgstr "_Nombre de la carpeta:"
+
+#~ 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."
+
+#~ msgid "Connecting..."
+#~ msgstr "Conectando..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Esta carpeta no contiene mensajes."
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Nombre del campo"
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "No se pudo abrir la carpeta compartida: %s."
 
-#~ msgid "Family Name"
-#~ msgstr "Apellido"
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Seleccionar una carpeta de destino donde importar estos datos"
+
+#, fuzzy
+#~ msgid "A folder named \"%s\" already exists.  Please use a different name."
+#~ msgstr ""
+#~ "Ya existe una carpeta llamada «%s». por favor, use un nombre diferente."
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No se pudo transferir la carpeta:\n"
+#~ "%s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "Añadir una carpeta"
+
+#~ msgid "Drafts"
+#~ msgstr "Borradores"
+
+#~ msgid "Outbox"
+#~ msgstr "Correo para enviar"
+
+#~ msgid "Sent"
+#~ msgstr "Enviado"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Error mientras se sincronizaba «%s»:\n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "Sincronizando carpeta"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Sincronizando «%s» (%d de %d)..."
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(No hay carpetas mostrándose)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(nada)"
+
+#~ msgid "No error"
+#~ msgstr "Sin errores"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Ya existe una carpeta con ese nombre"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Es tipo de archivo especificado no es válido"
+
+#~ msgid "I/O error"
+#~ msgstr "Error de E/S"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "No hay suficiente espacio para crear la carpeta"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Esta carpeta no está vacía"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "No se encontró la carpeta especificada"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Función sin implementar en este almacenamiento"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Operación no implementada"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "El tipo especificado no está implementado por este manejador"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "La carpeta especificada no puede ser modificado o borrado"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "No se pudo mover una carpeta dentro de uno de sus descendientes"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "No se pudo crear una carpeta con ese nombre"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Esta operación no puede efectuarse en modo desconectado"
+
+#~ msgid "Checkbox"
+#~ msgstr "Activar"
+
+#~ msgid "CORBA error"
+#~ msgstr "Error CORBA"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Argumento inválido"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Ya tiene un dueño"
+
+#~ msgid "No owner"
+#~ msgstr "Sin dueño"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Tipo no soportado"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Schema no soportado"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Operación no soportada"
+
+#~ msgid "Internal error"
+#~ msgstr "Error interno"
+
+#~ msgid "Exists"
+#~ msgstr "Salir"
+
+#~ msgid "Invalid URI"
+#~ msgstr "URI no válida"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Tiene subcarpetas"
+
+#~ msgid "No space left"
+#~ msgstr "No queda sitio"
+
+#~ msgid "Old owner has died"
+#~ msgstr "El antiguo dueño a muerto"
+
+#~ msgid "Test type"
+#~ msgstr "Tipo de pruebas"
+
+#~ msgid "Evolution Test Component"
+#~ msgstr "Componente de Prueba de Evolution"
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "Importar"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Crear una nueva cita para todo el día"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Nueva cit_a"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Nueva reunión"
+
+#, fuzzy
+#~ msgid "New _Task"
+#~ msgstr "Tarea nueva"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "_Ventana de Evolution"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "_Ventana de Evolution"
+
+#~ msgid "Toggle"
+#~ msgstr "Activar"
+
+#~ msgid "Clear"
+#~ msgstr "Vaciar"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Cancela la operación de correo actual"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -16728,9 +18160,6 @@ msgstr "Buscar ahora"
 #~ msgid "VCard (.vcf, .gcrd)"
 #~ msgstr "VCard (.vcf, .gcrd)"
 
-#~ msgid "Loading..."
-#~ msgstr "Cargando..."
-
 #~ msgid "Searching..."
 #~ msgstr "Buscando..."
 
@@ -16782,10 +18211,6 @@ msgstr "Buscar ahora"
 #~ msgstr "EBook no cargado\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "Ya existe el ID de la tarjeta"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Operación cancelada"
 
@@ -16932,9 +18357,6 @@ msgstr "Buscar ahora"
 #~ msgid "Callback"
 #~ msgstr "Devolución de llamada"
 
-#~ msgid "Company"
-#~ msgstr "Compañía"
-
 #~ msgid "Comp"
 #~ msgstr "Comp"
 
@@ -17001,9 +18423,6 @@ msgstr "Buscar ahora"
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#~ msgid "Phone"
-#~ msgstr "Teléfono"
-
 #~ msgid "Birth date"
 #~ msgstr "Cumpleaños"
 
@@ -17016,9 +18435,6 @@ msgstr "Buscar ahora"
 #~ msgid "Arbitrary"
 #~ msgstr "Arbitrario"
 
-#~ msgid "ID"
-#~ msgstr "ID"
-
 #~ msgid "Last Use"
 #~ msgstr "Último uso"
 
@@ -17031,9 +18447,6 @@ msgstr "Buscar ahora"
 #~ msgid "Folder containing contact information"
 #~ msgstr "La carpeta contiene información de contacto"
 
-#~ msgid "LDAP Server"
-#~ msgstr "Servidor LDAP"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "El servidor LDAP contiene información de contacto"
 
@@ -17043,18 +18456,6 @@ msgstr "Buscar ahora"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Carpeta pública conteniendo información de contactos"
 
-#~ msgid "_Contact"
-#~ msgstr "_Contacto"
-
-#~ msgid "Create a new contact"
-#~ msgstr "Crea un contacto nuevo"
-
-#~ msgid "New Contact List"
-#~ msgstr "Lista de contactos nueva"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "Crea una lista de contactos nueva"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "La URI que mostrará el visor de carpetas"
 
@@ -17070,9 +18471,6 @@ msgstr "Buscar ahora"
 #~ msgid "Is New Card"
 #~ msgstr "Es tarjeta nueva"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "Sin tarjetas"
 
@@ -17118,30 +18516,6 @@ msgstr "Buscar ahora"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "Carpeta pública conteniendo elementos por hacer"
 
-#~ msgid "New appointment"
-#~ msgstr "Nueva cita"
-
-#~ msgid "_Appointment"
-#~ msgstr "Cit_a"
-
-#~ msgid "New meeting"
-#~ msgstr "Reunión nueva"
-
-#~ msgid "M_eeting"
-#~ msgstr "R_eunión"
-
-#~ msgid "New task"
-#~ msgstr "Nueva tarea"
-
-#~ msgid "_Task"
-#~ msgstr "_Tarea"
-
-#~ msgid "New All Day Appointment"
-#~ msgstr "Cita para todo el día"
-
-#~ msgid "All _Day Appointment"
-#~ msgstr "Cita de todo el _día"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "No se pudo actualizar el objeto inválido"
 
@@ -17187,9 +18561,6 @@ msgstr "Buscar ahora"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "Abriendo calendario en %s"
 
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Abriendo carpeta de tareas predeterminada"
-
 #~ msgid "Evaluation of the search expression did not yield a boolean value"
 #~ msgstr ""
 #~ "La evaluación de la expresión de búsqueda no ha devuelto un valor booleano"
@@ -17231,9 +18602,6 @@ msgstr "Buscar ahora"
 #~ "Evolution ha encontrado archivos de GnomeCard.\n"
 #~ "¿Quiere importarlos a Evolution?"
 
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Interfaz de configuración del correo de Evolution"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "Carpeta conteniendo correo"
 
@@ -17249,9 +18617,6 @@ msgstr "Buscar ahora"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Carpetas de papelera virtuales"
 
-#~ msgid "Properties..."
-#~ msgstr "Propiedades..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Cambiar las propiedades de esta carpeta"
 
@@ -17261,15 +18626,6 @@ msgstr "Buscar ahora"
 #~ msgid "You have unsent messages, do you wish to quit anyway?"
 #~ msgstr "Tiene mensajes no enviados, ¿quiere salir de todas formas?"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Mensaje de correo nuevo"
-
-#~ msgid "_Mail Message"
-#~ msgstr "_Mensaje de correo"
-
-#~ msgid "Compose a new mail message"
-#~ msgstr "Redactar mensaje nuevo"
-
 #~ msgid "New Message Post"
 #~ msgstr "Publicar anuncio nuevo"
 
@@ -19076,9 +20432,6 @@ msgstr "Buscar ahora"
 #~ msgid "Cumberland"
 #~ msgstr "Cumberland"
 
-#~ msgid "Curitiba"
-#~ msgstr "Curitiba"
-
 #~ msgid "Curitiba Apt"
 #~ msgstr "Curitiba Apt"
 
@@ -22070,9 +23423,6 @@ msgstr "Buscar ahora"
 #~ msgid "North Bend"
 #~ msgstr "North Bend"
 
-#~ msgid "North Carolina"
-#~ msgstr "Carolina del Norte"
-
 #~ msgid "North Conway"
 #~ msgstr "North Conway"
 
@@ -23684,9 +25034,6 @@ msgstr "Buscar ahora"
 #~ msgid "State College"
 #~ msgstr "State College"
 
-#~ msgid "Stauning"
-#~ msgstr "Stauning"
-
 #~ msgid "Staunton"
 #~ msgstr "Staunton"
 
@@ -24275,9 +25622,6 @@ msgstr "Buscar ahora"
 #~ msgid "United Arab Emirates "
 #~ msgstr "Emiratos Árabes Unidos"
 
-#~ msgid "Unst"
-#~ msgstr "Unst"
-
 #~ msgid "Upington"
 #~ msgstr "Upington"
 
@@ -24386,12 +25730,6 @@ msgstr "Buscar ahora"
 #~ msgid "Veracruz"
 #~ msgstr "Veracruz"
 
-#~ msgid "Vermillion"
-#~ msgstr "Vermillion"
-
-#~ msgid "Vermont"
-#~ msgstr "Vermont"
-
 #~ msgid "Vernal"
 #~ msgstr "Vernal"
 
@@ -24920,9 +26258,6 @@ msgstr "Buscar ahora"
 #~ msgid " F"
 #~ msgstr " F"
 
-#~ msgid " C"
-#~ msgstr " C"
-
 #~ msgid "knots"
 #~ msgstr "nudos"
 
@@ -25541,9 +26876,6 @@ msgstr "Buscar ahora"
 #~ msgid "Freezing haze"
 #~ msgstr "Bruma con hielo"
 
-#~ msgid "Spray"
-#~ msgstr "Rocío"
-
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Rocío en los alrededores"
 
@@ -25907,18 +27239,6 @@ msgstr "Buscar ahora"
 #~ msgid "Remove a folder added with \"Open Other User's Folder\""
 #~ msgstr "Eliminar una carpeta añadida con «Abrir carpeta de otro usuario»"
 
-#~ msgid "Send / Receive"
-#~ msgstr "Enviar / Recibir"
-
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Enviar el correo en la cola y obtener el nuevo"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Activar si se muestra la barra de carpetas"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Activar si se muestra la barra de atajos"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Ver la carpeta seleccionada"
 
@@ -25946,9 +27266,6 @@ msgstr "Buscar ahora"
 #~ msgid "_Rename..."
 #~ msgstr "_Renombrar..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Enviar / Recibir"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "Barra de atajo_s"
 
@@ -25973,9 +27290,6 @@ msgstr "Buscar ahora"
 #~ msgstr ""
 #~ "ping_timeout_calbak: no se pudo determinar si el objeto CORBA es nil o no"
 
-#~ msgid "Automatically _detect links"
-#~ msgstr "_Detectar enlaces automáticamente"
-
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 
@@ -26223,18 +27537,12 @@ msgstr "Buscar ahora"
 #~ msgid "1234"
 #~ msgstr "1234"
 
-#~ msgid "380"
-#~ msgstr "380"
-
 #~ msgid "666"
 #~ msgstr "666"
 
 #~ msgid "<- _Remove"
 #~ msgstr "<- _Eliminar"
 
-#~ msgid "<< Fewer Options"
-#~ msgstr "<< Menos Opciones"
-
 #~ msgid "Add (or Edit) Attribute Mappings"
 #~ msgstr "Añadir (o Editar) Atributos de Planificación"
 
diff --git a/po/et.po b/po/et.po
index 236b1cbabb..67c37a8b91 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: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-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"
@@ -36,12 +36,171 @@ msgstr "Ei saa laadida %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Lõpetamise kuupäev"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "_Sertifikaadi ID:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Loob või muudab mailikontosid ja muid sätteid"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Kontaktid"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Muuda aadressiraamatut"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Factory for the Addressbook's address popup"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution Addressbook minicard viewer"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution Addressbook minicard viewer"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolution Addressbook minicard viewer"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution Addressbook minicard viewer"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution'i sõnumikausta kuvamise komponent."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Aadressiraamat"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Omadused..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Kustuta"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "_Nimeta ümber"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Uus kontakt:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:219
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Loob uue kontakti"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Uus kontaktide nimekiri"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "Kontaktide _nimekiri"
+
+#: addressbook/gui/component/addressbook-component.c:226
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Loob uue kontaktide nimekirja"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+#, fuzzy
+msgid "Work"
+msgstr "Cork"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "LDAP server"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Ei saa luua kataloogi %s: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr "Ei saa luua ühendust LDAP serveriga."
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -49,48 +208,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "IMAP serveri vastus ei sisaldanud %s infot"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Viga filtriinfo laadimisel:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP serveri vastus ei sisaldanud %s infot"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Konto nimi"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Serveri nimi"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Teised kontaktid"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -98,7 +241,7 @@ msgstr ""
 "Aadressiraamatu avamine nurjus.  Palun kontrolli, kas otsingutee\n"
 "on õige ja kas sul on sellele vajalikud ligipääsuõigused."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -109,7 +252,7 @@ msgstr ""
 "olla see, et sisestasid vale URI või kasutatav LDAP server\n"
 "on maas"
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -121,7 +264,7 @@ msgstr ""
 "ise Evolution'i lähtetekstidest kokku kompileerima.\n"
 "Eelnevalt laadi OpenLDAP alljärgneva viida abil.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -136,11 +279,11 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Aadressiraamatu avamine ebaõnnestus"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr ""
@@ -148,38 +291,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "Palun sisesta %s parool (kasutaja %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 #, fuzzy
 msgid "Name begins with"
 msgstr "lõppeb"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 #, fuzzy
 msgid "Email begins with"
 msgstr "lõppeb"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Kategooria on"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Suvaline väli sisaldab"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Edasijõudnutele..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -187,7 +329,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -195,95 +337,41 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Suvaline kategooria"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "URI, mida kalender näitab"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "_Sertifikaadi ID:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
 msgstr ""
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Kontaktid"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Muuda aadressiraamatut"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Evolutioni aadressiraamatu nime valiku kasutajaliides."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Factory for the Addressbook's address popup"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution Addressbook minicard viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution Addressbook minicard viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Evolution Addressbook minicard viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution Addressbook minicard viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution'i sõnumikausta kuvamise komponent."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -307,6 +395,7 @@ msgstr "_Tuvasta toetatavad tüübid"
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -342,8 +431,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Add LDAP Server"
-msgstr "LDAP server"
+msgid "Addressbook Creation Assistant"
+msgstr "Aadressiraamatu allikas"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -362,61 +451,60 @@ msgstr "Anonüümne"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 #, fuzzy
 msgid "Connecting"
 msgstr "Connecticut"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "Loendi _nimi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Edit LDAP Server"
 msgstr "LDAP server"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address:"
 msgstr "E-posti aadress:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution kasutab seda e-posti aadressi sinu autentimiseks serverile"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr "Evolution kasutab seda e-posti aadressi sinu autentimiseks serverile"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Finished"
 msgstr "_Otsi"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Üldine"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
-msgid "LDAP Configuration Assistant"
-msgstr "Häälestus"
+msgid "Group:"
+msgstr "Grupp"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Never"
 msgstr "_intervalliga:"
@@ -441,8 +529,8 @@ msgid "S_earch scope: "
 msgstr "Otsi _kehtivuspiirkonnast:"
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Otsin"
 
@@ -487,27 +575,28 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:47
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-#, fuzzy
-msgid "Step 1: Server Information"
-msgstr "Allika info"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
-msgid "Step 2: Connecting to Server"
-msgstr "Ühendun serverisse..."
+msgid "Step 2: Server Information"
+msgstr "Allika info"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr ""
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Ühendun serverisse..."
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr ""
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Ühendun serverisse..."
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -520,14 +609,6 @@ msgstr "Toetamata skeem"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -535,7 +616,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -543,7 +624,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -553,37 +634,36 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 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:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 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:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -593,6 +673,15 @@ msgstr ""
 "Seda nime kasutatakse sinu konto tuvastamiseks (programmisiseselt ja ainult "
 "näitamiseks."
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Seda nime kasutatakse sinu konto tuvastamiseks (programmisiseselt ja ainult "
+"näitamiseks."
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -619,22 +708,30 @@ msgid "Using email address"
 msgstr "See on e-_postiaadress"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Display name:"
 msgstr "N_äita"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -642,61 +739,60 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Redaktor"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 #, fuzzy
 msgid "_Search base:"
 msgstr "Otsi _baasist:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "_Serveri nimi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Easilükkamise aeg (minutites)"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid "cards"
 msgstr "Kaardid puuduvad"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Taastan ühenduse: %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid "general-tab"
 msgstr "Üldine"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "searching-tab"
 msgstr "Otsin"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Nimi"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolutioni aadressiraamatu nime valiku kasutajaliides."
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Eemalda kõik"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Eemalda"
@@ -725,25 +821,21 @@ msgstr "Lisa kontaktide hulka"
 msgid "Unnamed Contact"
 msgstr "Nimetu kontakt"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Nimi"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Allikas"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Kontaktide valimine aadressiraamatust"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-#, fuzzy
-msgid "Find contact in"
-msgstr "Saatja sisaldab"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolutioni aadressiraamatu nime valiku kasutajaliides."
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
 msgid "Find"
@@ -824,7 +916,8 @@ msgid "D_epartment:"
 msgstr "_Oskaond:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Täpsustused"
 
@@ -895,12 +988,12 @@ msgid "_Categories..."
 msgstr "Kate_gooriad"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Kustuta"
@@ -2046,7 +2139,7 @@ msgid "Esq."
 msgstr "Esq."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Täisnimi"
 
@@ -2142,11 +2235,27 @@ msgstr "Kontaktiloendi redaktor"
 msgid "Save List as VCard"
 msgstr "Salvesta nimekiri VKaardina"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Muudetud kontakt:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Vastulous kontakt:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Avastati korduv kontakt"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Muudetud kontsakti e-posti aadress või nimi juba\n"
+"eksisteerib antud kaustas. Kas sa soovid seda ikka lisada?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Uus kontakt:"
@@ -2163,22 +2272,6 @@ msgstr ""
 "Selle kontakti nimi või e-posti aadress juba eksisteerib\n"
 "antud kaustas. Kas sa soovid seda ikka lisada?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Muudetud kontakt:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Vastulous kontakt:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"Muudetud kontsakti e-posti aadress või nimi juba\n"
-"eksisteerib antud kaustas. Kas sa soovid seda ikka lisada?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2287,9 +2380,9 @@ msgstr "Saada kontakt edasi"
 msgid "Send Message to Contact"
 msgstr "Saada kontaktile sõnum"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Trüki"
@@ -2313,9 +2406,12 @@ msgstr "_Tõsta kausta..."
 msgid "Cut"
 msgstr "Lõika"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopeeri"
 
@@ -2324,16 +2420,8 @@ msgstr "Kopeeri"
 msgid "Paste"
 msgstr "Aseta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Kustuta"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 #, fuzzy
 msgid "Current View"
 msgstr "Käe_solev vaade"
@@ -2347,166 +2435,170 @@ msgid ""
 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:2
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Fax tööl"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Telefon tööl"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Telefon tööl 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Tagasihelistamise telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Autotelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategooriad"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Firma telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Osakond"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "E-post 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Perekonnanimi"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Fail kui"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "Vaba-kinni URL"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Kodune aadress"
+#, fuzzy
+msgid "Given Name"
+msgstr "Perekonnanimi"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Kodune faks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Kodune telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Kodune telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Ponce"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Jordaania"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Juht"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobiiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Hüüdnimi"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Märkus"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Kontor"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisatsioon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Muu aadress"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Muu faks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Muu telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Piipar"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Elukutse"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Raadio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Roll"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Abikaasa"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Tiitel"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Unst"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Koduleht"
 
@@ -2612,11 +2704,19 @@ msgstr "Liikmed"
 msgid "Job Title"
 msgstr "Ameti_nimetus:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Kodune aadress"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Kodune aadress"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Muu aadress"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2629,123 +2729,120 @@ msgstr "Kodune faks"
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Õnnestus"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Hoidla offlain"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Juurdepääs keelatud"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Kaarti ei leitud"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Kaardi ID on juba olemas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Mitte toetatud protokoll"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Katkestatud"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "Autentimine ebaõnnestus."
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Autentimine on vajalik"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #, fuzzy
 msgid "Addressbook does not exist"
 msgstr "Faili %s ei leitud."
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Muu viga"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Kas soovid muudatused salvestada?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 #, fuzzy
 msgid "_Discard"
 msgstr "Dinard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Viga listi lisamisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Viga kaardi lisamisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Viga listi muutmisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Viga kaardi muutmisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Viga listi eemaldamisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Viga kaardi eemaldamisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2754,50 +2851,50 @@ msgstr ""
 "%s on juba olemas\n"
 "Kas soovid üle kirjutada?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, fuzzy
 msgid "Overwrite"
 msgstr "Kirjutada fail üle?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, fuzzy, c-format
 msgid "Error saving %s: %s"
 msgstr "Viga faili salvestamisel: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "kaart.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "nimekiri"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Monte Scuro"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kaardid puuduvad"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Kaardid puuduvad"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kaardid puuduvad"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Mitu VKaarti"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "VKaart %s jaoks"
@@ -2994,7 +3091,7 @@ msgstr "Veerised"
 msgid "Number of columns:"
 msgstr "Tulpade arv:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Häälestus"
 
@@ -3182,18 +3279,18 @@ msgstr "Nimetu kontaktide nimekiri"
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Ei saa käivitada wombat serverit"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "EI saa käivitada wombatit"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -3202,25 +3299,93 @@ msgstr ""
 msgid "Default Priority:"
 msgstr "Tä_htsus:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Kalendri ja ülesannete sätted"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Kalendri ja ülesannete sätted"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr ""
+
+# !PARANDA!
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution'i kalendri iTip/iMip vaataja"
+
+# !PARANDA!
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution'i kalendri iTip/iMip vaataja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution'i uudiseredaktor"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution'i uudiseredaktor"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolution'i sõnumikausta kuvamise komponent."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolution'i sõnumiredaktor."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Ülesanded"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Alarmi teenus"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Algus:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Lõpp:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Evolution "
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm %s"
@@ -3296,44 +3461,173 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Seda küsimust rohkem mitte esitada."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Alarmi teenus"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Ei saa laadida Bonobot"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Ei saa gnome-vfs initsialiseerida"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "vigane aeg"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "iKalendri viga"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Täna lõppevate ülesannete värvus"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Täna lõppevate ülesannete värvus"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "Näita sündmuse _lõpuaegu nädala ja kuu vaadetel"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Trükitava kalendri eelvaatlemine"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#, fuzzy
+msgid "Units of default reminder"
+msgstr "Loo uusi sündmusi koos vaikimisi _meeldetuletajaga"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "_Küsi luba kirjete kustutamisel"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "_Küsi luba kirjete kustutamisel"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Kustutab valitud ülesanded"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "_Kuupäeva valikul kuvatakse nädalate numbreid"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Kokkuvõte sisaldab"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Kirjeldus sisaldab"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Kommentaar sisaldab"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Puudub"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3345,83 +3639,115 @@ msgstr ""
 "\n"
 "Kas tõesti eemaldame kustutatud sõnumid?"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "on väiksem kui"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "päeva"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A, %d. %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d. %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Trükib selle kalendri"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Uus-Kaledoonia"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
 #, fuzzy
-msgid "Rename"
-msgstr "_Nimeta ümber"
+msgid "New appointment"
+msgstr "Uus sündmus"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:633
+#, fuzzy
+msgid "_Appointment"
+msgstr "Sündmus"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Lisab uue sündmuse"
+
+#: calendar/gui/calendar-component.c:639
 #, fuzzy
-msgid "Personal"
-msgstr "Pownal"
+msgid "New meeting"
+msgstr "Uudistekanalite seadistused"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
+#: calendar/gui/calendar-component.c:640
 #, fuzzy
-msgid "Work"
-msgstr "Cork"
+msgid "M_eeting"
+msgstr "Kohtumine"
+
+#: calendar/gui/calendar-component.c:641
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Lisab uue ülesande"
+
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Uus sündmus"
+
+#: calendar/gui/calendar-component.c:647
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "Uus _sündmus"
+
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Lisab uue sündmuse"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3544,7 +3870,7 @@ msgstr "Saada"
 msgid "With these arguments:"
 msgstr "Nende parameetritega:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr ""
 
@@ -3560,6 +3886,10 @@ msgstr "tundi"
 msgid "minutes"
 msgstr "minutit"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3593,8 +3923,8 @@ msgstr "Saada sõnum"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Kokkuvõte:"
 
@@ -3623,7 +3953,7 @@ msgstr "sündmuse lõppu"
 msgid "hour(s)"
 msgstr "tund(i)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minuti(t)"
 
@@ -3678,7 +4008,7 @@ msgstr "Päev(a)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Reede"
 
@@ -3692,7 +4022,7 @@ msgstr "Minut(it)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Esmaspäev"
 
@@ -3703,7 +4033,7 @@ msgstr "_P"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Laupäev"
 
@@ -3717,7 +4047,7 @@ msgstr "_Kuupäeva valikul kuvatakse nädalate numbreid"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Pühapäev"
 
@@ -3737,7 +4067,7 @@ msgstr "Ülesannete n_imekiri"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Neljapäev"
 
@@ -3755,7 +4085,7 @@ msgstr "Aja vorming:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Teisipäev"
 
@@ -3765,12 +4095,12 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Kolmapäev"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Töönädal"
 
@@ -3808,7 +4138,7 @@ msgid "_Fri"
 msgstr "_R"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Üldine"
 
@@ -3853,79 +4183,79 @@ msgstr "_K"
 msgid "before every appointment"
 msgstr "enne sündmuse algust"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Kas sa tõesti soovid katkestada ja kustutada antud kohtumise?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Kas sa tõesti soovid katkestada ja kustutada antud ülesande?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Kas sa tõesti soovid katkestada ja kustutada antud päeviku sissekande?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Antud sündmus on kustutatud."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Antud ülesanne on kustutatud."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Antud päeviku sissekanne on kustutatud."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Sa oled teinud muutusi. Kas unustada need muudatused ja sulgeda aken?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Sa ei muutnud midagi. Kas sulgeda aken?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Antud sündmust on muudetud."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Antud ülesannet on muudetud."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Antud päeviku sissekannet on muudetud."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  On tehtud muudatusi.  Kas tühistada need muudatused ja uuendada "
 "redaktorit?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Muudatusi ei ole tehtud. Kas värskendada redaktorit?"
@@ -3935,167 +4265,172 @@ msgstr "%s  Muudatusi ei ole tehtud. Kas värskendada redaktorit?"
 msgid "Validation error: %s"
 msgstr "Tundmatu viga: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " kuni "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Valmis "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Lõpetatud "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Tähtaeg "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Tähtaeg "
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 #, fuzzy
 msgid "Could not update object"
 msgstr "Ei saanud uuendada objekti!"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Muuda sündmust"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Sündmus - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Ülesanne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Päeviku sissekanne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Kokkuvõte puudub"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Salvesta kui..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Vali kaust, kuhu salvestada imporditavad andmed"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Kas sa tõesti tahad kustutada sündmust '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Kas sa tõesti tahad kustutada seda nimetut sündmust?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Kas sa tõesti tahad kustutada ülesannet '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Kas sa tõesti tahad kustutada seda nimetut ülesannet?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Kas sa tõesti tahad kustutada päeviku sissekannet '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Kas sa tõesti tahad kustutada seda nimetut päeviku sissekannet?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Kas sa tõesti tahad kustutada %d sündmust?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Kas sa tõesti tahad kustutada %d ülesannet?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Kas sa tõesti tahad kustutada %d päeviku sissekannet?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 #, fuzzy
 msgid "The item could not be deleted due to a corba error"
 msgstr "Kirje saatmine ebaõnnestus!\n"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 #, fuzzy
 msgid "The task could not be deleted because permission was denied"
 msgstr "Osavõtja olekut ei ole võimailk uuendada, kuna selle olek on vigane!\n"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Kirje saatmine ebaõnnestus!\n"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Kirje saatmine ebaõnnestus!\n"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Osavõtja olekut ei ole võimailk uuendada, kuna selle olek on vigane!\n"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Kirje saatmine ebaõnnestus!\n"
@@ -4112,45 +4447,45 @@ msgstr "Delegeerida:"
 msgid "Enter Delegate"
 msgstr "Sisesta Delegaat"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Sündmus"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Meeldetuletaja"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Kordumine"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Planeering"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Kohtumine"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Algab kuupäeval"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 #, fuzzy
 msgid "Start time is wrong"
 msgstr "_Algus:"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr ""
 
@@ -4220,31 +4555,31 @@ msgid "_Start time:"
 msgstr "_Algus:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Puudub"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "Organiseerija peab olema määrtud."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "Vähemalt üks osaleja peab olema märgitud."
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Delegeerida..."
 
@@ -4285,21 +4620,15 @@ msgid "Member"
 msgstr "Liige"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Roll"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Olek"
@@ -4319,6 +4648,7 @@ msgid "_Invite Others..."
 msgstr "_Kustu teisi..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4351,6 +4681,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Ei saa luua kataloogi %s: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "Organiseerija peab olema määrtud."
@@ -4380,34 +4711,59 @@ msgstr "Kalendri info"
 msgid "Calendar Name"
 msgstr "Kalender"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Ei saa luua kataloogi %s: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Kalendri info"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Ülesannete n_imekiri"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Ülesannete n_imekiri"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Ülesannete n_imekiri"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Wallis ja Futuna"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 #, fuzzy
 msgid "This and Future Instances"
 msgstr "Wallis ja Futuna"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 #, fuzzy
 msgid "All Instances"
 msgstr "_Kõik ilmajaamad:"
@@ -4461,10 +4817,15 @@ msgstr "kuupäev"
 msgid "on the"
 msgstr "iga"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "korda"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Kuupäev ja kell:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "_Lisa"
@@ -4530,7 +4891,7 @@ msgstr "nädal(at)"
 msgid "year(s)"
 msgstr "aasta(t)"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 #, fuzzy
 msgid ""
 "This event has been changed, but has not been saved.\n"
@@ -4541,34 +4902,34 @@ msgstr ""
 "\n"
 "Kas sa soovid muudatused salvestada?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 #, fuzzy
 msgid "Save Event"
 msgstr "Kalendri sõnum"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 #, fuzzy
 msgid "The meeting information has been created. Send it?"
 msgstr "Kohtumise infot on muudetud. Kas soovid saata uuendatud versiooni?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Kohtumise infot on muudetud. Kas soovid saata uuendatud versiooni?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 #, fuzzy
 msgid "The task assignment information has been created. Send it?"
 msgstr "Ülesande infot on muudetud. Kas soovid saata uuendatud versiooni?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "Ülesande infot on muudetud. Kas soovid saata uuendatud versiooni?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "Lõpetatud "
@@ -4579,43 +4940,43 @@ msgid "% _Complete"
 msgstr "valmis (%)"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Lõpetatud"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Kõrge"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "Töös"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Madal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Keskmine"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Pole alanud"
 
@@ -4624,7 +4985,7 @@ msgid "Progress"
 msgstr "Edenemine"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Määramata"
 
@@ -4646,21 +5007,21 @@ msgstr "_Olek:"
 msgid "_Web Page:"
 msgstr "Kodulehe aad_ress"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Põhiline"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Kellele määratud"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4668,9 +5029,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "_Salajane"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Kirjeldus:"
 
@@ -4775,26 +5136,21 @@ msgstr ""
 msgid "%s for an unknown trigger type"
 msgstr "%s tundmatule trigeri tüübile"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Avalik"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Isiklik"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Salajane"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategooriad"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4807,29 +5163,27 @@ msgid "Start Date"
 msgstr "Algab kuupäeval"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Kokkuvõte"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " värvusega"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Sündmus"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Vaba"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Kinni"
 
@@ -4841,7 +5195,7 @@ msgstr "Põ"
 msgid "S"
 msgstr "Lõ"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "Ida"
 
@@ -4849,7 +5203,7 @@ msgstr "Ida"
 msgid "W"
 msgstr "Lä"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4859,7 +5213,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4867,7 +5221,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Jah"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4875,17 +5229,17 @@ msgstr "Ei"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Tundmatu"
 
@@ -4897,189 +5251,187 @@ msgstr "Korduv"
 msgid "Assigned"
 msgstr "Määratud"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Objektide uuendamine"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Kustutan valitud objektid"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Objektide uuendamine"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Uus _sündmus..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Uus kogu päeva _sündmus"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 #, fuzzy
 msgid "New Meeting"
 msgstr "Kohtumine"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Uus ülesanne"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Trüki..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Aseta"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Mine tänasele _päevale"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "_Mine kuupäevale..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Publitseeri vaba/hõivatud infot"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-#, fuzzy
-msgid "_Settings..."
-msgstr "_Sõnumite sätted..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "A_va"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Salvesta kui..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Kopeeri"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Ajasta kohtumine"
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Edasta i_Kalendrina"
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Ku_stuta see sündmus"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Kustuta k_õik sündmused"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+#, fuzzy
+msgid "_Settings..."
+msgstr "_Sõnumite sätted..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 #, fuzzy
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Ava sõnum"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Määra ülesanne"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Edasta i_Kalendrina"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "_Märgi lõpetatuks"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Märgi ülesanded lõpetatuks"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "_Kustuta valitud ülesanded"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Ülesande lisamiseks vajuta siia"
@@ -5093,8 +5445,8 @@ msgstr "valmis (%)"
 msgid "Alarms"
 msgstr "Alarmid"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Lõpetatud"
 
@@ -5123,18 +5475,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a, %d.%m.%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5153,7 +5505,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
@@ -5166,134 +5518,134 @@ msgstr "%d. %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "el"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pl"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "Li_htne kordus"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
 msgid "Every day"
 msgstr "Vahemikuga"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, fuzzy, c-format
 msgid "Every %d days"
 msgstr "%d päeva"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 #, fuzzy
 msgid "Every week"
 msgstr "Vahemikuga"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, fuzzy, c-format
 msgid "Every %d weeks"
 msgstr "%d nädalat"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 #, fuzzy
 msgid "Every week on "
 msgstr "Evergreen"
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, fuzzy, c-format
 msgid "Every %d weeks on "
 msgstr "%d nädalat"
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 #, fuzzy
 msgid " and "
 msgstr "Liiv"
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 #, fuzzy
 msgid "every month"
 msgstr "Ühte _kuud"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 #, fuzzy
 msgid "Every year"
 msgstr "Vahemikuga"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Lõpp: <b>"
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Lõpetatud "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "iKalendri informatsioon"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "iKalendri viga"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Tundmatu isik"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5301,331 +5653,330 @@ msgstr ""
 "<br> Palun vaata järgnev info üle ja vali allpool olevast menüüst endale "
 "sobilik tegevus."
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Puudub</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 #, fuzzy
 msgid "Location:"
 msgstr "As_ukoht:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 #, fuzzy
 msgid "Status:"
 msgstr "_Olek:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Vastu võetud"
 
 # !PARANDA!
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Proovinõusolek"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Tagasi lükatud"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Vali tegevus"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Uuenda"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Olgu"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Nõustu"
 
 # !PARANDA!
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Proovinõusolek"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Lükka tagasi"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Vaba/hõivatud info saatmine"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Saadab värskeima informatsiooni"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Tühista"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> publitseeris kohtumise info."
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Kohtumise info"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, 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:1271
+#: calendar/gui/e-itip-control.c:1269
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Ettepanek kohtumiseks"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Kohtumise info uuendus"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Soov muuta kohtumist"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, 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:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Kohtumise vastus"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> tühistas kohtumise."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Kokkusaamise tühistamine"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, 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:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Vigane kohtmise sõnum"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> avalikustas ülesande info."
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Ülesande info"
 
 # !PARANDA!
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, 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:1338
+#: calendar/gui/e-itip-control.c:1336
 #, 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:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Ettepanek ülesandeks"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, 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:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Ülesande uuendus"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, 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:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Soov muuta ülesannet"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, 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:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Ülesande vastus"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> katkestas ülesande."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Ülesande tühistamine"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Vigane ülesande sõnum"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, 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:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Vaba/hõivatud info"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, 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:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Soov saada vaba/hõivatud infot"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, 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:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Vaba/hõivatud vastus"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Vigane vaba/hõivatud sõnum"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 #, 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:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "Sõnum sisaldab ainult toetamata päringuid."
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Manus ei sisalda arusaadavat kalendriteadet"
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr "Manus ei sisalda vaadeldavaid kalendri elemente"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalendrifaili ei saa uuendada!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Uuendamine lõpetatud\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 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:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 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:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Kirje saatmine ebaõnnestus!\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 #, 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:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Osavõtja olek uuendatud\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "Osavõtja olekut ei ole võimailk uuendada!\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Eemaldamine lõpetatud"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Kirje saadetud!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Kirje saatmine ebaõnnestus!\n"
 
@@ -5788,7 +6139,7 @@ msgstr "%a, %d.%m.%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
@@ -5853,100 +6204,86 @@ msgstr "Kohtumise _algus:"
 msgid "Meeting _end time:"
 msgstr "Kohtumise l_õpp:"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "_Alguskuupäev:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "_Tähtaeg:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "Tä_htsus:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Lehekülg"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Avan %s ülesanded"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Ei saa laadida '%s' ülesandeid"
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s' laadimiseks vajalik meetod ei ole toetatud."
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, 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:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "Viga %s käivitamisel"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Lõpetamise kuupäev"
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Kustutan valitud objektid"
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 #, fuzzy
 msgid "Expunging"
 msgstr "Tühjendan kausta"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Ülesanded"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Ei saa avada '%s' kausta"
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s' avamiseks vajalik meetod on toetamata"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarm %s"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5954,7 +6291,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5962,66 +6299,11 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Turin"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#, fuzzy
-msgid "Calendar and Tasks"
-msgstr "Kalendri ja ülesannete sätted"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Kalender"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Kalendri ja ülesannete sätted"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr ""
-
-# !PARANDA!
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution'i kalendri iTip/iMip vaataja"
-
-# !PARANDA!
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Evolution'i kalendri iTip/iMip vaataja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution'i uudiseredaktor"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Evolution'i uudiseredaktor"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolution'i sõnumikausta kuvamise komponent."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolution'i sõnumiredaktor."
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aprill"
@@ -6078,300 +6360,337 @@ msgstr "Oktoober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Organiseerija peab olema määrtud."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Vaja on vähemalt ühte osavõtjat"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Teave sündmuse kohta"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Teave ülesande kohta"
 
 # !PARANDA! - siia peaks leidma sõna, mis ei oleks eitav
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 #, fuzzy
 msgid "Journal information"
 msgstr "Mittekohustuslik info"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Vaba/Hõivatud informatsioon"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Kalendri info"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 #, fuzzy
 msgid "Updated"
 msgstr "Uuenda"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 #, fuzzy
 msgid "Refresh"
 msgstr "Värskenda nimekirja"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vaba/Hõivatud informatsioon (%s - %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "iKalendri informatsioon"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Sa pead ise olema sündmusest osavõtja."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "P"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "E"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "T"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "K"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "N"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "R"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "L"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Valitud päev (%a, %d. %b %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a, %d. %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a, %d. %b %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Valitud nädal (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Valitud kuu (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Valitud aasta (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Ülesanne"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Olek: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "Tä_htsus:"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, fuzzy, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis (%): %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategooriad: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Kontaktid:"
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Trükkimise eelvaade"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Trüki kirje"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Trükkimise sätted"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Nimeta see kiirvalik ümber"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Ülesannete n_imekiri"
+
+#: calendar/gui/tasks-component.c:590
+#, fuzzy
+msgid "New task"
+msgstr "Uus ülesanne"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Ülesanne"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Lisab uue ülesande"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "Kuvatava ülesannete kausta URI"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 #, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -6384,11 +6703,11 @@ msgstr ""
 "\n"
 "Kas tõesti eemaldame kustutatud sõnumid?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Seda küsimust rohkem mitte esitada."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Trüki kaardid"
@@ -6424,17 +6743,17 @@ msgstr "Kalendri sõnum"
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Meeldetuletaja"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Kalendri sõnum"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6443,7 +6762,7 @@ msgstr ""
 "Evolution leidis Pine postifaile.\n"
 "Kas sa soovid neid Evolutionisse importida?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Kalender"
@@ -7981,28 +8300,28 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "See šiffer ei toeta allkirjastamist"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "See šiffer ei toeta kontrolli"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "See šiffer ei toeta krüpteerimist"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "See šiffer ei toeta dekrüpteerimist"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 #, fuzzy
 msgid "You may not import keys with this cipher"
 msgstr "See šiffer ei toeta dekrüpteerimist"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 #, fuzzy
 msgid "You may not export keys with this cipher"
 msgstr "See šiffer ei toeta dekrüpteerimist"
@@ -8058,89 +8377,89 @@ msgstr "Säilitan Kausta '%s'"
 msgid "You must be working online to complete this operation"
 msgstr "Selle operatsiooni täitmiseks pead olema onlainis"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ei saa luua kataloogi %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Kaustade sünkroniseerimine"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Viga filtri analüüsil: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Viga filtri täitmisel: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Puhverkausta pole võimalik avada"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Puhverkausta pole võimalik töödelda"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Võetakse vastu teadet %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Sõnumi avamine ebaõnnestus"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nurjumine teate %d juures"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Kausta sünkroniseerimine"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Tõmban %d. sõnumit %dst"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d. teate juures %d'st tekkis viga"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Sõnumi lahtikrüptimine ebaõnnestus."
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Vigased argumendid"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Vigased argumendid"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Viga filtri abil otsimisel %s: %s"
@@ -8173,36 +8492,36 @@ msgstr "(match-all) nõuab ühtainust tõeväärtustüüpi tulemust"
 msgid "Performing query on unknown header: %s"
 msgstr "Täidetakse päring tundmatul päisel: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Toetamata operatsioon: lisa sõnum: %s"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Toetamata operatsioon: otsimine avaldise järgi: %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Toetamata operatsioon: otsing UID järgi: %s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Sõnumite liigutamine"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 #, fuzzy
 msgid "Copying messages"
 msgstr "Sõnumite liigutamine"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Võtan vastu %d teadet"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8210,46 +8529,46 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Katkestatud."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Ootamatu vastus POP serverilt: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr ""
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 #, 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:1114
+#: camel/camel-gpg-context.c:1121
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8257,50 +8576,62 @@ msgid ""
 "%s"
 msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Ei saa muuda kausta %s nime %s-ks: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Sõnumi lahtikrüptimine ebaõnnestus."
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Sõnumi lahtikrüptimine ebaõnnestus."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "See on sõnumi digitaalselt allkirjastatud osa"
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr "Ei saa kontrollida sõnumit: Ajutise faili loomine ebaõnnestus: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, 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"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Ei saa luua kataloogi %s: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "See on sõnumi digitaalselt allkirjastatud osa"
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Sisu sisaldab"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Vigane sõnumi sisu"
@@ -8399,15 +8730,15 @@ msgstr "Viga ajutise postifaili kirjutamisel: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Viga ajutise postifaili kopeerimisel: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 #, fuzzy
 msgid "parse error"
 msgstr "Muu viga"
@@ -8721,12 +9052,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8735,71 +9066,82 @@ msgstr ""
 "Kataloogi %s loomine nurjus:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Palun sisesta oma %s parool %s jaoks"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Määramata"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Lisa tingimus"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Lisa tingimus"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Ei leia häälestusandmebaasi"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "_Sertifikaadi ID:"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Allkirja salvestamine"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Muu viga"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Server: %s, tüüp: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Prügi"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "Juuni"
+
 #: camel/camel-tcp-stream-openssl.c:568
 #, fuzzy
 msgid "Unable to get issuer's certificate"
@@ -8995,7 +9337,7 @@ msgid ""
 "Issuer: %s"
 msgstr "_Sertifikaadi ID:"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
@@ -9015,22 +9357,22 @@ msgstr ""
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kausta kustutamine nurjus: %s: vigane operatsioon"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kausta kustutamine nurjus: %s: kausta ei ole olemas"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kausta ümbernimetamine nurjus: %s: vigane operatsioon"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ei saa muuta kausta nime: %s: kausta ei ole olemas"
@@ -9108,7 +9450,7 @@ msgstr "Sõnumi lahtikrüptimine ebaõnnestus."
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9122,7 +9464,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Sõnumit ei leitud"
@@ -9160,54 +9502,71 @@ msgid "Failed to cache %s: %s"
 msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Ühendun serverisse..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Ei saa luua ühendust LDAP serveriga."
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr ""
+"\n"
+"Kommentaar: "
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Kontrollin uusi sõnumeid"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 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:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Kaustad"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Näita ainult tellitud kaustu"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "Kasuta serveri pakutava kaustade nimeruumi asemel enda oma"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Nimeruum"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Rakenda filtreid kõikidele Sisendkasti uutele sõnumitele"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Kontrolli uusi sõnumeid automaatselt"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "E-posti loetakse ja hoitakse IMAP serveris."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Parool"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9460,7 +9819,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Ei saa muuda kausta %s nime %s-ks: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kausta ümbernimetamine ebaõnnestus: %s"
@@ -9577,29 +9936,29 @@ msgstr "Kontrollin uute sõnumite olemasolu"
 msgid "Storing folder"
 msgstr "Kausta säilitamine"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s lukustamine nurjus: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9608,11 +9967,11 @@ msgstr ""
 "Ei saa kätte sõnumit %s kaustast %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -9680,12 +10039,17 @@ msgstr "Ei saa luua kataloogi %s: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "Ei saa kontrollida kausta: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "Kaardi ID on juba olemas"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Ei saa muuda kausta %s nime %s-ks: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Kirjeldatud kaustanimi ei ole korrektne: %s"
@@ -9729,7 +10093,7 @@ msgstr ""
 msgid "Could not close temp folder: %s"
 msgstr "Ajutise kausta sulgemine ebaõnnestus: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kausta ümbernimetamine ebaõnnestus: %s"
@@ -10015,7 +10379,7 @@ msgstr "Kustuta %s päeva möödumisel"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -10102,7 +10466,7 @@ msgid "No such folder `%s'."
 msgstr "Kausta '%s' ei ole olemas."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10156,7 +10520,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Sõnumite trantsport sendmail programmiga"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10327,7 +10691,7 @@ msgstr "SMTP posti saatmine %s kaudu"
 msgid "Cannot send message: sender address not valid."
 msgstr "Ei saa saata sõnumit: saatja aadress on vigane"
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Sõnumi saatmine"
 
@@ -10456,7 +10820,7 @@ msgstr "%.1fM"
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "manus"
 
@@ -10501,11 +10865,11 @@ msgstr "MIME tüüp:"
 msgid "Suggest automatic display of attachment"
 msgstr "Soovita manuse automaatset kuvamist"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Aadressiraamatu vaatamiseks kliki siia"
 
@@ -10516,45 +10880,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Vastus:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Saatja:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Teema:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Adressaat:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Sisesta sõnumi adressaadid"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Koopia:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Sisesta aadressid, milledele saadetakse sõnumi koopiad"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Pimekoopia:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10563,16 +10927,21 @@ msgstr "Sisesta aadressid, millele saadetakse sõnumi pimekoopiad."
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 #, fuzzy
 msgid "Posting destination"
 msgstr "Kirjeldus puudub"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Lisa sõnumile manus"
+
 #: composer/e-msg-composer-select-file.c:119
 #, fuzzy
 msgid "Attach file(s)"
@@ -10609,35 +10978,35 @@ msgstr "Fail on juba olemas. Kirjutada üle?"
 msgid "Error saving file: %s"
 msgstr "Viga faili salvestamisel: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Viga faili laadimisel: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10646,7 +11015,7 @@ msgstr ""
 "Väljundfaili loomine nurjus: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10655,7 +11024,7 @@ msgstr ""
 "Viga kirja automaatsel salvestamisel: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10663,7 +11032,7 @@ msgstr ""
 "Ximian Evolution leidis eelmisest sessioonist salvestamata faile.\n"
 "Kas sa soovid üritada nende taastamist?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10674,35 +11043,35 @@ msgstr ""
 "\n"
 "Kas sa soovid muudatused salvestada?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Hoiatus: salvestamata sõnum"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Ava fail"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 #, fuzzy
 msgid "Signature:"
 msgstr "Allkirja salvestamine"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Sõnumi koostamine"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10713,7 +11082,7 @@ msgstr ""
 "Ei saa luua sõnumiredaktori akent:\n"
 "Ei saa aktiveerida HTML redaktori komponenti."
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10721,18 +11090,20 @@ msgstr ""
 "Ei saa luua sõnumiredaktori akent:\n"
 "Ei saa aktiveerida HTML redaktori komponenti."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
-msgstr ""
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
+msgstr "Ximian Evolution"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10982,13 +11353,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11118,7 +11489,7 @@ msgstr "Siis"
 msgid "You must specify a folder."
 msgstr "Stiili nimi:"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Vali kaust"
@@ -11132,26 +11503,26 @@ msgstr ""
 "Viga regulaaravaldises '%s':\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Tähtis"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 #, fuzzy
 msgid "Later"
 msgstr "pärast"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Test"
 
@@ -11256,7 +11627,7 @@ msgstr "tagasi"
 msgid "months"
 msgstr "kuud"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "sekundit"
 
@@ -11356,7 +11727,7 @@ msgstr "Avaldis"
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
@@ -11430,121 +11801,127 @@ msgid "Source Account"
 msgstr "Lähtekonto"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Veetolm"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Päise eripära"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Peata töötlemine"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Teema"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "Määra olek"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "sisaldab"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "ei sisalda"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "ei lõppe"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "ei ole olemas"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 #, fuzzy
 msgid "does not return"
 msgstr "ei ole olemas"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "ei kõla kui"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "ei alga"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "lõppeb"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "on olemas"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 #, fuzzy
 msgid "is Flagged"
 msgstr "Tähistatud"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 #, fuzzy
 msgid "is after"
 msgstr "on pärast"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "is before"
 msgstr "on enne"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "on suurem kui"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "on väiksem kui"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Tähistatud"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "ei ole"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "on"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 #, fuzzy
 msgid "returns greater than"
 msgstr "on suurem kui"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 #, fuzzy
 msgid "returns less than"
 msgstr "on väiksem kui"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 #, fuzzy
 msgid "returns"
 msgstr "Burns"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "kõlab kui"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "algab"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
@@ -11570,19 +11947,87 @@ msgstr "Reegli nimi: "
 msgid "Score Rules"
 msgstr "Skoori reeglid"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Sa pead sellele vKaustale nime määrama."
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 #, fuzzy
 msgid "VFolder source"
 msgstr "vKausta allikad"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#, fuzzy
+msgid "Configure your email accounts here"
+msgstr "Loob või muudab mailikontosid ja muid sätteid"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution'i kontoredaktor"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Evolution'i sõnumiredaktor."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Evolution'i sõnumiredaktor."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution'i sõnumiredaktor."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution'i sõnumikausta kuvamise komponent."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolution'i sõnumikausta kuvamise komponent."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Post"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Kontod"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr ""
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Oled sa kindel, et soovid seda kontot kustutada?"
@@ -11627,7 +12072,7 @@ msgid "Protocol"
 msgstr "Puerto Rico"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 #, fuzzy
 msgid "Unnamed"
 msgstr "Nimetu kontakt"
@@ -11657,18 +12102,15 @@ msgstr "Lisa tingimus"
 msgid "Signature(s)"
 msgstr "_HTML allkiri:"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Saata sellegipoolest?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11676,28 +12118,28 @@ msgstr ""
 "Sellel sõnumil on teema väli tühi.\n"
 "Kas saadame ilma teemata?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11708,198 +12150,415 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Loo sõnumi baasil _Virtuaalne Kaust"
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "Post"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<kausta valimiseks kliki siia>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, fuzzy, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "Ava programmiga %s..."
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Loo _uus kaust..."
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Kirjelda, kuhu tuleb kaust luua:"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
-msgid "Folder _name"
+msgid "Folder _name:"
 msgstr "Kausta nimi:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Ajutise kataloogi loomine nurjus: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Ajutise kataloogi loomine nurjus: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Ajutise kataloogi loomine nurjus: %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Ajutise kausta sulgemine ebaõnnestus: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Laen..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Vali kaust"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Loo uue kausta"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Ei saa kustutada kausta '%s': %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr ""
+"Kausta kustutamine nurjus:\n"
+"%s"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Kustuta \"%s\""
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Nimeta kaust \"%s\" uue nimega:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+#, fuzzy
+msgid "Rename Folder"
+msgstr "Kausta nime muutmine"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Omadused"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Omadused"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "Kausta nimi:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Vaade"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Ava uues aknas"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Tõsta"
+
+#: mail/em-folder-tree.c:1500
+#, fuzzy
+msgid "_New Folder..."
+msgstr "Uus k_aust"
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "_Nimeta ümber"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "_Omadused..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "_Redigeeri kui uut sõnumit..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "_Trüki"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Vasta saatjale"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Vasta postiloendisse"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Vasta kõigile"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "_Saada edasi"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Lõpetatud"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Puhasta"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "_Märgi loetuks"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Märgi kui l_ugemata"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Märgi tä_htsaks"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Märgi vähet_ähtsaks"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Märgi kui l_ugemata"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Märgi tä_htsaks"
+
+#: mail/em-folder-view.c:706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Taasta"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Tõsta kausta..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "Ko_peeri kausta..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Lisa saatja aadressiraamatusse"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Rakenda filtrid"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Loo sõnumi baasil _reegel"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "VKaust _teema järgi"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "VKaust _saatja järgi"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "VKaust _adressaatide järgi"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "VKaust _postiloendi järgi"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "VKaust _saatja järgi"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Filter t_eema järgi"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Filter saat_ja järgi"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Filter a_dressaatide järgi"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Filter  p_ostiloendi järgi"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filter saat_ja järgi"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default"
 msgstr "_Vaikimisi"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Sõnumi trükkimine"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopeeri viida asukoht"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Vastavusi:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Määratud"
+
+# !PARANDA! - kas on ikka täpne tõlge?
+#: mail/em-format-html-display.c:597
+#, fuzzy
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr "See sõnum on digitaalselt allkirjastatud kuid ei ole autentne."
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Lisa tingimus"
+
+#: mail/em-format-html-display.c:598
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
 msgstr ""
-"See sõnum on digitaalselt allkirjastatud. Lisainfo jaoks kliki lukuikoonil."
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Lisa tingimus"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Katkestatud"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "PGP krüpteerimine"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Ei saa saata sõnumit: %s"
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Toetamata skeem"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Sertifikaatide kontroll ebaõnnestus."
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Kuva sõnumi sees"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Ära kuva"
@@ -11909,97 +12568,72 @@ msgstr "Ära kuva"
 msgid "Page %d of %d"
 msgstr "Tõmban %d. sõnumit %dst"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Võtan vastu sõnumit %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Viide FTP saidile (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Viide kohalikule failile (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-# !PARANDA! - kas on ikka täpne tõlge?
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-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."
-
-# !PARANDA! - kas on ikka täpne tõlge?
-#: mail/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "See sõnum on digitaalselt allkirjastatud ja autentne."
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-#, fuzzy
-msgid "No signature present"
-msgstr "HTML allkirjafail:"
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "GNOME lähtestamine nurjus"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Toetamata skeem"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Sõnumite liigutamine"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Kellelt"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr ""
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Kellele"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Koopia"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Pimekoopia"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 #, fuzzy
 msgid "Mailer"
 msgstr ""
@@ -12007,91 +12641,138 @@ msgstr ""
 "Postiprogramm:"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Kuupäev"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "\"%s\" tüüpi manus"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Ei saa saata sõnumit: %s"
+msgid "Session not initialised"
+msgstr "GNOME lähtestamine nurjus"
+
+# !PARANDA! - kas on ikka täpne tõlge?
+#: mail/em-format.c:1210
+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/em-format.c:1212
+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/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Ootan..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Kontrollin %s"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
 
-#: mail/em-popup.c:593
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Salvesta kui..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Vasta saatjale"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Ava uues aknas"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "_Saada loendile sõnum..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Uus aadressiraamat"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Ava programmiga %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "IMAP serveri vastus ei sisaldanud %s infot"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Telli"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Kaust"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Palun vali server."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Ühtegi serverit ei ole valitud"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Seda teadet enam mitte näidata."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12100,27 +12781,27 @@ msgstr ""
 "Viga filtriinfo laadimisel:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Filtrid"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Edasi saadetud sõnum"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "tundmatu saatja"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%%s kirjutas %a, %d.%m.%Y kell %H:%M:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12129,7 +12810,7 @@ msgstr ""
 "Ei saa kätte sõnumit: %s\n"
 "  %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12138,26 +12819,39 @@ msgstr ""
 "%s on juba olemas\n"
 "Kas soovid üle kirjutada?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Sõnum"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Sõnumi salvestamine teise nimega..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Ajutise kataloogi loomine nurjus: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "_Aadress:"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
+msgid ""
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"See tegevus eemaldab kõik kustutatud sõnumid. Hiljem ei ole neid sõnumeid "
+"enam võimalik taastada.\n"
+"\n"
+"Kas tõesti eemaldame kustutatud sõnumid?"
+
+#: mail/em-utils.c:2288
 #, fuzzy
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12166,105 +12860,389 @@ msgstr ""
 "\n"
 "Kas tõesti eemaldame kustutatud sõnumid?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
+#: mail/evolution-mail.schemas.in.in.h:1
+#, fuzzy
+msgid "Automatic link recognition"
+msgstr "_Kontrolli uusi sõnumeid automaatselt"
+
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "_Kontrolli uusi sõnumeid automaatselt"
+
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: mail/evolution-mail.schemas.in.in.h:6
 #, fuzzy
-msgid "Configure your email accounts here"
-msgstr "Loob või muudab mailikontosid ja muid sätteid"
+msgid "Default charset in which to compose messages"
+msgstr "Lõikab valitud sõnumid"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/evolution-mail.schemas.in.in.h:7
 #, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
+msgid "Default charset in which to compose messages."
+msgstr "Lõikab valitud sõnumid"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution'i kontoredaktor"
+msgid "Default charset in which to display messages"
+msgstr "Otsib teksti kuvatud sõnumi sisust"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
-msgid "Evolution Mail component"
-msgstr "Evolution'i sõnumiredaktor."
+msgid "Default charset in which to display messages."
+msgstr "Otsib teksti kuvatud sõnumi sisust"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Evolution'i sõnumiredaktor."
+msgid "Default forward style"
+msgstr "Vaikimisi edasisaatmise moodus on: "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution'i sõnumiredaktor."
+msgid "Default reply style"
+msgstr "Vaikimisi edasisaatmise moodus on: "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
 #, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution'i sõnumikausta kuvamise komponent."
+msgid "Empty Trash folders on exit"
+msgstr "Programmist väljumisel _puhasta prügikaust"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Evolution'i sõnumikausta kuvamise komponent."
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Programmist väljumisel _puhasta prügikaust"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
-msgid "Mail Accounts"
+msgid "Height of the message-list pane"
+msgstr "Saada sõnum hiljem"
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "Kontod"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: mail/importers/elm-importer.c:105
-msgid "Evolution is importing your old Elm mail"
-msgstr "Evolution impordib sinu sõnumeid programmist Elm'i"
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
-msgid "Importing..."
-msgstr "Impordin"
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
-msgid "Please wait"
-msgstr "Palun oota"
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
 msgstr ""
 
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Kontrollin %s"
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "_Logi filtreerimised faili:"
 
-#: mail/importers/elm-importer.c:547
+#: mail/evolution-mail.schemas.in.in.h:28
+#, fuzzy
+msgid "Log filter actions to the specified log file."
+msgstr "_Logi filtreerimised faili:"
+
+#: mail/evolution-mail.schemas.in.in.h:29
+#, fuzzy
+msgid "Logfile to log filter actions"
+msgstr "_Logi filtreerimised faili:"
+
+#: mail/evolution-mail.schemas.in.in.h:30
+#, fuzzy
+msgid "Logfile to log filter actions."
+msgstr "_Logi filtreerimised faili:"
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "E-posti seadistamine"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "E-posti seadistamine"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
-"Evolution leidis Elm'i sõnumifailid.\n"
-"Kas sa soovid neid Evolution'i importida?"
 
-#: mail/importers/elm-importer.c:568
-msgid "Elm"
-msgstr "Elm"
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr "Täpsustus, kui püütakse saata HTML sõnumit isikule, kes seda ei soovi"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr ""
+"Täpsustus, kui püütakse saata sõnumit, millel on kirjeldatud ainult "
+"pimekoopia adressaadid"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "_Vaikimisi saadetakse HTML vormingus sõnumeid"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "_Vaikimisi saadetakse HTML vormingus sõnumeid"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "Näita aega kui"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "Näita aega kui"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Näita sõnumit normaalse stiiliga"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "_Eelvaate paan"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+msgid "Sound file to play when new mail arrives."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+msgid "Spell check inline"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "Esialgne kontakt:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+msgid "The variable width font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Esitab sõnumeid jutulõngadena"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Esitab sõnumeid jutulõngadena"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "See konto on minu _vaikimisi konto"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "Muutlik"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 #, fuzzy
@@ -12298,6 +13276,44 @@ msgstr ""
 msgid "Evolution Pine importer"
 msgstr "Evolution'i sõnumiredaktor."
 
+#: mail/importers/elm-importer.c:105
+msgid "Evolution is importing your old Elm mail"
+msgstr "Evolution impordib sinu sõnumeid programmist Elm'i"
+
+#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
+#: mail/importers/pine-importer.c:115
+msgid "Importing..."
+msgstr "Impordin"
+
+#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
+#: mail/importers/pine-importer.c:117
+msgid "Please wait"
+msgstr "Palun oota"
+
+#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
+#: mail/importers/pine-importer.c:288
+#, c-format
+msgid "Importing %s as %s"
+msgstr ""
+
+#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
+#: mail/importers/pine-importer.c:425
+#, c-format
+msgid "Scanning %s"
+msgstr "Kontrollin %s"
+
+#: mail/importers/elm-importer.c:547
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution leidis Elm'i sõnumifailid.\n"
+"Kas sa soovid neid Evolution'i importida?"
+
+#: mail/importers/elm-importer.c:568
+msgid "Elm"
+msgstr "Elm"
+
 #: mail/importers/netscape-importer.c:75
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
@@ -12339,12 +13355,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution impordib sinu Netscape andmeid"
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Prügi"
-
 #: mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
@@ -12354,7 +13364,7 @@ msgstr "Kohaliku posti fail %s"
 msgid "Scanning directory"
 msgstr "Kontrollin kausta"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Impordi alustamine"
 
@@ -12428,24 +13438,24 @@ msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution'i kontoredaktor"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "_Konto nimi:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Kataloog:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Sa ei saa luua ühe nimega kahte kontot."
 
@@ -12454,35 +13464,35 @@ msgstr "Sa ei saa luua ühe nimega kahte kontot."
 msgid "Mail to %s"
 msgstr "Sõnumi saaja: %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Teema on %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Sõnumi saatja: %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "postiloend %s"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Vastatud kellele"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Lisa filtreerimisreegel"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12490,148 +13500,31 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:194
-#, fuzzy
-msgid "Connecting..."
-msgstr "Ühendun serverisse..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "See kaust ei saa sisaldada sõnumeid."
-
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Kausta ümbernimetamine ebaõnnestus: %s"
-
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Ajutise kataloogi loomine nurjus: %s"
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Uus sõnum"
 
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Ajutise kataloogi loomine nurjus: %s"
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "_Saada sõnum"
 
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Ajutise kausta sulgemine ebaõnnestus: %s"
+#: mail/mail-component.c:381
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Sõnumi koostamine"
 
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Vali kaust, kuhu salvestada imporditavad andmed"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Vali kaust, kuhu salvestada imporditavad andmed"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Loo uue kausta"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Kirjelda, kuhu tuleb kaust luua:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Ei saa kustutada kausta '%s': %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr ""
-"Kausta kustutamine nurjus:\n"
-"%s"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Kustuta \"%s\""
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Nimeta kaust \"%s\" uue nimega:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-#, fuzzy
-msgid "Rename Folder"
-msgstr "Kausta nime muutmine"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Kirjeldatud kaustanimi ei ole korrektne: %s"
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Omadused"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Omadused"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "Kausta nimi:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Vaade"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Ava uues aknas"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Tõsta"
-
-#: mail/mail-component.c:2087
-#, fuzzy
-msgid "_New Folder..."
-msgstr "Uus k_aust"
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "_Nimeta ümber"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Omadused..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Identiteet"
 
@@ -12696,11 +13589,11 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Teenuse kontrollimine"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Ühendun serverisse..."
 
@@ -12787,28 +13680,37 @@ msgid "C_olors"
 msgstr "_Sulge"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Uute sõnumite kontroll"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Uute sõnumite kontroll"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Täna lõppevate ülesannete värvus"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Sõnumi koostamine"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Häälestus"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -12825,332 +13727,341 @@ msgstr ""
 "\n"
 "Seadistuste salvestamiseks vajuta \"Lõpeta\"."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "_Vaikimisi"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Del Bajio"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Vaikimisi kodeering: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "E-posti võtmine"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Väljuvad sõnumid _allkirjastatakse alati selle konto abil"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Sõnumi avamine ebaõnnestus"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Valmis"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "_Mustandite kaust:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "_Luba"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email Accounts"
 msgstr "E-posti aadress sisaldab"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email _address:"
 msgstr "E-posti aadress:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "Programmist väljumisel _puhasta prügikaust"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Sertifikaadi ID:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Evolution'i kontoassistent"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Käivita tegevused"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "lõppeb"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "Häälestus"
+
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Font Properties"
 msgstr "Omadused"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Edasi saadetud sõnumid"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Rõhuta tsitaate"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Sõnumi sees"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Salvesta ja sulge"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Loading Images"
 msgstr "_Lae pildid"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "E-posti seadistamine"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Composer"
 msgstr "Kirja päis"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Message Display"
 msgstr "Sõnumi _kuvamine"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Fonts"
 msgstr "Sõnum sisaldab"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "E-posti seadistamine"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
 # !PARANDA! - siia peaks leidma sõna, mis ei oleks eitav
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Mittekohustuslik info"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "T_öökoht:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP _Võtme ID:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Vali värvus"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Täpsustus, kui püütakse saata sõnumit, millel on kirjeldatud ainult "
 "pimekoopia adressaadid"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Trükib valitud kontaktid"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Quote original message"
 msgstr "Sõnumi avamine ebaõnnestus"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Tsitaadina"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "_Jäta see parool meelde"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Vastus:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "E-posti vastuvõtmine"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Vastuvõtmise valikud"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Jäta see parool meelde"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Kohustuslik info"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Vaikimisi"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Turvalisus"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "E-posti saatmine"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Saadetud _sõnumite kaust:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Saadetud sõnumid ja mustandid"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Server vajab _autentimist"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Serveri seadistused"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Serveri _tüüp: "
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Ei leia häälestusandmebaasi"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Stiili nimi:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Standardne Unix'i mbox"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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:121
+#: mail/mail-config.glade.h:124
 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:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Muutlik"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -13161,194 +14072,203 @@ msgstr ""
 "\n"
 "Jätkamiseks vajuta \"Järgmine\". "
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_HTML allkiri:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "L_ae pildid alati võrgust"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Väljuvad sõnumid _allkirjastatakse alati selle konto abil"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "_Autentimise tüüp: "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Autentimise tüüp: "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "_Kontrolli uusi sõnumeid automaatselt"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Kontrolli uusi sõnumeid automaatselt"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Kausta puhastamisel küsi kinnitust"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML allkiri:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Defaults"
 msgstr "Vaikimisi"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Enable"
 msgstr "Luba"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Saada edasi määratud kujul"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Täisnimi"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML sõnumis"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Identity"
 msgstr "Identiteet"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Juuni"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "_Lae pildid ainult, kui saatja on aadressiraamatus"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "See konto on minu _vaikimisi konto"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Märgi sõnum loetuks peale"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "_Ära lae ühtegi pilti võrgust"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 #, 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:159
+#: mail/mail-config.glade.h:165
 #, 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:160
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Posti vastuvõtmine"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Vasta kõigile"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Script:"
 msgstr "_Turvalisus"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Kustuta"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Posti saatmine"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Näita aega kui"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Signatures"
 msgstr "_HTML allkiri:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Standard Font:"
 msgstr "Sand Point"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Terminal Font:"
 msgstr "Esialgne kontakt:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Kasuta turvalist ühendust (_SSL)"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "kirjeldus"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Kontrollin %s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13357,7 +14277,7 @@ msgstr ""
 "Viga tegevusel '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13366,7 +14286,7 @@ msgstr ""
 "Operatsiooni käigus tekkis viga:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Töötan"
 
@@ -13378,118 +14298,118 @@ msgstr "Filtreerin kausta"
 msgid "Fetching Mail"
 msgstr "E-posti võtmine"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Ebaõnnestud posti salvestamine ajutisse faili %s: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Ebaõnnestud posti salvestamine ajutisse faili %s: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Saadan \"%s\""
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Saadan sõnumit %d (kokku: %d)"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Valmis."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Salvestan sõnumi kausta"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Tõstan sõnumid %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Kontrollin kaustu \"%s\""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Edasi saadetud sõnumid"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Avan kausta %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eemaldan kausta %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Säilitan Kausta '%s'"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Värskendan kausta"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Tühjendan kausta"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Kohalikud kaustad"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Võtan vastu sõnumit %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Võtan vastu %d teadet"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvestan %d sõnumit"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13498,39 +14418,43 @@ msgstr ""
 "Väljundfaili loomine nurjus: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Manuse salvestamine"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Ühendun lahti: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Taastan ühenduse: %s"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Tõstutundlik"
@@ -13547,60 +14471,75 @@ msgstr "Leia:"
 msgid "Search"
 msgstr "Otsi"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Lisa tingimus"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Erandid"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Allika info"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, tüüp: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Kataloog: %s, tüüp: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Tüüp: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Sõnumite saatmine ja vastuvõtmine"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Katkesta kõik"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Uuendan..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Ootan..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Kasutaja katkestas töö."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Palun sisesta %s parool"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Sisesta parool"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "_Jäta see parool meelde"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -13641,26 +14580,31 @@ msgstr "_HTML allkiri:"
 msgid "Name:"
 msgstr "Nimi:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Edasi saadetud sõnum - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Edasi saadetud sõnum"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Avan kausta %s"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13669,88 +14613,88 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "VKaustad"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "vKaustad"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Muuda VKausta"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Proovitake redigeerida olematut vkausta '%s'."
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Uus VKaust"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Nägemata"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Nähtud"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Vastatud"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Mitu nägemata sõnumit"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Mitu sõnumit"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Madalaim"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Madal"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Kõrge"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Kõrgeim"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Täna %l:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Eile %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a, %l:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Sõnumite nimekirja koostamine"
 
@@ -13812,11 +14756,11 @@ msgstr "Saada edasi"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Vasta"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Vasta kõigile"
 
@@ -13873,42 +14817,141 @@ msgstr "_Telli"
 msgid "_Unsubscribe"
 msgstr "_Lõpeta tellimus"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, fuzzy, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+# !PARANDA!
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Evolution'i shell"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+#, fuzzy
+msgid "Folder Settings"
+msgstr "Sõnumite sätted"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "389"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Nimeta see kiirvalikute grupp ümber"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Lülitab kaustade riba sisse või välja"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Peidab kiirvalikute riba"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Tä_htsus:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Tä_htsus:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "E-posti seadistamisliides"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
 msgstr ""
-"Kausta ümbernimetamine ebaõnnestus:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 #, fuzzy
-msgid "Add a Folder"
-msgstr "Vali kaust"
+msgid "Path to the default contacts folder"
+msgstr "Avan kausta %s"
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Mustandid"
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Avan kausta %s"
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Sisendkast"
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Avan kausta %s"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Avan kausta %s"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Väljundkast"
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Lülitab kaustade riba sisse või välja"
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Saadetud"
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Lülitab kiirvkorralduste riba sisse või välja"
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "E-post"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13919,14 +14962,14 @@ msgstr ""
 "%s\n"
 "Viga: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13934,7 +14977,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -14040,10 +15083,11 @@ msgstr ""
 "Kausta ümbernimetamine ebaõnnestus:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+msgid "The specified folder name is not valid: %s"
+msgstr "Kirjeldatud kaustanimi ei ole korrektne: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -14067,20 +15111,15 @@ msgstr ""
 "Kirjeldatud kausta loomine nurjus:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-#, fuzzy
-msgid "Create New Folder"
-msgstr "Loo _uus kaust..."
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Pealkirjata)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Vali, millist tüüpi importerit sa soovid kasutada:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -14089,11 +15128,11 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Palun valige informatsioon, mida soovite importida:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -14101,7 +15140,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14110,22 +15149,22 @@ msgstr ""
 "Impordin %s\n"
 "Impordin elementi %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 #, fuzzy
 msgid "Select importer"
 msgstr "Vali kaust"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "Faili %s ei leitud."
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Evolution'i viga "
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -14134,11 +15173,11 @@ msgstr ""
 "Puudub importija, mis suudaks hakkama saada failiga\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Importimine"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -14147,17 +15186,17 @@ msgstr ""
 "Impordin %s.\n"
 "Käivitan %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Viga %s käivitamisel"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Viga %s laadimisel"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14166,36 +15205,36 @@ msgstr ""
 "Impordin %s\n"
 "Impordin elementi 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Faili nimi:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Vali fail"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Faili tüüp:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Impordi teiste programmide andmeid ja sätted"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Impordi üksikut faili"
 
 # !PARANDA!
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -14203,48 +15242,28 @@ msgstr ""
 "Palun oota...\n"
 "Üritan tuvastada olemasolevaid programme"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "Programmist %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Vali kaust, kuhu salvestada imporditavad andmed"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Impordi"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Sulgen ühendused..."
 
-#: shell/e-shell-offline-sync.c:163
-#, fuzzy, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Viga tegevusel '%s':\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-#, fuzzy
-msgid "Syncing Folder"
-msgstr "Kausta sünkroniseerimine"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr ""
-
 #: shell/e-shell-settings-dialog.c:346
 #, fuzzy
 msgid "Evolution Settings"
@@ -14285,7 +15304,7 @@ msgstr ""
 "Kirjeldatud kausta loomine nurjus:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14294,17 +15313,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Assistent"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Uus"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Kausta nimi on kirjeldamata."
@@ -14365,64 +15378,51 @@ 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:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "Ühendu v_õrku"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "Siirdu aut_onoomsesse olekusse"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Siirdu autonoomsesse olekusse"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Kausta ei näidata)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Puudub)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 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:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution siirdub autonoomsesse olekusse."
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution on hetkel autonoomses olekus. Võrku ühendumiseks vajuta "
 "seda nuppu."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Vigased argumendid"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Ei leia häälestusandmebaasi"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Üldine viga"
 
@@ -14542,75 +15542,18 @@ msgstr "_Eemalda"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Eemaldab kiirvalikute ribalt selle korralduse"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Viga kiirvalikute salvestamisel."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Sisendkast"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Kiirvalikud"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Vigu ei tekkinud"
-
-#: 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:575
-msgid "The specified folder type is not valid"
-msgstr "Kirjeldatud kaustatüüp on vigane"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "I/O viga"
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr "Pole piisavalt ruumi kausta loomiseks"
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr "Kaust ei ole tühi"
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "Antud kausta ei leitud"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr ""
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "Operatsioon ei ole toetatud"
-
-#: shell/e-storage.c:591
-msgid "The specified type is not supported in this storage"
-msgstr ""
-
-#: 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:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr ""
-
-#: 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:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr ""
-
-#: shell/e-storage-set-view.etspec.h:1
-#, fuzzy
-msgid "Checkbox"
-msgstr "Chico"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14621,6 +15564,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% valmis)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Uus"
+
+#: shell/evolution-folder-selector-button.c:128
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "Ava programmiga %s..."
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14650,76 +15604,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "CORBA viga"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Katkestatud"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Vigane parameeter"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Omanik puudub"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Ei leitud"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Toetamata tüüp"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Toetamata skeem"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Toetamata tegevus"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Sisemine viga"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Olemas"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "Vigane URI"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Sisaldab alamkaustu"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Vaba ruum on otsas"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr ""
-
-#: shell/evolution-test-component.c:63
-#, fuzzy
-msgid "Test type"
-msgstr "Faili tüüp:"
-
-#: shell/evolution-test-component.c:703
-#, fuzzy
-msgid "Evolution Test Component"
-msgstr "Evolution'i sõnumiredaktor."
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "Active Connections"
@@ -14753,11 +15637,6 @@ msgstr "E-_Post"
 msgid "_Tasks:"
 msgstr "Ülesanded"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-#, fuzzy
-msgid "Folder _name:"
-msgstr "Kausta nimi:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 #, fuzzy
 msgid "Folder _type:"
@@ -14822,25 +15701,6 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-
-# !PARANDA!
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Evolution'i shell"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-#, fuzzy
-msgid "Folder Settings"
-msgstr "Sõnumite sätted"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Faili importimiseks Evolution'i vajuta \"Impordi\"."
@@ -14876,7 +15736,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Importijad"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Impordi"
 
@@ -14892,16 +15752,16 @@ msgstr "Seda küsimust mitte rohkem esitada"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution suudab importida andmeid järgnevatest failidest:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Evolution lõpetab töö ..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14921,77 +15781,116 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:289
+#: shell/main.c:294
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Ximian Evolution"
 
-#: shell/main.c:297
+#: shell/main.c:302
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Seda küsimust mitte rohkem esitada"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr ""
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Impordi alustamine"
 
-#: shell/main.c:532
+#: shell/main.c:530
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Impordi alustamine"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Vali kaust"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Sertifikaadi ID:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "Edenemine"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Avaldis"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "E-posti aadress:"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr "_Sertifikaadi ID:"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -15047,91 +15946,378 @@ msgid "Backup All"
 msgstr "Blackpool"
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "_Sertifikaadi ID:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "_Sertifikaadi ID:"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "_Sertifikaadi ID:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Ühine nimi"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "_Sertifikaadi ID:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "_Redaktor"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Sertifikaatide kontroll ebaõnnestus."
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Avaldis"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Organisatsioon"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Organisatsioon"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Vaade"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "_Sertifikaadi ID:"
+
+#: smime/gui/smime-ui.glade.h:42
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "_Sertifikaadi ID:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Impordi"
+msgid "Certificate already exists"
+msgstr "Kaardi ID on juba olemas"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d.%m.%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Vermont"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr "° C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "Põ"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "Olgu"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "Põ"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "_Sertifikaadi ID:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "_Sertifikaadi ID:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "_Sertifikaadi ID:"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "I"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+#, fuzzy
+msgid "Subject Public Key Info"
+msgstr ""
+"\n"
+"Avalik võti: "
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Teema on %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Puhverkausta pole võimalik töödelda"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "_Sertifikaadi ID:"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Sertifikaatide kontroll ebaõnnestus."
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Info puudub"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "manus"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "_Sertifikaadi ID:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Curitiba"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "Põhja-Carolina"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Avaldis"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s (%d)"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Allkirjafail"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "_Lisa"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Teema on %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Allkirjafail"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Palun sisesta %s parool"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "_Sertifikaadi ID:"
 
 #: tools/evolution-launch-composer.c:324
 #, fuzzy
@@ -15187,7 +16373,7 @@ msgstr "Kopeerib valiku"
 msgid "Copy to Folder..."
 msgstr "Ko_peeri kausta..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Lõikab valiku"
 
@@ -15205,7 +16391,7 @@ msgstr "Tõstab valitud sõnumi teise kausta"
 msgid "Move to Folder..."
 msgstr "_Tõsta kausta..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Kleebib lõikepuhvri"
 
@@ -15213,8 +16399,8 @@ msgstr "Kleebib lõikepuhvri"
 msgid "Previews the contacts to be printed"
 msgstr "Trükitavate kontaktide eelvaatlemine"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Trükkimise _eelvaade"
@@ -15260,13 +16446,13 @@ msgstr "Peata laadimine"
 msgid "View the current contact"
 msgstr "käesoleva hetkega"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "_Tegevused"
 
@@ -15297,146 +16483,115 @@ msgstr "Saada _kontaktile sõnum"
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "Lisab uue sündmuse"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Lisab uue sündmuse"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "Loo uue kausta"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Lisab uue ülesande"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Lisab uue ülesande"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Päev"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 #, fuzzy
 msgid "Delete All Occurrences"
 msgstr "Kustuta k_õik sündmused"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Kustuta sündmus"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "Ku_stuta see sündmus"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "Ku_stuta see sündmus"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Mine"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Liigub tagasi"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Liigub edasi"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "_Mine valitud päevale"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Aktiveerib valitud kuupäeva"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Aktiveerib tänase päeva"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "List"
 msgstr "Lista"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Kuu"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Uus _sündmus"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Uus-Kaledoonia"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Kohtumine"
-
-#: ui/evolution-calendar.xml.h:27
-msgid "New _Task"
-msgstr "Uus _ülesanne"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Trükitava kalendri eelvaatlemine"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Trükib selle kalendri"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 "Publitseerib selle kalendri vaba- ja hõivatud aja kohta käivat informatsiooni"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Bourges"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Kohtumisi ja sündmusi sisaldav kaust"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Näita detaile"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Näitab ühte päeva"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Näitab ühte kuud"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Näitab ühte nädalat"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Näitab ühte töönädalat"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Nädal"
 
@@ -15501,7 +16656,7 @@ msgstr "Salvestab elemendi kettale"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Fail"
 
@@ -15727,7 +16882,7 @@ msgstr "Märgi kõik loetuk_s"
 msgid "Mark all visible messages as read"
 msgstr "Märgib kõik peitmata sõnumid loetuks"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Paste message(s) from the clipboard"
 msgstr "Asetab lõikepuhvris oleva sõnumi"
@@ -15784,16 +16939,6 @@ msgstr ""
 msgid "_Threaded Message List"
 msgstr "_Esita sõnumeid jutulõngadena"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Sulgeb akna"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "_Sulge"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Addressbook"
@@ -15957,278 +17102,303 @@ msgstr "Saadab valitud sõnumi kellelegi edasi (manusena)"
 msgid "Increase the text size"
 msgstr "Suurendab teksti suurust"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "_Lae pildid"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Märgi t_ähtsaks"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Märgi kui l_ugemata"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Märgi vähetä_htsaks"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark the selected message(s) as having been read"
 msgstr "Märgib valitud sõnumi loetuks"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark the selected message(s) as important"
 msgstr "Märgib valitud sõnumi tähtsaks"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Märgib valitud sõnumi vähetähtsaks"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Märgib valitud sõnumi lugemata sõnumiks"
+
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Märgib valitud sõnumi lugemata sõnumiks"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Märgib valitud sõnumi vähetähtsaks"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Märgib valitud sõnumi kustutamisele kuuluvaks"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Tõsta"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
 msgid "Move selected message(s) to another folder"
 msgstr "Tõstab valitud sõnumi teise kausta"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Järgmine"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Next _Important Message"
 msgstr "Järgmisele tähtsale sõnumile"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Next _Thread"
 msgstr "Järgmisele jutulõngale"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "Next _Unread Message"
 msgstr "Järgmisele lugemata sõnumile"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Ei leitud"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Avab valitud sõnumi uues aknas"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Valitud sõnumi uuesti saatmiseks ava see sõnumiredaktoris"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "_Algne suurus"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "P_revious Unread Message"
 msgstr "Eelmisele lugemata sõnumile"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Ülesande vastus"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Eelmisele tähtsale sõnumile"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Trükitava sõnumi eelvaatlemine"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Eelmine"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Trükib valitud sõnumi"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 #, fuzzy
 msgid "Re_direct"
 msgstr "Woensdrecht"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Saadab valitud sõnumi kellelegi edasi"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Taastab teksti algse suuruse"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "_Otsi sõnumist..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "_Väiksem"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Salvestab sõnumi tekstifaili"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Otsib teksti kuvatud sõnumi sisust"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "Set up the page settings for your current printer"
 msgstr "Lehekülje sätted aktiivse printeri jaoks"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "_Näita e-post lähtekoodi"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Näita kõiki _päiseid"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Otsib teksti kuvatud sõnumi sisust"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Näita sõnumit normaalse stiiliga"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Näita sõnumit koos kõigi päistega"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Näita sõnumit töötlemata kujul"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "Teksti _suurus"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Taasta valitud sõnumid"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "VKaust _postiloendi järgi..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "VKaust _saatja järgi..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "VKaust _adressaatide järgi..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "VKaust _teema järgi..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 #, fuzzy
 msgid "_Attached"
 msgstr "Manusta"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "_Kopeeri teise kausta"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "_Loo sõnumi baasil filter"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "Saada sõnum _edasi"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 #, fuzzy
 msgid "_Go To"
 msgstr "Mine"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 #, fuzzy
 msgid "_Inline"
 msgstr "Sõnumi sees"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "_Suurem"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "Sõnumi _kuvamine"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Tõsta teise kausta"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 #, fuzzy
 msgid "_Next Message"
 msgstr "Järgmisele sõnumile"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "_Harilik kuva"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "_Ava sõnum"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Eelmisele sõnumile"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 #, fuzzy
 msgid "_Quoted"
 msgstr "Tsitaadina"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 #, fuzzy
 msgid "_Resend..."
 msgstr "_Muuda nime..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "T_ööriistad"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "_Taasta"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Sulgeb akna"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "_Sulge"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Manusta"
@@ -16515,12 +17685,13 @@ msgid "Change Evolution's settings"
 msgstr "Evolution "
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "_Välju"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Lisab uue ülesande"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "Evolutioni _aken"
+msgid "E_xit"
+msgstr "_Välju"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16532,8 +17703,8 @@ msgstr "Impordib andmeid teistest programmidest"
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "Evolutioni _aken"
+msgid "Open a new window"
+msgstr "Ava uues aknas"
 
 #: ui/evolution.xml.h:11
 #, fuzzy
@@ -16541,54 +17712,69 @@ msgid "Pi_lot Settings..."
 msgstr "_Pilot'i sätted"
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Saada / võta vastu"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr ""
+"Saadab järjekorras olevad väljaminevad kirjad ja tõmbab ära uued kirjad."
+
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "E-posti seadistamine"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Näita infot Ximian Evolutioni kohta"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Saada veateade"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "Saada _veateade"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Saada veateade kasutades Bug Buddy't"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr ""
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Lülitab autonoomse reziimi sisse või välja"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolutioni _KKK"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "Ximian _Evolutionist..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "_Abi"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "_Impordi..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Uus"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Saada / Võta vastu"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "Otsi nüüd"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Kokkuvõtte trükkimine"
@@ -16729,12 +17915,12 @@ msgstr "Kirjelda vaateid"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "ETKNRLP"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -16872,7 +18058,7 @@ msgstr "_Otsi"
 msgid "_Find Now"
 msgstr "Otsi nüüd"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 #, fuzzy
 msgid "_Clear"
 msgstr "Puhasta"
@@ -16890,24 +18076,241 @@ msgstr ""
 msgid "Text"
 msgstr "Test"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Puhasta"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Otsi nüüd"
 
+#~ msgid "Account Name"
+#~ msgstr "Konto nimi"
+
+#~ msgid "Server Name"
+#~ msgstr "Serveri nimi"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Teised kontaktid"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Katkestab käimasoleva sõnumioperatsiooni"
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Evolutioni aadressiraamatu nime valiku kasutajaliides."
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Perekonnanimi"
+#~ msgid "Add LDAP Server"
+#~ msgstr "LDAP server"
+
+#, fuzzy
+#~ msgid "LDAP Configuration Assistant"
+#~ msgstr "Häälestus"
+
+#, fuzzy
+#~ msgid "Find contact in"
+#~ msgstr "Saatja sisaldab"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Kontakti lisamiseks vajuta siia *"
+
+#~ msgid "Business Address"
+#~ msgstr "Aadress tööl"
+
+#~ msgid "Department"
+#~ msgstr "Osakond"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "Vaba-kinni URL"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
 
-#~ msgid "Family Name"
-#~ msgstr "Perekonnanimi"
+#~ msgid "Profession"
+#~ msgstr "Elukutse"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Avan %s ülesanded"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Saata sellegipoolest?"
+
+#, fuzzy
+#~ msgid "Folder _name"
+#~ msgstr "Kausta nimi:"
+
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "See sõnum on digitaalselt allkirjastatud. Lisainfo jaoks kliki "
+#~ "lukuikoonil."
+
+#, fuzzy
+#~ msgid "No signature present"
+#~ msgstr "HTML allkirjafail:"
+
+#, fuzzy
+#~ msgid "Connecting..."
+#~ msgstr "Ühendun serverisse..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "See kaust ei saa sisaldada sõnumeid."
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Kausta ümbernimetamine ebaõnnestus: %s"
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Vali kaust, kuhu salvestada imporditavad andmed"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kausta ümbernimetamine ebaõnnestus:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Add a Folder"
+#~ msgstr "Vali kaust"
+
+#~ msgid "Drafts"
+#~ msgstr "Mustandid"
+
+#~ msgid "Outbox"
+#~ msgstr "Väljundkast"
+
+#~ msgid "Sent"
+#~ msgstr "Saadetud"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Viga tegevusel '%s':\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Syncing Folder"
+#~ msgstr "Kausta sünkroniseerimine"
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Kausta ei näidata)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(Puudub)"
+
+#~ msgid "No error"
+#~ msgstr "Vigu ei tekkinud"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Selle nimega kaust on juba olemas"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Kirjeldatud kaustatüüp on vigane"
+
+#~ msgid "I/O error"
+#~ msgstr "I/O viga"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Pole piisavalt ruumi kausta loomiseks"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Kaust ei ole tühi"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Antud kausta ei leitud"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Operatsioon ei ole toetatud"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Kirjeldatud kausta ei saa muuta ega eemaldada"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Sa ei saa luua selle nimega kausta"
+
+#, fuzzy
+#~ msgid "Checkbox"
+#~ msgstr "Chico"
+
+#~ msgid "CORBA error"
+#~ msgstr "CORBA viga"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Vigane parameeter"
+
+#~ msgid "No owner"
+#~ msgstr "Omanik puudub"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Toetamata tüüp"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Toetamata skeem"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Toetamata tegevus"
+
+#~ msgid "Internal error"
+#~ msgstr "Sisemine viga"
+
+#~ msgid "Exists"
+#~ msgstr "Olemas"
+
+#~ msgid "Invalid URI"
+#~ msgstr "Vigane URI"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Sisaldab alamkaustu"
+
+#~ msgid "No space left"
+#~ msgstr "Vaba ruum on otsas"
+
+#, fuzzy
+#~ msgid "Test type"
+#~ msgstr "Faili tüüp:"
+
+#, fuzzy
+#~ msgid "Evolution Test Component"
+#~ msgstr "Evolution'i sõnumiredaktor."
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "Impordi"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Lisab uue sündmuse"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Uus _sündmus"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Kohtumine"
+
+#~ msgid "New _Task"
+#~ msgstr "Uus _ülesanne"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "Evolutioni _aken"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "Evolutioni _aken"
+
+#~ msgid "Clear"
+#~ msgstr "Puhasta"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Katkestab käimasoleva sõnumioperatsiooni"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -17002,9 +18405,6 @@ msgstr "Otsi nüüd"
 #~ msgid "Evolution VCard importer"
 #~ msgstr "Evolution'i sõnumiredaktor."
 
-#~ msgid "Loading..."
-#~ msgstr "Laen..."
-
 #~ msgid "Searching..."
 #~ msgstr "Otsin..."
 
@@ -17060,10 +18460,6 @@ msgstr "Otsi nüüd"
 #~ msgstr "EBook ei ole laetud\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "Kaardi ID on juba olemas"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Operatsioon katekstatud"
 
@@ -17209,10 +18605,6 @@ msgstr "Otsi nüüd"
 #~ msgstr "%x"
 
 #, fuzzy
-#~ msgid "Phone"
-#~ msgstr "Ponce"
-
-#, fuzzy
 #~ msgid "Birth date"
 #~ msgstr "Sünniaeg"
 
@@ -17225,10 +18617,6 @@ msgstr "Otsi nüüd"
 #~ msgstr "Amritsar"
 
 #, fuzzy
-#~ msgid "ID"
-#~ msgstr "I"
-
-#, fuzzy
 #~ msgid "Last Use"
 #~ msgstr "Aseta"
 
@@ -17242,9 +18630,6 @@ msgstr "Otsi nüüd"
 #~ msgid "Folder containing contact information"
 #~ msgstr "Kontaktide infot sisaldav kaust"
 
-#~ msgid "LDAP Server"
-#~ msgstr "LDAP server"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "Kontaktide infot sisaldav LDAP server"
 
@@ -17256,20 +18641,6 @@ msgstr "Otsi nüüd"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Kontaktide infot sisaldav kaust"
 
-#~ msgid "_Contact"
-#~ msgstr "_Kontakt"
-
-#, fuzzy
-#~ msgid "Create a new contact"
-#~ msgstr "Loob uue kontakti"
-
-#~ msgid "New Contact List"
-#~ msgstr "Uus kontaktide nimekiri"
-
-#, fuzzy
-#~ msgid "Create a new contact list"
-#~ msgstr "Loob uue kontaktide nimekirja"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "URI, mida kaustalehitseja näitab"
 
@@ -17287,9 +18658,6 @@ msgstr "Otsi nüüd"
 #~ msgid "Is New Card"
 #~ msgstr "Uus"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "Kaardid puuduvad"
 
@@ -17339,37 +18707,6 @@ msgstr "Otsi nüüd"
 #~ msgstr "Ülesandeid sisaldav kaust"
 
 #, fuzzy
-#~ msgid "New appointment"
-#~ msgstr "Uus sündmus"
-
-#, fuzzy
-#~ msgid "_Appointment"
-#~ msgstr "Sündmus"
-
-#, fuzzy
-#~ msgid "New meeting"
-#~ msgstr "Uudistekanalite seadistused"
-
-#, fuzzy
-#~ msgid "M_eeting"
-#~ msgstr "Kohtumine"
-
-#, fuzzy
-#~ msgid "New task"
-#~ msgstr "Uus ülesanne"
-
-#~ msgid "_Task"
-#~ msgstr "_Ülesanne"
-
-#, fuzzy
-#~ msgid "New All Day Appointment"
-#~ msgstr "Uus sündmus"
-
-#, fuzzy
-#~ msgid "All _Day Appointment"
-#~ msgstr "Uus _sündmus"
-
-#, fuzzy
 #~ msgid "Could not update invalid object"
 #~ msgstr "Ei saanud uuendada objekti!"
 
@@ -17414,10 +18751,6 @@ msgstr "Otsi nüüd"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "Avan %s kalendri"
 
-#, fuzzy
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Avan kausta %s"
-
 #~ msgid "Evaluation of the search expression did not yield a boolean value"
 #~ msgstr "Otsinguavaldise täitmine ei andnud tõeväärtusetüüpi väärtust"
 
@@ -17448,10 +18781,6 @@ msgstr "Otsi nüüd"
 #~ "Kas sa soovid neid Evolutionisse importida?"
 
 #, fuzzy
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "E-posti seadistamisliides"
-
-#, fuzzy
 #~ msgid "Public Mail"
 #~ msgstr "Avalik"
 
@@ -17459,22 +18788,9 @@ msgstr "Otsi nüüd"
 #~ msgid "Public folder containing mail"
 #~ msgstr "Ülesandeid sisaldav kaust"
 
-#~ msgid "Properties..."
-#~ msgstr "Omadused..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Muudab selle kataloogi omadusi"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Uus sõnum"
-
-#~ msgid "_Mail Message"
-#~ msgstr "_Saada sõnum"
-
-#, fuzzy
-#~ msgid "Compose a new mail message"
-#~ msgstr "Sõnumi koostamine"
-
 #, fuzzy
 #~ msgid "New Message Post"
 #~ msgstr "Uus sõnum"
@@ -19196,9 +20512,6 @@ msgstr "Otsi nüüd"
 #~ msgid "Cumberland"
 #~ msgstr "Cumberland"
 
-#~ msgid "Curitiba"
-#~ msgstr "Curitiba"
-
 #~ msgid "Curitiba Apt"
 #~ msgstr "Curitiba Apt"
 
@@ -22174,9 +23487,6 @@ msgstr "Otsi nüüd"
 #~ msgid "North Bend"
 #~ msgstr "North Bend"
 
-#~ msgid "North Carolina"
-#~ msgstr "Põhja-Carolina"
-
 #~ msgid "North Conway"
 #~ msgstr "North Conway"
 
@@ -23787,9 +25097,6 @@ msgstr "Otsi nüüd"
 #~ msgid "State College"
 #~ msgstr "State College"
 
-#~ msgid "Stauning"
-#~ msgstr "Stauning"
-
 #~ msgid "Staunton"
 #~ msgstr "Staunton"
 
@@ -24380,9 +25687,6 @@ msgstr "Otsi nüüd"
 #~ msgid "United Arab Emirates "
 #~ msgstr "Araabia Ühendemiraadid"
 
-#~ msgid "Unst"
-#~ msgstr "Unst"
-
 #~ msgid "Upington"
 #~ msgstr "Upington"
 
@@ -24492,12 +25796,6 @@ msgstr "Otsi nüüd"
 #~ msgid "Veracruz"
 #~ msgstr "Veracruz"
 
-#~ msgid "Vermillion"
-#~ msgstr "Vermillion"
-
-#~ msgid "Vermont"
-#~ msgstr "Vermont"
-
 #~ msgid "Vernal"
 #~ msgstr "Vernal"
 
@@ -25017,9 +26315,6 @@ msgstr "Otsi nüüd"
 #~ msgid " F"
 #~ msgstr "° F"
 
-#~ msgid " C"
-#~ msgstr "° C"
-
 #~ msgid "knots"
 #~ msgstr "sõlme"
 
@@ -25638,9 +26933,6 @@ msgstr "Otsi nüüd"
 #~ msgid "Freezing haze"
 #~ msgstr "Jäätuv vine"
 
-#~ msgid "Spray"
-#~ msgstr "Veetolm"
-
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Veetolm läheduses"
 
@@ -25999,20 +27291,6 @@ msgstr "Otsi nüüd"
 #~ msgid "Remove a folder added with \"Open Other User's Folder\""
 #~ msgstr "Loo _uus kaust..."
 
-#~ msgid "Send / Receive"
-#~ msgstr "Saada / võta vastu"
-
-#, fuzzy
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr ""
-#~ "Saadab järjekorras olevad väljaminevad kirjad ja tõmbab ära uued kirjad."
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Lülitab kaustade riba sisse või välja"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Lülitab kiirvkorralduste riba sisse või välja"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Näitab valitud kausta"
 
@@ -26042,9 +27320,6 @@ msgstr "Otsi nüüd"
 #~ msgid "_Rename..."
 #~ msgstr "_Muuda nime..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Saada / Võta vastu"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "Kiir_valikute riba"
 
@@ -26093,10 +27368,6 @@ msgstr "Otsi nüüd"
 #~ msgstr "E_i kordu"
 
 #, fuzzy
-#~ msgid "Automatically _detect links"
-#~ msgstr "_Kontrolli uusi sõnumeid automaatselt"
-
-#, fuzzy
 #~ msgid "Emacs"
 #~ msgstr "Idast"
 
@@ -26191,18 +27462,10 @@ msgstr "Otsi nüüd"
 #~ msgstr "Factory for the sample Addressbook control"
 
 #, fuzzy
-#~ msgid "380"
-#~ msgstr "389"
-
-#, fuzzy
 #~ msgid "<- _Remove"
 #~ msgstr " _Eemalda"
 
 #, fuzzy
-#~ msgid "<< Fewer Options"
-#~ msgstr "Häälestus"
-
-#, fuzzy
 #~ msgid "DN Customization"
 #~ msgstr "Info puudub"
 
@@ -26705,9 +27968,6 @@ msgstr "Otsi nüüd"
 #~ msgid "News Servers"
 #~ msgstr "_Uudistekanalid"
 
-#~ msgid "Source Information"
-#~ msgstr "Allika info"
-
 #~ msgid "Save to Disk..."
 #~ msgstr "Salvesta kettale..."
 
@@ -26725,9 +27985,6 @@ msgstr "Otsi nüüd"
 #~ "Valitud kausta tüüp ei ole vastavuses\n"
 #~ "käesoleva tegevusega."
 
-#~ msgid "_Contact List"
-#~ msgstr "Kontaktide _nimekiri"
-
 #~ msgid "Insert a file as text into the message"
 #~ msgstr "Lisa fail sõnumisse tekstina"
 
@@ -26740,17 +27997,10 @@ msgstr "Otsi nüüd"
 #~ msgid "Send _later"
 #~ msgstr "Saada _hiljem"
 
-#~ msgid "Send the message later"
-#~ msgstr "Saada sõnum hiljem"
-
 #~ msgid "_Pilot Settings..."
 #~ msgstr "_Pilot'i sätted"
 
 #, fuzzy
-#~ msgid "Addressbook Settings"
-#~ msgstr "Aadressiraamatu allikas"
-
-#, fuzzy
 #~ msgid "Could not query for schema information"
 #~ msgstr ""
 #~ "Sendmail'i haruprotsessi pole võimalik tekitada: %s: e-post jäi saatmata"
@@ -27090,25 +28340,11 @@ msgstr "Otsi nüüd"
 
 #~ msgid ""
 #~ "\n"
-#~ "Comment: "
-#~ msgstr ""
-#~ "\n"
-#~ "Kommentaar: "
-
-#~ msgid ""
-#~ "\n"
 #~ "Unique String: "
 #~ msgstr ""
 #~ "\n"
 #~ "Unikaalne fraas: "
 
-#~ msgid ""
-#~ "\n"
-#~ "Public Key: "
-#~ msgstr ""
-#~ "\n"
-#~ "Avalik võti: "
-
 #~ msgid "Waiting for connection to LDAP server..."
 #~ msgstr "Ootan ühendust LDAP serveriga..."
 
@@ -27178,9 +28414,6 @@ msgstr "Otsi nüüd"
 #~ msgid "Republic Of Moldova"
 #~ msgstr "Moldova Vabariik"
 
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "Loo uusi sündmusi koos vaikimisi _meeldetuletajaga"
-
 #~ msgid "First day of wee_k:"
 #~ msgstr "Nädala e_simene päev:"
 
@@ -27294,9 +28527,6 @@ msgstr "Otsi nüüd"
 #~ msgid "Composer"
 #~ msgstr "Sõnumiredaktor"
 
-#~ msgid "Default Forward style is: "
-#~ msgstr "Vaikimisi edasisaatmise moodus on: "
-
 #~ msgid "Edit..."
 #~ msgstr "Muuda..."
 
@@ -27312,15 +28542,9 @@ msgstr "Otsi nüüd"
 #~ msgid "_Email Address:"
 #~ msgstr "_E-posti aadress:"
 
-#~ msgid "_Log filter actions to:"
-#~ msgstr "_Logi filtreerimised faili:"
-
 #~ msgid "_Organization:"
 #~ msgstr "_Organisatsioon"
 
-#~ msgid "_Send mail in HTML format by default."
-#~ msgstr "_Vaikimisi saadetakse HTML vormingus sõnumeid"
-
 #~ msgid "_Server Type: "
 #~ msgstr "_Serveri tüüp: "
 
diff --git a/po/eu.po b/po/eu.po
index 7e2bf540a3..05bb92a941 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: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-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"
@@ -28,12 +28,172 @@ msgstr "Ezin izan da %s kargatu: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Ezin izan da pilot-aren Helbidearen aplikazio-blokea irakurri"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Egite-data"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "_Ziurtagiri-IDa:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Sortu edo editatu posta-kontuak eta bestelako hobespenak"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Kontaktuak"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Editatu helbide-liburua"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Helbide-liburuko helbideen pop-up-erako fabrika"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution-en postaren laneko laburpenaren osagaia."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution-en Zereginen kontrolerako fabrika."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Helbide-liburua"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Propietateak..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Ezabatu"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "_Izena aldatu"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Kontaktu berria:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Kontaktua"
+
+#: addressbook/gui/component/addressbook-component.c:219
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Sortu kontaktu berria"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Kontaktuen zerrenda berria"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "_Kontaktuen zerrenda"
+
+#: addressbook/gui/component/addressbook-component.c:226
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Sortu kontaktu-zerrenda berria"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+#, fuzzy
+msgid "Work"
+msgstr "Cork"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "LDAP zerbitzaria"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Ezin izan da %s direktorioa sortu: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr "Ezin da LDAP zerbitzariarekin konektatu."
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -41,49 +201,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Errorea iragazki-informazioa kargatzean:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Kontuaren izena"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Zerbitzari-izena"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(SSL ez da onartzen Evolution-en bertsio honetan)"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Beste kontaktu batzuk"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -91,7 +234,7 @@ msgstr ""
 "Ezin izan dugu helbide-liburu hori ireki.  Egiaztatu bide-izena\n"
 "badagoela eta atzitzeko baimena baduzula. "
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -102,7 +245,7 @@ msgstr ""
 "okerreko URIa idatzi duzula, edo LDAP zerbitzaria\n"
 "ez dabilela"
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -114,7 +257,7 @@ msgstr ""
 "programa konpilatu behar duzu CVS iturburuetatik\n"
 "beheko estekatik OpenLDAP eskuratuz.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -129,11 +272,11 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Ezin da helbide-liburua ireki"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr ""
@@ -141,38 +284,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "Idatzi %s(r)en pasahitza (%s erabiltzailea)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 #, fuzzy
 msgid "Name begins with"
 msgstr "honela amaitzen da"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 #, fuzzy
 msgid "Email begins with"
 msgstr "honela amaitzen da"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Kategoria da"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Edozein eremuk hau dauka"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Aurreratua..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -180,7 +322,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -188,95 +330,41 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Edozein kategoria"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "Egutegiak bistaratuko duen URIa"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "_Ziurtagiri-IDa:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
 msgstr ""
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Kontaktuak"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Editatu helbide-liburua"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Evolution-en helbide-liburuko izen-hautaketako interfazea."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Helbide-liburuko helbideen pop-up-erako fabrika"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution-en postaren laneko laburpenaren osagaia."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -300,6 +388,7 @@ msgstr "_Begiratu zein mota onartzen diren"
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -335,8 +424,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Add LDAP Server"
-msgstr "LDAP zerbitzaria"
+msgid "Addressbook Creation Assistant"
+msgstr "Helbide-liburuaren iturburuak"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -355,65 +444,64 @@ msgstr "Anonimoa"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 #, fuzzy
 msgid "Connecting"
 msgstr "Connecticut"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "_Izen bereizitua:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Edit LDAP Server"
 msgstr "LDAP zerbitzaria"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address:"
 msgstr "_Helbide elektronikoa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 "Evolution-ek helbide elektroniko hau erabiliko du zu zerbitzarian "
 "autentifikatzeko"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution-ek helbide elektroniko hau erabiliko du zu zerbitzarian "
 "autentifikatzeko"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Finished"
 msgstr "_Bilatu:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Orokorra"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
-msgid "LDAP Configuration Assistant"
-msgstr "Konfigurazioa"
+msgid "Group:"
+msgstr "Taldea"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Never"
 msgstr "_dagoen, maiztasun honekin"
@@ -438,8 +526,8 @@ msgid "S_earch scope: "
 msgstr "Bilaketa _barrutia: "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Bilaketa"
 
@@ -484,27 +572,28 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:47
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-#, fuzzy
-msgid "Step 1: Server Information"
-msgstr "Iturburu-informazioa"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
-msgid "Step 2: Connecting to Server"
-msgstr "Zerbitzariarekin konektatzen..."
+msgid "Step 2: Server Information"
+msgstr "Iturburu-informazioa"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr ""
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Zerbitzariarekin konektatzen..."
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr ""
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Zerbitzariarekin konektatzen..."
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -517,14 +606,6 @@ msgstr "Onartzen ez den eskema"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -532,7 +613,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -540,7 +621,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -550,23 +631,22 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -576,7 +656,7 @@ msgstr ""
 "Hau, deskargatzeko gehieneko txartel-kopurua da.  Zenbaki handiegia ezartzen "
 "baduzu, helbide-liburuaren funtzionamendua mantsotuko da."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -586,7 +666,7 @@ msgstr ""
 "izan hemen \"Helbide elektronikoa\" ezartzen baduzu sarbide anonimoa beharko "
 "duzula zure ldap zerbitzarirako."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -596,6 +676,15 @@ msgstr ""
 "Izen hau erabiliko da zure kontua identifikatzeko.  Bistaratzeko bakarrik "
 "erabiliko da."
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Izen hau erabiliko da zure kontua identifikatzeko.  Bistaratzeko bakarrik "
+"erabiliko da."
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -623,23 +712,31 @@ msgid "Using email address"
 msgstr "Helbide elektronikoa"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Bistaratzea"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 #, fuzzy
 msgid "_Download limit:"
 msgstr "_Deskarga-muga"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -647,61 +744,60 @@ msgstr "_Deskarga-muga"
 msgid "_Edit"
 msgstr "_Edizioa"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Ataka:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 #, fuzzy
 msgid "_Search base:"
 msgstr "Bilaketa-_oinarria:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "Zer_bitzariaren izena:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Alarma-errepikaren denbora (minututan)"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid "cards"
 msgstr "Txartelik ez"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "connecting-tab"
 msgstr "%s(r)ekin berriro konektatzen"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid "general-tab"
 msgstr "Orokorra"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "searching-tab"
 msgstr "Bilaketa"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Izena"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution-en helbide-liburuko izen-hautaketako interfazea."
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Kendu denak"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Kendu"
@@ -730,25 +826,21 @@ msgstr "Gehitu kontaktuei"
 msgid "Unnamed Contact"
 msgstr "Kontaktu izengabea"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Izena"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Iturburua"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Hautatu kontaktuak helbide-liburutik"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-#, fuzzy
-msgid "Find contact in"
-msgstr "bidaltzaileak hau dauka"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution-en helbide-liburuko izen-hautaketako interfazea."
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
 msgid "Find"
@@ -829,7 +921,8 @@ msgid "D_epartment:"
 msgstr "_Saila:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Xehetasunak"
 
@@ -900,12 +993,12 @@ msgid "_Categories..."
 msgstr "Ka_tegoriak..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "E_zabatu..."
@@ -2043,7 +2136,7 @@ msgid "Esq."
 msgstr "Esq."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Izen osoa"
 
@@ -2139,11 +2232,27 @@ msgstr "Kontaktu-zerrendaren editorea"
 msgid "Save List as VCard"
 msgstr "Gorde zerrenda VCard gisa"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Aldatutako kontaktua:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Gatazka sortu duen kontaktua:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Kontaktu errepikatua aurkitu da"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Kontaktu honen izen edo helbide elektroniko aldatua lehendik ere \n"
+"badago karpeta honetan. Hala ere gehitu nahi duzu?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Kontaktu berria:"
@@ -2160,22 +2269,6 @@ msgstr ""
 "Kontaktu honen izena edo helbide elektronikoa lehendik ere badago \n"
 "karpeta honetan. Hala ere gehitu nahi duzu?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Aldatutako kontaktua:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Gatazka sortu duen kontaktua:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"Kontaktu honen izen edo helbide elektroniko aldatua lehendik ere \n"
-"badago karpeta honetan. Hala ere gehitu nahi duzu?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2284,9 +2377,9 @@ msgstr "Birbidali kontaktua"
 msgid "Send Message to Contact"
 msgstr "Bidali mezua kontaktuari"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Inprimatu"
@@ -2308,9 +2401,12 @@ msgstr "Eraman karpeta honetara..."
 msgid "Cut"
 msgstr "Ebaki"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopiatu"
 
@@ -2319,16 +2415,8 @@ msgstr "Kopiatu"
 msgid "Paste"
 msgstr "Itsatsi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Ezabatu"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 #, fuzzy
 msgid "Current View"
 msgstr "_Uneko ikuspegia"
@@ -2342,166 +2430,170 @@ msgid ""
 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:2
 msgid "Assistant"
 msgstr "Laguntzailea"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Laneko faxa"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Laneko telefonoa"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Laneko 2. telefonoa"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Atzera deitzeko telefonoa"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Autoko telefonoa"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategoriak"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Enpresako telefonoa"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Saila"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "Helb. el."
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "2. helb. el."
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "3. helb. el."
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Deitura"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Jaso honela"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "Libre-okupatuta URLa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Etxeko helbidea"
+#, fuzzy
+msgid "Given Name"
+msgstr "Deitura"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Etxeko faxa"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Etxeko telefonoa"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Etxeko 2.telefonoa"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Ponce"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Jordania"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Zuzendaria"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Telefono mugikorra"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Goitizena"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Oharra"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Bulegoa"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Erakundea"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Beste helbide bat"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Beste fax bat"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Beste telefono bat"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Bilagailua"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Telefono nagusia"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Lanbidea"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Irrati-telefonoa"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Funtzioa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Ezkontidea"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
 msgstr "Teletipoa"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Telex-a"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Kargua"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Unst"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Web gunea"
 
@@ -2603,11 +2695,19 @@ msgstr "Kideak"
 msgid "Job Title"
 msgstr "Kar_gua: "
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Etxeko helbidea"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Etxeko helbidea"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Beste helbide bat"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2620,116 +2720,113 @@ msgstr "Etxeko faxa"
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Behar bezala egin da"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Biltegia deskonektatuta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Baimena ukatuta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Ez da txartela aurkitu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Txartelaren ID hori badago lehendik"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Protokoloa ez da onartzen"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Bertan behera utzita"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "Autentifikazioak huts egin du."
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Autentifikazioa behar da"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #, fuzzy
 msgid "Addressbook does not exist"
 msgstr "'%s' fitxategia ez dago "
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Beste errore bat"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Aldaketak gorde nahi dituzu?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 #, fuzzy
 msgid "_Discard"
 msgstr "Dinard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Errorea zerrenda gehitzean"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Errorea txartela gehitzean"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Errorea zerrenda aldatzean"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Errorea txartela aldatzean"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Errorea zerrenda kentzean"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Errorea txartela kentzean"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2738,7 +2835,7 @@ msgstr ""
 "%d txartel txartelak izatea eskatu duzu. Hori dela-eta %d leiho berri\n"
 "agertuko dira pantailan. Ziur zaude txartel horiek bistaratu nahi dituzula?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2747,50 +2844,50 @@ msgstr ""
 "%s badago lehendik\n"
 "Gainidatzi nahi duzu?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, fuzzy
 msgid "Overwrite"
 msgstr "Fitxategia gainidatzi?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, fuzzy, c-format
 msgid "Error saving %s: %s"
 msgstr "Errorea fitxategia gordetzean: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "zerrenda"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Eraman txartela hona"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kopiatu txartela hemen"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Eraman txartelak hona"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kopiatu txartelak hemen"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "VCard anitz"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "%s(r)en VCard-a"
@@ -2987,7 +3084,7 @@ msgstr "Marjinak"
 msgid "Number of columns:"
 msgstr "Zutabe-kopurua:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Aukerak"
 
@@ -3175,18 +3272,18 @@ msgstr "Kontaktu-zerrenda izengabea"
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Ezin izan da wombat zerbitzaria abiarazi"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Ezin izan da wombat abiarazi"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Ezin izan da pilot-aren Calendar aplikazio-blokea irakurri"
 
@@ -3194,25 +3291,92 @@ msgstr "Ezin izan da pilot-aren Calendar aplikazio-blokea irakurri"
 msgid "Default Priority:"
 msgstr "Lehentasun lehenetsia:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Ezin izan da pilot-aren ToDo aplikazio-blokea irakurri"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Egutegiaren eta zereginen ezarpenak"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Egutegia"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Egutegiaren eta zereginen ezarpenak"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution-en Zereginen kontrolerako fabrika."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution-en egutegiaren iTip/iMip ikustailea"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution-en egutegiaren iTip/iMip ikustailea"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution-en berri-editorea"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution-en berri-editorea"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolution-en egutegiaren laneko laburpenaren osagaia."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolution-en mezu-prestatzailea."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Zereginak"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Alarma bidezko jakinarazpen-zerbitzurako fabrika"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Hasi:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Amaitu:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Evolution "
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "%s alarma"
@@ -3287,44 +3451,174 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Ez galdetu programa horri buruz berriro."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Alarma bidezko jakinarazpen-zerbitzurako fabrika"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Ezin izan da Bonobo hasieratu"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Ezin izan da gnome-vfs hasieratu"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Ezin izan da sortu alarma bidezko jakinarazpen-zerbitzuaren fabrika"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "baliogabeko ordua"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "iCalendar errorea"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Gaurko zereginen kolorea"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Gaurko zereginen kolorea"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr ""
+"Erakutsi hitzorduen a_maiera-orduak astearen eta hilabetearen ikuspegietan"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Inprimatuko den egutegiaren aurrebista eskaintzen du"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#, fuzzy
+msgid "Units of default reminder"
+msgstr "Sortu hitzordu berria _oroigarri lehenetsiarekin"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "_Eskatu berrespena elementuak ezabatzeko"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "_Eskatu berrespena elementuak ezabatzeko"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Ezabatu osatutako zereginak"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Erakutsi aste-_zenbakiak data-nabigatzailean"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Laburpenak hau dauka"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Azalpenak hau dauka"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Iruzkinak hau dauka"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Ez dator bat"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3336,83 +3630,111 @@ msgstr ""
 "\n"
 "Benetan borratu nahi dituzu?"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "hau baino txikiagoa da"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "egun "
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A, %Y %B %d"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a, %b %d"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a, %Y %b %d"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%Y %B %d"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%B %d"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Inprimatu egutegi hau"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Kaledonia berria"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "Hitzordu berria"
+
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "_Hitzordua"
+
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Sortu hitzordu berria"
+
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "Bilera berria"
+
+#: calendar/gui/calendar-component.c:640
 #, fuzzy
-msgid "Rename"
-msgstr "_Izena aldatu"
+msgid "M_eeting"
+msgstr "Bilera"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:641
+msgid "Create a new meeting request"
+msgstr "Sortu bilera-eskaera berria."
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
+#: calendar/gui/calendar-component.c:646
 #, fuzzy
-msgid "Personal"
-msgstr "Pownal"
+msgid "New all day appointment"
+msgstr "Hitzordu berria"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
+#: calendar/gui/calendar-component.c:647
 #, fuzzy
-msgid "Work"
-msgstr "Cork"
+msgid "All _Day Appointment"
+msgstr "_Hitzordua"
+
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Sortu hitzordu berria"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3536,7 +3858,7 @@ msgstr "Bidali"
 msgid "With these arguments:"
 msgstr "Argumentu hauekin:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr ""
 
@@ -3552,6 +3874,10 @@ msgstr "ordu "
 msgid "minutes"
 msgstr "minutu "
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3585,8 +3911,8 @@ msgstr "Bidali mezua"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Laburpena:"
 
@@ -3615,7 +3941,7 @@ msgstr "hitzordu-amaiera baino"
 msgid "hour(s)"
 msgstr "ordu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minutu"
 
@@ -3670,7 +3996,7 @@ msgstr "egun"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Ostirala"
 
@@ -3684,7 +4010,7 @@ msgstr "minutu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Astelehena"
 
@@ -3695,7 +4021,7 @@ msgstr "_Ig."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Larunbata"
 
@@ -3709,7 +4035,7 @@ msgstr "Erakutsi aste-_zenbakiak data-nabigatzailean"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Igandea"
 
@@ -3729,7 +4055,7 @@ msgstr "Z_ereginen zerrenda"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Osteguna"
 
@@ -3747,7 +4073,7 @@ msgstr "Ordu-formatua:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Asteartea"
 
@@ -3757,12 +4083,12 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Asteazkena"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Lan-astea"
 
@@ -3800,7 +4126,7 @@ msgid "_Fri"
 msgstr "_Or."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Orokorra"
 
@@ -3846,77 +4172,77 @@ msgstr "A_z."
 msgid "before every appointment"
 msgstr "hitzordua hasi aurretik"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Ziur zaude bilera hau bertan behera utzi eta ezabatu nahi duzula?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Ziur zaude zeregin hau bertan behera utzi eta ezabatu nahi duzula?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 "Ziur zaude egunkariko sarrera hau bertan behera utzi eta ezabatu nahi duzula?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Gertaera ezabatu da."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Zeregina ezabatu da."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Egunkariko sarrera ezabatu da."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Aldaketak egin dituzu. Aldaketak ahaztu eta editorea itxi?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Ez duzu aldaketarik egin; editorea itxi?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Gertaera hau aldatu egin da."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Zeregin hau aldatu egin da."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Egunkariko sarrera hau aldatu egin da."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Aldaketak egin dituzu. Aldaketak ahaztu eta editorea eguneratu?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Ez duzu aldaketarik egin; editorea eguneratu?"
@@ -3926,167 +4252,172 @@ msgstr "%s  Ez duzu aldaketarik egin; editorea eguneratu?"
 msgid "Validation error: %s"
 msgstr "Errore ezezaguna: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr "- "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr "(Eginda "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Eginda "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr "(Falta: "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Falta: "
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 #, fuzzy
 msgid "Could not update object"
 msgstr "Ezin izan da objektua eguneratu!"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Editatu hitzordua"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Hitzordua - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Zeregina - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Egunkariko sarrera - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Laburpenik ez"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Gorde honela..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Ezin da uneko bertsioa lortu!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Aukeratu datu hauek inportatzeko helburu-karpeta"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Ziur zaude `%s' hitzordua ezabatu nahi duzula?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Ziur zaude izenik gabeko hitzordu hau ezabatu nahi duzula?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Ziur zaude `%s' zeregina ezabatu nahi duzula?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Ziur zaude izenik gabeko zeregin hau ezabatu nahi duzula?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Ziur zaude egunkariko `%s' sarrera ezabatu nahi duzula?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Ziur zaude egunkariko sarrera izengabe hau ezabatu nahi duzula?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Ziur zaude %d hitzordu ezabatu nahi dituzula?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Ziur zaude %d zeregin ezabatu nahi dituzula?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Ziur zaude %d egunkari-sarrera ezabatu nahi dituzula?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 #, fuzzy
 msgid "The item could not be deleted due to a corba error"
 msgstr "Elementua ezin izan da bidali!\n"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 #, fuzzy
 msgid "The task could not be deleted because permission was denied"
 msgstr "Partaidearen egoera ezin da eguneratu egoera baliogabea dagoelako!\n"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Elementua ezin izan da bidali!\n"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Elementua ezin izan da bidali!\n"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Partaidearen egoera ezin da eguneratu egoera baliogabea dagoelako!\n"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Elementua ezin izan da bidali!\n"
@@ -4103,45 +4434,45 @@ msgstr "Delegatu:"
 msgid "Enter Delegate"
 msgstr "Sartu delegatua"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Hitzordua"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Oroigarria"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Errepikapena"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Antolaketa"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Bilera"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Hasiera-data"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 #, fuzzy
 msgid "Start time is wrong"
 msgstr "_Hasiera-ordua:"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr ""
 
@@ -4211,31 +4542,31 @@ msgid "_Start time:"
 msgstr "_Hasiera-ordua:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Bat ere ez"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "Antolatzailea behar da."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "Partaide bat behar da gutxienez."
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Delegatu ..."
 
@@ -4277,21 +4608,15 @@ msgid "Member"
 msgstr "Kidea"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Funtzioa"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Egoera"
@@ -4311,6 +4636,7 @@ msgid "_Invite Others..."
 msgstr "_Gonbidatu beste batzuk..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4343,6 +4669,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Ezin izan da %s direktorioa sortu: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "Antolatzailea ezarri behar da."
@@ -4372,34 +4699,59 @@ msgstr "Egutegi-informazioa"
 msgid "Calendar Name"
 msgstr "Egutegia"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Ezin izan da %s direktorioa sortu: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Egutegi-informazioa"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Z_ereginen zerrenda"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Z_ereginen zerrenda"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Z_ereginen zerrenda"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Wallis eta Futuna uharteak"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 #, fuzzy
 msgid "This and Future Instances"
 msgstr "Wallis eta Futuna uharteak"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 #, fuzzy
 msgid "All Instances"
 msgstr "Estazio _guztiak:"
@@ -4453,10 +4805,15 @@ msgstr "eguna"
 msgid "on the"
 msgstr "-"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "aldiz"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Data/Ordua:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "_Gehitu"
@@ -4521,7 +4878,7 @@ msgstr "aste"
 msgid "year(s)"
 msgstr "urte"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 #, fuzzy
 msgid ""
 "This event has been changed, but has not been saved.\n"
@@ -4532,34 +4889,34 @@ msgstr ""
 "\n"
 "Aldaketak gorde nahi dituzu?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 #, fuzzy
 msgid "Save Event"
 msgstr "Egutegi-mezua"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Bileraren informazioa sortu da. Bidali?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 "Bilerari buruzko informazioa aldatu egin da. Bertsio eguneratua bidali?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "Zeregina esleitzeko informazioa sortu da. Bidali?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 "Zereginari buruzko informazioa aldatu egin da. Bertsio eguneratua bidali?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "Eginda "
@@ -4570,43 +4927,43 @@ msgid "% _Complete"
 msgstr "% Osatuta"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Eginda"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Handia"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "Egiten ari da"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Txikia"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Normala"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Ez da hasi"
 
@@ -4615,7 +4972,7 @@ msgid "Progress"
 msgstr "Lanean"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Definitu gabe"
 
@@ -4637,21 +4994,21 @@ msgstr "_Egoera:"
 msgid "_Web Page:"
 msgstr "_Web orriaren helbidea:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Oinarrizkoa"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Esleipena"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4659,9 +5016,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "Kon_fidentziala"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Azalpena:"
 
@@ -4766,26 +5123,21 @@ msgstr "%s - %s"
 msgid "%s for an unknown trigger type"
 msgstr "abiarazle-mota ezezagunaren %s"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Publikoa"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Pribatua"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Konfidentziala"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategoriak"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4798,29 +5150,27 @@ msgid "Start Date"
 msgstr "Hasiera-data"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Laburpena"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr "kolorea"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Hitzordua"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Libre"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Okupatuta"
 
@@ -4832,7 +5182,7 @@ msgstr "I"
 msgid "S"
 msgstr "H"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "E"
 
@@ -4840,7 +5190,7 @@ msgstr "E"
 msgid "W"
 msgstr "M"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4850,7 +5200,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4858,7 +5208,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Bai"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4866,17 +5216,17 @@ msgstr "Ez"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Ezezaguna"
 
@@ -4888,188 +5238,186 @@ msgstr "Errepikatua"
 msgid "Assigned"
 msgstr "Esleitua"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Objektuak eguneratzen"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Hautatutako objektuak ezabatzen"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Objektuak eguneratzen"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Hitz_ordu berria..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Egun osoko gertaera _berria"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 #, fuzzy
 msgid "New Meeting"
 msgstr "Bilera berria"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Zeregin berria"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Inprimatu..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Itsatsi"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "_Joan gaurko egunera"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "_Joan data jakin batera..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Argitaratu libre/okupatuta informazioa"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-#, fuzzy
-msgid "_Settings..."
-msgstr "_Postaren ezarpenak..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Ireki"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Gorde honela..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "Ko_piatu"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Antolatu _bilera"
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Birbidali _iCalendar gisa"
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Ezabatu _agerraldi hau"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Ezabatu agerraldi _guztiak"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+#, fuzzy
+msgid "_Settings..."
+msgstr "_Postaren ezarpenak..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "%0"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "%10"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "%20"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "%30"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "%40"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "%50"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "%60"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "%70"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "%80"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "%90"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "%100"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Ireki mezua"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Esleitu zeregina"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Birbidali _iCalendar gisa"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "_Markatu 'Osatuta' gisa"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Ma_rkatu zereginak 'Osatuta' gisa"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "_Ezabatu hautatutako zereginak"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Egin klik zeregina gehitzeko"
@@ -5083,8 +5431,8 @@ msgstr "% Osatuta"
 msgid "Alarms"
 msgstr "Alarmak"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Eginda"
 
@@ -5113,18 +5461,18 @@ msgid "URL"
 msgstr "URLa"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %Y/%m/%d %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y/%m/%d %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5143,7 +5491,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A, %B %d"
 
@@ -5156,457 +5504,456 @@ msgstr "%b %d"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "Errepikapen _soila"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
 msgid "Every day"
 msgstr "Errepikatze-aldia"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, fuzzy, c-format
 msgid "Every %d days"
 msgstr "%d egun"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 #, fuzzy
 msgid "Every week"
 msgstr "Errepikatze-aldia"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, fuzzy, c-format
 msgid "Every %d weeks"
 msgstr "%d aste"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 #, fuzzy
 msgid "Every week on "
 msgstr "Evergreen"
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, fuzzy, c-format
 msgid "Every %d weeks on "
 msgstr "%d aste"
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 #, fuzzy
 msgid " and "
 msgstr "Harea"
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 #, fuzzy
 msgid "every month"
 msgstr "Hi_labete"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 #, fuzzy
 msgid "Every year"
 msgstr "Errepikatze-aldia"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Amaiera: <b>"
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Eginda "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "iCalendar informazioa"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "iCalendar errorea"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Pertsona ezezaguna"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 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:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Bat ere ez</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 #, fuzzy
 msgid "Location:"
 msgstr "K_okalekua:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Egoera:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Onartua"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Oraingoz onartua"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Ukatua"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Aukeratu ekintza bat:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Eguneratu"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Ados"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Onartu"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Onartu oraingoz"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Ukatu"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Bidali libre/okupatuta informazioa"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Eguneratu erantzun-emailearen egoera"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Bidali azken orduko informazioa"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Utzi"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, 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:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Bileraren informazioa"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, 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:1271
+#: calendar/gui/e-itip-control.c:1269
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Bilera-proposamena"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Bilera-eguneratzea"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Bilera-eguneratzearen eskaera"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, 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:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Bilera-erantzuna"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, 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:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Bilera bertan behera uztea"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, 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:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Bilera-mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Zereginaren informazioa"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, 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:1338
+#: calendar/gui/e-itip-control.c:1336
 #, 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:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Zeregin-proposamena"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, 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:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Zeregin-eguneratzea"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, 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:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Zeregin-eguneratzearen eskaera"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, 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:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Zereginaren erantzuna"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, 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:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Zeregina bertan behera uztea"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Zeregin-mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, 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:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Libre/okupatuta informazioa"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, 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:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Libre/okupatuta eskaera"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, 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:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Libre/okupatuta erantzuna"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Libre/okupatuta mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 #, 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:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "Mezu honek onartzen ez diren eskaerak bakarrik ditu."
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Eranskinak ez du baliozko egutegi-mezurik"
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr "Eranskinak ez du ikusteko moduko egutegi-elementurik"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "Ezin izan da egutegi-fitxategia eguneratu!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Eguneratzea osatu da\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 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:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 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:1942
+#: calendar/gui/e-itip-control.c:1940
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Errorea izan da datuak deskargatzean"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Elementua ezin izan da bidali!\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 #, 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:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Partaidearen egoera eguneratu da\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "Partaidearen egoera ezin izan da eguneratu\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Kentzea osatu da"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Elementua bidali da!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Elementua ezin izan da bidali!\n"
 
@@ -5769,7 +6116,7 @@ msgstr "%a, %Y/%m/%d"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
@@ -5833,99 +6180,85 @@ msgstr "Bilera _hasteko ordua:"
 msgid "Meeting _end time:"
 msgstr "Bilera amai_tzeko ordua:"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "Ha_siera-data:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "_Mugaeguna:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "_Lehentasuna:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Orrialdea"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "%s - zereginak irekitzen"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Ezin izan dira zereginak kargatu`%s'(e)n"
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s'kargatzeko behar den metodoa ez da onartzen"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, 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:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "Errorea %s abiaraztean"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Egite-data"
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Hautatutako objektuak ezabatzen"
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "Betiko borratzen"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Zereginak"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Egutegia"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Ezin izan da karpeta ireki`%s'(e)n"
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s'irekitzeko behar den metodoa ez da onartzen"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "%s alarma"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5933,7 +6266,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5941,65 +6274,11 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Turin"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#, fuzzy
-msgid "Calendar and Tasks"
-msgstr "Egutegiaren eta zereginen ezarpenak"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Egutegia"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Egutegiaren eta zereginen ezarpenak"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution-en Zereginen kontrolerako fabrika."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution-en egutegiaren iTip/iMip ikustailea"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Evolution-en egutegiaren iTip/iMip ikustailea"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution-en berri-editorea"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Evolution-en berri-editorea"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolution-en egutegiaren laneko laburpenaren osagaia."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolution-en mezu-prestatzailea."
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "apirila"
@@ -6056,298 +6335,334 @@ msgstr "urria"
 msgid "September"
 msgstr "iraila"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Antolatzailea ezarri behar da."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Partaide bat behar da gutxienez"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Gertaera-informazioa"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Zereginaren informazioa"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Egunkari-informazioa"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Libre/okupatuta informazioa"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Egutegi-informazioa"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 #, fuzzy
 msgid "Updated"
 msgstr "Eguneratu"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 #, fuzzy
 msgid "Refresh"
 msgstr "Freskatu zerrenda"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Libre/okupatuta informazioa (%s - %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "iCalendar informazioa"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Gertaerako partaidea izan behar duzu."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Ig"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Al"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Ar"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Az"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Og"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Or"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Lr"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Hautatutako eguna (%a, %Y %b %d)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a, %b %d"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a, %Y %d"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a, %Y %b %d"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Hautatutako astea (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Hautatutako hilabetea (%Y %b)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Hautatutako urtea (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Zeregina"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Egoera: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "_Lehentasuna:"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Osatutako ehunekoa: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URLa: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategoriak: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Kontaktuak "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Inprimatzeko aurrebista"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Inprimatu elementua"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Prestatu inprimaketa"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Aldatu izena lasterbide honi"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Z_ereginen zerrenda"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Zeregin berria"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Zeregina"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Sortu zeregin berria"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "Bistaratu beharreko zeregin-karpetaren URIa"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6359,11 +6674,11 @@ msgstr ""
 "\n"
 "Benetan borratu nahi dituzu?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Ez galdetu berriro."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Inprimatu txartelak"
@@ -6396,17 +6711,17 @@ msgstr "Egutegi-mezua"
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Oroigarria"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Egutegi-mezua"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6415,7 +6730,7 @@ msgstr ""
 "Evolution-ek Pine posta-fitxategiak aurkitu ditu.\n"
 "Evolution-era inportatu nahi dituzu?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Egutegia"
@@ -7953,28 +8268,28 @@ msgstr "Pazifikoa/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pazifikoa/Yap"
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "Zifraketa honek ez du sinatzerik onartzen"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "Zifraketa honek ez du egiaztatzerik onartzen"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Zifraketa honek ez du enkriptatzerik onartzen"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Zifraketa honek ez du desenkriptatzerik onartzen"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 #, fuzzy
 msgid "You may not import keys with this cipher"
 msgstr "Zifraketa honek ez du desenkriptatzerik onartzen"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 #, fuzzy
 msgid "You may not export keys with this cipher"
 msgstr "Zifraketa honek ez du desenkriptatzerik onartzen"
@@ -8027,88 +8342,88 @@ msgstr "%s karpeta biltegiratzen"
 msgid "You must be working online to complete this operation"
 msgstr "Linean jardun behar duzu lanean eragiketa hau bukatzeko"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ezin izan da %s direktorioa sortu: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Karpetak sinkronizatzen"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Errorea iragazkia analizatzean: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Errorea iragazkia exekutatzean: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Ezin da spool-karpeta ireki"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Ezin da spool-karpeta prozesatu"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%%%d) mezua lortzen"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Ezin da mezua ireki"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Huts egin du %d mezuan"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Karpeta sinkronizatzen"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d/%d mezua hartzen"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Huts egin du %d/%d mezuan"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Huts egin du mezua berreskuratzean"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Argumentu baliogabeak"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Argumentu baliogabeak"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Errorea iragazki-bilaketa exekutatzean: %s: %s"
@@ -8140,36 +8455,36 @@ msgstr "(bat-etorri-guztiekin)ek emaitza boolear bakarra behar du"
 msgid "Performing query on unknown header: %s"
 msgstr "Kontsulta egiten goiburuko ezezagunean: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Eragiketa hau ez da onartzen: mezua erantsi: %s"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Eragiketa hau ez da onartzen: adierazpen bidezko bilaketa: %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Eragiketa hau ez da onartzen: uid bidezko bilaketa: %s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Mezuak eramaten"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 #, fuzzy
 msgid "Copying messages"
 msgstr "Mezuak %s(e)n kopiatzen"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "%d mezu berreskuratzen"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8177,47 +8492,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Bertan behera utzita."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Ustekabeko erantzuna POP zerbitzaritik: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 #, fuzzy
 msgid "No data provided"
 msgstr "Ez da fitxategi-izenik eman."
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Ezin da mezua enkriptatu: ez da hartzailerik zehaztu"
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8225,51 +8540,64 @@ msgid ""
 "%s"
 msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Ezin izan da daturik idatzi: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Huts egin du mezua deskodetzean."
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Huts egin du mezua deskodetzean."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "Hau digitalki sinatutako mezu-zatia da"
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr ""
+"Ezin da mezua egiaztatu: ezin izan da aldi baterako fitxategia sortu: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Ezin da mezua egiaztatu: ezin izan da aldi baterako fitxategia sortu: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Ezin izan da daturik idatzi: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Hau digitalki sinatutako mezu-zatia da"
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Enkriptatutako mezua"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Ezin da mezua editoretik berreskuratu"
@@ -8370,16 +8698,16 @@ msgstr "Errorea aldi baterako posta-fitxategia idaztean: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Errorea aldi baterako posta-fitxategia kopiatzean: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 #, fuzzy
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "Huts egin du desenkriptatzean: Ezezaguna"
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 #, fuzzy
 msgid "parse error"
 msgstr "Beste errore bat"
@@ -8704,12 +9032,12 @@ msgstr "Karpeta birtualen posta-hornitzailea"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Mezuak beste karpeta-multzo bateko kontsulta gisa irakurtzeko"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Ez dago hornitzailerik `%s' protokolorako"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8718,71 +9046,82 @@ msgstr ""
 "Ezin izan da %s direktorioa sortu:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Idatzi zure %s pasaesaldia %s(e)rako"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Definitu gabe"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Gehitu irizpidea"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Gehitu irizpidea"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Ezin izan da sinatu: \"%s\"(r)en ziurtagiria ez da aurkitu."
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "_Ziurtagiri-IDa:"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Gorde sinadura"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Beste errore bat"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Zerbitzaria: %s, Mota: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Ezin da karpeta hartu: eragiketa baliogabea biltegi honetarako"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ezin da karpeta sortu: eragiketa baliogabea biltegi honetarako"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Zakarrontzia"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "ekaina"
+
 #: camel/camel-tcp-stream-openssl.c:568
 #, fuzzy
 msgid "Unable to get issuer's certificate"
@@ -8992,7 +9331,7 @@ msgid ""
 "Issuer: %s"
 msgstr "_Ziurtagiri-IDa:"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Ezin izan da `%s' URLa analizatu"
@@ -9012,22 +9351,22 @@ msgstr "%s mezurik ez dago %s(e)n"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Karpeta guztietan begiratu mezurik dagoen"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ezin da karpeta ezabatu: %s: eragiketa baliogabea"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ezin da karpeta ezabatu: %s: ez dago horrelako karpetarik"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ezin da karpetaren izena aldatu: %s: eragiketa baliogabea"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
@@ -9106,7 +9445,7 @@ msgstr "Huts egin du mezua berreskuratzean"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9120,7 +9459,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Ez dago horrelako mezurik"
@@ -9158,54 +9497,69 @@ msgid "Failed to cache %s: %s"
 msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Zerbitzariarekin konektatzen..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Ezin da LDAP zerbitzariarekin konektatu."
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "Enpresakoa"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Mezu berririk dagoen begiratzen"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 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:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Karpetak"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Erakutsi harpidetutako karpetak soilik"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "Gainidatzi zerbitzariak emandako karpeta-izena"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Izena"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Aplikatu iragazkiak zerbitzari honetako sarrerako ontziko mezu berriei"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Automatikoki begiratu mezu berririk"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP zerbitzarietan posta irakurri eta gordetzeko."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Pasahitza"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9462,7 +9816,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Ezin izan zaio karpeta-izena aldatu %s --> %s: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Ezin izan da karpetaren izena aldatu: %s"
@@ -9579,29 +9933,29 @@ msgstr "Mezu berrien bila eskaneatzen"
 msgid "Storing folder"
 msgstr "Karpeta biltegiratzen"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ezin da karpeta-blokeoa sortu %s(e)n: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Ezin da postontzia ireki: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "Posta eranstea bertan behera utzi da"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Ezin zaio mezua erantsi mbox fitxategiari: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9610,11 +9964,11 @@ msgstr ""
 "Ezin da mezua hartu: %s %s karpetatik\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Badirudi fitxategia hondatuta dagoela eta ezin dela berreskuratu."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Mezu-eraikuntzak huts egin du: Postontzia hondatuta?"
 
@@ -9682,12 +10036,17 @@ msgstr "Ezin izan da %s direktorioa sortu: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "Ezin da karpeta hartu: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "Txartelaren ID hori badago lehendik"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Ezin izan zaio karpeta-izena aldatu %s --> %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Adierazitako karpeta-izena ez da baliozkoa: %s"
@@ -9733,7 +10092,7 @@ msgstr "Ezin izan da itxi %s iturburu-karpeta: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Ezin izan da aldi baterako karpeta itxi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Ezin izan da karpetaren izena aldatu: %s"
@@ -10015,7 +10374,7 @@ msgstr "Ezabatu %s egunen ondoren"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -10107,7 +10466,7 @@ msgid "No such folder `%s'."
 msgstr "`%s' karpeta ez dago."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10160,7 +10519,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Posta-banaketa sendmail programaren bidez"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10333,7 +10692,7 @@ msgstr "SMTP posta-banaketa %s bidez"
 msgid "Cannot send message: sender address not valid."
 msgstr "Ezin da mezua bidali: bidaltzailearen helbidea ez da baliozkoa."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Mezua bidaltzen"
 
@@ -10456,7 +10815,7 @@ msgstr "%.1fM"
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "eranskina"
 
@@ -10501,14 +10860,14 @@ msgstr "MIME mota:"
 msgid "Suggest automatic display of attachment"
 msgstr "Proposatu eranskina automatikoki bistaratzea"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Identitatea konfiguratu behar duzu\n"
 "mezua idatzi ahal izateko."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Egin klik hemen helbide-liburura joateko"
 
@@ -10519,45 +10878,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Erantzun honi:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Nork:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Gaia:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Nori: "
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Idatzi mezuaren hartzaileak"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Idatzi mezuaren kopia jasoko dutenen helbideak"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10568,16 +10927,21 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 #, fuzzy
 msgid "Posting destination"
 msgstr "Azalpenik ez"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Erantsi fitxategi bat mezuari"
+
 #: composer/e-msg-composer-select-file.c:119
 #, fuzzy
 msgid "Attach file(s)"
@@ -10614,21 +10978,21 @@ msgstr "Fitxategia badago; gainidatzi?"
 msgid "Error saving file: %s"
 msgstr "Errorea fitxategia gordetzean: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Errorea fitxategia kargatzean: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Errorea fitxategia atzitzean: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Ezin da mezua editoretik berreskuratu"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10637,7 +11001,7 @@ msgstr ""
 "Ezin da fitxategian bilatu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10646,7 +11010,7 @@ msgstr ""
 "Ezin da fitxategia trunkatu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10655,7 +11019,7 @@ msgstr ""
 "Ezin da fitxategian bilatu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10664,7 +11028,7 @@ msgstr ""
 "Errorea mezua automatikoki gordetzean: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10672,7 +11036,7 @@ msgstr ""
 "Aurreko saioko fitxategi gorde gabeak aurkitu ditu Ximian Evolution-ek.\n"
 "Berreskuratzen saiatu nahi duzu?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10683,29 +11047,29 @@ msgstr ""
 "\n"
 "Aldaketak gorde nahi dituzu?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Kontuz: mezua aldatu egin da"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Ireki fitxategia"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 #, fuzzy
 msgid "Signature:"
 msgstr "Gorde sinadura"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Prestatu mezua"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10713,7 +11077,7 @@ msgstr ""
 "Ezin izan da mezua prestatzeko leihoa sortu:\n"
 "Ezin da helbidea hautatzeko kontrola aktibatu."
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10724,7 +11088,7 @@ msgstr ""
 "Ezin izan da mezua prestatzeko leihoa sortu:\n"
 "Ezin da HTML editorearen osagaia aktibatu."
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10732,18 +11096,20 @@ msgstr ""
 "Ezin izan da mezua prestatzeko leihoa sortu:\n"
 "Ezin da HTML editorearen osagaia aktibatu."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Evolution-en talde-lanerako tresna"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10992,13 +11358,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11128,7 +11494,7 @@ msgstr "Orduan"
 msgid "You must specify a folder."
 msgstr "Zehaztu fitxategi-izena:"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Hautatu karpeta"
@@ -11142,26 +11508,26 @@ msgstr ""
 "Errorea '%s' adierazpen erregularrean:\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Garrantzitsua"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 #, fuzzy
 msgid "Later"
 msgstr "geroago"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Proba"
 
@@ -11266,7 +11632,7 @@ msgstr "lehenago"
 msgid "months"
 msgstr "hilabete "
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "segundo "
 
@@ -11366,7 +11732,7 @@ msgstr "Adierazpena"
 msgid "Follow Up"
 msgstr "Jarraitu"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
@@ -11440,117 +11806,123 @@ msgid "Source Account"
 msgstr "Iturburu-kontua"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Zipriztinak"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Goiburuko espezifikoa"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Gelditu prozesatzea"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Gaia"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "Ezarri egoera"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "hau dauka"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "ez dauka hau"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "ez da honela amaitzen"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "ez dago"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 #, fuzzy
 msgid "does not return"
 msgstr "ez dago"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "ez da honen antzekoa"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "ez da honela hasten"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "honela amaitzen da"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "badago"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr "Banderaduna da"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr "honen ondorengoa da"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "is before"
 msgstr "honen aurrekoa da"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "hau baino handiagoa da"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "hau baino txikiagoa da"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr "ez da Banderaduna"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "ez da"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "da"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 #, fuzzy
 msgid "returns greater than"
 msgstr "hau baino handiagoa da"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 #, fuzzy
 msgid "returns less than"
 msgstr "hau baino txikiagoa da"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 #, fuzzy
 msgid "returns"
 msgstr "Burns"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "honen antzekoa da"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "honela hasten da"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
@@ -11576,19 +11948,89 @@ msgstr "Arau-izena: "
 msgid "Score Rules"
 msgstr "Puntuazio-arauak"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Karpeta birtualari izena eman behar diozu."
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr "Gutxienez karpeta bat zehaztu behar duzu iturburu gisa."
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 #, fuzzy
 msgid "VFolder source"
 msgstr "Karpeta birtualen iturburuak"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#, fuzzy
+msgid "Composer Preferences"
+msgstr "Egutegi-hobespenak"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#, fuzzy
+msgid "Configure your email accounts here"
+msgstr "Sortu edo editatu posta-kontuak eta bestelako hobespenak"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution "
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution-en Zereginen kontrolerako fabrika."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Evolution-en mezu-prestatzailea."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Evolution-en mezu-prestatzailea."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution-en Zereginen kontrolerako fabrika."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Posta-karpetak bistaratzeko Evolution-en osagaia."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolution-en postaren laneko laburpenaren osagaia."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Posta"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Kontuak"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "Egutegi-hobespenak"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Ziur zaude kontu hau ezabatu nahi duzula?"
@@ -11633,7 +12075,7 @@ msgid "Protocol"
 msgstr "Puerto Rico"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 #, fuzzy
 msgid "Unnamed"
 msgstr "Kontaktu izengabea"
@@ -11663,21 +12105,17 @@ msgstr "Gehitu irizpidea"
 msgid "Signature(s)"
 msgstr "_Sinadura-fitxategia:"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
-#, fuzzy
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "HTML formatuko mezua bidaltzera zoaz, baina hartzaile hauek ez dute HTML "
 "formatuko mezurik jaso nahi:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Hala ere bidali nahi duzu?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11685,7 +12123,7 @@ msgstr ""
 "Mezu honek ez du gairik.\n"
 "Ziur zaude bidali nahi duzula?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11693,11 +12131,11 @@ msgstr ""
 "Mezua bidali behar diozun kontaktu-zerrenda helbidea ezkutuan edukitzeko "
 "konfiguratuta dagoenez, Bcc hartzaileak bakarrik izango ditu mezuak."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Mezu honek Bcc hartzaileak bakarrik ditu."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11707,11 +12145,11 @@ msgstr ""
 "goiburukoa gehituz.\n"
 "Hala ere bidali nahi duzu?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Hartzaileak zehaztu behar dituzu mezua bidaltzeko."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11724,199 +12162,415 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Sortu _karpeta birtuala mezutik"
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "Posta"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<egin klik hemen karpeta hautatzeko>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, fuzzy, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "Ireki honekin: %s..."
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Sortu _karpeta berria...."
+
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Adierazi karpeta non sortu behar den:"
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
-msgid "Folder _name"
+msgid "Folder _name:"
 msgstr "Karpeta-izena:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Ezin izan da aldi baterako direktorioa sortu: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Ezin izan da aldi baterako direktorioa sortu: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Ezin izan da aldi baterako `%s' fitxategia sortu: %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Ezin izan da aldi baterako karpeta itxi: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Kargatzen..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Hautatu karpeta"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Sortu karpeta berria"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Ezin izan da '%s' karpeta ezabatu: %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Ezabatu '%s' karpeta"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Ezabatu \"%s\""
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "\"%s\" karpetaren izena aldatu eta jarri:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+#, fuzzy
+msgid "Rename Folder"
+msgstr "Karpetaren izena aldatu"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Propietateak"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Propietateak"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "Karpeta-izena:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "I_kusi"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Ireki leiho berrian"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Eraman"
+
+#: mail/em-folder-tree.c:1500
+#, fuzzy
+msgid "_New Folder..."
+msgstr "Kar_peta berria"
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "_Izena aldatu"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "_Propietateak..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "_Editatu mezu berri gisa..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "_Inprimatu"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "Erantzun bidal_tzaileari"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Erantzun zerre_ndari"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Erantzun g_uztiei"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "_Birbidali"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 #, fuzzy
 msgid "Follo_w Up..."
 msgstr "Jarrait_u..."
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Bandera o_satuta"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Garbitu ban_dera"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Mar_katu irakurritako gisa"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Markatu i_rakurri gabeko gisa"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Markatu garrantz_itsu gisa"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Markatu ez-garra_ntzitsu gisa"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Markatu i_rakurri gabeko gisa"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Markatu garrantz_itsu gisa"
+
+#: mail/em-folder-view.c:706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Desezabatu"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Eraman karpeta honetara..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "K_opiatu karpeta honetan..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Gehitu bidaltzailea _helbide-liburuan"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplikatu iragazkiak"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Sortu _araua mezutik"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "_Gaiaren araberako karpeta birtuala"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "_Bidaltzailearen araberako karpeta birtuala"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "_Hartzailearen araberako karpeta birtuala"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "Po_sta-zerrendaren araberako karpeta birtuala"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "_Bidaltzailearen araberako karpeta birtuala"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "G_aiaren araberako iragazkia"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Bi_daltzailearen araberako iragazkia"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Hart_zailearen araberako iragazkia"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Po_sta-zerrendaren araberako iragazkia"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Bi_daltzailearen araberako iragazkia"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Lehenetsi"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Inprimatu mezua"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopiatu estekaren helbidea"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Bat datozenak:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Esleitua"
+
+#: mail/em-format-html-display.c:597
+#, fuzzy
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr ""
+"Mezu honek sinadura digitala dauka, baina ezin izan da frogatu egiazkoa dela."
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Gehitu irizpidea"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Gehitu irizpidea"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
 msgstr ""
-"Mezu honek sinadura digitala du.Informazio gehiago ikusteko, egin klik "
-"giltzarrapoaren ikonoan."
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Etenda"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+#, fuzzy
+msgid "Encrypted, weak"
+msgstr "Enkriptatutako mezua"
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "PGP enkriptatzea"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+#, fuzzy
+msgid "Encrypted, strong"
+msgstr "Enkriptatutako mezua"
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Onartzen ez den eskema"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Huts egin du ziurtagiriak egiaztatzean."
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Ikusi barnean"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Ezkutatu"
@@ -11926,186 +12580,208 @@ msgstr "Ezkutatu"
 msgid "Page %d of %d"
 msgstr "%d/%d orria"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "%s mezua berreskuratzen"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Kanpoko goputz-zatia gaizki osatuta dago."
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP gunerako erakuslea (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Fitxategi lokalerako (%s) baliozko erakuslea \"%s\" gunean"
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "(%s) fitxategi lokalerako erakuslea"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "(%s)urruneko datuetarako erakuslea"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kanpoko datu ezezagunetarako erakuslea (\"%s\" mota)"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-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/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Mezu honek sinadura digitala du eta egiazkoa da."
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-#, fuzzy
-msgid "No signature present"
-msgstr "HTML sinaduraren fitxategia:"
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Ezin izan da GNOME hasieratu"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Onartzen ez den eskema"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Mezuak eramaten"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Nork"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Erantzun honi"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Nori"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 #, fuzzy
 msgid "Mailer"
 msgstr "Posta"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "%s eranskina"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
+msgid "Session not initialised"
+msgstr "Ezin izan da GNOME hasieratu"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Mezu honek sinadura digitala du eta egiazkoa da."
+
+#: mail/em-format.c:1212
+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/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Zain..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "%s eskaneatzen"
 
-#: mail/em-popup.c:593
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Gorde honela..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Erantzun bidal_tzaileari"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Ireki esteka arakatzailean"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Bidali _mezua zerrendara..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Gehitu helbide-liburua"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Ireki honekin: %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Harpidetu"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Karpeta"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Hautatu zerbitzari bat."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Ez da zerbitzaririk hautatu"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Ez erakutsi mezu hau berriro."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12114,29 +12790,29 @@ msgstr ""
 "Errorea iragazki-informazioa kargatzean:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Iragazkiak"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Birbidalitako mezua"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "bidaltzaile ezezaguna"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr ""
 "Jatorrizko mezua:\n"
 "data: %a, %Y-%m-%d %H:%M, egilea: %%s"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12145,7 +12821,7 @@ msgstr ""
 "Ezin da mezua hartu: %s\n"
 "  %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12154,26 +12830,39 @@ msgstr ""
 "%s badago lehendik\n"
 "Gainidatzi nahi duzu?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Mezua"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Gorde mezua honela..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Ezin izan da aldi baterako direktorioa sortu: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Helbi_dea:"
+
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
+msgid ""
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Eragiketa honek betiko borratuko ditu ezabatutako gisa markatutako mezuak. "
+"Jarraitzen baduzu, ezingo dituzu berreskuratu.\n"
+"\n"
+"Benetan borratu nahi dituzu?"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2288
 #, fuzzy
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12182,107 +12871,388 @@ msgstr ""
 "\n"
 "Benetan borratu nahi dituzu?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#: mail/evolution-mail.schemas.in.in.h:1
 #, fuzzy
-msgid "Composer Preferences"
-msgstr "Egutegi-hobespenak"
+msgid "Automatic link recognition"
+msgstr "_Automatikoki begiratu mezu berririk"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "_Automatikoki begiratu mezu berririk"
+
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:6
 #, fuzzy
-msgid "Configure your email accounts here"
-msgstr "Sortu edo editatu posta-kontuak eta bestelako hobespenak"
+msgid "Default charset in which to compose messages"
+msgstr "Ebaki hautatutako mezuak"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/evolution-mail.schemas.in.in.h:7
 #, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution "
+msgid "Default charset in which to compose messages."
+msgstr "Ebaki hautatutako mezuak"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution-en Zereginen kontrolerako fabrika."
+msgid "Default charset in which to display messages"
+msgstr "Bilatu testua bistaratutako mezuaren gorputzean"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
-msgid "Evolution Mail component"
-msgstr "Evolution-en mezu-prestatzailea."
+msgid "Default charset in which to display messages."
+msgstr "Bilatu testua bistaratutako mezuaren gorputzean"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Evolution-en mezu-prestatzailea."
+msgid "Default forward style"
+msgstr "Birbidaltzeko estilo lehenetsia: "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution-en Zereginen kontrolerako fabrika."
+msgid "Default reply style"
+msgstr "Birbidaltzeko estilo lehenetsia: "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
 #, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Posta-karpetak bistaratzeko Evolution-en osagaia."
+msgid "Empty Trash folders on exit"
+msgstr "_Hustu zakarrontziko karpetak irtetean"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Evolution-en postaren laneko laburpenaren osagaia."
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "_Hustu zakarrontziko karpetak irtetean"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
-msgid "Mail Accounts"
+msgid "Height of the message-list pane"
+msgstr "Bidali mezua geroago"
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "Kontuak"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
-msgid "Mail Preferences"
-msgstr "Egutegi-hobespenak"
+msgid "Log filter actions"
+msgstr "_Iragazki-ekintzen egunkaria:"
 
-#: mail/importers/elm-importer.c:105
-msgid "Evolution is importing your old Elm mail"
-msgstr "Elm posta zaharra inportatzen ari da Evolution"
+#: mail/evolution-mail.schemas.in.in.h:28
+#, fuzzy
+msgid "Log filter actions to the specified log file."
+msgstr "_Iragazki-ekintzen egunkaria:"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
-msgid "Importing..."
-msgstr "Inportatzen..."
+#: mail/evolution-mail.schemas.in.in.h:29
+#, fuzzy
+msgid "Logfile to log filter actions"
+msgstr "_Iragazki-ekintzen egunkaria:"
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
-msgid "Please wait"
-msgstr "Itxaron"
+#: mail/evolution-mail.schemas.in.in.h:30
+#, fuzzy
+msgid "Logfile to log filter actions."
+msgstr "_Iragazki-ekintzen egunkaria:"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "%s inportatzen %s gisa."
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
 
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "%s eskaneatzen"
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
 
-#: mail/importers/elm-importer.c:547
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Mezu berrien jakinarazpena"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Mezu berrien jakinarazpena"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
-"Evolution-ek Elm posta-fitxategiak aurkitu ditu\n"
-"Evolution-era inportatu nahi dituzu?"
 
-#: mail/importers/elm-importer.c:568
-msgid "Elm"
-msgstr "Elm"
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr "Abisatu HTML formaturik nahi ez dutenei HTML mezuak bidali aurretik"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "Abisatu B_cc hartzaileak bakarrik dituzten mezuak bidali aurretik"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "_Bidali mezuak HTML formatuan lehenespen gisa."
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "_Bidali mezuak HTML formatuan lehenespen gisa."
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "Erakutsi ordua honela"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "Erakutsi ordua honela"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Erakutsi mezua estilo normalean"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "Au_rrebistako panela"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "Jo soinua mezu berriak iristean"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+msgid "Spell check inline"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "Jatorrizko kontaktua:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+msgid "The variable width font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Hari bateko mezuen zerrenda"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Hari bateko mezuen zerrenda"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "Lehenetsi _kontu hau"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "Aldakorra"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 #, fuzzy
@@ -12316,6 +13286,44 @@ msgstr ""
 msgid "Evolution Pine importer"
 msgstr "Evolution-en mezu-prestatzailea."
 
+#: mail/importers/elm-importer.c:105
+msgid "Evolution is importing your old Elm mail"
+msgstr "Elm posta zaharra inportatzen ari da Evolution"
+
+#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
+#: mail/importers/pine-importer.c:115
+msgid "Importing..."
+msgstr "Inportatzen..."
+
+#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
+#: mail/importers/pine-importer.c:117
+msgid "Please wait"
+msgstr "Itxaron"
+
+#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
+#: mail/importers/pine-importer.c:288
+#, c-format
+msgid "Importing %s as %s"
+msgstr "%s inportatzen %s gisa."
+
+#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
+#: mail/importers/pine-importer.c:425
+#, c-format
+msgid "Scanning %s"
+msgstr "%s eskaneatzen"
+
+#: mail/importers/elm-importer.c:547
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution-ek Elm posta-fitxategiak aurkitu ditu\n"
+"Evolution-era inportatu nahi dituzu?"
+
+#: mail/importers/elm-importer.c:568
+msgid "Elm"
+msgstr "Elm"
+
 #: mail/importers/netscape-importer.c:75
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
@@ -12357,12 +13365,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Netscape-ko datu zaharrak inportatzen ari da Evolution"
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Zakarrontzia"
-
 #: mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
@@ -12372,7 +13374,7 @@ msgstr "%s posta-fitxategi lokala"
 msgid "Scanning directory"
 msgstr "Direktorioa eskaneatzen"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Inportatzen hasten"
 
@@ -12449,24 +13451,24 @@ msgid "You have not filled in all of the required information."
 msgstr "Ez duzu eman eskatu zaizun informazio guztia."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution-en kontu-editorea"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Ostalaria:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "_Erabiltzaile-izena:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Bide-izena:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Ezin dituzu izen bereko bi kontu izan."
 
@@ -12475,35 +13477,35 @@ msgstr "Ezin dituzu izen bereko bi kontu izan."
 msgid "Mail to %s"
 msgstr "Mezu-hartzailea: %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Gaia: %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Mezu-bidaltzailea: %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s posta-zerrenda"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Erantzunda"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Gehitu iragazkiaren araua"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, fuzzy, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12515,146 +13517,31 @@ msgstr ""
 "    '%s'\n"
 "Eta eguneratu egin dira."
 
-#: mail/mail-component.c:194
-#, fuzzy
-msgid "Connecting..."
-msgstr "Zerbitzariarekin konektatzen..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Karpeta honek ezin du mezurik eduki."
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Posta-mezu berria"
 
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Ezin izan da karpetaren izena aldatu: %s"
-
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Ezin izan da aldi baterako direktorioa sortu: %s"
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "_Posta-mezua"
 
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Ezin izan da aldi baterako `%s' fitxategia sortu: %s"
-
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Ezin izan da aldi baterako karpeta itxi: %s"
+#: mail/mail-component.c:381
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Prestatu mezua"
 
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Aukeratu datu hauek inportatzeko helburu-karpeta"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Aukeratu datu hauek inportatzeko helburu-karpeta"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Sortu karpeta berria"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Adierazi karpeta non sortu behar den:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Ezin izan da '%s' karpeta ezabatu: %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Ezabatu '%s' karpeta"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Ezabatu \"%s\""
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "\"%s\" karpetaren izena aldatu eta jarri:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-#, fuzzy
-msgid "Rename Folder"
-msgstr "Karpetaren izena aldatu"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Adierazitako karpeta-izena ez da baliozkoa: %s"
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Propietateak"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Propietateak"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "Karpeta-izena:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "I_kusi"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Ireki leiho berrian"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Eraman"
-
-#: mail/mail-component.c:2087
-#, fuzzy
-msgid "_New Folder..."
-msgstr "Kar_peta berria"
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "_Izena aldatu"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Propietateak..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Identitatea"
 
@@ -12724,11 +13611,11 @@ msgstr ""
 "Bistaratzeko \n"
 "bakarrik erabiliko da kontu-izen hori."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Zerbitzua egiaztatzen"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Zerbitzariarekin konektatzen..."
 
@@ -12817,27 +13704,36 @@ msgid "C_olors"
 msgstr "_Itxi"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Mezu berririk dagoen begiratzen"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Mezu berririk dagoen begiratzen"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Gaurko zereginen kolorea"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Mezuak prestatzen"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Konfigurazioa"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -12854,324 +13750,333 @@ msgstr ""
 "\n"
 "Egin klik \"Amaitu\" botoian, ezarpenak gordetzeko."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "Le_henetsi"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Lehentasun lehenetsia:"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Karaktere-kodeketa lehenetsia: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Mezuak bilatzen"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Ezin da mezua ireki"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Eginda"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Z_irriborroen karpeta:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "_Gaitu"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Helb. el.ak hau dauka"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email _address:"
 msgstr "_Helbide elektronikoa:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "_Hustu zakarrontziko karpetak irtetean"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Ziurtagiri-IDa:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Evolution-eko kontuaren morroia"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Exekutatu komandoa..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "honela amaitzen da"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "Aukerak"
+
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propietateak"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Birbidalitako mezuak"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Aipuak nabarmentzeko erabili "
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Barnean"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Gorde eta itxi"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Loading Images"
 msgstr "Kargatu iru_diak"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Posta-konfigurazioa"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Postontziaren kokalekua"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Composer"
 msgstr "Mezuaren goiburukoa"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Message Display"
 msgstr "_Mezu-bistaratzea"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Fonts"
 msgstr "mezuak hau dauka"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Mezu berrien jakinarazpena"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Aukerako informazioa"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "E_rakundea:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/_GPG gakoaren IDa:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Aukeratu kolorea"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Abisatu B_cc hartzaileak bakarrik dituzten mezuak bidali aurretik"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Inprimatu hautatutako kontaktuak"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Quote original message"
 msgstr "Ezin da mezua ireki"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Aipamen gisa"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "_Gogoratu pasahitz hau"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Erantzun honi:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Mezuak jaso"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Jasotzeko aukerak"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Gogoratu pasahitz hau"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Beharrezko informazioa"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Lehenespenak"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Segurtasuna"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME segurua (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Mezuak bidali"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "_Bidalitako mezuen karpeta:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Bidalitako mezuak eta zirriborroak"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Zerbitzariak _autentifikazioa behar du"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Zerbitzariaren konfigurazioa"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "_Zerbitzari-mota: "
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Ezin izan da sinatu: \"%s\"(r)en ziurtagiria ez da aurkitu."
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Zehaztu fitxategi-izena:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Unix mbox estandarra"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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:121
+#: mail/mail-config.glade.h:124
 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:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Aldakorra"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -13182,195 +14087,204 @@ msgstr ""
 "\n"
 "Hasteko, egin klik \"Hurrengoa\"n."
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_Sinadura-fitxategia:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "_Kargatu beti irudiak saretik kanpo"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "_Autentifikazio-mota: "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "_Autentifikazio-mota: "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "_Automatikoki begiratu mezu berririk"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Automatikoki begiratu mezu berririk"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Beep when new mail arrives"
 msgstr "Egin bip mezu berriak iristen direnean"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Berretsi karpeta betiko borratzean"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML sinadura:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Defaults"
 msgstr "Lehenespenak"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "Ez jakinarazi mezu berriak iristen direnean"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Enable"
 msgstr "Gaitu"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Birbidali honela"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "_Izen osoa:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML postan"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitatea"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "ekaina"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "_Kargatu irudiak bidaltzailea helbide-liburuan badago"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Lehenetsi _kontu hau"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Markatu mezuak irakurritako gisa"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Izena:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "_Inoiz ez kargatu irudirik saretik kanpo"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "Jo soinua mezu berriak iristean"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 #, 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:159
+#: mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Abisatu mezuak gairik _gabe bidali aurretik"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Mezuak jaso"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Erantzun denei"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Script:"
 msgstr "Se_gurtasuna"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Ezabatu..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Mezuak bidali"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Erakutsi ordua honela"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Signatures"
 msgstr "_Sinadura-fitxategia:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Standard Font:"
 msgstr "Sand Point"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Terminal Font:"
 msgstr "Jatorrizko kontaktua:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Erabili konexio segurua (_SSL)"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "azalpena"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "%s eskaneatzen"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13379,7 +14293,7 @@ msgstr ""
 "Errorea '%s' saiatu denean:\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13388,7 +14302,7 @@ msgstr ""
 "Errorea eragiketa egitean:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Lanean"
 
@@ -13400,118 +14314,118 @@ msgstr "Karpeta iragazten"
 msgid "Fetching Mail"
 msgstr "Mezuak bilatzen"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Huts egin du mezua aldi baterako %s fitxategian gordetzean: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Huts egin du mezua aldi baterako %s fitxategian gordetzean: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" bidaltzen"
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d/%d mezua bidaltzen"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Huts egin du %d/%d mezuan"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Osatuta."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Mezua karpetan gordetzen"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mezuak %s(e)ra eramaten"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Mezuak %s(e)n kopiatzen"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\": karpetak eskaneatzen"
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Birbidalitako mezuak"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s karpeta irekitzen"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "%s biltegia irekitzen"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s karpeta kentzen"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s karpeta biltegiratzen"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Karpeta freskatzen"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Karpeta betiko borratzen"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "%s inportatzen %s gisa."
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Karpeta lokalak"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s mezua berreskuratzen"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d mezu berreskuratzen"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d mezu gordetzen"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13520,7 +14434,7 @@ msgstr ""
 "Ezin da sortu irteerako fitxategia: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13529,11 +14443,11 @@ msgstr ""
 "Errorea mezuak hemen gordetzean: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Eranskina gordetzen"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13542,21 +14456,25 @@ msgstr ""
 "Ezin da irteerako fitxategia sortu: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ezin izan da daturik idatzi: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s(e)tik deskonektatzen"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s(r)ekin berriro konektatzen"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Maiuskula/minuskula"
@@ -13573,60 +14491,75 @@ msgstr "Bilatu:"
 msgid "Search"
 msgstr "Bilatu"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Gehitu irizpidea"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Salbuespenak"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Iturburu-informazioa"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Bertan behera uzten..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Zerbitzaria: %s, Mota: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Bide-izena: %s, Mota: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Mota: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Mezuak bidali eta jaso"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Utzi dena"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Eguneratzen..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Zain..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Erabiltzaileak bertan behera utzi du eragiketa."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Idatzi %s(r)en pasahitza"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Idatzi pasahitza"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "Gogora_tu pasahitz hau"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "Gogoratu pasahitz hau saio hau amaitu arte"
@@ -13668,26 +14601,31 @@ msgstr "_HTML sinadura:"
 msgid "Name:"
 msgstr "Izena:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Birbidalitako mezua - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Birbidalitako mezua"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "%s karpeta irekitzen"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Karpeta birtuala konfiguratzen: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "uri-aren karpeta birtualak eguneratzen: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13700,88 +14638,88 @@ msgstr ""
 "    '%s'\n"
 "Eta eguneratu egin dira."
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "Karpeta birtualak"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "Karpeta birtualak"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Editatu karpeta birtuala"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "'%s' kBirtuala editatu nahian dabil, baina ez dago."
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Karpeta birtual berria"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Ikusi gabe"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Ikusita"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Erantzunda"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Ikusi gabeko hainbat mezu"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Hainbat mezu"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Txikiena"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Txikia"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Handia"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Handiena"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Gaur %l:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Atzo %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Mezuen zerrenda sortzen"
 
@@ -13842,11 +14780,11 @@ msgstr "Birbidali"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Erantzun"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Erantzun denei"
 
@@ -13904,42 +14842,140 @@ msgstr "_Harpidetu"
 msgid "_Unsubscribe"
 msgstr "Harpidetza _kendu"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Evolution-en shell-a."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+#, fuzzy
+msgid "Folder Settings"
+msgstr "Postaren ezarpenak"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "389"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Aldatu izena lasterbide-taldeari"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Erakutsi/ezkutatu karpeta-barra "
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Ezkutatu lasterbide-barra"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Lehentasun lehenetsia:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Lehentasun lehenetsia:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Posta konfiguratzeko interfazea"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
-"Ezin izan da karpeta transferitu:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 #, fuzzy
-msgid "Add a Folder"
-msgstr "Bidalitakoen karpeta gisa"
+msgid "Path to the default contacts folder"
+msgstr "%s karpeta irekitzen"
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Zirriborroak"
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "%s karpeta irekitzen"
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Sarrerako ontzia"
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "%s karpeta irekitzen"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Irteerako ontzia"
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Bidalita"
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "%s karpeta irekitzen"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Erakutsi/ezkutatu karpeta-barra "
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Erakutsi/ezkutatu lasterbide-barra "
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "Helb. el."
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Fitxategiak ezin izan dira behar bezala eguneratu"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13950,7 +14986,7 @@ msgstr ""
 " %s\n"
 "Errorea: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13959,7 +14995,7 @@ msgstr ""
 "Errorea gertatu da `%s'(e)n \n"
 "fitxategiak kopiatzean."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13970,7 +15006,7 @@ msgstr ""
 "Aldatu lekuz, Evolution-en erabiltzaile-fitxategiak\n"
 "instalatu ahal izateko."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -14078,10 +15114,11 @@ msgstr ""
 "Ezin izan da karpetaren izena aldatu:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+msgid "The specified folder name is not valid: %s"
+msgstr "Adierazitako karpeta-izena ez da baliozkoa: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -14105,20 +15142,15 @@ msgstr ""
 "Ezin da sortu adierazitako karpeta:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-#, fuzzy
-msgid "Create New Folder"
-msgstr "Sortu _karpeta berria...."
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(izengabea)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Aukeratu inportatzailearen mota:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -14132,11 +15164,11 @@ msgstr ""
 "Ez badakizu, \"Automatikoa\" hauta dezakezu eta Evolution saiatuko da "
 "bideratzen."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Hautatu inportatu nahi duzun informazioa:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -14144,7 +15176,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14153,22 +15185,22 @@ msgstr ""
 "%s inportatzen\n"
 "%d elementua inportatzen."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 #, fuzzy
 msgid "Select importer"
 msgstr "Hautatu karpeta"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "'%s' fitxategia ez dago "
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Evolution errorea "
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -14177,11 +15209,11 @@ msgstr ""
 "Ez dago %s maneiatzeko\n"
 "gai den inportatzailerik"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Inportatzen"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -14190,17 +15222,17 @@ msgstr ""
 "%s inportatzen.\n"
 "%s abiarazten"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Errorea %s abiaraztean"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Errorea %s kargatzean"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14209,35 +15241,35 @@ msgstr ""
 "%s inportatzen\n"
 "1. elementua inportatzen."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Automatikoa"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Fitxategi-izena:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Hautatu fitxategia"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Fitxategi-mota:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Inportatu programa zaharretako datuak eta ezarpenak"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Inportatu fitxategi bakarra"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -14245,48 +15277,28 @@ msgstr ""
 "Itxaron...\n"
 "Lehengo instalazio bila eskaneatzen"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Inportatzaile adimendunak abiarazten"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "%s(e)tik:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Aukeratu datu hauek inportatzeko helburu-karpeta"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Inportatu"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Konexioak ixten..."
 
-#: shell/e-shell-offline-sync.c:163
-#, fuzzy, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Errorea '%s' saiatu denean:\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-#, fuzzy
-msgid "Syncing Folder"
-msgstr "Karpeta sinkronizatzen"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr ""
-
 #: shell/e-shell-settings-dialog.c:346
 #, fuzzy
 msgid "Evolution Settings"
@@ -14327,7 +15339,7 @@ msgstr ""
 "Ezin da sortu adierazitako karpeta:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14336,17 +15348,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Laguntzailea"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Berria"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Ez da karpeta-izenik zehaztu"
@@ -14408,64 +15414,51 @@ 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:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "_Lan egin linean"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "_Lan egin lineaz kanpo"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Lan egin lineaz kanpo"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Ez dago karpetarik bistaratuta)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(bat ere ez)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 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:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution lineaz kanpo jartzeko prozesuan dago."
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution lineaz kanpo dago. Egin klik botoi honetan linean lan "
 "egiteko."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Argumentu baliogabeak"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Ezin da OAFen erregistratu"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Ez da aurkitu konfigurazioko datu-basea"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Errore generikoa"
 
@@ -14585,75 +15578,18 @@ msgstr "_Kendu"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Kendu lasterbide hau lasterbide-barratik"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Errorea lasterbideak gordetzean."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Sarrerako ontzia"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Lasterbideak"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Errorerik ez"
-
-#: 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:575
-msgid "The specified folder type is not valid"
-msgstr "Adierazitako karpeta-mota ez da baliozkoa"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "S/Iko errorea"
-
-#: 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:581
-msgid "The folder is not empty"
-msgstr "Karpeta ez dago hutsik"
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "Adierazitako karpeta ez da aurkitu"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "Funtzioa ez dago inplementatuta biltegiratze honetan"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "Eragiketa ez da onartzen"
-
-#: 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:593
-msgid "The specified folder cannot be modified or removed"
-msgstr "Adierazitako karpeta ezin da aldatu edo kendu"
-
-#: 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:597
-msgid "Cannot create a folder with that name"
-msgstr "Ezin da izen horretako karpetarik sortu"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr ""
-
-#: shell/e-storage-set-view.etspec.h:1
-#, fuzzy
-msgid "Checkbox"
-msgstr "Chico"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14664,6 +15600,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%%%d osatuta)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Berria"
+
+#: shell/evolution-folder-selector-button.c:128
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "Ireki honekin: %s..."
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14701,75 +15648,6 @@ msgstr ""
 "Aktibazio-sistemak eman duen errorea:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "CORBA errorea"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Etenda"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Argumentu baliogabea"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Badu jabea"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Jaberik ez"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Ez da aurkitu"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Onartzen ez den mota"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Onartzen ez den eskema"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Onartzen ez den eragiketa"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Barne-errorea"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Badago"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "URI baliogabea"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Azpikarpetak ditu"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Ez dago lekurik"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "Jabe zaharra hil egin da"
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Proba-mota:"
-
-#: shell/evolution-test-component.c:703
-#, fuzzy
-msgid "Evolution Test Component"
-msgstr "Evolution-en mezu-prestatzailea."
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "Active Connections"
@@ -14803,11 +15681,6 @@ msgstr "_Posta"
 msgid "_Tasks:"
 msgstr "Zereginak"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-#, fuzzy
-msgid "Folder _name:"
-msgstr "Karpeta-izena:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 #, fuzzy
 msgid "Folder _type:"
@@ -14877,25 +15750,6 @@ msgstr ""
 "\n"
 "Egin klik \"Amaitu\" botoian, ezarpenak gordetzeko. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Evolution-en shell-a."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-#, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution-en Zereginen kontrolerako fabrika."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-#, fuzzy
-msgid "Folder Settings"
-msgstr "Postaren ezarpenak"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Egin klik \"Inportatu\"n fitxategia Evolution-era inportatzen hasteko."
@@ -14934,7 +15788,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Inportatzaileak"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Inportatu"
 
@@ -14950,16 +15804,16 @@ msgstr "Ez galdetu berriro"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution-ek datu-iturburu hauek aurkitu ditu:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution "
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Evolution ixten ari da..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14992,7 +15846,7 @@ msgstr ""
 "Espero dugu gogokoa izango duzula gure lan gogorraren emaitza,\n"
 "eta atsegin handiz gauzkazu zure ekarpenen zain!\n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -15001,38 +15855,50 @@ msgstr ""
 "Eskerrik asko\n"
 "Evolution Taldea\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Ez galdetu berriro"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ezin da Ximian Evolution-en shell-a atzitu."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ezin da Ximian Evolution-en shell-a abiarazi: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Hasi lineaz kanpo"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Hasi linean"
 
-#: shell/main.c:535
+#: shell/main.c:533
 #, fuzzy
 msgid "Forcibly shut down all evolution components"
 msgstr "Evolution-en ohar-osagairako fabrika."
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Bidali osagai guztien arazketa-irteera fitxategi batera."
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -15041,31 +15907,62 @@ msgstr ""
 "%s: --online eta --offline ezin dira batera erabili.\n"
 "  Erabili %s --help informazio gehiago lortzeko.\n"
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Hautatu karpeta"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Ziurtagiri-IDa:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "Lanean"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Adierazpena"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "_Helbide elektronikoa:"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr "_Ziurtagiri-IDa:"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, fuzzy, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+"Jaulkitzailea: %s\n"
+"Gaia: %s"
+
+#: smime/gui/e-cert-selector.c:117
+#, fuzzy, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+"Jaulkitzailea: %s\n"
+"Gaia: %s"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -15121,91 +16018,377 @@ msgid "Backup All"
 msgstr "Blackpool"
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "_Ziurtagiri-IDa:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "_Ziurtagiri-IDa:"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "_Ziurtagiri-IDa:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Izen arrunta"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "_Ziurtagiri-IDa:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "_Edizioa"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Huts egin du ziurtagiriak egiaztatzean."
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Adierazpena"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Erakundea"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Erakundea"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "I_kusi"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "_Ziurtagiri-IDa:"
+
+#: smime/gui/smime-ui.glade.h:42
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "_Ziurtagiri-IDa:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Inportatu"
+msgid "Certificate already exists"
+msgstr "Txartelaren ID hori badago lehendik"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+msgid "%d/%m/%Y"
+msgstr "%Y/%m/%d"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Vermont"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " °C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "I"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "Ados"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "I"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "_Ziurtagiri-IDa:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "_Ziurtagiri-IDa:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "_Ziurtagiri-IDa:"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "jn."
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+#, fuzzy
+msgid "Subject Public Key Info"
+msgstr ""
+"\n"
+"Gako publikoa: "
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Gaia: %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Ezin da spool-karpeta prozesatu"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "_Ziurtagiri-IDa:"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Huts egin du ziurtagiriak egiaztatzean."
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Ez dago informaziorik"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "eranskina"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "_Ziurtagiri-IDa:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Curitiba"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "Ipar Carolina"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Adierazpena"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s - %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Sinadura-fitxategia:"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "_Txertatu"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Gaia: %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Sinadura-fitxategia:"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Idatzi %s(r)en pasahitza"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "_Ziurtagiri-IDa:"
 
 #: tools/evolution-launch-composer.c:324
 #, fuzzy
@@ -15259,7 +16442,7 @@ msgstr "Kopiatu hautapena"
 msgid "Copy to Folder..."
 msgstr "Kopiatu karpeta honetan..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Ebaki hautapena"
 
@@ -15275,7 +16458,7 @@ msgstr "Eraman kontaktua(k) beste karpeta batera..."
 msgid "Move to Folder..."
 msgstr "Eraman karpeta honetara..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Itsatsi arbela"
 
@@ -15283,8 +16466,8 @@ msgstr "Itsatsi arbela"
 msgid "Previews the contacts to be printed"
 msgstr "Inprimatuko diren kontaktuen aurrebista eskaintzen du"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "_Inprimatzeko aurrebista"
@@ -15329,13 +16512,13 @@ msgstr "Utzi kargatzeari"
 msgid "View the current contact"
 msgstr "Ikusi uneko kontaktua"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "_Ekintzak"
 
@@ -15365,145 +16548,114 @@ msgstr "Bidali _mezua kontaktuari..."
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "Sortu hitzordu berria"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Sortu hitzordu berria"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "Sortu karpeta berria"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Sortu _bilera berria"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Sortu zeregin berria"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Eguna"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 #, fuzzy
 msgid "Delete All Occurrences"
 msgstr "Ezabatu agerraldi _guztiak"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Ezabatu hitzordu hau"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "Ezabatu _agerraldi hau"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "Ezabatu _agerraldi hau"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Joan"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Joan atzera"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Joan aurrera"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Joan _data jakin batera"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Joan data jakin batera"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "_Joan gaurko egunera"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "List"
 msgstr "Lista"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "_Hilabetea"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Hitz_ordu berria"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Kaledonia berria"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Bilera berria"
-
-#: ui/evolution-calendar.xml.h:27
-msgid "New _Task"
-msgstr "_Zeregin berria"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Inprimatuko den egutegiaren aurrebista eskaintzen du"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Inprimatu egutegi hau"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Argitaratu egutegi honen libre/okupatuta informazioa"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Bourges"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Hitzorduak eta gertaerak dituen karpeta"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Erakutsi xehetasunak"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Erakutsi egun bat"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Erakutsi hilabete bat"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Erakutsi aste bat"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Erakutsi lan-astea"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Astea"
 
@@ -15568,7 +16720,7 @@ msgstr "Gorde elementu hau diskoan"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "Fi_txategia"
 
@@ -15794,7 +16946,7 @@ msgstr "_Markatu denak irakurritako gisa"
 msgid "Mark all visible messages as read"
 msgstr "Markatu ikusgai dauden mezu guztiak irakurritako gisa"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Paste message(s) from the clipboard"
 msgstr "Itsatsi arbeleko mezua"
@@ -15851,16 +17003,6 @@ msgstr "_Alderantzikatu hautapena"
 msgid "_Threaded Message List"
 msgstr "_Hariko mezuen zerrenda"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Itxi leiho hau"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "_Itxi"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Addressbook"
@@ -16022,268 +17164,293 @@ msgstr "Birbidali hautatutako mezua norbaiti eranskin gisa"
 msgid "Increase the text size"
 msgstr "Handitu testuaren tamaina"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Kargatu iru_diak"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Markatu ga_rrantzitsu gisa"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Markatu i_rakurri gabeko gisa"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Markatu ez-garran_tzitsu gisa"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "Markatu hautatutako mezua(k) irakurritako gisa"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "Markatu hautatutako mezua(k) garrantzitsu gisa"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Markatu hautatutako mezua(k) ez-garrantzitsu gisa"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Markatu hautatutako mezua(k) irakurri gabeko gisa"
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Markatu hautatutako mezua(k) irakurri gabeko gisa"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Markatu hautatutako mezua(k) ez-garrantzitsu gisa"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Markatu hautatutako mezuak ezabatzeko"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Eraman"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "Eraman hautatutako mezua(k) beste karpeta batera"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Hurrengoa"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Next _Important Message"
 msgstr "Hurrengo mezu garrantzitsua"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Next _Thread"
 msgstr "Hurrengo haria"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "Next _Unread Message"
 msgstr "Hurrengo irakurri gabeko mezua"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Ez da aurkitu"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Ireki hautatutako mezua leiho berri batean"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Ireki hautatutako mezua mezu-prestatzailean, berriro bidaltzeko"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Jatorrizko ta_maina"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "P_revious Unread Message"
 msgstr "Irakurri gabeko aurreko mezua"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Zereginaren erantzuna"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "Karpeta guztietan begiratu mezurik dagoen"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Aurreko mezu garrantzitsua"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Inprimatuko den mezuaren aurrebista eskaintzen du"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Aurrekoa"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Inprimatu mezu hau"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "Birbi_deratu"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Birbideratu (errebotatu) hautatutako mezua norbaiti"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Testua jatorrizko tamainan berrezartzen du"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "Bi_latu mezuan..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "T_xikiagoa"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Gorde mezua testu-fitxategi gisa"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Bilatu testua bistaratutako mezuaren gorputzean"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "Set up the page settings for your current printer"
 msgstr "Konfiguratu orrialde-ezarpenak uneko inprimagailuarentzat"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Erakutsi posta-itur_burua"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Erakutsi _goiburuko osoak"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Bilatu testua bistaratutako mezuaren gorputzean"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Erakutsi mezua estilo normalean"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Erakutsi mezua posta-goiburuko guztiekin"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Erakutsi mezu-iturburua formatu gabe"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "Testu-tamai_na"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Desezabatu hautatutako mezuak"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "_Posta-zerrendaren araberako karpeta birtuala..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "_Bidaltzailearen araberako karpeta birtuala..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "_Hartzailearen araberako karpeta birtuala..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "_Gaiaren araberako karpeta birtuala..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "_Erantsita"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "_Kopiatu karpetan"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "_Sortu iragazkia mezutik"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "_Birbidali mezua"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 #, fuzzy
 msgid "_Go To"
 msgstr "Joan"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "_Barnean"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "_Handiagoa"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "_Mezu-bistaratzea"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Eraman karpetara"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 #, fuzzy
 msgid "_Next Message"
 msgstr "Hurrengo mezua"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "_Bistaratze normala"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "_Ireki mezua"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Aurreko mezua"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "_Aipamen gisa"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 #, fuzzy
 msgid "_Resend..."
 msgstr "I_zena aldatu..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "_Tresnak"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "_Desezabatu"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Itxi leiho hau"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "_Itxi"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Erantsi"
@@ -16568,12 +17735,13 @@ msgid "Change Evolution's settings"
 msgstr "Evolution "
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "Irte_n"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Sortu _bilera berria"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "Evolution _leihoa"
+msgid "E_xit"
+msgstr "Irte_n"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16585,8 +17753,8 @@ msgstr "Inportatu datuak beste programa batzuetatik"
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "Evolution _leihoa"
+msgid "Open a new window"
+msgstr "Ireki leiho berrian"
 
 #: ui/evolution.xml.h:11
 #, fuzzy
@@ -16594,54 +17762,68 @@ msgid "Pi_lot Settings..."
 msgstr "_Pilot-en ezarpenak..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Bidali / Jaso"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "Bidali ilarako mezuak eta hartu mezu berriak"
+
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Posta-konfigurazioa"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Erakutsi Ximian Evolution-i buruzko informazioa"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Bidali programa-erroreen berri-ematea"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "_Bidali akatsen berri-ematea"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Eman programa-erroreen berri Bug Buddy erabiliz"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Txandakatu"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Gaitu/desgaitu lineaz kanpo lanean aritzea."
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "Xiimian Evolution-i buruzko MEGak (FAQ)"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "Ximian E_volution-i buruz..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "_Laguntza"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "_Inportatu..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "Berr_ia"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Bidali / Jaso"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "Bilatu orain"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Inprimatu laburpena"
@@ -16783,12 +17965,12 @@ msgstr "Definitu ikuspegiak"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "AAAOOLI"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%Y %B"
 
@@ -16925,7 +18107,7 @@ msgstr "_Bilatu"
 msgid "_Find Now"
 msgstr "Bilatu orain"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 #, fuzzy
 msgid "_Clear"
 msgstr "Garbitu"
@@ -16943,24 +18125,261 @@ msgstr ""
 msgid "Text"
 msgstr "Proba"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Garbitu"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Bilatu orain"
 
+#~ msgid "Account Name"
+#~ msgstr "Kontuaren izena"
+
+#~ msgid "Server Name"
+#~ msgstr "Zerbitzari-izena"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Bertan behera utzi uneko posta-eragiketa"
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "(SSL ez da onartzen Evolution-en bertsio honetan)"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Beste kontaktu batzuk"
+
+#, fuzzy
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Evolution-en helbide-liburuko izen-hautaketako interfazea."
+
+#, fuzzy
+#~ msgid "Add LDAP Server"
+#~ msgstr "LDAP zerbitzaria"
+
+#, fuzzy
+#~ msgid "LDAP Configuration Assistant"
+#~ msgstr "Konfigurazioa"
+
+#, fuzzy
+#~ msgid "Find contact in"
+#~ msgstr "bidaltzaileak hau dauka"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Egin klik hemen kontaktua gehitzeko *"
+
+#~ msgid "Business Address"
+#~ msgstr "Laneko helbidea"
+
+#~ msgid "Department"
+#~ msgstr "Saila"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "Libre-okupatuta URLa"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Lanbidea"
+
+#~ msgid "TTY"
+#~ msgstr "Teletipoa"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "%s - zereginak irekitzen"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Hala ere bidali nahi duzu?"
+
+#, fuzzy
+#~ msgid "Folder _name"
+#~ msgstr "Karpeta-izena:"
+
+#~ 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."
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Deitura"
+#~ msgid "No signature present"
+#~ msgstr "HTML sinaduraren fitxategia:"
 
-#~ msgid "Family Name"
-#~ msgstr "Deitura"
+#, fuzzy
+#~ msgid "Connecting..."
+#~ msgstr "Zerbitzariarekin konektatzen..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Karpeta honek ezin du mezurik eduki."
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Ezin izan da karpetaren izena aldatu: %s"
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Aukeratu datu hauek inportatzeko helburu-karpeta"
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ezin izan da karpeta transferitu:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Add a Folder"
+#~ msgstr "Bidalitakoen karpeta gisa"
+
+#~ msgid "Drafts"
+#~ msgstr "Zirriborroak"
+
+#~ msgid "Outbox"
+#~ msgstr "Irteerako ontzia"
+
+#~ msgid "Sent"
+#~ msgstr "Bidalita"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Errorea '%s' saiatu denean:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Syncing Folder"
+#~ msgstr "Karpeta sinkronizatzen"
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Ez dago karpetarik bistaratuta)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(bat ere ez)"
+
+#~ msgid "No error"
+#~ msgstr "Errorerik ez"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Badago lehendik izen hori duen karpeta bat"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Adierazitako karpeta-mota ez da baliozkoa"
+
+#~ msgid "I/O error"
+#~ msgstr "S/Iko errorea"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Ez dago karpeta sortzeko behar adina leku"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Karpeta ez dago hutsik"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Adierazitako karpeta ez da aurkitu"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Funtzioa ez dago inplementatuta biltegiratze honetan"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Eragiketa ez da onartzen"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Adierazitako mota ez da onartzen biltegiratze honetan"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Adierazitako karpeta ezin da aldatu edo kendu"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "Karpeta bat ezin da bere azpikoen ume bihurtu."
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Ezin da izen horretako karpetarik sortu"
+
+#, fuzzy
+#~ msgid "Checkbox"
+#~ msgstr "Chico"
+
+#~ msgid "CORBA error"
+#~ msgstr "CORBA errorea"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Argumentu baliogabea"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Badu jabea"
+
+#~ msgid "No owner"
+#~ msgstr "Jaberik ez"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Onartzen ez den mota"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Onartzen ez den eskema"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Onartzen ez den eragiketa"
+
+#~ msgid "Internal error"
+#~ msgstr "Barne-errorea"
+
+#~ msgid "Exists"
+#~ msgstr "Badago"
+
+#~ msgid "Invalid URI"
+#~ msgstr "URI baliogabea"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Azpikarpetak ditu"
+
+#~ msgid "No space left"
+#~ msgstr "Ez dago lekurik"
+
+#~ msgid "Old owner has died"
+#~ msgstr "Jabe zaharra hil egin da"
+
+#~ msgid "Test type"
+#~ msgstr "Proba-mota:"
+
+#, fuzzy
+#~ msgid "Evolution Test Component"
+#~ msgstr "Evolution-en mezu-prestatzailea."
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "Inportatu"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Sortu hitzordu berria"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Hitz_ordu berria"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Bilera berria"
+
+#~ msgid "New _Task"
+#~ msgstr "_Zeregin berria"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "Evolution _leihoa"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "Evolution _leihoa"
+
+#~ msgid "Toggle"
+#~ msgstr "Txandakatu"
+
+#~ msgid "Clear"
+#~ msgstr "Garbitu"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Bertan behera utzi uneko posta-eragiketa"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -17055,9 +18474,6 @@ msgstr "Bilatu orain"
 #~ msgid "Evolution VCard importer"
 #~ msgstr "Evolution-en mezu-prestatzailea."
 
-#~ msgid "Loading..."
-#~ msgstr "Kargatzen..."
-
 #~ msgid "Searching..."
 #~ msgstr "Bilatzen..."
 
@@ -17113,10 +18529,6 @@ msgstr "Bilatu orain"
 #~ msgstr "EBook ez dago kargatuta\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "Txartelaren ID hori badago lehendik"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Eragiketa bertan behera utzi da"
 
@@ -17333,10 +18745,6 @@ msgstr "Bilatu orain"
 #~ msgstr "%x"
 
 #, fuzzy
-#~ msgid "Phone"
-#~ msgstr "Ponce"
-
-#, fuzzy
 #~ msgid "Birth date"
 #~ msgstr "Jaioteguna"
 
@@ -17349,10 +18757,6 @@ msgstr "Bilatu orain"
 #~ msgstr "Amritsar"
 
 #, fuzzy
-#~ msgid "ID"
-#~ msgstr "jn."
-
-#, fuzzy
 #~ msgid "Last Use"
 #~ msgstr "Itsatsi"
 
@@ -17366,9 +18770,6 @@ msgstr "Bilatu orain"
 #~ msgid "Folder containing contact information"
 #~ msgstr "Kontaktuen informazioa duen karpeta"
 
-#~ msgid "LDAP Server"
-#~ msgstr "LDAP zerbitzaria"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "Kontaktuen informazioa duen LDAP zerbitzaria"
 
@@ -17380,20 +18781,6 @@ msgstr "Bilatu orain"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Kontaktuen informazioa duen karpeta"
 
-#~ msgid "_Contact"
-#~ msgstr "_Kontaktua"
-
-#, fuzzy
-#~ msgid "Create a new contact"
-#~ msgstr "Sortu kontaktu berria"
-
-#~ msgid "New Contact List"
-#~ msgstr "Kontaktuen zerrenda berria"
-
-#, fuzzy
-#~ msgid "Create a new contact list"
-#~ msgstr "Sortu kontaktu-zerrenda berria"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "Karpeta-arakatzaileak bistaratuko duen URIa"
 
@@ -17411,9 +18798,6 @@ msgstr "Bilatu orain"
 #~ msgid "Is New Card"
 #~ msgstr "Berria"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "Teletipoa"
-
 #~ msgid "No cards"
 #~ msgstr "Txartelik ez"
 
@@ -17463,36 +18847,6 @@ msgstr "Bilatu orain"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "Egiteko elementuak dauzkan karpeta"
 
-#~ msgid "New appointment"
-#~ msgstr "Hitzordu berria"
-
-#~ msgid "_Appointment"
-#~ msgstr "_Hitzordua"
-
-#~ msgid "New meeting"
-#~ msgstr "Bilera berria"
-
-#, fuzzy
-#~ msgid "M_eeting"
-#~ msgstr "Bilera"
-
-#~ msgid "Create a new meeting request"
-#~ msgstr "Sortu bilera-eskaera berria."
-
-#~ msgid "New task"
-#~ msgstr "Zeregin berria"
-
-#~ msgid "_Task"
-#~ msgstr "_Zeregina"
-
-#, fuzzy
-#~ msgid "New All Day Appointment"
-#~ msgstr "Hitzordu berria"
-
-#, fuzzy
-#~ msgid "All _Day Appointment"
-#~ msgstr "_Hitzordua"
-
 #, fuzzy
 #~ msgid "Could not update invalid object"
 #~ msgstr "Ezin izan da objektua eguneratu!"
@@ -17538,10 +18892,6 @@ msgstr "Bilatu orain"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "%s - egutegia irekitzen"
 
-#, fuzzy
-#~ msgid "Opening default tasks folder"
-#~ msgstr "%s karpeta irekitzen"
-
 #~ msgid "Evaluation of the search expression did not yield a boolean value"
 #~ msgstr "Bilaketa-adierazpenaren ebaluazioak ez du balio boolearrik eman"
 
@@ -17581,10 +18931,6 @@ msgstr "Bilatu orain"
 #~ "Evolution-ek GnomeCard fitxategiak aurkitu ditu.\n"
 #~ "Evolution-era inportatu nahi dituzu?"
 
-#, fuzzy
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Posta konfiguratzeko interfazea"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "Posta duen karpeta"
 
@@ -17602,25 +18948,12 @@ msgstr "Bilatu orain"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Zakarrontzi birtualaren karpeta"
 
-#~ msgid "Properties..."
-#~ msgstr "Propietateak..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Aldatu karpeta honen propietateak"
 
 #~ msgid "You have not set a mail transport method"
 #~ msgstr "Ez duzu ezarri posta garraiatzeko metodorik"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Posta-mezu berria"
-
-#~ msgid "_Mail Message"
-#~ msgstr "_Posta-mezua"
-
-#, fuzzy
-#~ msgid "Compose a new mail message"
-#~ msgstr "Prestatu mezua"
-
 #, fuzzy
 #~ msgid "New Message Post"
 #~ msgstr "Mezu berria"
@@ -19447,9 +20780,6 @@ msgstr "Bilatu orain"
 #~ msgid "Cumberland"
 #~ msgstr "Cumberland"
 
-#~ msgid "Curitiba"
-#~ msgstr "Curitiba"
-
 #~ msgid "Curitiba Apt"
 #~ msgstr "Curitiba Apt"
 
@@ -22443,9 +23773,6 @@ msgstr "Bilatu orain"
 #~ msgid "North Bend"
 #~ msgstr "North Bend"
 
-#~ msgid "North Carolina"
-#~ msgstr "Ipar Carolina"
-
 #~ msgid "North Conway"
 #~ msgstr "North Conway"
 
@@ -24057,9 +25384,6 @@ msgstr "Bilatu orain"
 #~ msgid "State College"
 #~ msgstr "State College"
 
-#~ msgid "Stauning"
-#~ msgstr "Stauning"
-
 #~ msgid "Staunton"
 #~ msgstr "Staunton"
 
@@ -24649,9 +25973,6 @@ msgstr "Bilatu orain"
 #~ msgid "United Arab Emirates "
 #~ msgstr "Arabiar Emirerri Batuak "
 
-#~ msgid "Unst"
-#~ msgstr "Unst"
-
 #~ msgid "Upington"
 #~ msgstr "Upington"
 
@@ -24760,12 +26081,6 @@ msgstr "Bilatu orain"
 #~ msgid "Veracruz"
 #~ msgstr "Veracruz"
 
-#~ msgid "Vermillion"
-#~ msgstr "Vermillion"
-
-#~ msgid "Vermont"
-#~ msgstr "Vermont"
-
 #~ msgid "Vernal"
 #~ msgstr "Vernal"
 
@@ -25300,9 +26615,6 @@ msgstr "Bilatu orain"
 #~ msgid " F"
 #~ msgstr " °F"
 
-#~ msgid " C"
-#~ msgstr " °C"
-
 #~ msgid "knots"
 #~ msgstr "korapilo"
 
@@ -25921,9 +27233,6 @@ msgstr "Bilatu orain"
 #~ msgid "Freezing haze"
 #~ msgstr "Gandu izoztua"
 
-#~ msgid "Spray"
-#~ msgstr "Zipriztinak"
-
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Zipriztinak inguruan"
 
@@ -26296,19 +27605,6 @@ msgstr "Bilatu orain"
 #~ msgid "Remove a folder added with \"Open Other User's Folder\""
 #~ msgstr "Sortu _karpeta berria...."
 
-#~ msgid "Send / Receive"
-#~ msgstr "Bidali / Jaso"
-
-#, fuzzy
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Bidali ilarako mezuak eta hartu mezu berriak"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Erakutsi/ezkutatu karpeta-barra "
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Erakutsi/ezkutatu lasterbide-barra "
-
 #~ msgid "View the selected folder"
 #~ msgstr "Bistaratu hautatutako karpeta"
 
@@ -26338,9 +27634,6 @@ msgstr "Bilatu orain"
 #~ msgid "_Rename..."
 #~ msgstr "I_zena aldatu..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Bidali / Jaso"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "La_sterbide-barra"
 
@@ -26389,10 +27682,6 @@ msgstr "Bilatu orain"
 #~ msgstr "Egutegi-hobespenak"
 
 #, fuzzy
-#~ msgid "Automatically _detect links"
-#~ msgstr "_Automatikoki begiratu mezu berririk"
-
-#, fuzzy
 #~ msgid "Emacs"
 #~ msgstr "Ekialdea"
 
@@ -26495,18 +27784,10 @@ msgstr "Bilatu orain"
 #~ msgstr "Mostrako helbide-liburuaren kontrolerako fabrika"
 
 #, fuzzy
-#~ msgid "380"
-#~ msgstr "389"
-
-#, fuzzy
 #~ msgid "<- _Remove"
 #~ msgstr "_Kendu"
 
 #, fuzzy
-#~ msgid "<< Fewer Options"
-#~ msgstr "Aukerak"
-
-#, fuzzy
 #~ msgid "DN Customization"
 #~ msgstr "Ez dago informaziorik"
 
@@ -27158,13 +28439,6 @@ msgstr "Bilatu orain"
 #~ msgid "_Delete this Appointment"
 #~ msgstr "Ezabatu _hitzordu hau"
 
-#~ msgid ""
-#~ "Issuer: %s\n"
-#~ "Subject: %s"
-#~ msgstr ""
-#~ "Jaulkitzailea: %s\n"
-#~ "Gaia: %s"
-
 #~ msgid "SASL Protocol error"
 #~ msgstr "SASL protokolo-errorea"
 
@@ -27198,10 +28472,6 @@ msgstr "Bilatu orain"
 #~ "karpeta birtuala irekitzen den orduarekin\n"
 #~ "konparatuko da."
 
-#, fuzzy
-#~ msgid "Command"
-#~ msgstr "Enpresakoa"
-
 #~ msgid "Are you sure you want to delete this news account?"
 #~ msgstr "Ziur zaude kontu berri hau ezabatu nahi duzula?"
 
@@ -27215,9 +28485,6 @@ msgstr "Bilatu orain"
 #~ msgid "News Servers"
 #~ msgstr "Be_rri-iturriak"
 
-#~ msgid "Source Information"
-#~ msgstr "Iturburu-informazioa"
-
 #~ msgid "newswindow1"
 #~ msgstr "newswindow1"
 
@@ -27244,9 +28511,6 @@ msgstr "Bilatu orain"
 #~ msgid "You may only import to local folders"
 #~ msgstr "Fitxategi lokaletara bakarrik inporta dezakezu"
 
-#~ msgid "_Contact List"
-#~ msgstr "_Kontaktuen zerrenda"
-
 #~ msgid "Inline Text _File..."
 #~ msgstr "Bar_neko testu-fitxategia..."
 
@@ -27262,17 +28526,10 @@ msgstr "Bilatu orain"
 #~ msgid "Send _later"
 #~ msgstr "Bidali _geroago"
 
-#~ msgid "Send the message later"
-#~ msgstr "Bidali mezua geroago"
-
 #~ msgid "_Pilot Settings..."
 #~ msgstr "_Pilot-en ezarpenak..."
 
 #, fuzzy
-#~ msgid "Addressbook Settings"
-#~ msgstr "Helbide-liburuaren iturburuak"
-
-#, fuzzy
 #~ msgid "Could not query for schema information"
 #~ msgstr ""
 #~ "Aztarna opakoaren informazio baliogabea:\n"
@@ -27510,9 +28767,6 @@ msgstr "Bilatu orain"
 #~ msgid "Show contacts matching the following criteria:"
 #~ msgstr "Erakutsi irizpide hauekin bat datozen kontaktuak:"
 
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "Sortu hitzordu berria _oroigarri lehenetsiarekin"
-
 #~ msgid "First day of wee_k:"
 #~ msgstr "Asteko _lehenengo eguna:"
 
@@ -27684,9 +28938,6 @@ msgstr "Bilatu orain"
 #~ msgid "Composer"
 #~ msgstr "Mezu-prestatzailea"
 
-#~ msgid "Default Forward style is: "
-#~ msgstr "Birbidaltzeko estilo lehenetsia: "
-
 #~ msgid "Display"
 #~ msgstr "Bistaratzea"
 
@@ -27702,15 +28953,9 @@ msgstr "Bilatu orain"
 #~ msgid "Sources"
 #~ msgstr "Iturburuak"
 
-#~ msgid "_Log filter actions to:"
-#~ msgstr "_Iragazki-ekintzen egunkaria:"
-
 #~ msgid "_Organization:"
 #~ msgstr "E_rakundea:"
 
-#~ msgid "_Send mail in HTML format by default."
-#~ msgstr "_Bidali mezuak HTML formatuan lehenespen gisa."
-
 #~ msgid "_Server type: "
 #~ msgstr "_Zerbitzari-mota: "
 
@@ -28025,13 +29270,6 @@ msgstr "Bilatu orain"
 #~ "\n"
 #~ "Kate bakarra: "
 
-#~ msgid ""
-#~ "\n"
-#~ "Public Key: "
-#~ msgstr ""
-#~ "\n"
-#~ "Gako publikoa: "
-
 #~ msgid "New _Contact"
 #~ msgstr "Kontaktu _berria:"
 
@@ -28365,9 +29603,6 @@ msgstr "Bilatu orain"
 #~ msgid "VIP"
 #~ msgstr "VIP"
 
-#~ msgid "%d/%m/%Y"
-#~ msgstr "%Y/%m/%d"
-
 #~ msgid "%Y/%m/%d"
 #~ msgstr "%Y/%m/%d"
 
@@ -28398,9 +29633,6 @@ msgstr "Bilatu orain"
 #~ msgid "No GPG/PGP program configured."
 #~ msgstr "GPG/PGP programarik ez dago konfiguratuta."
 
-#~ msgid "Encrypted message"
-#~ msgstr "Enkriptatutako mezua"
-
 #~ msgid "Click icon to decrypt."
 #~ msgstr "Egin klik ikonoan desenkriptatzeko."
 
diff --git a/po/fi.po b/po/fi.po
index eb778861f9..500e5b25c4 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-04-06 20:59+0300\n"
 "Last-Translator: Sami Pesonen <sampeson@iki.fi>\n"
 "Language-Team: Gnome Finnish Translation Team <laatu@gnome-fi.org>\n"
@@ -30,66 +30,199 @@ msgstr "Osoitekirjaa ei voitu avata"
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Kansioden automaattinen täydennys"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Certificates"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Configure autocomple here"
+msgstr ""
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Yhteystiedot"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Tallenna osoitekirjaan"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook card viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook folder viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Osoitekirja"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Ominaisuudet..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Poista"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "Nimeä uudelleen"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Uusi yhteystieto:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Yhteystieto"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "Luo uusi yhteystieto"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Uusi yhteystietoluettelo"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "Uusi yhteystietoluettelo"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "Luo uusi yhteystietoluettelo"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr ""
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+#, fuzzy
+msgid "Work"
+msgstr "Työviikk_o"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "LDAP-palvelin"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Hakemistoa %s ei voitu luoda: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr "Yhdistäminen palvelimeen epäonnistui."
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr "Yhdistäminen palvelimeen epäonnistui."
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Tilin nimi"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Palvelimen nimi"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Muut yhteystiedot"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is unreachable."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -97,7 +230,7 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -108,47 +241,46 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Osoitekirjaa ei voitu avata"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr "Yhdistäminen palvelimeen epäonnistui."
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 #, fuzzy
 msgid "Name begins with"
 msgstr "loppuu merkkijonoon"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 #, fuzzy
 msgid "Email begins with"
 msgstr "loppuu merkkijonoon"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Mikä tahansa kenttä sisältää"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Edistyneet..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -156,7 +288,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -164,88 +296,41 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "URI jonka kalenteri näyttää"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Certificates"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
 msgstr ""
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Yhteystiedot"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Tallenna osoitekirjaan"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook folder viewer"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -268,6 +353,7 @@ msgstr " Tar_kista tuetut kannat "
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -301,8 +387,9 @@ msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "Lisää LDAP-palvelin"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "Palvelimen asetukset"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -319,59 +406,58 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 #, fuzzy
 msgid "Connecting"
 msgstr "Hakuasetukset"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Edit LDAP Server"
 msgstr "LDAP-palvelin"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address:"
 msgstr "Sähköpostiosoite:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Finished"
 msgstr "Etsi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Yleiset"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
-msgid "LDAP Configuration Assistant"
-msgstr "Palvelimen asetukset"
+msgid "Group:"
+msgstr "Ryhmän nimi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Never"
 msgstr "Joka"
@@ -396,8 +482,8 @@ msgid "S_earch scope: "
 msgstr "_Etsi viestiä"
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 #, fuzzy
 msgid "Searching"
 msgstr "Etsitään..."
@@ -443,27 +529,28 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:47
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-#, fuzzy
-msgid "Step 1: Server Information"
-msgstr "Lähteen tiedot"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
-msgid "Step 2: Connecting to Server"
-msgstr "Yhdistetään LDAP-palvelimeen..."
+msgid "Step 2: Server Information"
+msgstr "Lähteen tiedot"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr ""
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Yhdistetään LDAP-palvelimeen..."
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr ""
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Yhdistetään LDAP-palvelimeen..."
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -475,14 +562,6 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -490,7 +569,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -498,7 +577,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -508,37 +587,36 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 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:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 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:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -547,6 +625,14 @@ msgid ""
 msgstr ""
 "Tätä nimeä käytetään tilisi tunnistamiseksi. Se on vain sinua itseäsi varten"
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Tätä nimeä käytetään tilisi tunnistamiseksi. Se on vain sinua itseäsi varten"
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -573,22 +659,30 @@ msgid "Using email address"
 msgstr "_Tämä on postitusosoite"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Päivä"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -596,60 +690,58 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Portti:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 #, fuzzy
 msgid "_Search base:"
 msgstr "_Etsi"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "Palvelimen _nimi: "
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid "cards"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Hakuasetukset"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid "general-tab"
 msgstr "Yleiset"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "searching-tab"
 msgstr "Etsitään..."
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Nimi"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Poista kaikki"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Poista"
@@ -678,23 +770,21 @@ msgstr "Lisää yhteystietoihin"
 msgid "Unnamed Contact"
 msgstr "Nimetön yhteystieto"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Nimi"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Lähde"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "Etsi yhteystieto"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr ""
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
 msgid "Find"
@@ -774,7 +864,8 @@ msgid "D_epartment:"
 msgstr "_Osasto:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Yksityiskohtaiset"
 
@@ -845,12 +936,12 @@ msgid "_Categories..."
 msgstr "Ry_hmät..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Poista"
@@ -1987,7 +2078,7 @@ msgid "Esq."
 msgstr ""
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Koko nimi"
 
@@ -2082,11 +2173,25 @@ msgstr "Yhteystiedonhallinta"
 msgid "Save List as VCard"
 msgstr ""
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Muutettu yhteystieto:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr ""
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr ""
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Uusi yhteystieto:"
@@ -2101,20 +2206,6 @@ msgid ""
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Muutettu yhteystieto:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr ""
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2219,9 +2310,9 @@ msgstr ""
 msgid "Send Message to Contact"
 msgstr "Lähetä viesti yhteystiedolle"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Tulosta"
@@ -2245,9 +2336,12 @@ msgstr "_Siirrä kansioon..."
 msgid "Cut"
 msgstr "Leikkaa"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopioi"
 
@@ -2256,16 +2350,8 @@ msgstr "Kopioi"
 msgid "Paste"
 msgstr "Liitä"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Poista"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 #, fuzzy
 msgid "Current View"
 msgstr "_Nykyinen näkymä"
@@ -2279,166 +2365,169 @@ msgid ""
 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:2
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Työ/faksi"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Työpuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Työpuhelin 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Autopuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Ryhmät"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Yrityksen puhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Osasto"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "Sähköposti"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "Sähköposti 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "Sähköposti 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Sukunimi"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Kotiosoite"
+#, fuzzy
+msgid "Given Name"
+msgstr "Sukunimi"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Koti/faksi"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Kotipuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Kotipuhelin 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Määrittelemätön"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Jordania"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Asema"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Muu osoite"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Muu faksi"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Muu puhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Ensisijainen puhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Ammatti"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Rooli"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Puoliso"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+msgid "TTYTDD"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Nähty"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr ""
 
@@ -2529,11 +2618,19 @@ msgstr "Jäsenet"
 msgid "Job Title"
 msgstr "_Tehtävänimike:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Kotiosoite"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Kotiosoite"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Muu osoite"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2546,169 +2643,166 @@ msgstr "Koti/faksi"
 msgid "Blog"
 msgstr "Borger"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Uusi yhteystieto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Contact ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Peruutettu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "Todennus epäonnistui"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "Todennus vaaditaan"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "Osoitekirjaa ei ole olemassa"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Muu virhe"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Haluatko tallentaa muutokset?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 #, fuzzy
 msgid "_Discard"
 msgstr "Tulosta kortti"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Virhe kortin lisäämisessä"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Virhe muutettaessa korttia"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Virhe kortin poistossa"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, fuzzy
 msgid "Overwrite"
 msgstr "Kirjoita tiedoston yli?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, fuzzy, c-format
 msgid "Error saving %s: %s"
 msgstr "Virhe tallennettaessa tiedostoa: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -2904,7 +2998,7 @@ msgstr "Reunukset"
 msgid "Number of columns:"
 msgstr "Sarakkeiden määrä:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Asetukset"
 
@@ -3094,18 +3188,18 @@ msgstr "Nimetön kontaktiluettelo"
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -3114,27 +3208,90 @@ msgstr ""
 msgid "Default Priority:"
 msgstr "_Prioriteetti:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Kalenteri ja tehtävät"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Kalenteri"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Kalenteri ja tehtävät"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolutionin tilimuokkain"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Tehtävät"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 #, fuzzy
 msgid "Starting:"
 msgstr "Asetukset"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 #, fuzzy
 msgid "Ending:"
 msgstr "Varjostus"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr ""
@@ -3200,125 +3357,282 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Älä kysy tätä enää uudelleen"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr ""
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Bonobon alustus ei onnistunut"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs:n alustus ei onnistunut"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "epäkelpo aika"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "Kalenteri"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+msgid "Color of tasks that are due today"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+msgid "Color of tasks that are overdue"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "Näytä tapaamisten loppumisajat"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Esikatselee tulostettavaa kalenteria"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Poista valitut tehtävät"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Näytä viikkonumerot"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Yhteenveto sisältää"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Kuvaus sisältää"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Kommentti sisältää"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
 "events."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "on pienempi kuin"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "päivää"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Tulosta tämä kalenteri"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Uusi Kaledonia"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
 #, fuzzy
-msgid "Rename"
-msgstr "Nimeä uudelleen"
+msgid "New appointment"
+msgstr "Uusi tapaaminen"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:633
+#, fuzzy
+msgid "_Appointment"
+msgstr "Tapaaminen"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr ""
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Luo uusi tapaaminen"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
+#: calendar/gui/calendar-component.c:639
 #, fuzzy
-msgid "Work"
-msgstr "Työviikk_o"
+msgid "New meeting"
+msgstr "Peruuta tapaaminen"
+
+#: calendar/gui/calendar-component.c:640
+#, fuzzy
+msgid "M_eeting"
+msgstr "Peruuta tapaaminen"
+
+#: calendar/gui/calendar-component.c:641
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Luo uusi tehtävä"
+
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Uusi tapaaminen"
+
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr "Koko _päivän tapaaminen"
+
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Luo uusi tapaaminen"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3448,7 +3762,7 @@ msgstr "Lähetä"
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr ""
 
@@ -3465,6 +3779,10 @@ msgstr "tuntia"
 msgid "minutes"
 msgstr "minuutti"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3500,8 +3818,8 @@ msgstr "Lähetä sähköpostia"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Kuvaus:"
 
@@ -3531,7 +3849,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr "tunti(a)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minuutti"
 
@@ -3586,7 +3904,7 @@ msgstr "päivää"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Perjantai"
 
@@ -3602,7 +3920,7 @@ msgstr "minuutti"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Maanantai"
 
@@ -3613,7 +3931,7 @@ msgstr "Su"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Lauantai"
 
@@ -3628,7 +3946,7 @@ msgstr "Näytä viikkonumerot"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Sunnuntai"
 
@@ -3648,7 +3966,7 @@ msgstr "Tehtävät"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Torstai"
 
@@ -3669,7 +3987,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Tiistai"
 
@@ -3679,12 +3997,12 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 #, fuzzy
 msgid "Work Week"
 msgstr "Työviikk_o"
@@ -3728,7 +4046,7 @@ msgid "_Fri"
 msgstr "Pe"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_General"
 msgstr "Yleiset"
@@ -3776,76 +4094,76 @@ msgstr "Ke"
 msgid "before every appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Haluatko varmasti peruuttaa ja poistaa tämän tapaamisen?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Haluatko todella peruuttaa ja poistaa tämän tehtävän?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Haluatko varmasti peruuttaa ja poistaa tämän päiväkirjamerkinnän?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
@@ -3855,163 +4173,168 @@ msgstr ""
 msgid "Validation error: %s"
 msgstr "Tuntematon virhe: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Valmis "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 #, fuzzy
 msgid "Completed "
 msgstr "Valmis"
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 #, fuzzy
 msgid "Could not update object"
 msgstr "Tiedostojen päivitys ei onnistunut"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Muokkaa tapaamista"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tapaaminen - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Tehtävä - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Ei kuvausta"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Valitse aika johon verrataan"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Haluatko todella poistaa tapaamisen '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Haluatko todella poistaa tämän nimettömän tapaamisen?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Haluatko todella poistaa tehtävän '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Haluatko todella poistaa tämän nimettömän tehtävän?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Haluatko todella poistaa %d tapaamiset?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Haluatko todella poistaa %d tehtävää?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Haluatko varmasti poistaa %d päiväkirjamerkintää?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 msgid "The journal entry could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr ""
 
@@ -4029,46 +4352,46 @@ msgstr "Poistettu"
 msgid "Enter Delegate"
 msgstr "Poistettu"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Tapaaminen"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Muistutus"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 #, fuzzy
 msgid "Scheduling"
 msgstr "Varjostus"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 #, fuzzy
 msgid "Meeting"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 #, fuzzy
 msgid "Start time is wrong"
 msgstr "_Alkamisaika:"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr ""
 
@@ -4143,31 +4466,31 @@ msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Määrittelemätön"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Poista..."
@@ -4212,21 +4535,15 @@ msgid "Member"
 msgstr "Joulukuu"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Rooli"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Tila"
@@ -4247,6 +4564,7 @@ msgid "_Invite Others..."
 msgstr ""
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4279,6 +4597,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Hakemistoa %s ei voitu luoda: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "Ei palvelinta valittuna"
@@ -4308,32 +4627,57 @@ msgstr "Kalenteritiedot"
 msgid "Calendar Name"
 msgstr "Kalenteri"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Hakemistoa %s ei voitu luoda: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Kalenteritiedot"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Tehtävät"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Tehtävät"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Tehtävät"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 msgid "This and Prior Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr "Kaikki tahot"
 
@@ -4385,10 +4729,15 @@ msgstr "päivä"
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr ""
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Päiväys & Aika"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "_Lisää"
@@ -4454,7 +4803,7 @@ msgstr "viikkoa"
 msgid "year(s)"
 msgstr "vuotta"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 #, fuzzy
 msgid ""
 "This event has been changed, but has not been saved.\n"
@@ -4465,32 +4814,32 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 #, fuzzy
 msgid "Save Event"
 msgstr "Kalenteritapahtumat"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "Valmis"
@@ -4501,43 +4850,43 @@ msgid "% _Complete"
 msgstr "% Valmis"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Korkea"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Matala"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Tavallinen"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr ""
 
@@ -4546,7 +4895,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Määrittelemätön"
 
@@ -4568,21 +4917,21 @@ msgstr "_Tila:"
 msgid "_Web Page:"
 msgstr "_Kotisivun osoite:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Tapaaminen"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4591,9 +4940,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "Luottamuksellinen"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Kuvaus:"
 
@@ -4698,26 +5047,21 @@ msgstr ""
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Julkinen"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Henkilökohtainen"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Ryhmät"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4730,30 +5074,28 @@ msgid "Start Date"
 msgstr ""
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Kuvaus"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " "
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Tapaaminen"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 #, fuzzy
 msgid "Free"
 msgstr "Pe"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr ""
 
@@ -4765,7 +5107,7 @@ msgstr "P"
 msgid "S"
 msgstr "E"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "I"
 
@@ -4773,14 +5115,14 @@ msgstr "I"
 msgid "W"
 msgstr "L"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4788,7 +5130,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Kyllä"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4796,17 +5138,17 @@ msgstr "Ei"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Tuntematon"
 
@@ -4818,189 +5160,187 @@ msgstr ""
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Poista valitut kontaktit"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Uusi koko pä_ivän tapahtuma"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 #, fuzzy
 msgid "New Meeting"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Uusi tehtävä"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "T_ulosta..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "L_iitä"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "Siirry _päivään..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-#, fuzzy
-msgid "_Settings..."
-msgstr "_Sähköpostiasetukset..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Avaa"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Tallenna _nimellä..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Kopioi"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Varjostus"
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "_Välitä iCalendar-muodossa..."
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+#, fuzzy
+msgid "_Settings..."
+msgstr "_Sähköpostiasetukset..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Avaa viesti"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "_Välitä iCalendar-muodossa"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Poista tehtävä"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
@@ -5014,8 +5354,8 @@ msgstr "% Valmis"
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Valmis"
 
@@ -5044,18 +5384,18 @@ msgid "URL"
 msgstr "URL:"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5074,7 +5414,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5087,141 +5427,141 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
 msgid "Every day"
 msgstr "Joka"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, fuzzy, c-format
 msgid "Every %d days"
 msgstr " %d päivää"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 #, fuzzy
 msgid "Every week"
 msgstr "Joka"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, fuzzy, c-format
 msgid "Every %d weeks"
 msgstr " %d viikkoa"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, fuzzy, c-format
 msgid "Every %d weeks on "
 msgstr " %d viikkoa"
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 #, fuzzy
 msgid "every month"
 msgstr "Yksi kuukausi"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 #, fuzzy
 msgid "Every year"
 msgstr "Joka"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Loppuu:</b> "
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>Valmis:</b> "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "Pakolliset tiedot"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Kalenteri"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Tuntematon henkilö"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 #, fuzzy
 msgid "Location:"
 msgstr ""
@@ -5229,337 +5569,336 @@ msgstr ""
 "Maant. sijainti: "
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 #, fuzzy
 msgid "Status:"
 msgstr "_Tila:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Hyväksytty"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 #, fuzzy
 msgid "Declined"
 msgstr "Poistettu"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Valitse toiminto"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Päivitä"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Hyväksy"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 #, fuzzy
 msgid "Decline"
 msgstr "Poistettu"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Lähteen tiedot"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Tiedoksi"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> on julkaissut tapaamistietonsa."
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Valinnaiset tiedot"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> pyytää %s läsnäoloa tapaamisessa."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1270
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1275
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> toivoo saavansa viimeisimmät tapaamistiedot."
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1280
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> on vastannut tapaamispyyntöön."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1288
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> on peruuttanut tapaamisen."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Valitse toiminto"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Huono tapaaminen-sanoma"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> on julkaissut tehtävätietonsa."
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
 #, fuzzy
 msgid "Task Information"
 msgstr "Tiedoksi"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> pyytää %s tekemään työtehtävän."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
 #, fuzzy
 msgid "Task Proposal"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1342
 #, fuzzy
 msgid "Task Update"
 msgstr "Tehtävät"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> toivoo saavansa viimeisimmät työtehtävätiedot."
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1347
 #, fuzzy
 msgid "Task Update Request"
 msgstr "Tehtävät"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> on vastannut työtehtävän antoon."
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1355
 #, fuzzy
 msgid "Task Reply"
 msgstr "Vastaa"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Peruuta operaatio"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Huono tehtävä-sanoma"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> on julkaissut vapaa/kiireinen-tietonsa."
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1391
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Lähteen tiedot"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> pyytää sinun vapaa/varattu -tietoja."
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1396
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "Edellinen viesti"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> on vastannut vapaa/varattu -kyselyyn."
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1401
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Edellinen viesti"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Huono vapaa/kiireinen -viesti"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenteritiedostoa ei voitu päivittää!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Valmis"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Bug buddya ei voitu ajaa."
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 #, 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:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "Osallistujan tilan päivitys epäonnistui!\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 #, fuzzy
 msgid "Removal Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Lähetetty"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -5729,7 +6068,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -5793,100 +6132,86 @@ msgstr ""
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "_Alkamispäivä:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "Päiväys:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "_Prioriteetti:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Sivu"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, 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:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "Virhe %s:n käynnistyksessä"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Poista valitut kontaktit"
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Tehtävät"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Kalenteri"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Lisätään hälytyksiä %s varten"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5894,7 +6219,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5902,62 +6227,11 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Turkkilainen"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalenteri ja tehtävät"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Kalenteri"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Kalenteri ja tehtävät"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolutionin tilimuokkain"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Huhtikuu"
@@ -6014,304 +6288,341 @@ msgstr "Lokakuu"
 msgid "September"
 msgstr "Syyskuu"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 #, fuzzy
 msgid "Event information"
 msgstr "Valinnaiset tiedot"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 #, fuzzy
 msgid "Task information"
 msgstr "Tiedoksi"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 #, fuzzy
 msgid "Journal information"
 msgstr "Valinnaiset tiedot"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Lähteen tiedot"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Kalenteritiedot"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 #, fuzzy
 msgid "Updated"
 msgstr "Tehtävät"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 #, fuzzy
 msgid "Refresh"
 msgstr "vuotta"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Lähteen tiedot"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 #, fuzzy
 msgid "iCalendar information"
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Su"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Ma"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Ti"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Ke"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "To"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Pe"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "La"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 #, fuzzy
 msgid "Task"
 msgstr "_Tehtävä"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, fuzzy, c-format
 msgid "Status: %s"
 msgstr "_Tila:"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "_Prioriteetti:"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, fuzzy, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Ryhmät: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Yhteystiedot: "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Tulostuksen esikatselu"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Tulosta kohta"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Tulostusasetukset"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Nimeä tämä oikotie uudelleen"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Tehtävät"
+
+#: calendar/gui/tasks-component.c:590
+#, fuzzy
+msgid "New task"
+msgstr "Uusi tehtävä"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Tehtävä"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Luo uusi tehtävä"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6319,12 +6630,12 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Älä kysy tätä enää uudelleen"
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Tulosta kortti"
@@ -6355,16 +6666,16 @@ msgstr ""
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Muistutus"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "Kalenteritapahtumat"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6373,7 +6684,7 @@ msgstr ""
 "Evolution löysi Pinen sähköpostitiedostoja.\n"
 "Haluatko tuoda nämä Evolutioniin?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Kalenteri"
@@ -7915,27 +8226,27 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr ""
 
@@ -7981,87 +8292,87 @@ msgstr "Poistetaan kansiota %s"
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Viestin salauksen purkaminen epäonnistui."
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Viestin salauksen purkaminen epäonnistui."
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Hakemistoa %s ei voitu luoda: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Virhe jäsennettäessä suodatinta: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Haetaan viestiä %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Viestiä ei voida avata"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Virhe viestin %d kohdalla"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Haetaan viestiä %d / %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Virhe viestin %d/%d kohdalla"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Viestin salauksen purkaminen epäonnistui."
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -8089,37 +8400,37 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 #, fuzzy
 msgid "Moving messages"
 msgstr "Lähetetään viestiä"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 #, fuzzy
 msgid "Copying messages"
 msgstr "Lähetetään viestiä"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Haetaan %d viesti(ä)"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8127,47 +8438,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Peruutettu."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Odottamaton vastaus POP-palvelimelta: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 #, fuzzy
 msgid "No data provided"
 msgstr "Vastaanottajia ei ole määritelty"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 #, 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:1114
+#: camel/camel-gpg-context.c:1121
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8175,51 +8486,65 @@ msgid ""
 "%s"
 msgstr "Viestin salauksen purkaminen epäonnistui."
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Viestin salauksen purkaminen epäonnistui."
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Hakemistoa %s ei voitu uudelleennimetä seuraavaksi: %s: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Viestin salauksen purkaminen epäonnistui."
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Viestin salauksen purkaminen epäonnistui."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr ""
+"Viestin allekirjoitusta ei voida varmentaa: väliaikaistiedostoa ei voitu "
+"luoda: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Viestin allekirjoitusta ei voida varmentaa: väliaikaistiedostoa ei voitu "
 "luoda: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Hakemistoa %s ei voitu luoda: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "sisältää"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Viestin salauksen purkaminen epäonnistui."
@@ -8318,15 +8643,15 @@ msgstr "Virhe kirjoitettaessa väliaikaista viestitiedostoa: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Virhe kopioitaessa viestin väliaikaistiedostoa: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 #, fuzzy
 msgid "parse error"
 msgstr "Muu virhe"
@@ -8631,12 +8956,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8645,70 +8970,81 @@ msgstr ""
 "Hakemistoa %s ei voitu luoda:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr ""
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Määrittelemätön"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Lisää ehto"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Lisää ehto"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 msgid "Signing certificate not found"
 msgstr ""
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 msgid "Signing certificate not trusted"
 msgstr ""
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Tallenna allekirjoitus"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Muu virhe"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Palvelintyyppi: "
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "Kansion hakeminen ei onnistu: virheellinen toiminto tässä tallennuspaikassa"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kansion luominen ei onnistu: virheellinen tapahtuma tallennuspaikassa"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Roskakori"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "Kesäkuu"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr ""
@@ -8895,7 +9231,7 @@ msgid ""
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL:n `%s' jäsentäminen epäonnistui"
@@ -8915,22 +9251,22 @@ msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 "Viestien kopioiminen tai siirtäminen ei onnistu virtuaalisiin kansioihin"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kansion poistaminen ei onnistu: %s: Virheellinen tapahtuma"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kansion poistaminen ei onnistu: %s: Kansiota ei ole"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kansion nimeäminen ei onnistu: %s: virheellinen toiminto"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kansion nimeäminen ei onnistu: %s: kansiota ei löydy"
@@ -9010,7 +9346,7 @@ msgstr "Viestin salauksen purkaminen epäonnistui."
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9022,7 +9358,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr ""
@@ -9060,55 +9396,70 @@ msgid "Failed to cache %s: %s"
 msgstr "Viestin salauksen purkaminen epäonnistui."
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Yhdistetään LDAP-palvelimeen..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Yhdistäminen palvelimeen epäonnistui."
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "Yritys"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Tarkastetaan onko uutta sähköpostia"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 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:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Kansiot"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "T_arkasta onko uutta postia joka"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 #, fuzzy
 msgid "IMAP"
 msgstr "IMAPv4"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Salasana"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Ota yhteys IMAP-palvelimeen tekstimuotoista salasanaa käyttäen."
@@ -9353,7 +9704,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Hakemistoa %s ei voitu uudelleennimetä seuraavaksi: %s: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr ""
@@ -9471,29 +9822,29 @@ msgstr "Etsitään uusia viestejä"
 msgid "Storing folder"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9502,11 +9853,11 @@ msgstr ""
 "Viestin %s hakeminen kansiosta %s epäonnistui\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -9568,12 +9919,19 @@ msgstr "Hakemistoa %s ei voitu luoda: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr ""
+"Saman niminen tiedosto on jo olemassa.\n"
+"Kirjoitetaanko sen yli?"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Hakemistoa %s ei voitu uudelleennimetä seuraavaksi: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Vastaanottajia ei ole määritelty"
@@ -9621,7 +9979,7 @@ msgstr ""
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
@@ -9906,7 +10264,7 @@ msgstr "Poista %s:n päivän kuluttua"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -9986,7 +10344,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10039,7 +10397,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10202,7 +10560,7 @@ msgstr ""
 msgid "Cannot send message: sender address not valid."
 msgstr "Viestiä ei voida lähettää: lähettäjän osoite on epäkelpo."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Lähetetään viestiä"
 
@@ -10324,7 +10682,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "liite"
 
@@ -10369,12 +10727,12 @@ msgstr "MIME-tyyppi:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr "Sinun tulee luoda tili ennen kuin voit lähettää tätä viestiä."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr ""
 
@@ -10385,45 +10743,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Vastausosoite:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Lähettäjä:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Aihe:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Vastaanottaja:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Kopiot:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 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:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Piilokopiot:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10434,16 +10792,21 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "_Portti:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 #, fuzzy
 msgid "Posting destination"
 msgstr "Kuvaus:"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Lisää viestiin liitetiedoston"
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Liitä tiedosto(t)"
@@ -10477,42 +10840,42 @@ msgstr "Tiedosto on jo olemassa, kirjoitetaanko yli?"
 msgid "Error saving file: %s"
 msgstr "Virhe tallennettaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Virhe avattaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10521,7 +10884,7 @@ msgstr ""
 "Virhe tallennettaessa tiedostoa automaattisesti: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10529,7 +10892,7 @@ msgstr ""
 "Ximian Evolution on löytänyt tallentamattomia tiedostoja edelliseltä \n"
 "istunnolta. Haluatko koettaa niiden palauttamista?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10540,35 +10903,35 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Varoitus: Muutettu viesti"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Avaa tiedosto"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 #, fuzzy
 msgid "Signature:"
 msgstr "Tallenna allekirjoitus"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Kirjoita viesti"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10579,7 +10942,7 @@ msgstr ""
 "Viestimuokkain -ikkunan luominen epäonnistui:\n"
 "HTML-muokkainkomponentin käynnistys ei onnistunut."
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10587,19 +10950,22 @@ msgstr ""
 "Viestimuokkain -ikkunan luominen epäonnistui:\n"
 "HTML-muokkainkomponentin käynnistys ei onnistunut."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr ""
+"Kiitos\n"
+"The Evolution Team\n"
 
 #: data/evolution.desktop.in.in.h:2
 #, fuzzy
-msgid "Ximian Evolution"
+msgid "Ximian Evolution (Unstable)"
 msgstr "Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10845,13 +11211,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -10974,7 +11340,7 @@ msgstr "Sitten"
 msgid "You must specify a folder."
 msgstr "Tyylin nimi:"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr ""
@@ -10986,26 +11352,26 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 #, fuzzy
 msgid "Later"
 msgstr "jälkeen"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr ""
 
@@ -11101,7 +11467,7 @@ msgstr ""
 msgid "months"
 msgstr "kuukautta"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "sekuntia"
 
@@ -11198,7 +11564,7 @@ msgstr ""
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr ""
 
@@ -11271,120 +11637,126 @@ msgid "Source Account"
 msgstr ""
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Lauantai"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Aihe"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "Yhdysvallat"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "sisältää"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "ei sisällä"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "ei lopu merkkijonoon"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "ei ole olemassa"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 #, fuzzy
 msgid "does not return"
 msgstr "ei ole olemassa"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "ei ala merkkijonolla"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "loppuu merkkijonoon"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 #, fuzzy
 msgid "is after"
 msgstr "jälkeen"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "is before"
 msgstr "ennen"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "on suurempi kuin"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "on pienempi kuin"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 #, fuzzy
 msgid "is not Flagged"
 msgstr "ei ole"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "ei ole"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "on"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 #, fuzzy
 msgid "returns greater than"
 msgstr "on suurempi kuin"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 #, fuzzy
 msgid "returns less than"
 msgstr "on pienempi kuin"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 #, fuzzy
 msgid "returns"
 msgstr "Burundi"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "alkaa merkkijonolla"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
@@ -11410,18 +11782,82 @@ msgstr "Säännön nimi: "
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Muuta tämän vKansion nimeä"
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 msgid "VFolder source"
 msgstr "vKansion lähde"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolutionin tilimuokkain"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail folder viewer"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Tilit"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr ""
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Haluatko varmasti poistaa tämän tilin?"
@@ -11464,7 +11900,7 @@ msgid "Protocol"
 msgstr ""
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 #, fuzzy
 msgid "Unnamed"
 msgstr "Nimetön kontakti"
@@ -11491,19 +11927,15 @@ msgstr "Lisää allekirjoituskomentotiedosto"
 msgid "Signature(s)"
 msgstr "_HTML-allekirjoitus:"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 
-#: mail/em-composer-utils.c:129
-#, fuzzy
-msgid "Send anyway?"
-msgstr "Lähetä sähköpostia"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11511,29 +11943,29 @@ msgstr ""
 "Viestillä ei ole aihetta.\n"
 "Lähetetäänkö toedella?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 "Sinuun tulee määritellä vastaanottajat ennen tämän viestin lähettämistä."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11544,196 +11976,411 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "_Luo viestistä suodatin"
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr ""
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" kohteessa \"%s\""
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Luo _uusi kansio"
+
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr ""
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
-msgid "Folder _name"
+msgid "Folder _name:"
 msgstr "Kansion nimi:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Väliaikaishakemistoa ei voitu luoda: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Väliaikaishakemistoa ei voitu luoda: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Väliaikaishakemistoa ei voitu luoda: %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Väliaikaishakemistoa %s ei voitu synkronoida: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Ladataan..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Valitse kansio"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Luo uusi kansio"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Kansion `%s' poistaminen epäonnistui: %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Kansion hakeminen ei onnistu: %s: %s"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, fuzzy, c-format
+msgid "Delete \"%s\""
+msgstr "Poista"
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, fuzzy, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Nimeä kansio '%s' uudelleen"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+#, fuzzy
+msgid "Rename Folder"
+msgstr "Nimeä kansio '%s' uudelleen"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Ominaisuudet"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Ominaisuudet"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "Kansion nimi:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Näytä"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Avaa uudessa ikkunassa"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Siirrä"
+
+#: mail/em-folder-tree.c:1500
+#, fuzzy
+msgid "_New Folder..."
+msgstr "_Uusi kansio"
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+#, fuzzy
+msgid "_Rename"
+msgstr "Nimeä uudelleen"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "_Ominaisuudet..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "Tulosta viesti..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "_Välitä"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Valmis"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Kalenteri"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Merkitse luke_mattomaksi"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Merkitse tärkeäks_i"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Merkitse tärkeäks_i"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Merkitse luke_mattomaksi"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Merkitse tärkeäks_i"
+
+#: mail/em-folder-view.c:706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Palauta"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Siirrä kansioon..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "Lisää lähettäjä _osoitekirjaan"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "Toteuta _suodattimet"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "_Luo viestistä sääntö"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "vKansion lähde"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Suodata a_iheen mukaan"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Suodata _lähettäjän mukaan"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Suodata _postituslistan mukaan"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Suodata _lähettäjän mukaan"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default"
 msgstr "_Oletukset"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopioi linkin sijainti"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Osumia:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Määrittelemätön"
+
+#: mail/em-format-html-display.c:597
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr ""
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Lisää ehto"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Lisää ehto"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Määrittelemätön"
+
+#: mail/em-format-html-display.c:606
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "PGP-salaus"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Viestin lähettäminen epäonnistui: %s"
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Tar_kista tuetut tavat"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Tuntematon virhe: %s"
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Työskentele linjoilla"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Piilota"
@@ -11743,210 +12390,233 @@ msgstr "Piilota"
 msgid "Page %d of %d"
 msgstr "Haetaan viestiä %d / %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Haetaan viestiä %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-
-#: mail/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-msgid "No signature present"
-msgstr ""
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Bonobon alustus ei onnistunut"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Tar_kista tuetut tavat"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Lähetetään viestiä"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Lähettäjä"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Vastausosoite:"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Vastaanottaja"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Kopiot:"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Piilokopiot"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 #, fuzzy
 msgid "Mailer"
 msgstr "_Matkapuhelin"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Päiväys"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Viestin lähettäminen epäonnistui: %s"
+msgid "Session not initialised"
+msgstr "Bonobon alustus ei onnistunut"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/em-format.c:1212
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Odotetaan..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
 
-#: mail/em-popup.c:593
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Lähetetään \"%s\""
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Viestin salauksen purkaminen epäonnistui."
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Viestin salauksen purkaminen epäonnistui."
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Viestin salauksen purkaminen epäonnistui."
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Tallenna nimellä..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Avaa linkki selaimessa"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Lähetä _viesti yhteystiedolle..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Lisää lähettäjä osoitekirjaan"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Tilaa"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Kansio"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Valitse palvelin."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Ei palvelinta valittuna"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Älä näytä tätä viestiä uudelleen."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Suodattimet"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Välitetty viesti"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Tuntematon virhe"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr ""
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -11955,7 +12625,7 @@ msgstr ""
 "Tallentaminen ei onnistu \"%s\"\n"
 "%s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -11964,124 +12634,407 @@ msgstr ""
 "Saman niminen tiedosto on jo olemassa.\n"
 "Kirjoitetaanko sen yli?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Viesti"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Tallenna viesti nimellä..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Osoite"
+
+#: mail/em-utils.c:2262
 #, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Väliaikaishakemistoa ei voitu luoda: %s"
+msgid ""
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2288
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
+#: mail/evolution-mail.schemas.in.in.h:1
+#, fuzzy
+msgid "Automatic link recognition"
+msgstr "_Havaitse linkit automaattisesti"
+
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "_Havaitse linkit automaattisesti"
+
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
+#: mail/evolution-mail.schemas.in.in.h:6
+msgid "Default charset in which to compose messages"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/evolution-mail.schemas.in.in.h:7
+msgid "Default charset in which to compose messages."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
+msgid "Default charset in which to display messages"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:9
+msgid "Default charset in which to display messages."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
+msgid "Default forward style"
+msgstr "_Välitä tyyli:"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolutionin tilimuokkain"
+msgid "Default reply style"
+msgstr "Vastaa kaikille"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
 #, fuzzy
-msgid "Evolution Mail component"
-msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
+msgid "Empty Trash folders on exit"
+msgstr "Tyhj_ennä roskakorit lopetettaessa"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Tyhj_ennä roskakorit lopetettaessa"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Height of the message-list pane"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
 #, fuzzy
-msgid "Mail Accounts"
+msgid "List of accounts"
 msgstr "Tilit"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: mail/importers/elm-importer.c:105
-msgid "Evolution is importing your old Elm mail"
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
 msgstr ""
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
-msgid "Importing..."
-msgstr "Tuodaan..."
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
-msgid "Please wait"
-msgstr "Odota, ole hyvä"
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
 msgstr ""
 
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "Suorita toiminnot"
+
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/importers/elm-importer.c:547
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "New Mail Notify sound file"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
+msgid "New Mail Notify type"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
-"Evolution löysi Elmin sähköpostitiedostoja.\n"
-"Haluatko tuoda nämä Evolutioniin?"
 
-#: mail/importers/elm-importer.c:568
-msgid "Elm"
-msgstr "Elm"
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "Viestiä ei voida lähettää: vastaanottajia ei ole määritelty."
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "Lähetä HTML-postia?"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "Lähetä HTML-postia?"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "Näytä"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "Näytä"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Näytä viesti normaalimuodossa"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "_Esikatseluruutu:"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+msgid "Sound file to play when new mail arrives."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+msgid "Spell check inline"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "Alkuperäinen yhteystieto:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+msgid "The variable width font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Säikeistetty viesti-ikkuna"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Säikeistetty viesti-ikkuna"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "Tee tästä _oletustilini"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+msgid "Variable width font"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 #, fuzzy
@@ -12115,6 +13068,44 @@ msgstr ""
 msgid "Evolution Pine importer"
 msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
 
+#: mail/importers/elm-importer.c:105
+msgid "Evolution is importing your old Elm mail"
+msgstr ""
+
+#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
+#: mail/importers/pine-importer.c:115
+msgid "Importing..."
+msgstr "Tuodaan..."
+
+#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
+#: mail/importers/pine-importer.c:117
+msgid "Please wait"
+msgstr "Odota, ole hyvä"
+
+#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
+#: mail/importers/pine-importer.c:288
+#, c-format
+msgid "Importing %s as %s"
+msgstr ""
+
+#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
+#: mail/importers/pine-importer.c:425
+#, c-format
+msgid "Scanning %s"
+msgstr ""
+
+#: mail/importers/elm-importer.c:547
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution löysi Elmin sähköpostitiedostoja.\n"
+"Haluatko tuoda nämä Evolutioniin?"
+
+#: mail/importers/elm-importer.c:568
+msgid "Elm"
+msgstr "Elm"
+
 #: mail/importers/netscape-importer.c:75
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
@@ -12156,12 +13147,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Roskakori"
-
 #: mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
@@ -12171,7 +13156,7 @@ msgstr "Paikallinen viestitiedosto %s"
 msgid "Scanning directory"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr ""
 
@@ -12246,24 +13231,24 @@ msgid "You have not filled in all of the required information."
 msgstr "Et ole täyttänyt kaikkia tarvittavia kohtia."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolutionin tilimuokkain"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Isäntäpalvelin:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "Käyttäjät_unnus:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Polku:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -12272,35 +13257,35 @@ msgstr ""
 msgid "Mail to %s"
 msgstr "Suodattimet"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Aihe on %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, fuzzy, c-format
 msgid "Mail from %s"
 msgstr "Lähettäjä:"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s postilista"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Vastaa _listalle"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Lisää suodatussääntö"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12308,148 +13293,33 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:194
-#, fuzzy
-msgid "Connecting..."
-msgstr "Peruutetaan..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Tämä kansio ei voi sisältää viestejä."
-
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr ""
-"Tiedoston %s poistaminen epäonnistui:\n"
-"%s"
-
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Väliaikaishakemistoa ei voitu luoda: %s"
-
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Väliaikaishakemistoa ei voitu luoda: %s"
-
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Väliaikaishakemistoa %s ei voitu synkronoida: %s"
-
-#: mail/mail-component.c:1014
-#, c-format
-msgid ""
-"The following error occured while migrating your mail data:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-component.c:1632
+#: mail/mail-component.c:379
 #, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Valitse aika johon verrataan"
-
-#: mail/mail-component.c:1643
-msgid "Select destination to move folder into"
-msgstr ""
+msgid "New Mail Message"
+msgstr "Seuraava viesti"
 
-#: mail/mail-component.c:1707
+#: mail/mail-component.c:380
 #, fuzzy
-msgid "Create folder"
-msgstr "Luo uusi kansio"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr ""
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Kansion `%s' poistaminen epäonnistui: %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Kansion hakeminen ei onnistu: %s: %s"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, fuzzy, c-format
-msgid "Delete \"%s\""
-msgstr "Poista"
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, fuzzy, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Nimeä kansio '%s' uudelleen"
+msgid "_Mail Message"
+msgstr "Seuraava viesti"
 
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
+#: mail/mail-component.c:381
 #, fuzzy
-msgid "Rename Folder"
-msgstr "Nimeä kansio '%s' uudelleen"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr ""
+msgid "Compose a new mail message"
+msgstr "Kirjoita viesti"
 
-#: mail/mail-component.c:1860
+#: mail/mail-component.c:472
 #, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
+msgid ""
+"The following error occured while migrating your mail data:\n"
+"%s"
 msgstr ""
 
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Ominaisuudet"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Ominaisuudet"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "Kansion nimi:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Näytä"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Avaa uudessa ikkunassa"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Siirrä"
-
-#: mail/mail-component.c:2087
-#, fuzzy
-msgid "_New Folder..."
-msgstr "_Uusi kansio"
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-#, fuzzy
-msgid "_Rename"
-msgstr "Nimeä uudelleen"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Ominaisuudet..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr ""
 
@@ -12499,11 +13369,11 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr ""
 
@@ -12584,29 +13454,38 @@ msgid "C_olors"
 msgstr "_Värit"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Tarkastetaan onko uutta sähköpostia"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "Tarkastetaan onko uutta sähköpostia"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Kirjoita viesti"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 #, fuzzy
 msgid "Configuration"
 msgstr "Palvelimen asetukset"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12616,529 +13495,547 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "_Oletukset"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default Behavior"
 msgstr "_Oletukset"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Tuleva posti"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Viestiä ei voida avata"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Valmis"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Luonnoskansio:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "Kä_ytä"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Sähköposti sisältää"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email _address:"
 msgstr "Sähköpostiosoite:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "Tyhj_ennä roskakorit lopetettaessa"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Yhteystietoluettelo"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Evolutionin tilimuokkain"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Suorita toiminnot"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "loppuu merkkijonoon"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "<< Vähemmän vaihtoehtoja"
+
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Font Properties"
 msgstr "Ominaisuudet"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Välitetyt viestit"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Korosta lainaukset värillä"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Nimikkeet ja värit"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Loading Images"
 msgstr "Lataa k_uvat"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Composer"
 msgstr "Viestin otsikko"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Message Display"
 msgstr "Viestit"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Fonts"
 msgstr "Viesti sisältää"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Valinnaiset tiedot"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_saatio:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Valitse väri"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Viestiä ei voida lähettää: vastaanottajia ei ole määritelty."
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Tulosta valitut kontaktit"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Quote original message"
 msgstr "Viestiä ei voida avata"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_member this password"
 msgstr "Muista tämä salasana"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Vastausosoite:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Otetaan vastaan sähköpostia"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Hakuasetukset"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Muista tämä salasana"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Pakolliset tiedot"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "_Oletukset"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Turvallisuus"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Lähetetään sähköpostia"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Lähetettyjen kansio:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Lähetetyt viestit ja luonnokset"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "P_alvelin vaati todennuksen"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Palvelimen asetukset"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Palvelintyyppi: "
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Si_gning certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Tyylin nimi:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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:121
+#: mail/mail-config.glade.h:124
 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:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_HTML-allekirjoitus:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Todennustapa:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Todennustapa:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "T_arkasta onko uutta postia joka"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "T_arkasta onko uutta postia joka"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML-allekirjoitus:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Defaults"
 msgstr "_Oletukset"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Enable"
 msgstr "Käytä"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "_Välitä tyyli:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Koko nimi:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Lähetä HTML-postia?"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Kesäkuu"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Tee tästä _oletustilini"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Merkitse viestit luetuiksi kun on kulunut"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Tuleva posti"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Vastaa kaikille"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Komentotiedosto:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Poista..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Lähtevä posti"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Näytä"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Signatures"
 msgstr "_HTML-allekirjoitus:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Standard Font:"
 msgstr "San Marino"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Terminal Font:"
 msgstr "Alkuperäinen yhteystieto:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Käytä salattua yhteyttä (_SSL)"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "description"
 msgstr "Kuvaus:"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Lähetetään \"%s\""
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr ""
 
@@ -13150,157 +14047,161 @@ msgstr ""
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Viestin tallentaminen väliaikaistiedostoon %s epäonnistui: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Viestin tallentaminen väliaikaistiedostoon %s epäonnistui: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Lähetetään \"%s\""
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Lähetetään viestiä %d / %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Valmis."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Välitetyt viestit"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Poistetaan kansiota %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Poistetaan kansiota %s"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Paikalliset kansiot"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Haetaan viestiä %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Haetaan %d viesti(ä)"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Tallennetaan %d viesti(ä)"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Tallennetaan liite"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Hakuasetukset"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Kirjainkoolla on merkitystä"
@@ -13317,62 +14218,77 @@ msgstr "Etsi:"
 msgid "Search"
 msgstr "Etsi"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Lisää ehto"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Poikkeukset"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Tilitiedot"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Peruutetaan..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Palvelintyyppi: "
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Tyyppi: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Lähetä & Vastaanota postia"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Peruuta kaikki"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Päivitetään..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 #, fuzzy
 msgid "Enter Password"
 msgstr "Salasana"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "_Muista tämä salasana"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -13413,26 +14329,31 @@ msgstr "_HTML-allekirjoitus:"
 msgid "Name:"
 msgstr "Nimi:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Välitetty viesti - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Välitetty viesti"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Poistetaan kansiota %s"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Asetetaan vKansiota: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Päivitetään vKansioita URI:lle: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13441,88 +14362,88 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "vKansiot"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "vKansiot"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Muokkaa vKansiota"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Nähty"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Näkemättä"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Vastattu"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Matalin"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Matalampi"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Korkein"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Tänään %l:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
@@ -13581,11 +14502,11 @@ msgstr "Välitä"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Vastaa"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Vastaa kaikille"
 
@@ -13642,43 +14563,140 @@ msgstr "Tilaa"
 msgid "_Unsubscribe"
 msgstr "Poista tilaus"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Evolution-kuori."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+#, fuzzy
+msgid "Folder Settings"
+msgstr "Asetukset"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "380"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Nimeä tämä oikotieryhmä uudelleen"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Määritä, näytetäänkö kansiopalkki"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Piilota oikotiepalkki"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "_Prioriteetti:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "_Prioriteetti:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
 msgstr ""
-"Kansion välittäminen ei onnistu:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Lisää kansio"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
 
-#: shell/e-local-storage.c:179
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 #, fuzzy
-msgid "Drafts"
-msgstr "Luonnos"
+msgid "Path to the default contacts folder"
+msgstr "Synkronoidaan kansiota"
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Saapuneet"
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Synkronoidaan kansiota"
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Lähtevät"
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Synkronoidaan kansiota"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
 
-#: shell/e-local-storage.c:182
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
 #, fuzzy
-msgid "Sent"
-msgstr "Näkemättä"
+msgid "Physical URI to the default tasks folder"
+msgstr "Synkronoidaan kansiota"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Määritä, näytetäänkö kansiopalkki"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Määritä, näytetäänkö oikotiepalkki"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "Sähköposti"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Tiedostojen päivitys ei onnistunut"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13689,14 +14707,14 @@ msgstr ""
 "%s\n"
 "Virhe: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13704,7 +14722,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13805,9 +14823,10 @@ msgstr ""
 "Kansion nimeäminen ei onnistu:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
+msgid "The specified folder name is not valid: %s"
 msgstr ""
 
 #: shell/e-shell-folder-commands.c:584
@@ -13830,20 +14849,15 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:318
-#, fuzzy
-msgid "Create New Folder"
-msgstr "Luo _uusi kansio"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Nimetön)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr ""
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13852,11 +14866,11 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13864,137 +14878,119 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 #, fuzzy
 msgid "Select importer"
 msgstr "Valitse kansio"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "Kansiota `%s' ei ole olemassa."
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Virhe %s:n käynnistyksessä"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Virhe %s:n lataamisessa"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Tiedostonimi:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Tiedoston tyyppi:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Tuo"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "Lähettäjä:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Tuo"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-offline-sync.c:163
-#, fuzzy, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr "Virhe %s:n käynnistyksessä"
-
-#: shell/e-shell-offline-sync.c:232
-#, fuzzy
-msgid "Syncing Folder"
-msgstr "Synkronoidaan kansiota"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr ""
-
 #: shell/e-shell-settings-dialog.c:346
 #, fuzzy
 msgid "Evolution Settings"
@@ -14034,7 +15030,7 @@ msgstr ""
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14043,17 +15039,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Evolutionin asennus"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Uusi"
-
 #: shell/e-shell-utils.c:116
 #, fuzzy
 msgid "No folder name specified."
@@ -14115,61 +15105,48 @@ msgstr "Luo uusi kontakti"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 #, fuzzy
 msgid "_Work Online"
 msgstr "Työskentele linjoilla"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Työskentele poissa linjoilta"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr ""
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr ""
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Ei nimeä)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Yleinen virhe"
 
@@ -14288,74 +15265,18 @@ msgstr "Poista"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Poista tämä oikotie oikotiepalkista"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Virhe tallennettaessa oikoteitä."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Saapuneet"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Oikotiet"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Ei virhettä"
-
-#: shell/e-storage.c:573
-msgid "A folder with the same name already exists"
-msgstr ""
-
-#: shell/e-storage.c:575
-msgid "The specified folder type is not valid"
-msgstr ""
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "I/O-virhe"
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr ""
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr ""
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr ""
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr ""
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr ""
-
-#: shell/e-storage.c:591
-msgid "The specified type is not supported in this storage"
-msgstr ""
-
-#: shell/e-storage.c:593
-msgid "The specified folder cannot be modified or removed"
-msgstr ""
-
-#: shell/e-storage.c:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr ""
-
-#: shell/e-storage.c:597
-msgid "Cannot create a folder with that name"
-msgstr "Kansion luominen tällä nimellä ei onnistu"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr ""
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr ""
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14366,6 +15287,17 @@ msgstr ""
 msgid "%s (%d%% complete)"
 msgstr ""
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Uusi"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "\"%s\" kohteessa \"%s\""
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14395,82 +15327,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "CORBA-virhe"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1195
-#, fuzzy
-msgid "No owner"
-msgstr "Määrittelemätön"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1199
-#, fuzzy
-msgid "Unsupported type"
-msgstr "Tar_kista tuetut tavat"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1205
-#, fuzzy
-msgid "Internal error"
-msgstr "I/O-virhe"
-
-#: shell/evolution-shell-component.c:1209
-#, fuzzy
-msgid "Exists"
-msgstr "_Poistu"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1215
-#, fuzzy
-msgid "Has subfolders"
-msgstr "Luonnoskansio:"
-
-#: shell/evolution-shell-component.c:1217
-#, fuzzy
-msgid "No space left"
-msgstr "Ei viestejä valittuna"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr ""
-
-#: shell/evolution-test-component.c:63
-#, fuzzy
-msgid "Test type"
-msgstr "Tiedoston tyyppi:"
-
-#: shell/evolution-test-component.c:703
-#, fuzzy
-msgid "Evolution Test Component"
-msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "Active Connections"
@@ -14502,11 +15358,6 @@ msgstr "_Matkapuhelin"
 msgid "_Tasks:"
 msgstr "Tehtävät"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-#, fuzzy
-msgid "Folder _name:"
-msgstr "Kansion nimi:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 #, fuzzy
 msgid "Folder _type:"
@@ -14570,24 +15421,6 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Evolution-kuori."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-#, fuzzy
-msgid "Folder Settings"
-msgstr "Asetukset"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -14627,7 +15460,7 @@ msgstr ""
 msgid "Importers"
 msgstr ""
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Tuo"
 
@@ -14643,17 +15476,17 @@ msgstr "Älä kysy tätä enää uudelleen"
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "Evolutionin aseukseni"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14673,7 +15506,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:289
+#: shell/main.c:294
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -14682,70 +15515,109 @@ msgstr ""
 "Kiitos\n"
 "The Evolution Team\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Älä kysy tätä enää uudelleen"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ximian Evolutionin kuoren alustus epäonnistui: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Aloita uudelta sivulta"
 
-#: shell/main.c:532
+#: shell/main.c:530
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Aloita uudelta sivulta"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Valitse kansio"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "Allekirjoitustiedosto:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "Sulje"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "_Poistu"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Sähköpostiosoite:"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr "Allekirjoitustiedosto:"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14798,87 +15670,364 @@ msgid "Backup All"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "Allekirjoitustiedosto:"
+
+#: smime/gui/smime-ui.glade.h:15
+msgid "Certificate Authority Trust"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "Allekirjoitustiedosto:"
+
+#: smime/gui/smime-ui.glade.h:17
 msgid "Common Name (CN)"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "_Yhteystietoluettelo"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "_Muokkaa"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 msgid "Email Signer Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 msgid "Expires On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Organisaatio"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Organisaatio"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Näytä"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "Allekirjoitustiedosto:"
+
+#: smime/gui/smime-ui.glade.h:42
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Tuo"
+msgid "Certificate already exists"
+msgstr "Allekirjoitustiedosto:"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "kuukausi"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "kuukausi"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "kuukausi"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "kuukausi"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr "Kopiot:"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "P"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "OK"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "P"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "Allekirjoitustiedosto:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "Allekirjoitustiedosto:"
+
+#: smime/lib/e-cert.c:618
+msgid "Certificate Authority Key Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "I"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Aihe on %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+msgid "Error: Unable to process extension"
+msgstr ""
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+msgid "SSL Certificate Authority"
+msgstr ""
+
+#: smime/lib/e-cert.c:781
+msgid "Email Certificate Authority"
+msgstr ""
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Asetukset"
+
+#: smime/lib/e-cert.c:813
+msgid "Non-repudiation"
+msgstr ""
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "liite"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "Allekirjoitustiedosto:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Kroatia"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "Kroatia"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Poikkeukset"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "\"%s\" kohteessa \"%s\""
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Allekirjoitustiedosto:"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "Li_sää"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Aihe on %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Allekirjoitustiedosto:"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+msgid "Enter password for PKCS12 file:"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "_Yhteystietoluettelo"
 
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
@@ -14933,7 +16082,7 @@ msgstr "Kopioi valinta"
 msgid "Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Leikkaa valinta"
 
@@ -14950,7 +16099,7 @@ msgstr "Siirrä yhteystiedot toiseen kansioon..."
 msgid "Move to Folder..."
 msgstr "_Siirrä kansioon..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Liitä leikepöytä"
 
@@ -14958,8 +16107,8 @@ msgstr "Liitä leikepöytä"
 msgid "Previews the contacts to be printed"
 msgstr "Esikatsele tulostettavia yhteystietoja"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Tulostuksen esikatselu"
@@ -15004,13 +16153,13 @@ msgstr "Pysäytä lataaminen"
 msgid "View the current contact"
 msgstr "Katsele nykyistä yhteystietoa"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "T_oiminnot"
 
@@ -15040,152 +16189,120 @@ msgstr "Lähetä _viesti yhteystiedolle..."
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "Luo uusi tapaaminen"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Luo uusi tapaaminen"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "Luo uusi kansio"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Luo uusi tehtävä"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Luo uusi tehtävä"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 #, fuzzy
 msgid "Day"
 msgstr "_Päivä"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 #, fuzzy
 msgid "Delete the appointment"
 msgstr "Poista tämä tapaaminen"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "Poista tämä kohta"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "Poista tämä kansio"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Siirry"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Mene eteenpäin"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 #, fuzzy
 msgid "Go to today"
 msgstr "Siirry tähän päivään"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "List"
 msgstr "Pakistan"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 #, fuzzy
 msgid "Month"
 msgstr "_Kuukausi"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Uusi t_apaaminen"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Uusi Kaledonia"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Peruuta tapaaminen"
-
-#: ui/evolution-calendar.xml.h:27
-#, fuzzy
-msgid "New _Task"
-msgstr "Uusi tehtävä"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Esikatselee tulostettavaa kalenteria"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 #, fuzzy
 msgid "Print this calendar"
 msgstr "Tulosta tämä kalenteri"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Bourges"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 msgid "Purge old appointments and meetings"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Näytä yksityiskohdat"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 #, fuzzy
 msgid "Show one day"
 msgstr "Näytä 1 päivä"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 #, fuzzy
 msgid "Show one month"
 msgstr "Näytä 1 kuukausi"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 #, fuzzy
 msgid "Show one week"
 msgstr "Näytä 1 viikko"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Näytä työviikko"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 #, fuzzy
 msgid "Week"
 msgstr "_Viikko"
@@ -15253,7 +16370,7 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Tiedosto"
 
@@ -15479,7 +16596,7 @@ msgstr "Merkitse ka_ikki luetuksi"
 msgid "Mark all visible messages as read"
 msgstr "Merkitse kaikki näkyvät viestit luetuiksi"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Paste message(s) from the clipboard"
 msgstr "Liitä viesti leikepöydälle"
@@ -15536,16 +16653,6 @@ msgstr "_Käännä valinta"
 msgid "_Threaded Message List"
 msgstr "Säikeis_tetty viesti-ikkuna"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Sulje tämä ikkuna"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "_Sulje"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "_Lisää lähettäjä osoitekirjaan"
@@ -15706,276 +16813,300 @@ msgstr ""
 msgid "Increase the text size"
 msgstr "Liitä tekstitiedosto..."
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Lataa k_uvat"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Merkitse _tärkeäksi"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Merkitse luke_mattomaksi"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark the selected message(s) as having been read"
 msgstr "Merkitse valitut viestit luetuiksi"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark the selected message(s) as important"
 msgstr "Merkitse valitut viestit tärkeiksi"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Merkitse valitut viestit tärkeiksi"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Merkitse valitut viestit lukemattomiksi"
+
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Merkitse valitut viestit lukemattomiksi"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Merkitse valitut viestit tärkeiksi"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Merkitse valitut viestit poistettaviksi"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Siirrä"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
 msgid "Move selected message(s) to another folder"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Seuraava"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Next _Important Message"
 msgstr "Seuraava tärkeä viesti"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Next _Thread"
 msgstr "Seuraava säie"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "Next _Unread Message"
 msgstr "Seuraava lukematon viesti"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+msgid "Not Junk"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Avaa valittu viesti uudessa ikkunassa"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Avaa valittu viesti muokkaimeen uudelleenlähettämistä varten"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "P_revious Unread Message"
 msgstr "Edellinen lukematon viesti"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Vastaa"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "Etsi uusia viestejä kaikista kansioista"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Edellinen tärkeä viesti"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 #, fuzzy
 msgid "Preview the message to be printed"
 msgstr "Esikatsele tulostettavaa viestiä"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Edellinen"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Tulosta tämä viesti"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Peruuta valittujen viestien poistaminen"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "_Etsi viestiä"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Tallenna viesti tiedostona"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "Set up the page settings for your current printer"
 msgstr "Muuta nykyisen tulostimesi sivuasetuksia"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Näytä täydet _otsikkotiedot"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Näytä viesti normaalimuodossa"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Peruuta valittujen viestien poistaminen"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "_Liitetty"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "_Luo viestistä suodatin"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "_Välitä viesti"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 #, fuzzy
 msgid "_Go To"
 msgstr "Siirry"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 #, fuzzy
 msgid "_Inline"
 msgstr "Työskentele linjoilla"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 #, fuzzy
 msgid "_Larger"
 msgstr "_Suuret kuvakkeet"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Siirrä kansioon"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 #, fuzzy
 msgid "_Next Message"
 msgstr "Seuraava viesti"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "_Avaa viesti"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Edellinen viesti"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 #, fuzzy
 msgid "_Resend..."
 msgstr "_Nimeä uudelleen..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "T_yökalut"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "_Palauta"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Sulje tämä ikkuna"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "_Sulje"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Liitä"
@@ -16263,12 +17394,13 @@ msgid "Change Evolution's settings"
 msgstr "Muuta Evolutionin asetuksia"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "_Poistu"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Luo uusi tehtävä"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr ""
+msgid "E_xit"
+msgstr "_Poistu"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16280,7 +17412,7 @@ msgstr ""
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
+msgid "Open a new window"
 msgstr "Avaa uudessa ikkunassa"
 
 #: ui/evolution.xml.h:11
@@ -16289,57 +17421,71 @@ msgid "Pi_lot Settings..."
 msgstr "_Sähköpostiasetukset..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Lähetä / Vastaanota"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "Lähetä jonossa olevat viestit ja hae uudet viestit"
+
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Palvelimen asetukset"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Lähetä virheraportti"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "Lähetä _virheraportti"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Lähetä virheraportti käyttäen Bug Buddy:a"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Määritä"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Määritä, työskennelläänkö poissa linjoilta."
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 #, fuzzy
 msgid "_About Ximian Evolution..."
 msgstr "_Tietoja Evolutionista..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "_Ohje"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 #, fuzzy
 msgid "_Import..."
 msgstr "_Siirry kansioon..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Uusi"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Lähetä / Vastaanota"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "Etsi nyt"
+
 #: ui/my-evolution.xml.h:2
 #, fuzzy
 msgid "Print Summary"
@@ -16482,12 +17628,12 @@ msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "MTKTPLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -16625,7 +17771,7 @@ msgstr "_Etsi"
 msgid "_Find Now"
 msgstr "Etsi nyt"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 #, fuzzy
 msgid "_Clear"
 msgstr "Kalenteri"
@@ -16643,25 +17789,170 @@ msgstr ""
 msgid "Text"
 msgstr "Seuraava"
 
-#: widgets/misc/e-search-bar.c:928
-#, fuzzy
-msgid "Clear"
-msgstr "Kalenteri"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Etsi nyt"
 
+#~ msgid "Account Name"
+#~ msgstr "Tilin nimi"
+
+#~ msgid "Server Name"
+#~ msgstr "Palvelimen nimi"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Muut yhteystiedot"
+
+#~ msgid "Add LDAP Server"
+#~ msgstr "Lisää LDAP-palvelin"
+
+#~ msgid "Find contact in"
+#~ msgstr "Etsi yhteystieto"
+
+#~ msgid "Business Address"
+#~ msgstr "Työosoite"
+
+#~ msgid "Department"
+#~ msgstr "Osasto"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Ammatti"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Peruuta nykyinen postioperaatio"
+#~ msgid "Send anyway?"
+#~ msgstr "Lähetä sähköpostia"
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Sukunimi"
+#~ msgid "Folder _name"
+#~ msgstr "Kansion nimi:"
 
-#~ msgid "Family Name"
-#~ msgstr "Sukunimi"
+#, fuzzy
+#~ msgid "Connecting..."
+#~ msgstr "Peruutetaan..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Tämä kansio ei voi sisältää viestejä."
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr ""
+#~ "Tiedoston %s poistaminen epäonnistui:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kansion välittäminen ei onnistu:\n"
+#~ "%s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "Lisää kansio"
+
+#, fuzzy
+#~ msgid "Drafts"
+#~ msgstr "Luonnos"
+
+#~ msgid "Outbox"
+#~ msgstr "Lähtevät"
+
+#, fuzzy
+#~ msgid "Sent"
+#~ msgstr "Näkemättä"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr "Virhe %s:n käynnistyksessä"
+
+#, fuzzy
+#~ msgid "Syncing Folder"
+#~ msgstr "Synkronoidaan kansiota"
+
+#~ msgid "(None)"
+#~ msgstr "(Ei nimeä)"
+
+#~ msgid "No error"
+#~ msgstr "Ei virhettä"
+
+#~ msgid "I/O error"
+#~ msgstr "I/O-virhe"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Kansion luominen tällä nimellä ei onnistu"
+
+#~ msgid "CORBA error"
+#~ msgstr "CORBA-virhe"
+
+#, fuzzy
+#~ msgid "No owner"
+#~ msgstr "Määrittelemätön"
+
+#, fuzzy
+#~ msgid "Unsupported type"
+#~ msgstr "Tar_kista tuetut tavat"
+
+#, fuzzy
+#~ msgid "Internal error"
+#~ msgstr "I/O-virhe"
+
+#, fuzzy
+#~ msgid "Exists"
+#~ msgstr "_Poistu"
+
+#, fuzzy
+#~ msgid "Has subfolders"
+#~ msgstr "Luonnoskansio:"
+
+#, fuzzy
+#~ msgid "No space left"
+#~ msgstr "Ei viestejä valittuna"
+
+#, fuzzy
+#~ msgid "Test type"
+#~ msgstr "Tiedoston tyyppi:"
+
+#, fuzzy
+#~ msgid "Evolution Test Component"
+#~ msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "Tuo"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Luo uusi tapaaminen"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Uusi t_apaaminen"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Peruuta tapaaminen"
+
+#, fuzzy
+#~ msgid "New _Task"
+#~ msgstr "Uusi tehtävä"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "Avaa uudessa ikkunassa"
+
+#~ msgid "Toggle"
+#~ msgstr "Määritä"
+
+#, fuzzy
+#~ msgid "Clear"
+#~ msgstr "Kalenteri"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Peruuta nykyinen postioperaatio"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -16749,9 +18040,6 @@ msgstr "Etsi nyt"
 #~ msgid "Evolution VCard importer"
 #~ msgstr "Evolution"
 
-#~ msgid "Loading..."
-#~ msgstr "Ladataan..."
-
 #~ msgid "Searching..."
 #~ msgstr "Etsitään..."
 
@@ -16817,9 +18105,6 @@ msgstr "Etsi nyt"
 #~ msgid "Prim"
 #~ msgstr "Ensisij"
 
-#~ msgid "Company"
-#~ msgstr "Yritys"
-
 #~ msgid "Comp"
 #~ msgstr "Yrit"
 
@@ -16849,10 +18134,6 @@ msgstr "Etsi nyt"
 #~ msgid "ECard"
 #~ msgstr "Auto"
 
-#, fuzzy
-#~ msgid "Phone"
-#~ msgstr "Määrittelemätön"
-
 #~ msgid "Birth date"
 #~ msgstr "Syntymäpäivä"
 
@@ -16863,10 +18144,6 @@ msgstr "Etsi nyt"
 #~ msgstr "Arbitrary"
 
 #, fuzzy
-#~ msgid "ID"
-#~ msgstr "I"
-
-#, fuzzy
 #~ msgid "Last Use"
 #~ msgstr "Liitä"
 
@@ -16877,27 +18154,12 @@ msgstr "Etsi nyt"
 #~ msgid "Cursor could not be loaded\n"
 #~ msgstr "Kohdistimen lataaminen epäonnistui\n"
 
-#~ msgid "LDAP Server"
-#~ msgstr "LDAP-palvelin"
-
 #~ msgid "Public Contacts"
 #~ msgstr "Julkiset yhteystiedot"
 
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Yhteystietoja sisältävä julkinen kansio"
 
-#~ msgid "_Contact"
-#~ msgstr "_Yhteystieto"
-
-#~ msgid "Create a new contact"
-#~ msgstr "Luo uusi yhteystieto"
-
-#~ msgid "New Contact List"
-#~ msgstr "Uusi yhteystietoluettelo"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "Luo uusi yhteystietoluettelo"
-
 #~ msgid "Disable Queries"
 #~ msgstr "Älä salli kyselyjä"
 
@@ -16939,36 +18201,6 @@ msgstr "Etsi nyt"
 #~ msgstr "Suodata postituslistan mukaan"
 
 #, fuzzy
-#~ msgid "New appointment"
-#~ msgstr "Uusi tapaaminen"
-
-#, fuzzy
-#~ msgid "_Appointment"
-#~ msgstr "Tapaaminen"
-
-#, fuzzy
-#~ msgid "New meeting"
-#~ msgstr "Peruuta tapaaminen"
-
-#, fuzzy
-#~ msgid "M_eeting"
-#~ msgstr "Peruuta tapaaminen"
-
-#, fuzzy
-#~ msgid "New task"
-#~ msgstr "Uusi tehtävä"
-
-#~ msgid "_Task"
-#~ msgstr "_Tehtävä"
-
-#, fuzzy
-#~ msgid "New All Day Appointment"
-#~ msgstr "Uusi tapaaminen"
-
-#~ msgid "All _Day Appointment"
-#~ msgstr "Koko _päivän tapaaminen"
-
-#, fuzzy
 #~ msgid "Could not update invalid object"
 #~ msgstr "Tiedostojen päivitys ei onnistunut"
 
@@ -16988,10 +18220,6 @@ msgstr "Etsi nyt"
 #~ "Tiedoston %s poistaminen epäonnistui:\n"
 #~ "%s"
 
-#, fuzzy
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Synkronoidaan kansiota"
-
 #~ msgid "Failed to decode message."
 #~ msgstr "Viestin salauksen purkaminen epäonnistui."
 
@@ -17018,21 +18246,10 @@ msgstr "Etsi nyt"
 #~ msgid "Public folder containing mail"
 #~ msgstr "Suodata postituslistan mukaan"
 
-#~ msgid "Properties..."
-#~ msgstr "Ominaisuudet..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Muuta tämän kansion ominaisuuksia"
 
 #, fuzzy
-#~ msgid "New Mail Message"
-#~ msgstr "Seuraava viesti"
-
-#, fuzzy
-#~ msgid "Compose a new mail message"
-#~ msgstr "Kirjoita viesti"
-
-#, fuzzy
 #~ msgid "New Message Post"
 #~ msgstr "Seuraava viesti"
 
@@ -17116,14 +18333,6 @@ msgstr "Etsi nyt"
 #~ msgid "Printing of message failed"
 #~ msgstr "Viestin tulostus epäonnistui"
 
-#, fuzzy
-#~ msgid ""
-#~ "File `%s' already exists.\n"
-#~ "Overwrite it?"
-#~ msgstr ""
-#~ "Saman niminen tiedosto on jo olemassa.\n"
-#~ "Kirjoitetaanko sen yli?"
-
 #~ msgid "Save Attachment"
 #~ msgstr "Tallenna liite"
 
@@ -17214,10 +18423,6 @@ msgstr "Etsi nyt"
 #~ msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
 
 #, fuzzy
-#~ msgid "Evolution Summary configuration control"
-#~ msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
-
-#, fuzzy
 #~ msgid "Summary Preferences"
 #~ msgstr "Yhteenveto sisältää"
 
@@ -17893,10 +19098,6 @@ msgstr "Etsi nyt"
 #~ msgstr "Kanada"
 
 #, fuzzy
-#~ msgid "Curitiba"
-#~ msgstr "Kroatia"
-
-#, fuzzy
 #~ msgid "Custer"
 #~ msgstr "Leikkaa"
 
@@ -20027,10 +21228,6 @@ msgstr "Etsi nyt"
 #~ msgstr "Yksinkertaistettu"
 
 #, fuzzy
-#~ msgid "Stauning"
-#~ msgstr "Asetukset"
-
-#, fuzzy
 #~ msgid "Staverton"
 #~ msgstr "Asetukset"
 
@@ -20282,10 +21479,6 @@ msgstr "Etsi nyt"
 #~ msgstr "Yhdistyneet arabiemiirikunnat"
 
 #, fuzzy
-#~ msgid "Unst"
-#~ msgstr "Nähty"
-
-#, fuzzy
 #~ msgid "Uruapan"
 #~ msgstr "Japani"
 
@@ -20338,10 +21531,6 @@ msgstr "Etsi nyt"
 #~ msgstr "Unicode"
 
 #, fuzzy
-#~ msgid "Vermont"
-#~ msgstr "kuukausi"
-
-#, fuzzy
 #~ msgid "Vernal"
 #~ msgstr "Yleiset"
 
@@ -20576,10 +21765,6 @@ msgstr "Etsi nyt"
 #~ msgstr "Suodattimet"
 
 #, fuzzy
-#~ msgid "Spray"
-#~ msgstr "Lauantai"
-
-#, fuzzy
 #~ msgid "Partial spray"
 #~ msgstr "Ensisijainen"
 
@@ -20680,19 +21865,6 @@ msgstr "Etsi nyt"
 #~ msgid "Remove a folder added with \"Open Other User's Folder\""
 #~ msgstr "Luo _uusi kansio"
 
-#~ msgid "Send / Receive"
-#~ msgstr "Lähetä / Vastaanota"
-
-#, fuzzy
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Lähetä jonossa olevat viestit ja hae uudet viestit"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Määritä, näytetäänkö kansiopalkki"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Määritä, näytetäänkö oikotiepalkki"
-
 #~ msgid "_Copy..."
 #~ msgstr "_Kopioi..."
 
@@ -20719,9 +21891,6 @@ msgstr "Etsi nyt"
 #~ msgid "_Rename..."
 #~ msgstr "_Nimeä uudelleen..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Lähetä / Vastaanota"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "_Oikotiepalkki"
 
@@ -20747,9 +21916,6 @@ msgstr "Etsi nyt"
 #~ msgid "Change Anyway"
 #~ msgstr "Muuta silti"
 
-#~ msgid "Automatically _detect links"
-#~ msgstr "_Havaitse linkit automaattisesti"
-
 #, fuzzy
 #~ msgid "Emacs"
 #~ msgstr "Sähköposti"
@@ -20813,15 +21979,9 @@ msgstr "Etsi nyt"
 #~ msgid "Output File"
 #~ msgstr "Avaa tiedosto"
 
-#~ msgid "380"
-#~ msgstr "380"
-
 #~ msgid "<- _Remove"
 #~ msgstr "<- _Poista"
 
-#~ msgid "<< Fewer Options"
-#~ msgstr "<< Vähemmän vaihtoehtoja"
-
 #, fuzzy
 #~ msgid "Mappings"
 #~ msgstr "Reunukset"
diff --git a/po/fr.po b/po/fr.po
index 07f76369b6..7fbb2348da 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.4.4\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-08-02 09:33+0200\n"
 "Last-Translator: Brigitte Le Grand <brigitte.le.grand@sun.com>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
@@ -35,52 +35,185 @@ msgstr "Impossible de charger %s : %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Impossible de lire les données du bloc Adresses du Pilot."
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Dossiers de complétion automatique"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "_ID de certificat :"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Configurez ici vos comptes de messagerie."
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Contacts"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
+msgstr "Carnet d'adresses d'Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address pop-up"
+msgstr "Pop-up d'adresse du carnet d'adresses d'Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address viewer"
+msgstr "Visualiseur d'adresses du carnet d'adresses d'Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook card viewer"
+msgstr "Visualiseur de cartes du carnet d'adresses d'Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook component"
+msgstr "Composant Carnet d'adresses d'Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook folder viewer"
+msgstr "Visualiseur de dossiers du carnet d'adresses d'Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Préférences de la messagerie d'Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Composant de configuration des paramètres dossier d'Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Carnet d'adresses"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Propriétés..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Supprimer"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "_Renommer"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Nouveau contact"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Contacts"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "Créer un nouveau contact"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Nouvelle liste de contacts"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "Liste de contacts"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "Créer une nouvelle liste de contacts"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Personnel"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Travail"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "Serveur LDAP"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Impossible de créer le répertoire %s : %s."
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "Échec de la connexion au serveur LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "Échec de l'authentification sur le serveur LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "Impossible d'effectuer la requête sur la racine DES."
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "Le serveur a renvoyé des bases de recherche non supportées."
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 "Ce serveur ne supporte pas les informations relatives au schéma LDAPv3."
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "Erreur lors de la récupération des informations relatives au schéma"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr "Le serveur a renvoyé des informations invalides relatives au schéma."
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Nom du compte"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Nom du serveur"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP n'a pas été activé dans cette compilation d'Evolution."
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Autres contacts"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -88,7 +221,7 @@ msgstr ""
 "Impossible d'ouvrir ce carnet d'adresses. Veuillez vérifier\n"
 "que le chemin existe et que vous avez la permission d'accès."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -97,7 +230,7 @@ msgstr ""
 "Impossible d'ouvrir ce carnet d'adresses. Vous avez\n"
 "saisi un URI incorrect ou le serveur LDAP n'est pas accessible. "
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -109,7 +242,7 @@ msgstr ""
 "devez compiler le programme à partir des sources CVS\n"
 "après voir récupéré OpenLDAP à l'adresse indiquée ci-dessous.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -122,44 +255,43 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Impossible d'ouvrir le carnet d'adresses."
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "Accès anonyme au serveur LDAP"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "Échec de l'authentification\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sSaisissez le mot de passe pour %s (utilisateur %s)."
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "Le nom commence par"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "L'adresse commence par"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "La catégorie est"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Tout champ contient"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Avancée..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -172,7 +304,7 @@ msgstr ""
 "recherche ou augmenter le nombre maximum de résultats dans\n"
 "les préférences du serveur d'annuaires de ce carnet d'adresses."
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -185,92 +317,45 @@ msgstr ""
 "temps dans les préférences du serveur d'annuaires de ce carnet \n"
 "d'adresses."
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "Le moteur de traitement du carnet d'adresses n'a pas pu analyser cette "
 "requête."
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "Le moteur de traitement du carnet d'adresses a refusé d'effectuer cette "
 "requête."
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "Cette requête ne s'est pas terminée correctement."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Toute catégorie"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "L'URI que le calendrier affichera."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "_ID de certificat :"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "Configurez ici l'accès aux serveurs d'annuaires LDAP"
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Contacts"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "Serveurs d'annuaires"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Carnet d'adresses d'Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Composant de configuration LDAP du carnet d'adresses d'Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "Pop-up d'adresse du carnet d'adresses d'Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "Visualiseur d'adresses du carnet d'adresses d'Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Visualiseur de cartes du carnet d'adresses d'Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr "Composant Carnet d'adresses d'Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook folder viewer"
-msgstr "Visualiseur de dossiers du carnet d'adresses d'Evolution"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Préférences de la messagerie d'Evolution"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -293,6 +378,7 @@ msgstr "  Affic_her les bases dupportées"
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -326,8 +412,9 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "Ajouter un serveur LDAP"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "Paramètres du carnet d'adresses"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -343,9 +430,9 @@ msgid "Anonymously"
 msgstr "Anonymement"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -356,49 +443,50 @@ msgstr ""
 "Cliquez sur le bouton « Terminer » pour enregistrer les paramètres\n"
 "que vous avez saisis."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "Connexion"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "_Nom distinctif :"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr "Éditer un serveur LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
 msgstr "Adresse électronique :"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution utilisera ce DN pour vous authentifier sur le serveur."
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution utilisera cette adresse électronique pour vous authentifier sur le "
 "serveur."
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "Terminé"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Général"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "Assistant de configuration LDAP"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "Groupe"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Jamais"
 
@@ -427,8 +515,8 @@ msgid "S_earch scope: "
 msgstr "Domain_e de recherche : "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Recherche"
 
@@ -489,28 +577,32 @@ msgstr ""
 "des contacts."
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 "Spécifier un nom d'affichage est la dernière étape nécessaire à la "
 "configuration d'un serveur LDAP."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "Étape 1: Informations sur le serveur"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "Étape 2: Connexion au Serveur"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "Étape 1: Informations sur le serveur"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "Étape 3 : Rechercher dans l'annuaire"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Étape 2: Connexion au Serveur"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "Étape 4 : Nom d'affichage"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Étape 3 : Rechercher dans l'annuaire"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -522,18 +614,6 @@ msgstr "Bases de recherche supportées"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"La première étape de la configuration d'un serveur LDAP est de fournir son "
-"nom et\n"
-"vos informations d'identification. En cas de doute, veuillez contacter votre "
-"administrateur système."
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -546,7 +626,7 @@ msgstr ""
 "toute\n"
 "modification concernant ces options."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -559,7 +639,7 @@ msgstr ""
 "racine de \n"
 "l'arborescence de l'annuaire."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -576,14 +656,14 @@ msgstr ""
 "trouvant un niveau\n"
 "en dessous de la base.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
+#, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "Cet assistant vous aidera à accéder aux services d'annuaires en ligne\n"
 "qui utilisent des serveurs LDAP (Lightweight Directory Access Protocol).\n"
@@ -592,7 +672,7 @@ msgstr ""
 "spécifiques concernant le serveur. Veuillez contacter votre administrateur\n"
 "système si vous avez besoin d'aide pour trouver ces informations."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -600,7 +680,7 @@ msgstr ""
 "Ceci représente le nom complet de votre serveur ldap. Par exemple, « ldap."
 "monentreprise.com »."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -609,7 +689,7 @@ msgstr ""
 "Ceci représente le nombre maximum d'entrées à télécharger. Un nombre\n"
 "trop élevé ralentira l'accès à votre carnet d'adresses."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -619,7 +699,7 @@ msgstr ""
 "Notez que spécifier « Adresse électronique » implique l'accès anonyme au "
 "serveur."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -629,6 +709,16 @@ msgstr ""
 "dossiers d'Evolution\n"
 "(dans un but d'affichage uniquement)."
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Ceci représente le nom du serveur tel qu'il apparaîtra dans la liste des "
+"dossiers d'Evolution\n"
+"(dans un but d'affichage uniquement)."
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -658,21 +748,34 @@ msgid "Using email address"
 msgstr "En utilisant l'adresse électronique"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Lorsque c'est possible"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+"La première étape de la configuration d'un serveur LDAP est de fournir son "
+"nom et\n"
+"vos informations d'identification. En cas de doute, veuillez contacter votre "
+"administrateur système."
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "_Nom d'affichage :"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "Limite de _téléchargement :"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -680,54 +783,52 @@ msgstr "Limite de _téléchargement :"
 msgid "_Edit"
 msgstr "_Éditer"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "_Méthode d'identification :"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "_Numéro de port :"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "Ba_se de la recherche :"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "Nom du _serveur :"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "_Temps d'attente maximum (minutes) :"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "cartes"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr "Connexion"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr "Général"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr "Recherche"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Nom"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Interface de sélection de nom du carnet d'adresses d'Evolution"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Tout supprimer"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Supprimer"
@@ -754,23 +855,21 @@ msgstr "Ajouter aux contacts"
 msgid "Unnamed Contact"
 msgstr "Contact sans nom"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Nom"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Source"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Sélectionnez les contacts dans le carnet d'adresses"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "Rechercher un contact dans"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Interface de sélection de nom du carnet d'adresses d'Evolution"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Rechercher"
@@ -847,7 +946,8 @@ msgid "D_epartment:"
 msgstr "_Service :"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Détails"
 
@@ -914,12 +1014,12 @@ msgid "_Categories..."
 msgstr "Ca_tégories..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Supprimer"
@@ -2043,7 +2143,7 @@ msgid "Esq."
 msgstr "Monsieur"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Nom complet"
 
@@ -2138,11 +2238,27 @@ msgstr "Éditeur de liste de contacts"
 msgid "Save List as VCard"
 msgstr "Enregistrer la liste comme VCard"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Contact Modifié :"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Contact en conflit :"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Contact double détecté"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Le nom ou l'adresse électronique modifié(e) pour ce contact existe déjà\n"
+"dans ce dossier. Voulez vous quand même l'ajouter ?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Nouveau contact"
@@ -2159,22 +2275,6 @@ msgstr ""
 "Le nom ou l'adresse électronique de ce contact existe déjà\n"
 "dans ce dossier. Voulez vous quand même l'ajouter ?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Contact Modifié :"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Contact en conflit :"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"Le nom ou l'adresse électronique modifié(e) pour ce contact existe déjà\n"
-"dans ce dossier. Voulez vous quand même l'ajouter ?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2274,9 +2374,9 @@ msgstr "Faire suivre au contact"
 msgid "Send Message to Contact"
 msgstr "Envoyer un message au contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimer"
@@ -2298,9 +2398,12 @@ msgstr "Déplacer vers le dossier..."
 msgid "Cut"
 msgstr "Couper"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copier"
 
@@ -2309,16 +2412,8 @@ msgstr "Copier"
 msgid "Paste"
 msgstr "Coller"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Supprimer"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "Vue courante"
 
@@ -2335,166 +2430,170 @@ msgstr ""
 "l'utiliser de nouveau."
 
 #: 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:2
 msgid "Assistant"
 msgstr "Adjoint"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Fax (travail)"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Téléphone (travail)"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Téléphone (travail) 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Répondeur"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Téléphone voiture"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Catégories"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Téléphone société"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Service"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "Courrier électronique"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "Courrier électronique 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "Courrier électronique 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Nom de famille"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Classer comme"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "URL Libre-Occupé"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Adresse (domicile)"
+#, fuzzy
+msgid "Given Name"
+msgstr "Nom du champ"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Fax (domicile)"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Téléphone (domicile)"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Téléphone (domicile) 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "RNIS"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Téléphone"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Jordanie"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Directeur"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Téléphone portable"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Surnom"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Note"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Bureau"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Autre adresse"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Fax Autre"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Autre téléphone"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Téléphone principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Profession"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Rôle"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Conjoint(e)"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Télex"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Titre"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Unst"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Site Web"
 
@@ -2587,11 +2686,19 @@ msgstr "Membres"
 msgid "Job Title"
 msgstr "Fonct_ion :"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Adresse (domicile)"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Adresse (domicile)"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Autre adresse"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2604,112 +2711,109 @@ msgstr "Fax (domicile)"
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Succès"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Dépôt Hors ligne"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Permission refusée"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Carte non trouvée"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "L'ID de la carte existe déjà."
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Protocole non supporté"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Annulée"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr " Échec de l'authentification"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "Authentification requise"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS non disponible"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "Le carnet d'adresses n'existe pas."
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Autre erreur"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Voulez-vous enregistrer les modifications ?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr "_Abandonner"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Erreur lors de l'ajout de la liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Erreur lors de l'ajout de la carte"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Erreur lors de la modification de la liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Erreur lors de la modification de la carte"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Erreur lors de la suppression de la liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Erreur lors de la suppression de la carte"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2718,7 +2822,7 @@ msgstr ""
 "L'affichage de %d cartes implique l'ouverture de %d nouvelles fenêtres. \n"
 "Voulez-vous vraiment afficher toutes ces cartes ?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2727,49 +2831,49 @@ msgstr ""
 "%s existe déjà.\n"
 "Voulez vous l'écraser ?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "Écraser"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Erreur lors de l'enregistrement du fichier %s : %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Déplacer la carte vers"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Copier la carte vers"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Déplacer les cartes vers"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Copier les cartes vers"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "VCards multiples"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard pour %s"
@@ -2964,7 +3068,7 @@ msgstr "Marges"
 msgid "Number of columns:"
 msgstr "Nombre de colonnes :"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Options"
 
@@ -3151,18 +3255,18 @@ msgstr "Liste de contacts sans nom"
 msgid "Split Multi-Day Events:"
 msgstr "Partager les événements sur plusieurs jours :"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Impossible de démarrer le serveur wombat."
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Impossible de démarrer wombat."
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Impossible de lire les données du block Calendrier du Pilot."
 
@@ -3170,24 +3274,85 @@ msgstr "Impossible de lire les données du block Calendrier du Pilot."
 msgid "Default Priority:"
 msgstr "Priorité par défaut :"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Impossible de lire les données du bloc « À faire » du Pilot."
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Calendrier et tâches"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Calendrier"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+"Configurez ici votre fuseau horaire, votre calendrier et votre liste de "
+"tâches"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Calendrier et tâches d'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Composant de configuration du calendrier d'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Afficheur de message de planification du calendrier d'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Afficheur de calendrier d'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Éditeur de calendrier/tâches d'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Afficheur de tâches d'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Composant Calendrier et tâches d'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Composant Test d'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Tâches"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Service de notification d'alarme du calendrier d'Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Débute :"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Fini :"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Alarme Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarme du %s"
@@ -3263,43 +3428,175 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Ne plus me demander à propos de ce programme."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Service de notification d'alarme du calendrier d'Evolution"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Impossible d'initialiser Bonobo."
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Impossible d'initialiser gnome-vfs."
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Impossible de créer la fabrique de services de notification d'alarme."
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "Heure invalide"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "Erreur iCalendar"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Couleur des tâches d'aujourd'hui"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Couleur des tâches d'aujourd'hui"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr ""
+"_Afficher les heures de fin de rendez-vous dans les vues mensuelles et "
+"hebdomadaires"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Prévisualise le calendrier à imprimer"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#, fuzzy
+msgid "Units of default reminder"
+msgstr "Créer de nouveaux rendez-vous avec un _rappel par défaut"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "_Demander une confirmation pour l'effacement des éléments"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "_Demander une confirmation pour l'effacement des éléments"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Supprimer les tâches terminées"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Afficher les _numéros de semaine dans le navigateur de dates"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Le résumé contient"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "La description contient"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Le commentaire contient"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Différent"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3312,81 +3609,110 @@ msgstr ""
 "Voulez-vous vraiment effacer les tâches ?"
 
 #
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "est inférieur à"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "jours"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Imprimer ce calendrier"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Nouvelle Calédonie"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "Nouveau RDV"
+
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "_Rendez-vous"
+
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Créer un nouveau rendez-vous"
+
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "Nouvelle réunion"
+
+#: calendar/gui/calendar-component.c:640
+msgid "M_eeting"
+msgstr "_Réunion"
+
+#: calendar/gui/calendar-component.c:641
 #, fuzzy
-msgid "Rename"
-msgstr "_Renommer"
+msgid "Create a new meeting request"
+msgstr "Créer une nouvelle demande de réunion"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Nouveau rendez-vous journée entière"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Personnel"
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr "Rendez-vous _journée entière"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Travail"
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Créer un nouveau rendez-vous"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3503,7 +3829,7 @@ msgstr "Envoyer à :"
 msgid "With these arguments:"
 msgstr "Avec ces arguments :"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr "boîte de dialogue 1"
 
@@ -3519,6 +3845,10 @@ msgstr "heures"
 msgid "minutes"
 msgstr "minutes"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3551,8 +3881,8 @@ msgstr "Envoyer un courrier électronique"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Résumé :"
 
@@ -3581,7 +3911,7 @@ msgstr "Fin du rendez-vous"
 msgid "hour(s)"
 msgstr "heure(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minute(s)"
 
@@ -3635,7 +3965,7 @@ msgstr "Jours"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Vendredi"
 
@@ -3649,7 +3979,7 @@ msgstr "Minutes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Lundi"
 
@@ -3659,7 +3989,7 @@ msgstr "_Dim"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Samedi"
 
@@ -3673,7 +4003,7 @@ msgstr "Afficher les _numéros de semaine dans le navigateur de dates"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Dimanche"
 
@@ -3691,7 +4021,7 @@ msgstr "Liste des tâches"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Jeudi"
 
@@ -3709,7 +4039,7 @@ msgstr "Format de date :"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Mardi"
 
@@ -3719,12 +4049,12 @@ msgstr "La s_emaine débute :"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Mercredi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Sem. travail"
 
@@ -3761,7 +4091,7 @@ msgid "_Fri"
 msgstr "_Ven"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Général"
 
@@ -3803,7 +4133,7 @@ msgstr "M_er"
 msgid "before every appointment"
 msgstr "avant chaque rendez-vous"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
@@ -3811,11 +4141,11 @@ msgstr ""
 "L'événement faisant l'objet d'une suppression est une réunion. Voulez-vous "
 "envoyer une note d'annulation ?"
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Êtes-vous sûr de vouloir annuler et supprimer cette réunion ?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
@@ -3823,11 +4153,11 @@ msgstr ""
 "La tâche faisant l'objet d'une suppression est attribuée. Voulez-vous "
 "envoyer une note d'annulation ?"
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Êtes-vous sûr de vouloir annuler et supprimer cette tâche ?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -3835,54 +4165,54 @@ msgstr ""
 "L'entrée du journal faisant l'objet d'une suppression est publiée. Voulez-"
 "vous envoyer une note d'annulation ?"
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Êtes-vous sûr de vouloir annuler et supprimer l'entrée de journal ?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Cet événement a été supprimé."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Cette tâche a été supprimée."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Cette entrée du journal a été supprimée."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Vous avez fait des modifications. Oublier ces modifications et fermer "
 "l'éditeur ?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Vous n'avez fait aucune modification. Fermer l'éditeur ?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Cet événement a été modifié."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Cette tâche a été modifiée."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Cette entrée du journal a été modifiée."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Vous avez fait des modifications. Oublier ces modifications et mettre à "
 "jour l'éditeur ?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Vous n'avez fait aucune modification. Mettre à jour l'éditeur ?"
@@ -3892,173 +4222,178 @@ msgstr "%s  Vous n'avez fait aucune modification. Mettre à jour l'éditeur ?"
 msgid "Validation error: %s"
 msgstr "Erreur de validation : %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " À "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Terminé "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Terminé "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Date d'échéance "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Date d'échéance "
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "Impossible de mettre à jour l'objet."
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Éditer le rendez-vous"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Rendez-vous - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Tâche - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrée de journal - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Aucun résumé"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Les changements apportés à cet élément peuvent être annulés en cas de "
 "réception d'une mise à jour."
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Récupération de la version courante impossible !"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Sélectionnez un dossier de destination pour importer ces données."
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Êtes-vous sûr de vouloir supprimer le rendez-vous « %s » ?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Êtes-vous sûr de vouloir supprimer ce rendez-vous sans titre ?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Êtes-vous sûr de vouloir supprimer la tâche « %s » ?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Êtes-vous sûr de vouloir supprimer cette tâche sans titre ?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Êtes-vous sûr de vouloir supprimer l'entrée de journal « %s » ?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 "Êtes-vous sûr de vouloir supprimer cette entrée de journal sans titre ?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Êtes-vous sûr de vouloir supprimer %d rendez-vous ?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Êtes-vous sûr de vouloir supprimer %d tâches ?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Êtes-vous sûr de vouloir supprimer %d entrées de journal ?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "Impossible de supprimer l'événement à cause d'une erreur CORBA."
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "Impossible de supprimer la tâche à cause d'une erreur CORBA."
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 "Impossible de supprimer l'entrée de journal à cause d'une erreur CORBA."
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Impossible de supprimer l'élément à cause d'une erreur CORBA."
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 "Impossible de supprimer l'événement à cause de permissions insuffisantes."
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "Impossible de supprimer la tâche à cause de permissions insuffisantes."
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 "Impossible de supprimer l'entrée de journal à cause de permissions "
 "insuffisantes."
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 "Impossible de supprimer l'élément à cause de permissions insuffisantes."
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Impossible de supprimer l'événement à cause d'une erreur CORBA."
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Impossible de supprimer la tâche à cause d'une erreur CORBA."
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr ""
 "Impossible de supprimer l'entrée de journal à cause d'une erreur CORBA."
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Impossible de supprimer l'élément à cause d'une erreur CORBA."
@@ -4075,43 +4410,43 @@ msgstr "Déléguer à :"
 msgid "Enter Delegate"
 msgstr "Saisissez un délégué"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Rendez-vous"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Rappel"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Récurrence"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Planification"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Réunion"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "La date de début est erronée."
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "La date de fin est erronée."
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "L'heure de début est erronée."
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "L'heure de fin est erronée."
 
@@ -4181,31 +4516,31 @@ msgid "_Start time:"
 msgstr "Heure de _début :"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Aucune"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr "L'organisateur sélectionné n'a plus de compte."
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "Un organisateur est nécessaire."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "Au moins un participant est nécessaire."
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Déléguer à..."
 
@@ -4246,21 +4581,15 @@ msgid "Member"
 msgstr "Membre"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Réponse S.V.P"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Rôle"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "État"
@@ -4280,6 +4609,7 @@ msgid "_Invite Others..."
 msgstr "_Inviter d'autres personnes..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4312,6 +4642,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Impossible de créer le répertoire %s : %s."
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "Un organizer doit être configuré."
@@ -4341,42 +4672,67 @@ msgstr "Informations du calendrier"
 msgid "Calendar Name"
 msgstr "Calendrier"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Impossible de créer le répertoire %s : %s."
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Informations du calendrier"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Liste des tâches"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Liste des tâches"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Liste des tâches"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 "Vous êtes en train de modifier un événement récurrent. Que souhaitez-vous "
 "modifier ?"
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 "Vous êtes en train de modifier une tâche récurrente. Que souhaitez-vous "
 "modifier ?"
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 "Vous êtes en train de modifier une entrée de journal récurrente. Que "
 "souhaitez-vous modifier ?"
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr "Seulement cette occurrence"
 
 #
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Îles Wallis et Futuna"
 
 #
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr "Îles Wallis et Futuna"
 
 #
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr "Toutes les occurrences"
 
@@ -4424,10 +4780,15 @@ msgstr "jour"
 msgid "on the"
 msgstr "le"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "occurrences"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Date/Heure :"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "A_jouter"
@@ -4492,7 +4853,7 @@ msgstr "semaine(s)"
 msgid "year(s)"
 msgstr "année(s)"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
@@ -4502,33 +4863,33 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer les modifications ?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "Aban_donner les modifications"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 msgid "Save Event"
 msgstr "Enregistrer l'événement"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Les informations de la réunion ont été créées. Envoyer ?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 "Les informations de la réunion ont changé. Envoyer une version mise à jour ?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "Les assignations de tâche ont été créées. Envoyer ?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 "Les informations de la tâche ont changé. Envoyer une version mise à jour ?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "La date d'achèvement est erronée."
 
@@ -4538,43 +4899,43 @@ msgid "% _Complete"
 msgstr "% Fait"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Achevée"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Haute"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "En cours"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Basse"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Non démarrée"
 
@@ -4583,7 +4944,7 @@ msgid "Progress"
 msgstr "En cours"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Indéfinie"
 
@@ -4605,21 +4966,21 @@ msgstr "_État :"
 msgid "_Web Page:"
 msgstr "Adresse de la page _Web :"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Basique"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Tâche"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "La date d'échéance est erronée."
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr "La date d'échéance est avant la date de début !"
 
@@ -4627,9 +4988,9 @@ msgstr "La date d'échéance est avant la date de début !"
 msgid "Con_fidential"
 msgstr "Con_fidentiel"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Description :"
 
@@ -4734,26 +5095,21 @@ msgstr "%s à %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s pour un type d'activation inconnu"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Public"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Privé"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Confidentiel"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Catégories"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4766,28 +5122,26 @@ msgid "Start Date"
 msgstr "Date de début"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Résumé"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "couleur"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Rendez-vous"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Libre"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Occupé"
 
@@ -4799,7 +5153,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "E"
 
@@ -4807,7 +5161,7 @@ msgstr "E"
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4817,7 +5171,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4825,7 +5179,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Oui"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4833,17 +5187,17 @@ msgstr "Non"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Inconnu"
 
@@ -4855,181 +5209,179 @@ msgstr "Récurant"
 msgid "Assigned"
 msgstr "Attribué"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Mise à jour des objets"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Supprimer les objets sélectionnés"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Mise à jour des objets"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Nouveau _RDV..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Nouvel événement journée _entière"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "Nouvelle réunion"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Nouvelle tâche"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Imprimer..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "C_oller"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Aller à _aujourd'hui"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "A_ller à la date..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Publier l'information Libre/Occupé"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "Paramétra_ge..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Ouvrir"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Enregistrer _sous..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Copier"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "Planifier une _réunion..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "_Faire suivre comme iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Supprimer cette _occurrence"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Supprimer _toutes les occurrences"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "Paramétra_ge..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Ouvrir le message"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "_Assigner une tâche"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "_Faire suivre comme iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "_Marquer comme terminé"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marquer les tâches sélectionnées comme terminées"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "_Supprimer les tâches sélectionnées"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Cliquez ici pour ajouter une tâche"
@@ -5043,8 +5395,8 @@ msgstr "% Fait"
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Terminé"
 
@@ -5073,18 +5425,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5103,7 +5455,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5116,125 +5468,125 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr "Oui. (Récurrence complexe)"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "Tous les jours"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "Tous les %d jours"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "Toutes les semaines"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "Toutes les %d semaines"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr "Toutes les semaines le "
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Toutes les %d semaines le "
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " et "
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr "Le %s jour de"
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr "Le %s %s de"
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "tous les mois"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr "tous les %d mois"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "Tous les ans"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "Tous les %d ans"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr " un total de %d fois"
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ", finissant le"
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>Débute : </b> "
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Finit : </b> "
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>Terminé : </b>"
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>Échéance : </b> "
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "Information iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "Erreur iCalendar"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Une personne inconnue"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5243,325 +5595,324 @@ msgstr ""
 "action\n"
 "du menu ci-dessous."
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Aucun</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "Lieu :"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "État :"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Accepté"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Accepté provisoirement"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Refusé"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Sélectionner une action :"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Mise à jour"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Accepter"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Accepter provisoirement"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Refuser"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Envoyer l'information Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Mettre à jour le statut de l'interlocuteur"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Envoyer les dernières informations"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annuler"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, 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:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Informations de la réunion"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> demande la présence de %s à ce rendez-vous. "
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Proposition de réunion"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> souhaite être intégré à une réunion existante."
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Mise à jour de la réunion"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> souhaite recevoir les informations de la dernière réunion."
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Demande de mise à jour de la réunion"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, 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:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Réponse à une réunion"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, 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:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Annulation de réunion"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, 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:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Mauvais message de réunion"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Informations de la tâche"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> demande à %s d'exécuter une tâche. "
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> vous demande d'exécuter une tâche."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Tâche proposée"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> souhaite être intégré à une tâche existante."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Mise à jour de tâche"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> souhaite recevoir les informations de la dernière tâche"
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Demande de mise à jour de tâche"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, 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:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Réponse à une tâche"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, 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:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Annulation de tâche"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Mauvais message de tâche"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, 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:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Information Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, 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:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Demande Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, 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:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Réponse Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Mauvais message Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 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:1552
+#: calendar/gui/e-itip-control.c:1550
 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:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr "La pièce jointe ne contient pas d'information de calendrier valide."
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 "La pièce jointe ne contient pas d'information de calendrier visualisable."
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "Impossible de mettre à jour le fichier de calendrier !\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Mise à jour terminée\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Le statut du participant ne peut être mis à jour car l'entrée n'existe plus."
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "L'objet est invalide et ne peut être mis à jour.\n"
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 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:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Le statut du participant n'a pas pu être mis à jour à cause d'un statut non "
 "valide !\n"
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr "Il y a eu une erreur dans le système CORBA.\n"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr "Impossible de trouver l'objet.\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 "Vous n'avez pas les permissions nécessaires pour mettre à jour le "
 "calendrier\n"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Statut du participant mis à jour\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "Impossible de mettre à jour le statut du participant !\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Effacement Terminé"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Élément envoyé !\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Impossible d'envoyer l'élément !\n"
 
@@ -5721,7 +6072,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -5785,49 +6136,44 @@ 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:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "Date de _début :"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "Date d'_échéance :"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "_Priorité :"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Page"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Ouverture des tâches à %s"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Impossible de charger les tâches dans « %s »."
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "La méthode requise pour charger « %s » n'est pas supportée."
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Vous n'avez pas la permission d'ouvrir le dossier dans « %s »."
 
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5836,48 +6182,39 @@ msgstr ""
 "Erreur sur %s :\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "Achèvement des tâches..."
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "Suppression des objets sélectionnés..."
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "Nettoyage"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Tâches"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Calendrier"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Impossible d'ouvrir le dossier dans « %s »."
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, 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."
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Ajout d'alarmes pour %s"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5889,7 +6226,7 @@ msgstr ""
 "est tombé en panne. Vous devez redémarrer Evolution afin de pouvoir "
 "l'utiliser de nouveau."
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5901,60 +6238,11 @@ msgstr ""
 "est tombé en panne. Vous devez redémarrer Evolution afin de pouvoir "
 "l'utiliser de nouveau."
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Imprimer"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Calendrier et tâches"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Calendrier"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-"Configurez ici votre fuseau horaire, votre calendrier et votre liste de "
-"tâches"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Calendrier et tâches d'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Composant de configuration du calendrier d'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Afficheur de message de planification du calendrier d'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Afficheur de calendrier d'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Éditeur de calendrier/tâches d'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Afficheur de tâches d'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Composant Calendrier et tâches d'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Composant Test d'Evolution"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Avril"
@@ -6011,296 +6299,332 @@ msgstr "Octobre"
 msgid "September"
 msgstr "Septembre"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Un organizer doit être configuré."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Au moins un participant est nécessaire."
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Informations de l'événement"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Informations de la tâche"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Informations du journal"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Information Libre-Occupé"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Informations du calendrier"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Mis à jour"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "Contre-proposition"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Information Libre/Occupé (%s à %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "Information iCalendar"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Vous devez être inscrit comme participant à l'événement."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1er"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2ème"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3ème"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4ème"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5ème"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6ème"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7ème"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8ème"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9ème"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10ème"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11ème"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12ème"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13ème"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14ème"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15ème"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16ème"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17ème"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18ème"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19ème"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20ème"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21ème"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22ème"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23ème"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24ème"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25ème"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26ème"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27ème"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28ème"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29ème"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30ème"
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31ème"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Di"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Je"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Jour sélectionné (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Semaine sélectionnée (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Mois sélectionné (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Année sélectionnée (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Tâche"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "État : %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorité : %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Pourcentage terminé : %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL : %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Catégories : %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Contacts : "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Aperçu avant impression"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Imprimer l'élément"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Configuration de l'impression"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Renommer ce raccourci"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Liste des tâches"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Nouvelle tâche"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Tâche"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Créer une nouvelle tâche"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "L'URI du dossier de tâches à afficher"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6312,11 +6636,11 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment effacer les tâches ?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Ne plus me demander."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "Imprimer les tâches"
 
@@ -6345,15 +6669,15 @@ msgstr "Fichiers iCalendar (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "Fichiers vCalendar (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "Rappel !!"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "Événements du calendrier"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6361,7 +6685,7 @@ msgstr ""
 "Evolution a trouvé des fichiers du calendrier de Gnome.\n"
 "Voulez-vous les importer dans Evolution ?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Calendrier de Gnome"
 
@@ -7897,27 +8221,27 @@ msgstr "Pacifique/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacifique/Yap"
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "La signature n'est pas supportée par ce message chiffré."
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "La vérification n'est pas supportée par ce message chiffré."
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Le codage n'est pas supporté par ce message chiffré."
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Le décodage n'est pas supporté par ce message chiffré."
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr "Vous ne pouvez pas importer de clé avec ce message chiffré."
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr "Vous ne pouvez pas exporter de clé avec ce message chiffré."
 
@@ -7969,86 +8293,86 @@ msgstr "Préparation du dossier « %s » pour le hors-ligne"
 msgid "You must be working online to complete this operation"
 msgstr "Vous devez travailler en ligne pour terminer cette opération."
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Impossible de créer le tube pour « %s » : %s."
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Impossible de créer un processus fils « %s » : %s."
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Flux de messages invalide en provenance de %s : %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Synchronisation des dossiers"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erreur d'analyse du filtre : %s : %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erreur d'exécution du filtre : %s : %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Impossible d'ouvrir le dossier spool."
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Impossible de traiter le dossier spool."
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Récupération du message %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Impossible d'ouvrir le message."
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Anomalie message %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Synchronisation du dossier"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Récupération du message %d parmis %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Anomalie message %d du %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Échec de la récupération du message"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr "Arguments invalides (system-flag)"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr "Arguments invalides (user-tag)"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erreur lors de la recherche filtrée : %s : %s"
@@ -8080,35 +8404,35 @@ msgstr "(compare tout) demande un unique résultat booléen."
 msgid "Performing query on unknown header: %s"
 msgstr "Interrogation sur un en-tête inconnu : %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Opération non supportée : ajout du message : pour %s"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Opération non-supportée : recherche par expression : pour %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Opération non-supportée : recherche par uids : pour %s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Déplacement des messages"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr "Copie des messages"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Récupération de %d message(s)"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8119,15 +8443,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr "Échec d'analyse de l'indication ID d'utilisateur du GPG"
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr "Échec d'analyse de la requête de mot de passe du GPG."
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8136,30 +8460,30 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour\n"
 "débloquer la clé de l'utilisateur : « %s »"
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Annulé."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Échec du déblocage de la clé secrète : 3 mauvais mots de passe saisis."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Réponse inattendue de GnuPG : %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr "Aucune donnée fournie"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Échec de chiffrement : aucun destinataire valide spécifié."
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8170,51 +8494,65 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Échec GPG %s : %s\n"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Impossible d'écrire les données : %s."
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Impossible d'exécuter GPG : %s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr "Impossible d'exécuter GPG. "
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "Ceci est une partie de message numériquement signée."
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr ""
+"Impossible de vérifier la signature de ce message : impossible de créer le "
+"fichier temporaire : %s."
+
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Impossible de vérifier la signature de ce message : impossible de créer le "
 "fichier temporaire : %s."
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Impossible d'écrire les données : %s."
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Ceci est une partie de message numériquement signée."
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Contenu du corps de l'index"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Impossible de récupérer le message de l'éditeur."
@@ -8317,15 +8655,15 @@ msgstr "Erreur d'écriture du fichier temporaire de courrier : %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Erreur de copie du fichier temporaire de courrier : %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Impossible de décrypter la partie MIME : erreur de protocole"
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "Impossible de décrypter la partie MIME: structure invalide"
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "erreur d'analyse"
 
@@ -8658,12 +8996,12 @@ msgid "For reading mail as a query of another set of folders"
 msgstr ""
 "Pour la lecture du courrier comme requête sur un autre ensemble de dossiers"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Aucun fournisseur disponible pour le protocole « %s »"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8672,71 +9010,82 @@ msgstr ""
 "Impossible de créer le répertoire %s :\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Veuillez saisir votre phrase de passe %s pour %s."
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Indéfinie"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Éditer la signature"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Éditer la signature"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Impossible de signer : certificat non trouvé pour « %s »."
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "Certificat non autorisé :"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Enregistrer la signature"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Erreur d'analyse"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Serveur : %s, type : %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Impossible d'obtenir le dossier : opération invalide sur ce stockage"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Impossible de créer le dossier : opération invalide sur ce stockage"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Corbeille"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "Juin"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "Impossible d'obtenir le certificat de l'émetteur."
@@ -8946,7 +9295,7 @@ msgstr ""
 "Liste de révocations de certificat expirée : %s\n"
 "Émetteur : %s"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Impossible d'analyser l'URL « %s »."
@@ -8966,22 +9315,22 @@ msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 "Impossible de copier ou déplacer des messages vers des dossiers virtuels."
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Impossible de supprimer le dossier : %s : opération invalide."
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Impossible de supprimer le dossier : %s : dossier inexistant."
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Impossible de renommer le dossier : %s : opération invalide."
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Impossible de renommer le dossier : %s : dossier inexistant."
@@ -9061,7 +9410,7 @@ msgstr "Impossible de récupérer le message : %s"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9075,7 +9424,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Aucun message correspondant"
@@ -9113,56 +9462,71 @@ msgid "Failed to cache %s: %s"
 msgstr "Impossible de mettre %s en cache : %s."
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Connexion au serveur"
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Échec de la connexion au serveur LDAP"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "Commande"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Recherche de nouveau courrier"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 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:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Dossiers"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Afficher uniquement les dossiers abonnés"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "Outrepasser l'espace de noms fourni par le serveur"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Espace de noms"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 "Appliquer les filtres aux nouveaux messages dans la boîte de réception sur "
 "ce serveur"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Vérifier automatiquement la présence de nouveaux messages tous les"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Lecture et stockage du courrier sur des serveurs IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Mot de passe"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9422,7 +9786,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Impossible de renommer le dossier %s vers %s : %s."
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Impossible de renommer « %s » : %s."
@@ -9537,29 +9901,29 @@ msgstr "Recherche de nouveaux messages"
 msgid "Storing folder"
 msgstr "Stockage du dossier"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Impossible de créer le verrou sur le dossier %s : %s."
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Impossible d'ouvrir la boîte à lettres : %s : %s.\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "Ajout de courrier annulé"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Impossible de joindre le message au fichier mbox : %s : %s."
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9568,11 +9932,11 @@ msgstr ""
 "Impossible d'obtenir le message : %s du dossier %s\n"
 "  %s."
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Le dossier semble irrémédiablement corrompu."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Erreur construction message : boîte à lettres corrompue ?"
 
@@ -9640,12 +10004,17 @@ msgstr "Impossible de créer le répertoire %s : %s."
 msgid "Cannot create folder: %s: %s"
 msgstr "Impossible d'obtenir le répertoire : %s : %s."
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "L'ID de la carte existe déjà."
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Impossible de renommer le dossier %s vers %s : %s."
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Le nom de dossier spécifié n'est pas valide : %s"
@@ -9691,7 +10060,7 @@ msgstr "Impossible de fermer le dossier source %s : %s."
 msgid "Could not close temp folder: %s"
 msgstr "Impossible de fermer le dossier temporaire : %s."
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Impossible de renommer le dossier : %s."
@@ -9977,7 +10346,7 @@ msgstr "Supprimer après %s jour(s)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Désactiver le support de toutes les extensions POP3"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -10067,7 +10436,7 @@ msgid "No such folder `%s'."
 msgstr "Aucun dossier de type « %s »."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10121,7 +10490,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Distribution du courrier via le programme sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10293,7 +10662,7 @@ msgid "Cannot send message: sender address not valid."
 msgstr ""
 "Impossible d'envoyer le message : l'adresse de l'expéditeur n'est pas valide."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Envoi du message"
 
@@ -10415,7 +10784,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "pièce jointe"
 
@@ -10460,14 +10829,14 @@ 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:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Vous devez configurer un compte\n"
 "avant de pouvoir composer un message."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Cliquez ici pour le carnet d'adresses"
 
@@ -10478,45 +10847,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Répondre à :"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "De :"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Objet :"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "À :"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Saisissez les destinataires du message"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc :"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Saisissez les adresses qui recevront une copie carbone de ce message"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc :"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10528,15 +10897,20 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Poster à :"
 
 #
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr "Destination de la contribution"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Joindre un fichier au message"
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Joindre des fichiers"
@@ -10574,21 +10948,21 @@ msgstr "Le fichier existe, l'écraser ?"
 msgid "Error saving file: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erreur de chargement du fichier : %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erreur accès au fichier : %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Impossible de récupérer le message de l'éditeur."
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10597,7 +10971,7 @@ msgstr ""
 "Impossible de rechercher dans le fichier : %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10606,7 +10980,7 @@ msgstr ""
 "Impossible de tronquer le fichier : %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10615,7 +10989,7 @@ msgstr ""
 "Impossible de copier le descripteur de fichier : %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10624,7 +10998,7 @@ msgstr ""
 "Erreur lors de l'auto-enregistrement du message : %s :\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10632,7 +11006,7 @@ msgstr ""
 "Evolution a trouvé des fichiers non enregistrés d'une session précédente.\n"
 "Voulez-vous essayer de les récupérer ?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10643,28 +11017,28 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer les modifications ?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Avertissement : message modifié"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Ouvrir un fichier"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "Signature :"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "Généré automatiquement"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Composer un message"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10672,7 +11046,7 @@ msgstr ""
 "Impossible de créer la fenêtre de composition :\n"
 "activation du composant de sélection d'adresses impossible."
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10684,7 +11058,7 @@ msgstr ""
 "Veuillez vous assurer que vous avez les bonnes\n"
 "versions de gtkhtml et libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10692,7 +11066,7 @@ msgstr ""
 "Impossible de créer la fenêtre de composition :\n"
 "activation du composant « Éditeur HTML » impossible."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10701,11 +11075,13 @@ msgstr ""
 "édité.)<b>"
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "La suite de travail collaboratif Evolution"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10961,13 +11337,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11086,7 +11462,7 @@ msgstr "Alors"
 msgid "You must specify a folder."
 msgstr "Vous devez indiquer un dossier."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Sélectionnez un dossier."
@@ -11100,24 +11476,24 @@ msgstr ""
 "Erreur dans l'expression régulière « %s » :\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Important"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "À faire"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Plus tard"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Test"
 
@@ -11217,7 +11593,7 @@ msgstr "passé(e)s"
 msgid "months"
 msgstr "mois"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "secondes"
 
@@ -11314,7 +11690,7 @@ msgstr "Expression"
 msgid "Follow Up"
 msgstr "Donner suite"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "Étiquette"
 
@@ -11384,114 +11760,120 @@ msgid "Source Account"
 msgstr "Compte source"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Crachin"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "En-tête spécifique"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Arrêter le traitement"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Objet"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "Statut non défini"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "contient"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "ne contient pas"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "ne finit pas par"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "n'existe pas"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "does not return"
 msgstr "ne retourne pas"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "ne ressemble pas à"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "ne commence pas par"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "finit par"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "existe"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr "est marqué"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr "est aprés"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "is before"
 msgstr "est avant"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "est supérieur à"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "est inférieur à"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr "n'est pas marqué"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "n'est pas"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "est"
 
 #
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr "est supérieur à"
 
 #
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr "est inférieur à"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr "retourne"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "ressemble à"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "Débute par"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Le nom de la règle « %s » n'est pas unique. Choisissez-en un autre."
@@ -11516,18 +11898,81 @@ msgstr "Nom de la règle"
 msgid "Score Rules"
 msgstr "Règles des scores"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Vous devez nommer ce dossier virtuel."
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr "Vous devez spécifier au moins un dossier comme source."
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 msgid "VFolder source"
 msgstr "Source du dossier virtuel"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Préférences du composeur"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Définissez ici les préférences pour le courrier, les paramètres de sécurité "
+"et l'affichage des messages."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Définissez ici la fonction de correction de l'orthographe et les signatures, "
+"et configurez le composeur de messages."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Configurez ici vos comptes de messagerie."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Messagerie d'Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Composant de configuration des comptes de messagerie d'Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Composant Messagerie d'Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Composeur de courrier d'Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Composant de configuration du composeur de courrier d'Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail folder viewer"
+msgstr "Afficheur de dossiers courrier d'Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Préférences de la messagerie d'Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Courrier"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Comptes de messagerie"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "Préférences du courrier"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Êtes-vous sûr de vouloir supprimer ce compte ?"
@@ -11569,7 +12014,7 @@ msgid "Protocol"
 msgstr "Protocole"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr "Sans nom"
 
@@ -11593,21 +12038,18 @@ msgstr "Ajouter une signature script"
 msgid "Signature(s)"
 msgstr "Signatures"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "Vous êtes sur le point d'envoyer un message au format HTML. Veuillez\n"
 "vous assurer que les destinataires suivants veulent et peuvent recevoir\n"
 "du courrier HTML : \n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Envoyer tout de même ?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11615,7 +12057,7 @@ msgstr ""
 "Ce message n'a pas d'objet.\n"
 "Voulez-vous vraiment l'envoyer ?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11623,11 +12065,11 @@ msgstr ""
 "Comme la liste de contacts que vous envoyez est configurée pour masquer la "
 "liste des adresses, ce message contiendra seulement des destinataires Bcc."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Le message contient seulement des destinataires Bcc."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11637,12 +12079,12 @@ msgstr ""
 "en ajoutant un en-tête Apparently-To.\n"
 "Envoyer quand même ?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 "Vous devez spécifier des destinataires afin de pouvoir envoyer ce message."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11654,189 +12096,404 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Créer un dossier _virtuel à partir d'une recherche..."
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "Courrier"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<cliquez ici pour sélectionner un dossier>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "« %s » dans « %s »"
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Créer un nouveau dossier"
 
-#: mail/em-folder-selector.c:267
-#, fuzzy
-msgid "Folder _name"
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Précisez où créer le dossier >"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
 msgstr "_Nom du dossier :"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Impossible de créer de répertoire temporaire : %s."
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Impossible de créer de répertoire temporaire : %s."
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Impossible de créer le fichier temporaire : « %s » : %s."
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Impossible de fermer le dossier temporaire : %s."
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Chargement"
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Sélectionnez un dossier"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Créer un nouveau dossier"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Impossible de supprimer le dossier « %s » : %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Réellement supprimer le dossier « %s » ? "
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Supprimer « %s »"
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Renommer le dossier « %s » en :"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+msgid "Rename Folder"
+msgstr "Renommer le dossier"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+"Un dossier nommé « %s » existe déjà. Veuillez utiliser un nom différent."
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Propriétés de la police"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Propriétés"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "Nom du _Dossier :"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "Afficha_ge"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Ouvrir dans une nouvelle fenêtre"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Déplacer"
+
+#: mail/em-folder-tree.c:1500
+msgid "_New Folder..."
+msgstr "_Nouveau dossier..."
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "_Renommer"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "_Propriétés..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "_Éditer comme nouveau  message..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "_Imprimer"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Répondre à l'expéditeur"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Répondre à la _liste"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Répondre à _tous"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "_Faire suivre"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr "_Donner suite..."
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr "Marquer _Achevé"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "_Effacer les marqueurs"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Marquer comme _lu"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "Marquer comme _non lu"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Marquer comme _important"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "Marquer comme non im_portant"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Marquer comme _non lu"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Marquer comme _important"
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "_Récupérer"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "Déplacer _vers le dossier..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Copier vers le dossier..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "Ajouter l'expéditeur au _carnet d'adresses"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "Appliquer les _filtres"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "Créer une _règle à partir du message"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "Dossier virtuel sur l'_objet"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "Dossier virtuel sur l'e_xpéditeur"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "Dossier virtuel sur les de_stinataires"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "Dossier virtuel sur la _liste de diffusion"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "Dossier virtuel sur l'e_xpéditeur"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Filtre sur l'_objet"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Filtre sur l'e_xpéditeur"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Filtre sur les de_stinataires"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Filtre sur la _liste de diffusion"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filtre sur l'e_xpéditeur"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Défaut"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Imprimer le message"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Copier l'emplacement du lien"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Correspond :"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Attribué"
+
+#: mail/em-format-html-display.c:597
+#, fuzzy
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr ""
+"Ce message est signé numériquement mais ne peut être certifié authentique."
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Éditer la signature"
+
+#: mail/em-format-html-display.c:598
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
 msgstr ""
-"Ce message est signé numériquement. Cliquez sur l'icône de verrou pour plus "
-"d'informations."
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Éditer la signature"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+#, fuzzy
+msgid "Valid signature, cannot verify sender"
+msgstr "Éditer le contenu de la signature dans l'éditeur"
+
+#: mail/em-format-html-display.c:600
+#, fuzzy
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"Le paramètre input_token contient une signature non valide, ou une signature "
+"qui n'a pas pu être vérifiée."
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Interrompu"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "Chiffrer avec PGP"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Impossible d'analyser le message MIME. Afficher comme source"
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Schéma non supporté"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Impossible de vérifier la signature de la feuille."
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Afficher dans le corps"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Masquer"
@@ -11846,186 +12503,208 @@ msgstr "Masquer"
 msgid "Page %d of %d"
 msgstr "Page %d de %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Récupération du message %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Partie corps externe mal formée"
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pointeur sur le site FTP (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, 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/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pointeur sur le fichier local (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pointeur sur des données distantes (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pointeur sur des données externes inconnues (« %s » type)"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-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/em-format-html.c:906 mail/em-format.c:1217
-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/em-format-html.c:930 mail/em-format.c:1190
-#, fuzzy
-msgid "No signature present"
-msgstr "Masquer l'indication de signature"
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Impossible d'initialiser GNOME."
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Schéma non supporté"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Impossible d'analyser le message MIME. Afficher comme source"
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Déplacement des messages"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "De"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Répondre à :"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "À"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "Logiciel de messagerie"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Date"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "pièce jointe %s"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Impossible d'analyser le message MIME. Afficher comme source"
+msgid "Session not initialised"
+msgstr "Impossible d'initialiser GNOME."
+
+#: mail/em-format.c:1210
+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/em-format.c:1212
+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/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Attente..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Ping sur %s"
 
-#: mail/em-popup.c:593
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Impossible de mettre %s en cache : %s."
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Impossible de créer le tube pour « %s » : %s."
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Impossible de résoudre le nom d'hôte « %s » : %s."
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Enregistrer sous..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Répondre à l'expéditeur"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Ouvrir un lien dans le navigateur"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Envoyer un _message à la liste..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Ajouter un carnet d'adresses"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Ouvrir dans %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr ""
 "Ce serveur ne supporte pas les informations relatives au schéma LDAPv3."
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "S'abonner"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Dossier"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Veuillez sélectionner un serveur."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Aucun serveur n'a été sélectionné."
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Ne plus afficher ce message."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12034,27 +12713,27 @@ msgstr ""
 "Erreur de chargement des informations du filtre :\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Filtres"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Message transféré"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "Un expéditeur inconnu"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Le %a %d/%m/%Y à %H:%M,  %%s a écrit :"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12063,7 +12742,7 @@ msgstr ""
 "Impossible d'enregistrer dans « %s »\n"
 " %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12072,26 +12751,27 @@ msgstr ""
 "« %s » existe déjà.\n"
 "L'écraser ?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Message"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Enregistrer le message sous..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Impossible de créer de répertoire temporaire : %s."
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Adresse"
 
 #
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12100,62 +12780,437 @@ msgstr ""
 "\n"
 "Effacer réellement ces messages ?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Préférences du composeur"
+#
+#: mail/em-utils.c:2288
+#, fuzzy
+msgid ""
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Cette opération effacera définitivement tous les messages marqués comme\n"
+"effacés. Si vous continuez, vous ne pourrez plus les récupérer.\n"
+"\n"
+"Effacer réellement ces messages ?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/evolution-mail.schemas.in.in.h:1
+#, fuzzy
+msgid "Automatic link recognition"
+msgstr "_Détecter automatiquement les liens"
+
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "_Détecter automatiquement les liens"
+
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
+msgid "Default charset in which to compose messages"
+msgstr "Objet par défaut pour le message."
+
+#: mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
+msgid "Default charset in which to compose messages."
+msgstr "Objet par défaut pour le message."
+
+#: mail/evolution-mail.schemas.in.in.h:8
+#, fuzzy
+msgid "Default charset in which to display messages"
+msgstr "Rechercher un texte dans le corps du message affiché"
+
+#: mail/evolution-mail.schemas.in.in.h:9
+#, fuzzy
+msgid "Default charset in which to display messages."
+msgstr "Rechercher un texte dans le corps du message affiché"
+
+#: mail/evolution-mail.schemas.in.in.h:10
+#, fuzzy
+msgid "Default forward style"
+msgstr "Style de transfert par défaut :"
+
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default reply style"
+msgstr "Style de transfert par défaut :"
+
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Empty Trash folders on exit"
+msgstr "Vider les dossiers Corbeille en qui_ttant"
+
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Vider les dossiers Corbeille en qui_ttant"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+#, fuzzy
+msgid "Height of the message-list pane"
+msgstr "Envoyer le message plus tard"
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid ""
-"Configure mail preferences, including security and message display, here"
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
 msgstr ""
-"Définissez ici les préférences pour le courrier, les paramètres de sécurité "
-"et l'affichage des messages."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
 msgstr ""
-"Définissez ici la fonction de correction de l'orthographe et les signatures, "
-"et configurez le composeur de messages."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Configurez ici vos comptes de messagerie."
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
+msgstr "Liste de signatures"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Messagerie d'Evolution"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Composant de configuration des comptes de messagerie d'Evolution"
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Composant Messagerie d'Evolution"
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Composeur de courrier d'Evolution"
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Composant de configuration du composeur de courrier d'Evolution"
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Afficheur de dossiers courrier d'Evolution"
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "Enregistrer les actions des _filtres dans :"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Préférences de la messagerie d'Evolution"
+#: mail/evolution-mail.schemas.in.in.h:28
+#, fuzzy
+msgid "Log filter actions to the specified log file."
+msgstr "Enregistrer les actions des _filtres dans :"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Comptes de messagerie"
+#: mail/evolution-mail.schemas.in.in.h:29
+#, fuzzy
+msgid "Logfile to log filter actions"
+msgstr "Enregistrer les actions des _filtres dans :"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "Préférences du courrier"
+#: mail/evolution-mail.schemas.in.in.h:30
+#, fuzzy
+msgid "Logfile to log filter actions."
+msgstr "Enregistrer les actions des _filtres dans :"
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Notification du courrier entrant"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Notification du courrier entrant"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+#, fuzzy
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr "Avertissement lors de l'envoi d'un message sans _objet"
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+"Demander lors de l'envoi de messages HTML à des contacts qui n'en veulent "
+"_pas"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr ""
+"_Demander lors de l'envoi de messages où seuls des destinataires BCC sont "
+"définis."
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "Envoyer par défaut le courrier au format HTML"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "Envoyer par défaut le courrier au format HTML"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "Afficher le_s images animées"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "Afficher le_s images animées"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Afficher le message en style normal"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "Panneau d'_aperçu"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "_Jouer un fichier son lors de l'arrivée de nouveaux messages"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "_Correction orthographique"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "Police du _terminal :"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "Sélection d'une police HTML à largeur variable pour l'impression"
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Liste de messages par fil de discussion"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Liste de messages par fil de discussion"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "En faire _mon compte par défaut"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "_Largeur variable :"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Assistant d'importation Elm d'Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+msgid "Evolution mbox importer"
+msgstr "Assistant d'importation mbox d'Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Netscape Mail importer"
+msgstr "Assistant d'importation de courrier Netscape d'Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Assistant d'importation Outlook Express 4 d'Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Pine importer"
+msgstr "Assistant d'importation Pine d'Evolution"
 
 #: mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
@@ -12195,34 +13250,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Assistant d'importation Elm d'Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Assistant d'importation mbox d'Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Netscape Mail importer"
-msgstr "Assistant d'importation de courrier Netscape d'Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Assistant d'importation Outlook Express 4 d'Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Pine importer"
-msgstr "Assistant d'importation Pine d'Evolution"
-
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -12284,12 +13311,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importe vos anciennes données Netscape."
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Corbeille"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Examen des filtres de courrier"
@@ -12298,7 +13319,7 @@ msgstr "Examen des filtres de courrier"
 msgid "Scanning directory"
 msgstr "Examen du répertoire"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Démarrage de l'importation"
 
@@ -12374,23 +13395,23 @@ msgid "You have not filled in all of the required information."
 msgstr "Vous n'avez pas saisi toutes les informations requises."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Éditeur de compte d'Evolution"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Hôte :"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "_Nom d'utilisateur :"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Chemin :"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Vous ne devez pas créer deux comptes avec le même nom."
 
@@ -12399,35 +13420,35 @@ msgstr "Vous ne devez pas créer deux comptes avec le même nom."
 msgid "Mail to %s"
 msgstr "Courrier à %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "L'objet est %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Courrier de %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "liste de diffusion %s"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Répondu à"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Ajouter une règle de filtre"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "Les règles de filtrage suivantes :\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12438,144 +13459,30 @@ msgstr ""
 "    « %s »\n"
 "Et ont été mis à jour."
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "Connexion..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Ce dossier ne peut pas contenir de messages."
-
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Impossible d'ouvrir le dossier partagé : %s."
-
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Impossible de créer de répertoire temporaire : %s."
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Nouveau message"
 
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Impossible de créer le fichier temporaire : « %s » : %s."
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "_Message"
 
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Impossible de fermer le dossier temporaire : %s."
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "Composer un nouveau message"
 
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Sélectionnez un dossier de destination pour importer ces données."
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Sélectionnez un dossier de destination pour importer ces données."
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Créer un nouveau dossier"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Précisez où créer le dossier >"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Impossible de supprimer le dossier « %s » : %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Réellement supprimer le dossier « %s » ? "
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Supprimer « %s »"
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Renommer le dossier « %s » en :"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-msgid "Rename Folder"
-msgstr "Renommer le dossier"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Le nom de dossier spécifié n'est pas valide : %s"
-
-#: mail/mail-component.c:1860
-#, fuzzy, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-"Un dossier nommé « %s » existe déjà. Veuillez utiliser un nom différent."
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Propriétés de la police"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Propriétés"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "Nom du _Dossier :"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "Afficha_ge"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Ouvrir dans une nouvelle fenêtre"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Déplacer"
-
-#: mail/mail-component.c:2087
-msgid "_New Folder..."
-msgstr "_Nouveau dossier..."
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "_Renommer"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Propriétés..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Identité"
 
@@ -12639,11 +13546,11 @@ msgstr ""
 "Evolution. Veuillez saisir un nom pour ce compte dans l'espace ci-dessous. "
 "Ce nom sera utilisé uniquement dans un but d'affichage."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Service de vérification"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Connexion au serveur"
 
@@ -12726,26 +13633,35 @@ msgid "C_olors"
 msgstr "C_ouleurs"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Recherche de nouveau courrier"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "Vérifier l'or_thographe pendant la frappe"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Recherche de nouveau courrier"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "Couleur pour les _mots mal orthographiés :"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Composition des messages"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Configuration"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12760,134 +13676,139 @@ msgstr ""
 "\n"
 "Cliquez sur « Appliquer » pour enregistrer les paramètres."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "Dé_faut"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Comportement par défaut"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "_Codage des caractères par défaut :"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Suppression du courrier"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr ""
 "_Toujours signer les messages sortants lors de l'utilisation de ce compte"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "Ne pas citer le message d'origine"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Ne pas signer les de_mandes de réunion (compatibilité Outlook)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Fait"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "Dossier _Brouillons :"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "A_ctiver"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "Comptes de courrier"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "_Adresse électronique :"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "Vider les dossiers Corbeille en qui_ttant"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_ID de certificat :"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Assistant de compte d'Evolution"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Exécuter une commande..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "Largeur fi_xe :"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "<< Moins d'options"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "Propriétés de la police"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "Formater les messages en _HTML"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "Mettre les citations en _surbrillance avec"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Dans le corps"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Étiquettes et couleurs"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Chargement des images"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Configuration de la messagerie"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Emplacement de la boîte à lettres"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Composeur de messages"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Affichage du message"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 msgid "Message Fonts"
 msgstr "Polices pour les messages"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Notification du courrier entrant"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -12895,142 +13816,142 @@ msgstr ""
 "Note : vous n'aurez pas à fournir de mot de passe avant votre première "
 "connexion."
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Informations facultatives"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "Or_ganisation :"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "ID de la _clé PGP/GPG :"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Choisissez une couleur"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "_Demander lors de l'envoi de messages où seuls des destinataires BCC sont "
 "définis."
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Polices imprimées"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Répertoire de courrier Qmail"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "Citer le message d'origine"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Cité"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "_Mémoriser le mot de passe"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "Ré_pondre à :"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Réception des messages"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "_Options de réception"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "Mémoriser ce mot de _passe"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Informations requises"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "Restaurer les valeurs par défaut"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "S_écurité"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME sécurisé (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr "Sélection d'une police HTML à largeur fixe"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr "Sélection d'une police HTML à largeur fixe pour l'impression"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr "Sélection d'une police HTML à largeur variable"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr "Sélection d'une police HTML à largeur variable pour l'impression"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Envoi du message"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Dossier des _messages envoyés :"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Messages envoyés et brouillons"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Le _serveur requiert une authentification."
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Configuration du serveur"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "_Type de serveur : "
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Impossible de signer : certificat non trouvé pour « %s »."
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "Spécifiez le nom de _fichier :"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "_Correction orthographique"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "mbox Unix standard"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13040,7 +13961,7 @@ msgstr ""
 "signature. Le nom spécifié ne sera utilisé\n"
 "que pour l'affichage. "
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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 "
@@ -13050,7 +13971,7 @@ msgstr ""
 "orthographique ainsi que la langue. La liste ne mentionne que les langues "
 "pour lesquelles un dictionnaire a été installé."
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13058,11 +13979,15 @@ msgstr ""
 "Saisissez le nom par lequel vous voulez désigner ce compte.\n"
 "Par exemple : « Travail » ou « Personnel »"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "_Largeur variable :"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13072,173 +13997,182 @@ msgstr ""
 "\n"
 "Cliquez sur  « Suivant » pour commencer."
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "A_jouter une signature"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "_Toujours charger les images hors du réseau"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 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:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "Type d'_authentification : "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "Type d'_authentification : "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr "_Vérifier automatiquement la présence de nouveaux messages tous les"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "Insérer _automatiquement des images de trombines"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "Émettre un _bip lors de l'arrivée de nouveaux messages"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "_Confirmer avant le nettoyage du dossier"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "Signature par _défaut :"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "Valeurs par _défaut"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "Ne pas prévenir lors _de l'arrivée de nouveaux messages"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "Activ_er"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "Style de _transfert :"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "_Nom complet :"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "Courrier _HTML"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "_Identité"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Juin"
+
+#: mail/mail-config.glade.h:156
 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:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "En faire _mon compte par défaut"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "_Marquer les messages comme lus après"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Nom :"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "_Ne jamais charger les images hors du réseau"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "_Jouer un fichier son lors de l'arrivée de nouveaux messages"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Demander lors de l'envoi de messages HTML à des contacts qui n'en veulent "
 "_pas"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Demander lors de l'envoi de messages dé_pourvu d'objet"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "_Réception du courrier"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "Style de _réponse  :"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "_Restaurer les valeurs par défaut"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Script :"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Supprimer..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "Envoi du _courrier"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "Afficher le_s images animées"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Signatures"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr "Police par _défaut :"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr "Police du _terminal :"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "_Utiliser une connexion sécurisée (SSL) :"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr "_Utiliser les mêmes polices que dans les autres applications"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "description"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping sur %s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13247,7 +14181,7 @@ msgstr ""
 "Erreur durant « %s » :\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13256,7 +14190,7 @@ msgstr ""
 "Erreur durant l'exécution de l'opération :\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Travail en cours"
 
@@ -13268,118 +14202,118 @@ msgstr "Filtrage du dossier"
 msgid "Fetching Mail"
 msgstr "Récupération du courrier"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Échec du stockage du courrier dans le fichier temporaire %s : %s."
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Échec du stockage du courrier dans le fichier temporaire %s : %s."
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Envoi de « %s »"
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Envoi du message %d du %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Échec sur le message %d de %d"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Terminé"
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Enregistrement du message dans le dossier"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Déplacement des messages vers %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copie des messages vers %s"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examen des dossiers dans « %s »"
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Messages transférés"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ouverture du dossier %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "Ouverture du stockage %s"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Suppression du dossier %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Stockage du dossier « %s »"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Rafraîchissement du dossier"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Nettoyage du dossier"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vidage de la corbeille dans « %s »"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Dossiers locaux"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Récupération du message %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Récupération de %d message(s)"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Enregistrement de %d message(s)"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13388,7 +14322,7 @@ msgstr ""
 "Impossible de créer le fichier de sortie : %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13397,11 +14331,11 @@ msgstr ""
 "Erreur lors de l'enregistrement des messages vers : %s :\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Enregistrement de la pièce jointe"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13410,21 +14344,25 @@ msgstr ""
 "Impossible de créer le fichier de sortie : %s\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Impossible d'écrire les données : %s."
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Déconnexion de %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconnexion à %s"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Respecter la casse"
@@ -13441,60 +14379,75 @@ msgstr "Rechercher :"
 msgid "Search"
 msgstr "Rechercher"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Éditer la signature"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Exceptions"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Informations de source"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Annulation..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Serveur : %s, type : %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Chemin : %s, type : %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Type : %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Envoyer & recevoir le courrier"
 
 #
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 msgid "Cancel _All"
 msgstr "_Tout annuler"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Mise à jour..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Attente..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "L'utilisateur a annulé l'opération."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Saisissez le mot de passe pour %s"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Saisissez le mot de passe"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "Mémo _riser le mot de passe"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr "Mémo_riser ce mot de passe jusqu'à la fin de la session."
 
@@ -13533,26 +14486,31 @@ msgstr "Saisissez un nom pour cette signature."
 msgid "Name:"
 msgstr "Nom :"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Message transféré - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Message transféré"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Ouverture du dossier %s"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Mise en place du dossier virtuel : %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Mise à jour des dossiers virtuels pour l'URI : %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13565,88 +14523,88 @@ msgstr ""
 "        « %s »\n"
 "et ont été mis à jour."
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "Dossiers virtuels"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "Dossiers virtuels"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Éditer le dossier virtuel"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Tentative d'édition du dossier virtuel « %s » qui n'existe pas."
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Nouveau dossier virtuel"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Non vu"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Vu"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Répondu"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Multiples messages non vus"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Messages multiples"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Le plus bas"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Plus bas"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Plus haut"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Le plus haut"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Aujourd'hui %H:%M"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Hier %H:%M"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H:%M"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Génération de la liste des messages"
 
@@ -13703,11 +14661,11 @@ msgstr "Faire suivre"
 msgid "No Response Necessary"
 msgstr "Aucune réponse nécessaire"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Répondre"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Répondre à tous"
 
@@ -13759,41 +14717,140 @@ msgstr "_S'abonner"
 msgid "_Unsubscribe"
 msgstr "Se _désabonner"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr "Configurez ici les dossiers spéciaux et les dossiers hors-ligne"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Shell d'Evolution."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Paramètres dossier"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "380"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Renommer ce groupe de raccourcis"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Commuter l'affichage de la barre de dossiers"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Masquer la barre de raccourcis"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Priorité par défaut :"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Priorité par défaut :"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Interface de configuration de la messagerie d'Evolution"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+#, fuzzy
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+"Marquer le fichier joint à afficher par défaut dans le corps du message."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
 msgstr ""
-"Impossible de transférer le dossier :\n"
-"%s"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Ajouter un dossier"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Brouillons"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Boîte de réception"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Boîte d'envoi"
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "Ouverture du dossier de tâches par défaut"
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Envoyé"
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Ouverture du dossier de tâches par défaut"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Ouverture du dossier de tâches par défaut"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Ouverture du dossier de tâches par défaut"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Commuter l'affichage de la barre de dossiers"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Commuter l'affichage de la barre de raccourcis"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "Courrier électronique"
 
-#: shell/e-setup.c:145
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Impossible de mettre à jour les fichiers correctement."
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13804,7 +14861,7 @@ msgstr ""
 "%s.\n"
 "Erreur : %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13813,7 +14870,7 @@ msgstr ""
 "Une erreur est survenue durant la copie des fichiers dans\n"
 "« %s »."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13824,7 +14881,7 @@ msgstr ""
 "Déplacez-le afin de permettre l'installation\n"
 "des fichiers utilisateur d'Evolution."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13922,11 +14979,11 @@ msgstr ""
 "Impossible de supprimer le dossier :\n"
 "%s."
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
-"Un dossier nommé « %s » existe déjà. Veuillez utiliser un nom différent."
+msgid "The specified folder name is not valid: %s"
+msgstr "Le nom de dossier spécifié n'est pas valide : %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -13950,19 +15007,15 @@ msgstr ""
 "Impossible de créer le dossier spécifié :\n"
 "%s."
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Créer un nouveau dossier"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Sans titre)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Choisissez l'assistant d'importation à lancer :"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13976,11 +15029,11 @@ msgstr ""
 "Si vous ignorez le type, sélectionnez « Automatique » et Evolution essaiera "
 "de l'utiliser."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Veuillez sélectionner les informations que vous désirez importer :"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13992,7 +15045,7 @@ msgstr ""
 "être importé n'a été trouvé. Si vous voulez essayer de nouveau,\n"
 "veuillez cliquer le bouton « Retour ».\n"
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14001,21 +15054,21 @@ msgstr ""
 "Importation de %s\n"
 "Importation de l'élément %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "Sélectionnez un assistant d'importation."
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "Le fichier %s n'existe pas."
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Erreur d'Evolution"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -14024,11 +15077,11 @@ msgstr ""
 "Aucun assistant d'importation ne peut traiter\n"
 "%s."
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Importation"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -14037,17 +15090,17 @@ msgstr ""
 "Importation de %s.\n"
 "Lancement de %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Erreur au lancement de %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Erreur de chargement de %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14056,35 +15109,35 @@ msgstr ""
 "Importation de %s\n"
 "Importation de l'élément 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Automatique"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Nom du _fichier"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Sélectionner un fichier"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Type de fichier :"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Importer les données et paramètres d'anciens programmes"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Importer un seul fichier"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -14092,47 +15145,28 @@ msgstr ""
 "Veuillez patienter...\n"
 "Recherche des paramétrages existants"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Lancement des assistants intelligents d'importation"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "De %s :"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Sélectionnez un dossier de destination pour importer ces données."
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Importer"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Fermeture des connexions..."
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Erreur de synchronisation « %s » : \n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "Synchronisation du dossier"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Synchronisation de « %s » (%d de %d) ..."
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Paramètres d'Evolution"
@@ -14167,7 +15201,7 @@ msgstr "Impossible d'ouvrir le dossier partagé : %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Impossible de trouver le dossier partagé spécifié."
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14176,17 +15210,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Adjoint"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Nouveau"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Aucun nom de dossier spécifié."
@@ -14244,64 +15272,51 @@ msgstr "Créer un nouveau raccourci"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Sélectionnez le dossier vers lequel faire pointer le raccourci :"
 
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "Travail _en ligne"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "Travail _hors ligne"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Travail hors ligne"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Aucun dossier affiché)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Aucun)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 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:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution est en train de passer hors ligne."
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution est hors ligne. Cliquez sur ce bouton pour travailler en "
 "ligne."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Arguments invalides"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Impossible d'enregistrer dans OAF."
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Base de données de configuration non trouvée"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Erreur générique"
 
@@ -14416,74 +15431,18 @@ msgstr "Suppri_mer"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Supprimer ce raccourci de la barre de raccourcis"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Erreur lors de l'enregistrement des raccourcis."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Boîte de réception"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Raccourcis"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Aucune erreur"
-
-#: 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:575
-msgid "The specified folder type is not valid"
-msgstr "Le type de dossier spécifié n'est pas valide."
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "Erreur d'E/S"
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr "Espace insuffisant pour créer le dossier"
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr "Le dossier n'est pas vide."
-
-#: 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:585
-msgid "Function not implemented in this storage"
-msgstr "La fonction n'est pas implémenté dans ce stockage."
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "Opération non supportée"
-
-#: 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 ce stockage."
-
-#: 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 supprimé."
-
-#: shell/e-storage.c:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "Impossible de faire d'un dossier un enfant de ses descendants."
-
-#: 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:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Opération impossible en mode Hors ligne"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Case à cocher"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14494,6 +15453,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% terminé)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Nouveau"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "« %s » dans « %s »"
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14531,74 +15501,6 @@ msgstr ""
 "L'erreur du système d'activation est :\n"
 "%s."
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "Erreur CORBA"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Interrompu"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Argument invalide"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "A déjà un propriétaire."
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Aucun propriétaire"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Introuvable"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Type non supporté"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Schéma non supporté"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Opération non supportée"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Erreur interne"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Existe"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "URI invalide"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "A des sous-dossiers."
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Espace manquant"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "L'ancien propriétaire a disparu."
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Type de test"
-
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr "Composant Test d'Evolution"
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr "Connexions actives"
@@ -14627,10 +15529,6 @@ msgstr "_Courrier :"
 msgid "_Tasks:"
 msgstr "_Tâches :"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr "_Nom du dossier :"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder _type:"
 msgstr "_Type de dossier :"
@@ -14693,22 +15591,6 @@ msgstr ""
 "\n"
 "Veuillez cliquer le bouton « Appliquer » pour enregistrer vos paramètres."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "Configurez ici les dossiers spéciaux et les dossiers hors-ligne"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Shell d'Evolution."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Composant de configuration des paramètres dossier d'Evolution"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Paramètres dossier"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Cliquez sur « Importer » pour commencer à importer le fichier."
@@ -14747,7 +15629,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Assistants d'importation"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Importer"
 
@@ -14763,16 +15645,16 @@ msgstr "Ne plus me demander"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution peut importer des données depuis les fichiers suivants :"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Fermeture d'Evolution..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14809,7 +15691,7 @@ msgstr ""
 "Nous espérons que vous apprécierez le résultat de notre dur labeur,\n"
 "et nous attendons impatiemment vos contributions !\n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -14817,36 +15699,48 @@ msgstr ""
 "Merci\n"
 "L'équipe Evolution de Ximian\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr "Ne plus me le dire"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Impossible d'accéder au shell de Ximian Evolution."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Impossible d'initialiser le shell de Ximian Evolution : %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Démarrer en mode déconnecté"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Démarrer en mode connecté"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr "Forcer l'arrêt de tous les composants d'Evolution."
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Envoyer la sortie de déboguage de tous les composants à un fichier."
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14855,31 +15749,64 @@ msgstr ""
 "%s : --online et --offline ne peuvent pas être utilisés \n"
 "ensemble. Utilisez %s --help pour plus d'informations.\n"
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Sélectionnez un assistant d'importation."
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_ID de certificat :"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "En cours"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Expression"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Adresse électronique :"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"Certificat expiré : %s\n"
+"Émetteur : %s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, fuzzy, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+"Émetteur : %s\n"
+"Objet : %s"
+
+#: smime/gui/e-cert-selector.c:117
+#, fuzzy, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+"Émetteur : %s\n"
+"Objet : %s"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14937,91 +15864,376 @@ msgid "Backup All"
 msgstr "Blackpool"
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "_ID de certificat :"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Certificat non autorisé :"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "_ID de certificat :"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Nom courant"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "_ID de certificat :"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "_Éditer"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Échec de vérification des certificats."
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Expression"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Organisation"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Organisation"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "Afficha_ge"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "_ID de certificat :"
+
+#: smime/gui/smime-ui.glade.h:42
+#, fuzzy
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr "Autorité de certification (CA) invalide"
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "_ID de certificat :"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Importer"
+msgid "Certificate already exists"
+msgstr "L'ID de la carte existe déjà."
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Vermont"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "OK"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "_ID de certificat :"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "_ID de certificat :"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "Certificat non autorisé :"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "ID"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "L'objet est %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Impossible de traiter le dossier spool."
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "Autorité de certification (CA) invalide"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Autorité de certification (CA) invalide"
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Aucune information"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "pièce jointe"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "_ID de certificat :"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Curitiba"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "Caroline du Nord"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Expression"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s à %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Échec de la signature du certificat"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "_Insérer"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "L'objet est %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Échec de la signature du certificat"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Saisissez le mot de passe pour %s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "_ID de certificat :"
 
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
@@ -15073,7 +16285,7 @@ msgstr "Copier la sélection"
 msgid "Copy to Folder..."
 msgstr "Copier vers le dossier..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Couper la sélection"
 
@@ -15089,7 +16301,7 @@ msgstr "Déplacer les contacts vers un autre dossier..."
 msgid "Move to Folder..."
 msgstr "Déplacer vers le dossier..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Coller le contenu du presse-papiers"
 
@@ -15097,8 +16309,8 @@ msgstr "Coller le contenu du presse-papiers"
 msgid "Previews the contacts to be printed"
 msgstr "Prévisualiser les contacts à imprimer"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "_Aperçu avant impression"
@@ -15143,13 +16355,13 @@ msgstr "Arrêter le chargement"
 msgid "View the current contact"
 msgstr "Voir le contact actif"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "_Actions"
 
@@ -15179,142 +16391,110 @@ msgstr "Envoyer un _message au contact..."
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "Créer un nouveau rendez-vous journée entière"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Créer un nouveau rendez-vous"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "Créer un nouveau dossier"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Créer une nouvelle demande de réunion"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Créer une nouvelle tâche"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Jour"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Supprimer toutes les occurences"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Supprimer le rendez-vous"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Supprimer cette occurence"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Supprimer cette occurence"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Aller à"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "En arrière"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "En avant"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Aller à la _date"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Aller à une date précise"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Aller à aujourd'hui"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "Liste"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Mois"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Nouveau _rendez-vous"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Nouvelle Calédonie"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Nouvelle réunion"
-
-#: ui/evolution-calendar.xml.h:27
-#, fuzzy
-msgid "New _Task"
-msgstr "Nouvelle tâche"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Prévisualise le calendrier à imprimer"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Imprimer ce calendrier"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publier l'information Libre/Occupé pour ce calendrier"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Bourges"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Dossier public contenant des rendez-vous et des événements"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Afficher les détails"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Afficher une journée"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Afficher un mois"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Afficher une semaine"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Afficher la semaine de travail"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Semaine"
 
@@ -15379,7 +16559,7 @@ msgstr "Enregistrer cet élément sur le disque"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Fichier"
 
@@ -15596,7 +16776,7 @@ msgstr "Marquer tout comme _lu"
 msgid "Mark all visible messages as read"
 msgstr "Marquer tous les messages visibles comme lus"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "Coller les messages à partir du presse-papiers"
 
@@ -15653,16 +16833,6 @@ msgstr "_Inverser la sélection"
 msgid "_Threaded Message List"
 msgstr "_Liste des messages par fil de discussion"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Fermer cette fenetre"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "_Fermer"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "A_jouter l'expéditeur au carnet d'adresses"
@@ -15821,258 +16991,283 @@ msgstr ""
 msgid "Increase the text size"
 msgstr "Augmenter la taille du texte"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Charger les _images"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Marquer comme _important"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Marquer comme _non lu"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Marquer comme n_on important"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "Marquer les messages sélectionnés comme lus"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "Marquer les messages sélectionnés comme important"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Marquer les messages sélectionnés comme non importants"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Marquer les messages sélectionnés comme non lus"
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Marquer les messages sélectionnés comme non lus"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Marquer les messages sélectionnés comme non importants"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Marquer les messages sélectionnés pour suppression"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Déplacer"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "Déplacer les messages sélectionnés vers un autre dossier"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Suivant"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "Message _important suivant"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "_Fil de discussion suivant"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "Message _non lu suivant"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Introuvable"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Ouvrir le message sélectionné dans une nouvelle fenêtre"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Ouvrir le message sélectionné dans le composeur pour le renvoyer"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Taille d'_origine"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "Message n_on lu précédent"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Poster une réponse"
 
 #
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr "Poster une réponse dans un dossier public"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "Message i_mportant précédent"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Prévisualiser le message a imprimer"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Précédent"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Imprimer ce message"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "Re_diriger"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Rediriger le message sélectionné à un correspondant"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Restaurer la taille du texte à sa valeur d'origine"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "R_echercher un message..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "Plus _petit"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Enregistrer le message comme un fichier texte"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Rechercher un texte dans le corps du message affiché"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr "Définissez les paramètres de la page pour votre imprimante active"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Afficher la _source du message"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Afficher les _en-têtes complets"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Rechercher un texte dans le corps du message affiché"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Afficher le message en style normal"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Afficher le message avec toutes les en-têtes"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Afficher la source brute du message"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "_Taille du texte"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Récupérer les messages sélectionnés"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "Dossier virtuel sur la _liste de diffusion..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "Dossier virtuel sur l'e_xpéditeur..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "Dossier virtuel sur les de_stinataires..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "Dossier virtuel sur l'_objet..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "_Joint"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "_Copier vers le dossier"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "_Créer un filtre à partir du message"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "Faire _suivre le message"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "_Aller à"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "_Dans le corps"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "Plus _grand"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "Affichage du _message"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Déplacer vers le dossier"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "Message _suivant"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "Affichage _normal"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "_Ouvrir le message"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "Message _précédent"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "_Cité"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "_Renvoyer..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "_Outils"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "_Récupérer"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Fermer cette fenetre"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "_Fermer"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Joindre"
@@ -16350,12 +17545,13 @@ msgid "Change Evolution's settings"
 msgstr "Changer les paramètres d'Evolution"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "_Quitter"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Créer une nouvelle demande de réunion"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "_Fenêtre Evolution"
+msgid "E_xit"
+msgstr "_Quitter"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16367,61 +17563,74 @@ msgstr "Importer les données d'autres programmes"
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "_Fenêtre Evolution"
+msgid "Open a new window"
+msgstr "Ouvrir dans une nouvelle fenêtre"
 
 #: ui/evolution.xml.h:11
 msgid "Pi_lot Settings..."
 msgstr "Paramètres du Pi_lot..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Envoyer / Recevoir"
+
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr "Envoyer les éléments en attente et récupérer les nouveaux"
+
+#: ui/evolution.xml.h:14
 msgid "Set up Pilot configuration"
 msgstr "Configuration du Pilot"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Afficher les informations concernant Ximian Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Soumettre un rapport d'anomalies"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "Soumettre un _rapport d'anomalies"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Soumettre un rapport d'anomalies en utilisant Bug Buddy."
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Commuter"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Commuter si travail Hors ligne"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "_FAQ Ximian Evolution"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "À _propos de Ximian Evolution..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "A_ide"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "_Importer..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Nouveau"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Envoyer / recevoir"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "_Trouver maintenant"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Imprimer le résumé"
@@ -16550,12 +17759,12 @@ msgstr "Vues définies"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "LMMJVSD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -16688,7 +17897,7 @@ msgstr "_Rechercher"
 msgid "_Find Now"
 msgstr "_Trouver maintenant"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "_Effacer"
 
@@ -16704,24 +17913,271 @@ msgstr "ID du sous-élément"
 msgid "Text"
 msgstr "Texte"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Effacer"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Rechercher maintenant"
 
+#~ msgid "Account Name"
+#~ msgstr "Nom du compte"
+
+#~ msgid "Server Name"
+#~ msgstr "Nom du serveur"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "LDAP n'a pas été activé dans cette compilation d'Evolution."
+
+#~ msgid "Other Contacts"
+#~ msgstr "Autres contacts"
+
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "Configurez ici l'accès aux serveurs d'annuaires LDAP"
+
+#~ msgid "Directory Servers"
+#~ msgstr "Serveurs d'annuaires"
+
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Composant de configuration LDAP du carnet d'adresses d'Evolution"
+
+#~ msgid "Add LDAP Server"
+#~ msgstr "Ajouter un serveur LDAP"
+
+#~ msgid "LDAP Configuration Assistant"
+#~ msgstr "Assistant de configuration LDAP"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Étape 4 : Nom d'affichage"
+
+#~ msgid "Find contact in"
+#~ msgstr "Rechercher un contact dans"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Cliquez ici pour ajouter un contact *"
+
+#~ msgid "Business Address"
+#~ msgstr "Adresse (travail)"
+
+#~ msgid "Department"
+#~ msgstr "Service"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "URL Libre-Occupé"
+
+#~ msgid "ISDN"
+#~ msgstr "RNIS"
+
+#~ msgid "Profession"
+#~ msgstr "Profession"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Ouverture des tâches à %s"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Envoyer tout de même ?"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Annuler l'opération de courrier active"
+#~ msgid "Folder _name"
+#~ msgstr "_Nom du dossier :"
+
+#~ 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'informations."
+
+#, fuzzy
+#~ msgid "No signature present"
+#~ msgstr "Masquer l'indication de signature"
+
+#~ msgid "Connecting..."
+#~ msgstr "Connexion..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Ce dossier ne peut pas contenir de messages."
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Impossible d'ouvrir le dossier partagé : %s."
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Sélectionnez un dossier de destination pour importer ces données."
+
+#, fuzzy
+#~ msgid "A folder named \"%s\" already exists.  Please use a different name."
+#~ msgstr ""
+#~ "Un dossier nommé « %s » existe déjà. Veuillez utiliser un nom différent."
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Impossible de transférer le dossier :\n"
+#~ "%s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "Ajouter un dossier"
+
+#~ msgid "Drafts"
+#~ msgstr "Brouillons"
+
+#~ msgid "Outbox"
+#~ msgstr "Boîte d'envoi"
+
+#~ msgid "Sent"
+#~ msgstr "Envoyé"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Erreur de synchronisation « %s » : \n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "Synchronisation du dossier"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Synchronisation de « %s » (%d de %d) ..."
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Aucun dossier affiché)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(Aucun)"
+
+#~ msgid "No error"
+#~ msgstr "Aucune erreur"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Un dossier avec le même nom existe déjà."
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Le type de dossier spécifié n'est pas valide."
+
+#~ msgid "I/O error"
+#~ msgstr "Erreur d'E/S"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Espace insuffisant pour créer le dossier"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Le dossier n'est pas vide."
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Le dossier spécifié n'a pas été trouvé."
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "La fonction n'est pas implémenté dans ce stockage."
+
+#~ msgid "Operation not supported"
+#~ msgstr "Opération non supportée"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Le type spécifié n'est pas supporté dans ce stockage."
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Le dossier spécifié ne peut pas être modifié ou supprimé."
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "Impossible de faire d'un dossier un enfant de ses descendants."
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Impossible de créer un dossier avec ce nom."
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Opération impossible en mode Hors ligne"
+
+#~ msgid "Checkbox"
+#~ msgstr "Case à cocher"
+
+#~ msgid "CORBA error"
+#~ msgstr "Erreur CORBA"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Argument invalide"
+
+#~ msgid "Already has an owner"
+#~ msgstr "A déjà un propriétaire."
+
+#~ msgid "No owner"
+#~ msgstr "Aucun propriétaire"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Type non supporté"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Schéma non supporté"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Opération non supportée"
+
+#~ msgid "Internal error"
+#~ msgstr "Erreur interne"
+
+#~ msgid "Exists"
+#~ msgstr "Existe"
+
+#~ msgid "Invalid URI"
+#~ msgstr "URI invalide"
+
+#~ msgid "Has subfolders"
+#~ msgstr "A des sous-dossiers."
+
+#~ msgid "No space left"
+#~ msgstr "Espace manquant"
+
+#~ msgid "Old owner has died"
+#~ msgstr "L'ancien propriétaire a disparu."
+
+#~ msgid "Test type"
+#~ msgstr "Type de test"
+
+#~ msgid "Evolution Test Component"
+#~ msgstr "Composant Test d'Evolution"
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Nom du champ"
+#~ msgid "import"
+#~ msgstr "Importer"
 
-#~ msgid "Family Name"
-#~ msgstr "Nom de famille"
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Créer un nouveau rendez-vous journée entière"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Nouveau _rendez-vous"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Nouvelle réunion"
+
+#, fuzzy
+#~ msgid "New _Task"
+#~ msgstr "Nouvelle tâche"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "_Fenêtre Evolution"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "_Fenêtre Evolution"
+
+#~ msgid "Toggle"
+#~ msgstr "Commuter"
+
+#~ msgid "Clear"
+#~ msgstr "Effacer"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Annuler l'opération de courrier active"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -16814,9 +18270,6 @@ msgstr "Rechercher maintenant"
 #~ msgid "VCard (.vcf, .gcrd)"
 #~ msgstr "VCard (.vcf, .gcrd)"
 
-#~ msgid "Loading..."
-#~ msgstr "Chargement"
-
 #~ msgid "Searching..."
 #~ msgstr "Recherche..."
 
@@ -16868,10 +18321,6 @@ msgstr "Rechercher maintenant"
 #~ msgstr "EBook non chargé\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "L'ID de la carte existe déjà."
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Opération annulée"
 
@@ -17089,9 +18538,6 @@ msgstr "Rechercher maintenant"
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#~ msgid "Phone"
-#~ msgstr "Téléphone"
-
 #~ msgid "Birth date"
 #~ msgstr "Date de naissance"
 
@@ -17104,9 +18550,6 @@ msgstr "Rechercher maintenant"
 #~ msgid "Arbitrary"
 #~ msgstr "Arbitraire"
 
-#~ msgid "ID"
-#~ msgstr "ID"
-
 #~ msgid "Last Use"
 #~ msgstr "Dernière utilisation"
 
@@ -17119,9 +18562,6 @@ msgstr "Rechercher maintenant"
 #~ msgid "Folder containing contact information"
 #~ msgstr "Dossier contenant des informations sur les contacts"
 
-#~ msgid "LDAP Server"
-#~ msgstr "Serveur LDAP"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "Serveur LDAP contenant des informations sur les contacts"
 
@@ -17131,18 +18571,6 @@ msgstr "Rechercher maintenant"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Dossier public contenant des informations sur les contacts"
 
-#~ msgid "_Contact"
-#~ msgstr "_Contacts"
-
-#~ msgid "Create a new contact"
-#~ msgstr "Créer un nouveau contact"
-
-#~ msgid "New Contact List"
-#~ msgstr "Nouvelle liste de contacts"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "Créer une nouvelle liste de contacts"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "L'URI que le navigateur de dossiers affichera."
 
@@ -17158,9 +18586,6 @@ msgstr "Rechercher maintenant"
 #~ msgid "Is New Card"
 #~ msgstr "Est une nouvelle carte"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "Aucune carte"
 
@@ -17210,30 +18635,6 @@ msgstr "Rechercher maintenant"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "Dossier public contenant des éléments « À faire »"
 
-#~ msgid "New appointment"
-#~ msgstr "Nouveau RDV"
-
-#~ msgid "_Appointment"
-#~ msgstr "_Rendez-vous"
-
-#~ msgid "New meeting"
-#~ msgstr "Nouvelle réunion"
-
-#~ msgid "M_eeting"
-#~ msgstr "_Réunion"
-
-#~ msgid "New task"
-#~ msgstr "Nouvelle tâche"
-
-#~ msgid "_Task"
-#~ msgstr "_Tâche"
-
-#~ msgid "New All Day Appointment"
-#~ msgstr "Nouveau rendez-vous journée entière"
-
-#~ msgid "All _Day Appointment"
-#~ msgstr "Rendez-vous _journée entière"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "Impossible de mettre à jour un objet invalide."
 
@@ -17272,9 +18673,6 @@ msgstr "Rechercher maintenant"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "Ouverture du calendrier à %s"
 
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Ouverture du dossier de tâches par défaut"
-
 #, fuzzy
 #~ msgid "Purging event %s"
 #~ msgstr "Ping sur %s"
@@ -17320,9 +18718,6 @@ msgstr "Rechercher maintenant"
 #~ "Evolution a trouvé des fichiers GnomeCard.\n"
 #~ "Voulez-vous les importer dans Evolution ?"
 
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Interface de configuration de la messagerie d'Evolution"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "Dossier contenant du courrier"
 
@@ -17338,9 +18733,6 @@ msgstr "Rechercher maintenant"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Dossier de corbeille virtuelle"
 
-#~ msgid "Properties..."
-#~ msgstr "Propriétés..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Modifier les propriétés de ce dossier"
 
@@ -17352,15 +18744,6 @@ msgstr "Rechercher maintenant"
 #~ "Certains messages n'ont pas été envoyés. Êtes-vous sûr de vouloir quitter "
 #~ "le programme ?"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Nouveau message"
-
-#~ msgid "_Mail Message"
-#~ msgstr "_Message"
-
-#~ msgid "Compose a new mail message"
-#~ msgstr "Composer un nouveau message"
-
 #
 #~ msgid "New Message Post"
 #~ msgstr "Nouveau message"
@@ -19168,9 +20551,6 @@ msgstr "Rechercher maintenant"
 #~ msgid "Cumberland"
 #~ msgstr "Cumberland"
 
-#~ msgid "Curitiba"
-#~ msgstr "Curitiba"
-
 #~ msgid "Curitiba Apt"
 #~ msgstr "Curitiba Apt"
 
@@ -22162,9 +23542,6 @@ msgstr "Rechercher maintenant"
 #~ msgid "North Bend"
 #~ msgstr "North Bend"
 
-#~ msgid "North Carolina"
-#~ msgstr "Caroline du Nord"
-
 #~ msgid "North Conway"
 #~ msgstr "North Conway"
 
@@ -23776,9 +25153,6 @@ msgstr "Rechercher maintenant"
 #~ msgid "State College"
 #~ msgstr "State College"
 
-#~ msgid "Stauning"
-#~ msgstr "Stauning"
-
 #~ msgid "Staunton"
 #~ msgstr "Staunton"
 
@@ -24370,9 +25744,6 @@ msgstr "Rechercher maintenant"
 #~ msgid "United Arab Emirates "
 #~ msgstr "Émirats Arabes Unis"
 
-#~ msgid "Unst"
-#~ msgstr "Unst"
-
 #~ msgid "Upington"
 #~ msgstr "Upington"
 
@@ -24481,12 +25852,6 @@ msgstr "Rechercher maintenant"
 #~ msgid "Veracruz"
 #~ msgstr "Veracruz"
 
-#~ msgid "Vermillion"
-#~ msgstr "Vermillion"
-
-#~ msgid "Vermont"
-#~ msgstr "Vermont"
-
 #~ msgid "Vernal"
 #~ msgstr "Vernal"
 
@@ -25015,9 +26380,6 @@ msgstr "Rechercher maintenant"
 #~ msgid " F"
 #~ msgstr " F"
 
-#~ msgid " C"
-#~ msgstr " C"
-
 #~ msgid "knots"
 #~ msgstr "noeuds"
 
@@ -25636,9 +26998,6 @@ msgstr "Rechercher maintenant"
 #~ msgid "Freezing haze"
 #~ msgstr "Brume verglassante"
 
-#~ msgid "Spray"
-#~ msgstr "Crachin"
-
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Crachin dans les environs"
 
@@ -26010,18 +27369,6 @@ msgstr "Rechercher maintenant"
 #~ "Supprimer un dossier ouvert avec « Ouvrir un dossier d'un autre "
 #~ "utilisateur »"
 
-#~ msgid "Send / Receive"
-#~ msgstr "Envoyer / Recevoir"
-
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Envoyer les éléments en attente et récupérer les nouveaux"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Commuter l'affichage de la barre de dossiers"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Commuter l'affichage de la barre de raccourcis"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Afficher le dossier sélectionné"
 
@@ -26049,9 +27396,6 @@ msgstr "Rechercher maintenant"
 #~ msgid "_Rename..."
 #~ msgstr "_Renommer..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Envoyer / recevoir"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "Barre de _raccourcis"
 
@@ -26099,9 +27443,6 @@ msgstr "Rechercher maintenant"
 #~ "ping_timeout_callback : impossible de déterminé si l'objet CORBA est nil "
 #~ "ou non."
 
-#~ msgid "Automatically _detect links"
-#~ msgstr "_Détecter automatiquement les liens"
-
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 
@@ -26183,18 +27524,12 @@ msgstr "Rechercher maintenant"
 #~ msgid "1234"
 #~ msgstr "1234"
 
-#~ msgid "380"
-#~ msgstr "380"
-
 #~ msgid "666"
 #~ msgstr "666"
 
 #~ msgid "<- _Remove"
 #~ msgstr "<- Supp_rimer"
 
-#~ msgid "<< Fewer Options"
-#~ msgstr "<< Moins d'options"
-
 #~ msgid "Associated LDAP Attribute"
 #~ msgstr "Attribut LDAP associé"
 
@@ -26929,13 +28264,6 @@ msgstr "Rechercher maintenant"
 #~ msgid "_Delete this Appointment"
 #~ msgstr "_Supprimer ce rendez-vous"
 
-#~ msgid ""
-#~ "Issuer: %s\n"
-#~ "Subject: %s"
-#~ msgstr ""
-#~ "Émetteur : %s\n"
-#~ "Objet : %s"
-
 #~ msgid "SASL Protocol error"
 #~ msgstr "Erreur de protocole SASL"
 
@@ -26969,9 +28297,6 @@ msgstr "Rechercher maintenant"
 #~ "importe l'heure de lancement du filtre\n"
 #~ "ou d'ouverture du dossier virtuel."
 
-#~ msgid "Command"
-#~ msgstr "Commande"
-
 #~ msgid "Are you sure you want to delete this news account?"
 #~ msgstr "Êtes-vous sûr de vouloir supprimer ce compte de nouvelles ?"
 
@@ -26985,9 +28310,6 @@ msgstr "Rechercher maintenant"
 #~ msgid "News Servers"
 #~ msgstr "Serveurs de nouvelles"
 
-#~ msgid "Source Information"
-#~ msgstr "Informations de source"
-
 #~ msgid "newswindow1"
 #~ msgstr "newswindow1"
 
@@ -27013,9 +28335,6 @@ msgstr "Rechercher maintenant"
 #~ msgid "You may only import to local folders"
 #~ msgstr "Vous ne pouvez importer que vers des dossiers locaux."
 
-#~ msgid "_Contact List"
-#~ msgstr "Liste de contacts"
-
 #~ msgid "Inline Text _File..."
 #~ msgstr "Insérer un _fichier texte..."
 
@@ -27031,15 +28350,9 @@ msgstr "Rechercher maintenant"
 #~ msgid "Send _later"
 #~ msgstr "Envoyer plus _tard"
 
-#~ msgid "Send the message later"
-#~ msgstr "Envoyer le message plus tard"
-
 #~ msgid "_Pilot Settings..."
 #~ msgstr "Paramétrage du Pilot..."
 
-#~ msgid "Addressbook Settings"
-#~ msgstr "Paramètres du carnet d'adresses"
-
 #~ msgid "Configuration control for the Evolution Addressbook."
 #~ msgstr "Composant de configuration pour le carnet d'adresse d'Evolution."
 
@@ -27295,9 +28608,6 @@ msgstr "Rechercher maintenant"
 #~ msgid "Show contacts matching the following criteria:"
 #~ msgstr "Afficher les contacts correspondant aux critères suivants :"
 
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "Créer de nouveaux rendez-vous avec un _rappel par défaut"
-
 #~ msgid "First day of wee_k:"
 #~ msgstr "_Premier jour de la semaine :"
 
@@ -27374,9 +28684,6 @@ msgstr "Rechercher maintenant"
 #~ msgid "Confirm when Expunging a folder"
 #~ msgstr "Confirmer avant le nettoyage du dossier"
 
-#~ msgid "Default Forward style is:"
-#~ msgstr "Style de transfert par défaut :"
-
 #~ msgid "Default character encoding:"
 #~ msgstr "Codage des caractères par défaut"
 
@@ -27386,9 +28693,6 @@ msgstr "Rechercher maintenant"
 #~ msgid "Display"
 #~ msgstr "Affichage"
 
-#~ msgid "Edit signature content in editor"
-#~ msgstr "Éditer le contenu de la signature dans l'éditeur"
-
 #~ msgid "File containing signature"
 #~ msgstr "Fichier contenant la signature"
 
@@ -27406,18 +28710,12 @@ msgstr "Rechercher maintenant"
 #~ msgid "Include in _random signatures list"
 #~ msgstr "Inclure dans la liste des signatures aléatoires"
 
-#~ msgid "List of signatures"
-#~ msgstr "Liste de signatures"
-
 #~ msgid "Name of selected signature"
 #~ msgstr "Nom de la signature sélectionnée"
 
 #~ msgid "News"
 #~ msgstr "Nouvelles"
 
-#~ msgid "Prompt when sending messages with an _empty subject"
-#~ msgstr "Avertissement lors de l'envoi d'un message sans _objet"
-
 #~ msgid "Script which is run before signature loading from specified filename"
 #~ msgstr ""
 #~ "Script lancé avant le chargement de la signature du fichier spécifié"
@@ -27440,18 +28738,12 @@ msgstr "Rechercher maintenant"
 #~ msgid "_Highlight citations with"
 #~ msgstr "Mettre les citations en _surbrillance"
 
-#~ msgid "_Log filter actions to:"
-#~ msgstr "Enregistrer les actions des _filtres dans :"
-
 #~ msgid "_Mark messages as Read after"
 #~ msgstr "_Marquer les messages comme lus après"
 
 #~ msgid "_Name"
 #~ msgstr "_Nom"
 
-#~ msgid "_Send mail in HTML format by default."
-#~ msgstr "Envoyer par défaut le courrier au format HTML"
-
 #~ msgid "placeholder"
 #~ msgstr "substituant"
 
diff --git a/po/ga.po b/po/ga.po
index bcbabd0b9a..d7e0f323f5 100755
--- a/po/ga.po
+++ b/po/ga.po
@@ -7,14 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: locales 0.01\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 20:47+0000\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-11-02 21:56+0000\n"
 "Last-Translator: David O'Callaghan <david.ocallaghan@cs.tcd.ie>\n"
 "Language-Team: Irish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
@@ -20721,7 +20721,8 @@ msgstr "Faigh"
 #, fuzzy
 #~ msgid "Select PGP program"
 #~ msgstr ""
-#~ "Tóg Ainmhí:"
+#~ "Tóg "
+#~ "Ainmhí:"
 
 # SG
 #, fuzzy
diff --git a/po/gl.po b/po/gl.po
index f3cc1ec7b9..4fa1b9739c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-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"
@@ -37,7 +37,165 @@ msgstr "Non foi posible cargar %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Non foi posible ler o bloque de aplicación Enderezo do pilot"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Data na que se completa"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "ID do certificado:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Crear ou editar contas de correo e outras preferencias"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Contactos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Editar o Libro de Enderezos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Fábrica para o menú emerxente de enderezos do Libro de Enderezos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Compoñente de resumo executivo do correo de Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Fábrica para o compoñente de correo de Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Libro de Enderezos"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Propiedades..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Eliminar"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+msgid "Rename"
+msgstr "Renomear"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Novo Contacto:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Contacto"
+
+#: addressbook/gui/component/addressbook-component.c:219
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Crear un novo contacto"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Nova Lista de Contactos"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "Lista de _Contactos"
+
+#: addressbook/gui/component/addressbook-component.c:226
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Crear unha nova lista de contactos"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr ""
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+#, fuzzy
+msgid "Work"
+msgstr "Traballando"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "Servidor NNTP:"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Non foi posible crear o directorio %s: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr ""
@@ -45,7 +203,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -53,49 +211,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "A resposta do servidor IMAP non contiña información sobre %s"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Erro ao cargar a información do filtro:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "A resposta do servidor IMAP non contiña información sobre %s"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Nome da Conta"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Nome do Servidor"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(SSL non está soportado nesta versión de evolution)"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Outros Contactos"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -103,7 +244,7 @@ msgstr ""
 "Non foi posible abrir este libro de enderezos. Por favor, comprobe\n"
 "que a ruta existe e que ten permisos para acceder a ela."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -114,7 +255,7 @@ msgstr ""
 "que introduciu un URI incorrecto ou que o servidor LDAP está\n"
 "fóra de servicio"
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -126,7 +267,7 @@ msgstr ""
 "debe compilar o programa desde as fontes do CVS\n"
 "logo de obter OpenLDAP desde o enlace de abaixo.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -141,11 +282,11 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Non se pode abrir o libro de enderezos"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr ""
@@ -153,38 +294,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 #, fuzzy
 msgid "Name begins with"
 msgstr "remata en"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 #, fuzzy
 msgid "Email begins with"
 msgstr "remata en"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "A categoría é"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Calquera campo contén"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Avanzado..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -192,7 +332,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -200,95 +340,41 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Calquera Categoría"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "O URI que ha amosar a axenda"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "ID do certificado:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
 msgstr ""
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Contactos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Editar o Libro de Enderezos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Interface de selección de nome do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Fábrica para o menú emerxente de enderezos do Libro de Enderezos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Compoñente de resumo executivo do correo de Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -312,6 +398,7 @@ msgstr "Dete_ctar tipos soportados "
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -347,8 +434,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Add LDAP Server"
-msgstr "Servidor NNTP:"
+msgid "Addressbook Creation Assistant"
+msgstr "Fontes do Libro de Enderezos"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -367,60 +454,59 @@ msgstr "Anónimo"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 #, fuzzy
 msgid "Connecting"
 msgstr "Desconectando de %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "_Nome da lista:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Edit LDAP Server"
 msgstr "Servidor NNTP:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address:"
 msgstr "Enderezo de Correo:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Finished"
 msgstr "B_uscar"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Xeral"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
-msgid "LDAP Configuration Assistant"
-msgstr "Configuración do Correo"
+msgid "Group:"
+msgstr "Grupo"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Never"
 msgstr "Cada"
@@ -445,8 +531,8 @@ msgid "S_earch scope: "
 msgstr "Ámbito da busca:"
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 #, fuzzy
 msgid "Searching"
 msgstr "Buscar M_ensaxe..."
@@ -492,27 +578,28 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:47
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-#, fuzzy
-msgid "Step 1: Server Information"
-msgstr "Información da Fonte"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
-msgid "Step 2: Connecting to Server"
-msgstr "Conectando ao servidor..."
+msgid "Step 2: Server Information"
+msgstr "Información da Fonte"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr ""
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Conectando ao servidor..."
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr ""
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Conectando ao servidor..."
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -525,14 +612,6 @@ msgstr "Armacenar busca como CartafolV"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -540,7 +619,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -548,7 +627,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -558,37 +637,36 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 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:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 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:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -598,6 +676,15 @@ msgstr ""
 "Este nome hase empregar para identifica-la conta. Só se empregará para "
 "amosar."
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Este nome hase empregar para identifica-la conta. Só se empregará para "
+"amosar."
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -624,22 +711,30 @@ msgid "Using email address"
 msgstr "_Este é o enderezo de correo"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Amosar"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -647,61 +742,60 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Editar"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Porto:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 #, fuzzy
 msgid "_Search base:"
 msgstr "_Base da busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "Nome do _Servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Tempo de adiamento (minutos)"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid "cards"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Desconectando de %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid "general-tab"
 msgstr "Xeral"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "searching-tab"
 msgstr "Buscar M_ensaxe..."
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Nome:"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
+msgstr "Interface de selección de nome do Libro de Enderezos de Evolution"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Eliminar Todos"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Eliminar"
@@ -730,25 +824,21 @@ msgstr "Engadir a Contactos"
 msgid "Unnamed Contact"
 msgstr "Contacto Sen Nome"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Nome:"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Fonte"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Seleccionar Contactos do Libro de Enderezos"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-#, fuzzy
-msgid "Find contact in"
-msgstr "Buscar un contacto"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Interface de selección de nome do Libro de Enderezos de Evolution"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
 msgid "Find"
@@ -832,7 +922,8 @@ msgid "D_epartment:"
 msgstr "_Departamento:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalles"
 
@@ -904,12 +995,12 @@ msgid "_Categories..."
 msgstr "Ca_tegorías..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Borrar"
@@ -2058,7 +2149,7 @@ msgid "Esq."
 msgstr "Don"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Nome Completo:"
 
@@ -2156,11 +2247,27 @@ msgstr "Editor de Listas de Contactos"
 msgid "Save List as VCard"
 msgstr "Gardar como VCard"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Contacto Cambiado:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Contacto Conflictivo:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Detectado un Contacto Duplicado"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"O enderezo ou nome cambiado deste contacto xa existe neste\n"
+"cartafol.  ¿Gostaríalle engadilo de todas maneiras?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Novo Contacto:"
@@ -2177,22 +2284,6 @@ msgstr ""
 "O nome ou enderezo de correo deste contacto xa existe neste\n"
 "cartafol.  ¿Gostaríalle engadilo de todas maneiras?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Contacto Cambiado:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Contacto Conflictivo:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"O enderezo ou nome cambiado deste contacto xa existe neste\n"
-"cartafol.  ¿Gostaríalle engadilo de todas maneiras?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2301,9 +2392,9 @@ msgstr "Remitir Contacto"
 msgid "Send Message to Contact"
 msgstr "Enviar unha Mensaxe a un Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimir"
@@ -2327,9 +2418,12 @@ msgstr "_Mover ó Cartafol.."
 msgid "Cut"
 msgstr "Cortar"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiar"
 
@@ -2338,16 +2432,8 @@ msgstr "Copiar"
 msgid "Paste"
 msgstr "Pegar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Eliminar"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 #, fuzzy
 msgid "Current View"
 msgstr "_Vista Actual"
@@ -2361,166 +2447,171 @@ msgid ""
 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:2
 msgid "Assistant"
 msgstr "Asistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Fax do Traballo"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Teléfono do Traballo"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Teléfono do Traballo 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Teléfono de Resposta"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Teléfono do Automóbil"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Categorías"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Teléfono da Compañía"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Departamento"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "Correo Electrónico"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "Correo Electrónico 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "Correo Electrónico 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#, fuzzy
+msgid "Family Name"
+msgstr "Nome Completo:"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Arquivar coma"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "URL libre-ocupado"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Enderezo Particular"
+#, fuzzy
+msgid "Given Name"
+msgstr "Nome Completo:"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Fax Particular"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Teléfono Particular"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Particular 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "RDSI"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Nada"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Xordania"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Xestor"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Teléfono Móbil"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Alcume"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Oficina"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organización"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Outro Enderezo"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Outro Fax"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Outro Teléfono"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Buscapersoas"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Teléfono Principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Profesión"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Papel"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Cónxuxe"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Título"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Non vista"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Sitio Web"
 
@@ -2625,11 +2716,19 @@ msgstr "Membros"
 msgid "Job Title"
 msgstr "_Posto de traballo:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Enderezo Particular"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Enderezo Particular"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Outro Enderezo"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2642,123 +2741,120 @@ msgstr "Fax Particular"
 msgid "Blog"
 msgstr "para sempre"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Éxito"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Tarxeta non atopada"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "O ID da Tarxeta xa existe"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Protocolo non soportado"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Cancelada"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "A autenticación fallou."
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Autenticación requirida"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #, fuzzy
 msgid "Addressbook does not exist"
 msgstr "O cartafol `%s' non existe."
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Outro erro"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "¿Quere gardar os cambios?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 #, fuzzy
 msgid "_Discard"
 msgstr "Imprimir tarxeta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Erro ao engadi-la lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Erro ao engadi-la tarxeta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Erro ao modifica-la lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Erro ao modifica-la tarxeta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Erro ao elimina-la lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Erro ao elimina-la tarxeta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2767,51 +2863,51 @@ msgstr ""
 "%s xa existe\n"
 "¿Quere sobrescribilo?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, fuzzy
 msgid "Overwrite"
 msgstr "¿Sobrescribir ficheiro?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, fuzzy, c-format
 msgid "Error saving %s: %s"
 msgstr "Erro ao gardar o ficheiro: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 #, fuzzy
 msgid "list"
 msgstr "Brétema"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Varias VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard de %s"
@@ -3008,7 +3104,7 @@ msgstr "Marxes"
 msgid "Number of columns:"
 msgstr "Número de columnas:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Opcións"
 
@@ -3200,18 +3296,18 @@ msgstr "Contacto Sen Nome"
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Non foi posible iniciar o servidor wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Non foi posible iniciar wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Non foi posible ler o bloque de aplicación da Axenda do pilot"
 
@@ -3220,27 +3316,94 @@ msgstr "Non foi posible ler o bloque de aplicación da Axenda do pilot"
 msgid "Default Priority:"
 msgstr "_Prioridade:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Non foi posible ler o bloque de aplicación ToDo (PorFacer) do pilot"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Preferencias da Axenda e as Tarefas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Axenda"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Preferencias da Axenda e as Tarefas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Fábrica para o compoñente de correo de Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Visor da axenda iTip/iMip de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Visor da axenda iTip/iMip de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Editor de Novas de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Editor de Novas de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Compoñente do resumo executivo da axenda de Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Compositor de correo de Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Tarefas"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Fábica para o servicio de notificación de alarmas"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 #, fuzzy
 msgid "Starting:"
 msgstr "Opcións"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 #, fuzzy
 msgid "Ending:"
 msgstr "Í_ndice"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, fuzzy, c-format
 msgid "Alarm on %s"
 msgstr "Alarmas"
@@ -3306,45 +3469,174 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Non preguntar de novo"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Fábica para o servicio de notificación de alarmas"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Non foi posible inicializar Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Non foi posible inicializar gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Non foi posible crear a fábrica do servicio de notificacións de alarma"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 #, fuzzy
 msgid "invalid time"
 msgstr "Hora de _finalización:"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "Axenda"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Cor para tarefas para hoxe"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Cor para tarefas para hoxe"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "Amosar os prazos _finais das citas nas vistas semanal e mensual"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Previsualiza a axenda que se vai imprimir"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#, fuzzy
+msgid "Units of default reminder"
+msgstr "_Crear novas citas cun recordatorio por defecto"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "_Pedir confirmación ao eliminar elementos"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "_Pedir confirmación ao eliminar elementos"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Borrar a tarefa seleccionada"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Amosa-los _números das semanas no navegador de datas"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "O resumo contén"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "A descrición contén"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "O comentario contén"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Non concorda"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3356,81 +3648,115 @@ msgstr ""
 "\n"
 "¿Eliminar realmente estas mensaxes?"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "é menor que"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "días"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A, %d de %B de %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d de %B de %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d de %b"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Imprimir esta axenda"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Nova Caledonia"
 
-#: calendar/gui/calendar-component.c:207
-msgid "Rename"
-msgstr "Renomear"
+#: calendar/gui/calendar-component.c:632
+#, fuzzy
+msgid "New appointment"
+msgstr "Nova Cita"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:633
+#, fuzzy
+msgid "_Appointment"
+msgstr "Cita"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr ""
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Crear unha nova cita"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
+#: calendar/gui/calendar-component.c:639
 #, fuzzy
-msgid "Work"
-msgstr "Traballando"
+msgid "New meeting"
+msgstr "Configuración da Fonte de Novas"
+
+#: calendar/gui/calendar-component.c:640
+#, fuzzy
+msgid "M_eeting"
+msgstr "Xuntanza"
+
+#: calendar/gui/calendar-component.c:641
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Crear unha nova tarefa"
+
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Nova Cita"
+
+#: calendar/gui/calendar-component.c:647
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "Nova C_ita"
+
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Crear unha nova cita"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3553,7 +3879,7 @@ msgstr "Enviar como:"
 msgid "With these arguments:"
 msgstr "Con estes argumentos:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 #, fuzzy
 msgid "dialog1"
 msgstr "Amosar un diálogo"
@@ -3570,6 +3896,10 @@ msgstr "horas"
 msgid "minutes"
 msgstr "minutos"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3603,8 +3933,8 @@ msgstr "Enviar unha mensaxe"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Resumo:"
 
@@ -3633,7 +3963,7 @@ msgstr "fin da cita"
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minutos"
 
@@ -3688,7 +4018,7 @@ msgstr "Días"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Venres"
 
@@ -3702,7 +4032,7 @@ msgstr "Minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Luns"
 
@@ -3713,7 +4043,7 @@ msgstr "_Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -3727,7 +4057,7 @@ 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:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -3747,7 +4077,7 @@ msgstr "Lista de _Tarefas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Xoves"
 
@@ -3765,7 +4095,7 @@ msgstr "Formato da hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Martes"
 
@@ -3775,12 +4105,12 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Mércores"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Semana Laboral"
 
@@ -3818,7 +4148,7 @@ msgid "_Fri"
 msgstr "_Ven"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Xeral"
 
@@ -3863,76 +4193,76 @@ msgstr "Mé_r"
 msgid "before every appointment"
 msgstr "antes da fin da cita"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "¿Está seguro de que quere cancelar e borrar esta cita?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "¿Está seguro de que quere cancelar e borrar esta tarefa?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "¿Está seguro de que quere cancelar e borrar esta entrada de diario?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Este evento foi eliminado."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Esta tarefa foi eliminada."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Esta entrada de diario foi eliminada"
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Fixo cambios. ¿Quere esquecer estes cambios e pechar o editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Non fixo cambios, ¿quere pechar o editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Este evento foi modificado."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Esta tarefa foi modificada."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Esta entrada de diario foi modificada."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Fixo cambios. ¿Quere esquecer estes cambios e actualizar o editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Non fixo cambios, ¿quere actualizar o editor?"
@@ -3942,166 +4272,171 @@ msgstr "%s  Non fixo cambios, ¿quere actualizar o editor?"
 msgid "Validation error: %s"
 msgstr "Erro descoñecido: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " a "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Completada "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Completada "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Pendente "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Pendente "
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 #, fuzzy
 msgid "Could not update object"
 msgstr "Non foi posible actualizar os ficheiros correctamente"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada de diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Sen resumo"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "¡Non foi posible obter a versión actual!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Escolla un cartafol de destino para importar estes datos"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "¿Está seguro de que quere borrar a cita `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "¿Está seguro de que quere borrar esta cita sen título?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "¿Está seguro de que quere borrar a tarefa `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "¿Está seguro de que quere borrar esta tarefa sen título?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "¿Está seguro de que quere borrar a entrada de diario `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "¿Está seguro de que quere borrar esta entrada de diario sen título?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "¿Está seguro de que quere borrar %d citas?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "¿Está seguro de que quere borrar %d tarefas?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "¿Está seguro de que quere borrar %d entradas de diario?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 #, fuzzy
 msgid "The item could not be deleted due to a corba error"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "¡Non se puido envia-lo elemento!\n"
@@ -4118,46 +4453,46 @@ msgstr "Delegar En:"
 msgid "Enter Delegate"
 msgstr "Introducir Delegado"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Cita"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Recordatorio"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Recorrencia"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 #, fuzzy
 msgid "Scheduling"
 msgstr "_Programar Xuntanza"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Xuntanza"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Data de _Inicio:"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 #, fuzzy
 msgid "Start time is wrong"
 msgstr "Hora de _comezo:"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr ""
 
@@ -4230,32 +4565,32 @@ msgid "_Start time:"
 msgstr "Hora de _comezo:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Nada"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 #, fuzzy
 msgid "An organizer is required."
 msgstr "Debe estabrecerse un organizador."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Delegar En..."
 
@@ -4296,21 +4631,15 @@ msgid "Member"
 msgstr "Membro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Papel"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
@@ -4330,6 +4659,7 @@ msgid "_Invite Others..."
 msgstr "_Convidar Outros..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4362,6 +4692,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Non foi posible crear o directorio %s: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "Debe estabrecerse un organizador."
@@ -4391,34 +4722,59 @@ msgstr "información de axenda"
 msgid "Calendar Name"
 msgstr "Axenda"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Non foi posible crear o directorio %s: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "información de axenda"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Lista de _Tarefas"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Lista de _Tarefas"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Lista de _Tarefas"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Illas Wallis e Futuna"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 #, fuzzy
 msgid "This and Future Instances"
 msgstr "Illas Wallis e Futuna"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 #, fuzzy
 msgid "All Instances"
 msgstr "Avanzado"
@@ -4472,10 +4828,15 @@ msgstr "día"
 msgid "on the"
 msgstr "no"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "ocorrencias"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Data/Hora:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "Enga_dir"
@@ -4540,7 +4901,7 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 #, fuzzy
 msgid ""
 "This event has been changed, but has not been saved.\n"
@@ -4551,34 +4912,34 @@ msgstr ""
 "\n"
 "¿Desexa gardar os cambios?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 #, fuzzy
 msgid "Save Event"
 msgstr "Mensaxe da Axenda"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 #, fuzzy
 msgid "The meeting information has been created. Send it?"
 msgstr "A información da xuntanza cambiou. ¿Enviar unha versión actualizada?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "A información da xuntanza cambiou. ¿Enviar unha versión actualizada?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 #, fuzzy
 msgid "The task assignment information has been created. Send it?"
 msgstr "A información da tarefa cambiou. ¿Enviar unha versión actualizada?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "A información da tarefa cambiou. ¿Enviar unha versión actualizada?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "Completada "
@@ -4589,43 +4950,43 @@ msgid "% _Complete"
 msgstr "% Completo"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Completada"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Alta"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "En Progreso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Baixa"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Non Iniciada"
 
@@ -4634,7 +4995,7 @@ msgid "Progress"
 msgstr "En Progreso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Indefinida"
 
@@ -4656,21 +5017,21 @@ msgstr "E_stado:"
 msgid "_Web Page:"
 msgstr "Enderezo da páxina _Web:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Básico"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Asignación"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4678,9 +5039,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "Con_fidencial"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Descrición:"
 
@@ -4786,26 +5147,21 @@ msgstr "Servidor %s %s"
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Público"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Categorías"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4818,29 +5174,27 @@ msgid "Start Date"
 msgstr "Data de _Inicio:"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Resumo"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " cor"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Cita"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Libre"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Ocupado"
 
@@ -4852,7 +5206,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "E"
 
@@ -4860,7 +5214,7 @@ msgstr "E"
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4870,7 +5224,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4878,7 +5232,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Si"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4886,17 +5240,17 @@ msgstr "Non"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Descoñecido"
 
@@ -4908,190 +5262,188 @@ msgstr "Recorrendo"
 msgid "Assigned"
 msgstr "Asignada"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Elimina-los contactos seleccionados"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Nova _Cita..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Novo _Evento de Día Completo"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 #, fuzzy
 msgid "New Meeting"
 msgstr "Xuntanza"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Ir a _Hoxe"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "_Ir á Data..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar Información de Libre/Ocupado"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-#, fuzzy
-msgid "_Settings..."
-msgstr "_Preferencias de Correo..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Gardar _Como..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Programar Xuntanza"
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Remitir como i_Calendar"
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _Ocorrencia"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Borrar _Tódalas Ocorrencias"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+#, fuzzy
+msgid "_Settings..."
+msgstr "_Preferencias de Correo..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 #, fuzzy
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Abrir Mensaxe"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Asignar Tarefa"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Remitir como i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "_Marcar como Completa"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marca-las Tarefas como Completas"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "_Borra-las Tarefas Seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Prema para engadir unha tarefa"
@@ -5105,8 +5457,8 @@ msgstr "% Completo"
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Completo"
 
@@ -5135,18 +5487,18 @@ msgid "URL"
 msgstr "URL:"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5165,7 +5517,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A, %d de %B"
 
@@ -5178,137 +5530,137 @@ msgstr "%d de %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "Recorrencia _simple"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
 msgid "Every day"
 msgstr "Cada"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, fuzzy, c-format
 msgid "Every %d days"
 msgstr "%d días"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 #, fuzzy
 msgid "Every week"
 msgstr "Cada"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, fuzzy, c-format
 msgid "Every %d weeks"
 msgstr "%d semanas"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, fuzzy, c-format
 msgid "Every %d weeks on "
 msgstr "%d semanas"
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 #, fuzzy
 msgid " and "
 msgstr "Area"
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 #, fuzzy
 msgid "every month"
 msgstr "Un m_es"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 #, fuzzy
 msgid "Every year"
 msgstr "Cada"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Hora do _final da reunión:"
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Completada "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "<b>Descrición:</b> %s"
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "información de axenda"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Axenda"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 #, fuzzy
 msgid "An unknown person"
 msgstr "un remitente descoñecido"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5316,11 +5668,11 @@ msgstr ""
 "<br> Por favor, olle a seguinte información, e escolla unha acción do menú "
 "de embaixo."
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Ningunha</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 #, fuzzy
 msgid "Location:"
 msgstr ""
@@ -5328,326 +5680,325 @@ msgstr ""
 "Localización Xeográfica: "
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 #, fuzzy
 msgid "Status:"
 msgstr "E_stado:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr " Tentativa "
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Rexeitado"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Escolla unha Acción"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 #, fuzzy
 msgid "Update"
 msgstr "Actualización de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 #, fuzzy
 msgid "Accept"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 #, fuzzy
 msgid "Tentatively accept"
 msgstr " Tentativa "
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 #, fuzzy
 msgid "Decline"
 msgstr "Rexeitado"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Información de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Información da Tarefa"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, 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:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Información da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, 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:1271
+#: calendar/gui/e-itip-control.c:1269
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Proposta de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Actualización da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "_Solicitude de Actualización de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, 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:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Resposta de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> cancelou unha reunión."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Cancelación da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, 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:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Mensaxe Incorrecta sobre a Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Información da Tarefa"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, 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:1338
+#: calendar/gui/e-itip-control.c:1336
 #, 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:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Proposta de Tarefas"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, 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:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Actualización de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, 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:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Petición de Actualización de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, 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:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Resposta á Tarefa"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> cancelou unha tarefa."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Cancelación de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Mensaxe Incorrecta sobre a Tarefa"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, 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:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Información de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, 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:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Petición de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, 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:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Resposta de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Mensaxe de Libre/Ocupado Incorrecta"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 #, 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:1552
+#: calendar/gui/e-itip-control.c:1550
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "Esta mensaxe só contén destinatarios Bcc."
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Actualización completada\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 #, 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:1945
+#: calendar/gui/e-itip-control.c:1943
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 #, 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:1951
+#: calendar/gui/e-itip-control.c:1949
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Enderezo do asistente"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Enderezo do asistente"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Eliminación Completa"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "¡Elemento enviado!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
@@ -5810,7 +6161,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -5874,100 +6225,86 @@ msgstr "Hora do _inicio da reunión:"
 msgid "Meeting _end time:"
 msgstr "Hora do _final da reunión:"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "Data de _Inicio:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "_Data Límite"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "_Prioridade:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Páxina"
 
-#: calendar/gui/e-tasks.c:715
-#, fuzzy, c-format
-msgid "Opening tasks at %s"
-msgstr "Abrindo armacenamento %s"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Non foi posible cargar as tarefas en `%s'"
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "O método requirido para cargar `%s' non está soportado"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, 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:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "Erro ao iniciar %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data na que se completa"
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Elimina-los contactos seleccionados"
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 #, fuzzy
 msgid "Expunging"
 msgstr "Limpar"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Tarefas"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Axenda"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Non foi posible abrir o cartafol en `%s'"
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "O método requirido para cargar `%s' non está soportado"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarmas"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5975,7 +6312,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5983,65 +6320,11 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Turco"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#, fuzzy
-msgid "Calendar and Tasks"
-msgstr "Preferencias da Axenda e as Tarefas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Axenda"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Preferencias da Axenda e as Tarefas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Fábrica para o compoñente de correo de Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Visor da axenda iTip/iMip de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Visor da axenda iTip/iMip de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Editor de Novas de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Editor de Novas de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Compoñente do resumo executivo da axenda de Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Compositor de correo de Evolution."
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "abril"
@@ -6098,308 +6381,345 @@ msgstr "outubro"
 msgid "September"
 msgstr "setembro"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Debe estabrecerse un organizador."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 #, fuzzy
 msgid "Event information"
 msgstr "información de axenda"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 #, fuzzy
 msgid "Task information"
 msgstr "Información da Tarefa"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 #, fuzzy
 msgid "Journal information"
 msgstr "Información Opcional"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Información de Libre/Ocupado"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 #, fuzzy
 msgid "Calendar information"
 msgstr "información de axenda"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 #, fuzzy
 msgid "Updated"
 msgstr "Actualización de Tarefa"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 #, fuzzy
 msgid "Refresh"
 msgstr "Actualizar Lista"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Información de Libre/Ocupado"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 #, fuzzy
 msgid "iCalendar information"
 msgstr "información de axenda"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Xo"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Sá"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Día seleccionado (%a, %d de %b de %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d de %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a, %d de %b de %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Semana seleccionada (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Mes seleccionado (%b de %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Ano seleccionado (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 #, fuzzy
 msgid "Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, fuzzy, c-format
 msgid "Status: %s"
 msgstr "E_stado:"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "_Prioridade:"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, fuzzy, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaxe completada"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, fuzzy, c-format
 msgid "URL: %s"
 msgstr "URL:"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, fuzzy, c-format
 msgid "Categories: %s"
 msgstr ""
 "\n"
 "Categorías: "
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 #, fuzzy
 msgid "Contacts: "
 msgstr "Co_ntactos:"
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Previsualización da Impresión"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Imprimir Elemento"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Configuración da Impresión"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Renomear este atallo"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Lista de _Tarefas"
+
+#: calendar/gui/tasks-component.c:590
+#, fuzzy
+msgid "New task"
+msgstr "Nova Tarefa"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Tarefa"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Crear unha nova tarefa"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "O URI do cartafol de tarefas a amosar"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 #, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -6412,11 +6732,11 @@ msgstr ""
 "\n"
 "¿Eliminar realmente estas mensaxes?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Non preguntar de novo"
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Imprimir tarxetas"
@@ -6449,17 +6769,17 @@ msgstr "Mensaxe da Axenda"
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Recordatorio"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Mensaxe da Axenda"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6468,7 +6788,7 @@ msgstr ""
 "Evolution atopou ficheiros de correo de Pine.\n"
 "¿Gostaríalle importalos a Evolution?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Axenda"
@@ -8107,28 +8427,28 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "As sinaturas non están soportadas por este cifrado"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "A verificación non está soportada neste cifrado"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Non se soporta o cifrado con esta cifra"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Non está soportado o descifrado desta cifra"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 #, fuzzy
 msgid "You may not import keys with this cipher"
 msgstr "Non está soportado o descifrado desta cifra"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 #, fuzzy
 msgid "You may not export keys with this cipher"
 msgstr "Non está soportado o descifrado desta cifra"
@@ -8184,89 +8504,89 @@ msgstr "Creando o cartafol %s"
 msgid "You must be working online to complete this operation"
 msgstr "Debe estar traballando conectado para completar esta operación"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Non foi posible crear o directorio %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Sincronizando cartafoles"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro ao analizar o filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro ao executar o filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Incapaz de abrir o cartafol spool"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Incapaz de procesar o cartafol spool"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Recibindo a mensaxe %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Fallo na mensaxe %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Sincronizando cartafol"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Argumentos non válidos"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Argumentos non válidos"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro ao executar a busca por filtro: %s: %s"
@@ -8298,41 +8618,41 @@ msgstr "(coinciden-todas) require un único resultado booleano"
 msgid "Performing query on unknown header: %s"
 msgstr "Efectuando petición sobre a cabeceira descoñecida: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Erro ao executar a expresión de busca: %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Erro ao executar a expresión de busca: %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 #, fuzzy
 msgid "Moving messages"
 msgstr "Copiando as mensaxes"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 #, fuzzy
 msgid "Copying messages"
 msgstr "Copiando as mensaxes a %s"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Recibindo %d mensaxe(s)"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8340,47 +8660,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Cancelado."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Resposta inesperada do servidor IMAP: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 #, fuzzy
 msgid "No data provided"
 msgstr "Non se especificou un nome de cartafol"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 #, 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:1114
+#: camel/camel-gpg-context.c:1121
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8388,49 +8708,61 @@ msgid ""
 "%s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr "Non foi posible crear o ficheiro temporal: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Non foi posible crear o ficheiro temporal: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Mensaxe cifrada"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Non foi posible recibir a mensaxe do editor"
@@ -8531,15 +8863,15 @@ msgstr "Erro ao escribir o ficheiro temporal de correo: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Erro ao copiar o ficheiro temporal de correo: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 #, fuzzy
 msgid "parse error"
 msgstr "Outro erro"
@@ -8858,12 +9190,12 @@ msgstr "Fornecedor de correo do cartafol virtual"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Para ler correo coma unha petición de outro conxunto de cartafoles"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Non hai ningún fornecedor dispoñible para o protocolo `%s'"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8872,73 +9204,84 @@ msgstr ""
 "Non foi posible crear o directorio %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Introduza o seu contrasinal %s para %s"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Indefinida"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Engadir criterio"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Engadir criterio"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Non se atopou a Base de Datos de configuracións"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "ID do certificado:"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Gravar sinatura"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Outro erro"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Tipo de Servidor: "
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Lixo"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "xuño"
+
 #: camel/camel-tcp-stream-openssl.c:568
 #, fuzzy
 msgid "Unable to get issuer's certificate"
@@ -9144,7 +9487,7 @@ msgid ""
 "Issuer: %s"
 msgstr "ID do certificado:"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Non foi posible analizar o URL `%s'"
@@ -9164,26 +9507,26 @@ msgstr "Non existe a mensaxe %s en %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Comprobar as novas mensaxes en tódolos cartafoles"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Non foi posible renomear o cartafol: %s"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Non foi posible renomear o cartafol %s a %s: %s"
@@ -9261,7 +9604,7 @@ msgstr "Non se puido descodifica-la mensaxe."
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9275,7 +9618,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Non existe a mensaxe"
@@ -9313,54 +9656,72 @@ msgid "Failed to cache %s: %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Conectando ao servidor..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr ""
+"Non foi posible autenticarse co servidor IMAP.\n"
+"%s\n"
+"\n"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "_Compañía:"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Comprobando o novo correo"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 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:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Cartafoles"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Amosar só os cartafoles subscritos"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "Ignora-lo espacio de nomes de cartafoles proporcionado polo servidor"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Espacio de nomes"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Aplicar filtros ás mensaxes novas de INBOX neste servidor"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "Comprobar _automaticamente se hai correo novo cada"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para ler e almacenar correo en servidores IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Contrasinal"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9618,7 +9979,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Non foi posible renomear o cartafol %s a %s: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Non foi posible renomear o cartafol: %s"
@@ -9737,30 +10098,30 @@ msgstr "Buscando mensaxes novas"
 msgid "Storing folder"
 msgstr "Sincronizando cartafol"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Non se pode abri-la caixa do correo: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "Operación cancelada"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Non se pode engadir a mensaxe ao ficheiro mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9769,11 +10130,11 @@ msgstr ""
 "Non é posible obter a mensaxe: %s do cartafol %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "O cartafol parece estar corrompido sen recuperación posible."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Contrucción da mensaxe fallida: ¿mailbox corrompido?"
 
@@ -9841,12 +10202,17 @@ msgstr "Non foi posible crear o directorio %s: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "O ID da Tarxeta xa existe"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Non foi posible renomear o cartafol %s a %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "O nome de cartafol indicado non é válido: %s"
@@ -9895,7 +10261,7 @@ msgstr "Non foi posible pechar o cartafol orixe %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Non foi posible pechar o cartafol temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Non foi posible renomear o cartafol: %s"
@@ -10181,7 +10547,7 @@ msgstr "Borrar despois de %s día(s)"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -10272,7 +10638,7 @@ msgid "No such folder `%s'."
 msgstr "Non existe o cartafol `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10328,7 +10694,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Entrega de correo a través do programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10506,7 +10872,7 @@ msgstr "Entrega de correo SMTP vía %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Non se pode enviar a mensaxe: enderezo do autor non válido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
@@ -10634,7 +11000,7 @@ msgstr "%.1fM"
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "anexo"
 
@@ -10679,14 +11045,14 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Suxerir que se amose o anexo automaticamente"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Ten que configurar unha identidade\n"
 "antes de poder escribir correo."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Prema aquí para o libro de enderezos"
 
@@ -10697,45 +11063,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Responder-A:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Introduza os enderezos que recibirán unha copia da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10746,16 +11112,21 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "_Porto:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 #, fuzzy
 msgid "Posting destination"
 msgstr "descrición"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Anexar un ficheiro á mensaxe"
+
 #: composer/e-msg-composer-select-file.c:119
 #, fuzzy
 msgid "Attach file(s)"
@@ -10792,21 +11163,21 @@ msgstr "O ficheiro existe, ¿sobrescribir?"
 msgid "Error saving file: %s"
 msgstr "Erro ao gardar o ficheiro: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao cargar o ficheiro: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro ao acceder ao ficheiro: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Non foi posible recibir a mensaxe do editor"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10815,7 +11186,7 @@ msgstr ""
 "Non é posible desprazarse no ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10824,7 +11195,7 @@ msgstr ""
 "Non foi posible trunca-lo ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10833,7 +11204,7 @@ msgstr ""
 "Non é posible desprazarse no ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10842,7 +11213,7 @@ msgstr ""
 "Erro ao autogardar a mensaxe: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
@@ -10851,7 +11222,7 @@ msgstr ""
 "Evolution atopou ficheiros non gravados dunha sesión anterior.\n"
 "¿Gostaríalle probar a recuperalos?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10862,36 +11233,36 @@ msgstr ""
 "\n"
 "¿Desexa gardar os cambios?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Mensaxe Remitida"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 #, fuzzy
 msgid "Signature:"
 msgstr "Gravar sinatura"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Compoñer unha mensaxe"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10902,7 +11273,7 @@ msgstr ""
 "Non foi posible crear a fiestra do compositor, porque aínda\n"
 "non configurou ningunha identidade no compoñente de correo."
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10911,19 +11282,20 @@ msgstr ""
 "Non foi posible crear a fiestra do compositor, porque aínda\n"
 "non configurou ningunha identidade no compoñente de correo."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "A suite de traballo en grupo Evolution"
 
 #: data/evolution.desktop.in.in.h:2
 #, fuzzy
-msgid "Ximian Evolution"
+msgid "Ximian Evolution (Unstable)"
 msgstr "Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -11181,13 +11553,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11318,7 +11690,7 @@ msgstr "Entón"
 msgid "You must specify a folder."
 msgstr "Nome do estilo:"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Seleccionar Cartafol"
@@ -11332,26 +11704,26 @@ msgstr ""
 "Erro na expresión regular '%s':\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Importante"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 #, fuzzy
 msgid "Later"
 msgstr "despois"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Proba"
 
@@ -11457,7 +11829,7 @@ msgstr "atrás"
 msgid "months"
 msgstr "meses"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "segundos"
 
@@ -11557,7 +11929,7 @@ msgstr "Expresión"
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr ""
 
@@ -11630,121 +12002,127 @@ msgid "Source Account"
 msgstr "Conta Fonte"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Orballo"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Cabeceira específica"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Parar o Procesamento"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Asunto"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "Establecer Estado"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "contén"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "non contén"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "non remata en"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "non existe"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 #, fuzzy
 msgid "does not return"
 msgstr "non existe"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "non soa como"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "non comeza por"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "remata en"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "existe"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 #, fuzzy
 msgid "is Flagged"
 msgstr "Marcada"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 #, fuzzy
 msgid "is after"
 msgstr "foi posterior a"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "is before"
 msgstr "foi anterior a"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "é maior que"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "é menor que"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Marcada"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "non é"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "é"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 #, fuzzy
 msgid "returns greater than"
 msgstr "é maior que"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 #, fuzzy
 msgid "returns less than"
 msgstr "é menor que"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 #, fuzzy
 msgid "returns"
 msgstr "Ocupado"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "soa como"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "comeza por"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
@@ -11770,21 +12148,91 @@ msgstr "Nome da regra: "
 msgid "Score Rules"
 msgstr "Regras de Puntuación"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "Cambiar o nome deste cartafol"
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 #, fuzzy
 msgid "You need to to specify at least one folder as a source."
 msgstr "Oops.  Necesita especificar polo menos un cartafol como fonte."
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 #, fuzzy
 msgid "VFolder source"
 msgstr "Fontes de CartafolV"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#, fuzzy
+msgid "Composer Preferences"
+msgstr "Preferencias da Axenda"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#, fuzzy
+msgid "Configure your email accounts here"
+msgstr "Crear ou editar contas de correo e outras preferencias"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Fábrica para o compoñente de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Compositor de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Compositor de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Fábrica para o compoñente de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Compoñente de mostra de cartafoles de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Compoñente de resumo executivo do correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Correo"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Contas"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "Preferencias da Axenda"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "¿Está seguro de que quere borrar esta conta?"
@@ -11829,7 +12277,7 @@ msgid "Protocol"
 msgstr "Porto Rico"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 #, fuzzy
 msgid "Unnamed"
 msgstr "Contacto Sen Nome"
@@ -11859,19 +12307,15 @@ msgstr "Engadir criterio"
 msgid "Signature(s)"
 msgstr "Sinatura _HTML:"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 
-#: mail/em-composer-utils.c:129
-#, fuzzy
-msgid "Send anyway?"
-msgstr "Enviar unha mensaxe"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11879,7 +12323,7 @@ msgstr ""
 "Esta mensaxe non ten asunto.\n"
 "¿Enviar realmente?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11887,11 +12331,11 @@ msgstr ""
 "Xa que a lista de contactos á que envía está configurada para agocha-los "
 "enderezos da lista, esta mensaxe só ha conter destinatarios Bcc."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Esta mensaxe só contén destinatarios Bcc."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11901,11 +12345,11 @@ msgstr ""
 "cabeceira Apparently-To.\n"
 "¿Enviar de todas maneiras?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Ten que especificar destinatarios para poder enviar esta mensaxe."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11918,198 +12362,417 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crear Cartafol _Virtual Dende Mensaxe"
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "Correo"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<prema aquí para seleccionar un cartafol>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, fuzzy, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "Abrir en %s..."
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Crear un _Novo Cartafol..."
+
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Especifica ónde crear o cartafol:"
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
-msgid "Folder _name"
+msgid "Folder _name:"
 msgstr "Nome do cartafol:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Non foi posible crear o directorio temporal: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Non foi posible crear o directorio temporal: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Non foi posible crear a caixa de correo temporal `%s': %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Non foi posible pechar o cartafol temporal: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+#, fuzzy
+msgid "Loading..."
+msgstr "Agardando..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, fuzzy, c-format
+msgid "%s"
+msgstr "s"
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Crear un novo cartafol"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Non foi posible borrar o cartafol `%s': %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Elimina-lo cartafol '%s'"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, fuzzy, c-format
+msgid "Delete \"%s\""
+msgstr "Eliminar"
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, fuzzy, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Renomea-lo cartafol '%s'"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+#, fuzzy
+msgid "Rename Folder"
+msgstr "Renomea-lo cartafol '%s'"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Propiedades"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Propiedades"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "Nome do cartafol:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Vista"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Abrir nunha Nova Fiestra"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Mover"
+
+#: mail/em-folder-tree.c:1500
+#, fuzzy
+msgid "_New Folder..."
+msgstr "_Novo Cartafol"
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "_Renomear"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "_Propiedades..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "_Editar coma unha Nova Mensaxe"
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Responder ó Autor"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Responder á _Lista"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "_Remitir"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Completada"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Limpar"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Marcar como _Lida"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marcar como _Non Lida"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Marcar coma _Importante"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marcar coma Non Im_portante"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Marcar como _Non Lida"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Marcar coma _Importante"
+
+#: mail/em-folder-view.c:706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Mover ó Cartafol.."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Copiar a un Cartafol..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Engadir o Autor ao Libro de Enderezos"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Crear Reg_ra Dende Mensaxe"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "CartafolV polo A_sunto"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "CartafolV polo Au_tor"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "CartafolV polos _Destinatarios"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "CartafolV pola _Lista de Correo"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "CartafolV polo Au_tor"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Filtrar polo As_unto"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Filtrar polo Au_tor"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Filtrar polos D_estinatarios"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Filtrar pola Lista de _Correo"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filtrar polo Au_tor"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default"
 msgstr "Por de_fecto"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Copiar Localización da Ligazón"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Aparicións:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Asignada"
+
+#: mail/em-format-html-display.c:597
 #, fuzzy
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr "Esta mensaxe está asinada dixitalmente e comprobouse a autenticidade."
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr ""
+"Esta mensaxe está asinada dixitalmente pero non se puido comprobar a súa "
+"autenticidade"
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Engadir criterio"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Engadir criterio"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Indefinida"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+#, fuzzy
+msgid "Encrypted, weak"
+msgstr "Mensaxe cifrada"
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "Cifrar con PGP"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+#, fuzzy
+msgid "Encrypted, strong"
+msgstr "Mensaxe cifrada"
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "O usuario cancelou a operación."
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Non se puido verifica-los certificados."
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Ver Inline"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Agochar"
@@ -12119,98 +12782,73 @@ msgstr "Agochar"
 msgid "Page %d of %d"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Recibindo a mensaxe %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Parte external-body mal formada."
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro a sitio FTP (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Punteiro a ficheiro local (%s) válido no sitio \"%s\""
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro a ficheiro local (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punteiro a datos remotos (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punteiro a datos externos descoñecidos (tipo \"%s\")"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-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/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Esta mensaxe está asinada dixitalmente e comprobouse a autenticidade."
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-#, fuzzy
-msgid "No signature present"
-msgstr "Ficheiro de sinatura HTML:"
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Non foi posible inicializar GNOME"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "O usuario cancelou a operación."
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Copiando as mensaxes"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "De"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Responder-A"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Para"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 #, fuzzy
 msgid "Mailer"
 msgstr ""
@@ -12218,92 +12856,139 @@ msgstr ""
 "Cliente de Correo: "
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "%s anexo"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
+msgid "Session not initialised"
+msgstr "Non foi posible inicializar GNOME"
 
-#: mail/em-popup.c:593
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Esta mensaxe está asinada dixitalmente e comprobouse a autenticidade."
+
+#: mail/em-format.c:1212
+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/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Agardando..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Examinando %s"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Non se puido descodifica-la mensaxe."
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Non se puido descodifica-la mensaxe."
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Non se puido descodifica-la mensaxe."
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Gardar Como..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 #, fuzzy
 msgid "Set as _Background"
 msgstr "Fondo:"
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Responder ó autor"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Abrir Ligazón no Navegador"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Enviar unha _mensaxe á lista..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Engadir Libro de Enderezos"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "A resposta do servidor IMAP non contiña información sobre %s"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Subscribir"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Cartafol"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Non se seleccionou ningún servidor"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Non amosar esta mensaxe outra vez"
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12312,27 +12997,27 @@ msgstr ""
 "Erro ao cargar a información do filtro:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Mensaxe Remitida"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "un remitente descoñecido"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "O %a, %Y-%m-%d ás %H:%M, %%s escribiu:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12341,7 +13026,7 @@ msgstr ""
 "Non é posible obter a mensaxe: %s\n"
 "  %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12350,26 +13035,39 @@ msgstr ""
 "%s xa existe\n"
 "¿Quere sobrescribilo?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Mensaxe"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Gardar Mensaxe Como..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Non foi posible crear o directorio temporal: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "_Enderezo:"
+
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
+msgid ""
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Esta operación ha eliminar permanentemente todas as mensaxes marcadas como "
+"eliminadas. Se continúa, non será capaz de recuperar estas mensaxes.\n"
+"\n"
+"¿Eliminar realmente estas mensaxes?"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2288
 #, fuzzy
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12378,106 +13076,387 @@ msgstr ""
 "\n"
 "¿Eliminar realmente estas mensaxes?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#: mail/evolution-mail.schemas.in.in.h:1
 #, fuzzy
-msgid "Composer Preferences"
-msgstr "Preferencias da Axenda"
+msgid "Automatic link recognition"
+msgstr "Comprobar _automaticamente se hai correo novo cada"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "Comprobar _automaticamente se hai correo novo cada"
+
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:6
 #, fuzzy
-msgid "Configure your email accounts here"
-msgstr "Crear ou editar contas de correo e outras preferencias"
+msgid "Default charset in which to compose messages"
+msgstr "Borrar esta mensaxe"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/evolution-mail.schemas.in.in.h:7
 #, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
+msgid "Default charset in which to compose messages."
+msgstr "Borrar esta mensaxe"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Fábrica para o compoñente de correo de Evolution."
+msgid "Default charset in which to display messages"
+msgstr "Buscar texto no corpo da mensaxe amosada"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
-msgid "Evolution Mail component"
-msgstr "Compositor de correo de Evolution."
+msgid "Default charset in which to display messages."
+msgstr "Buscar texto no corpo da mensaxe amosada"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Compositor de correo de Evolution."
+msgid "Default forward style"
+msgstr "O estilo de Remitir por defecto é: "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Fábrica para o compoñente de correo de Evolution."
+msgid "Default reply style"
+msgstr "O estilo de Remitir por defecto é: "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
 #, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Compoñente de mostra de cartafoles de correo de Evolution."
+msgid "Empty Trash folders on exit"
+msgstr "_Baleirar os cartafoles de lixo ao sair"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Compoñente de resumo executivo do correo de Evolution."
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "_Baleirar os cartafoles de lixo ao sair"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
-msgid "Mail Accounts"
+msgid "Height of the message-list pane"
+msgstr "Enviar a mensaxe máis tarde"
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "Contas"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
-msgid "Mail Preferences"
-msgstr "Preferencias da Axenda"
+msgid "Log filter actions"
+msgstr "_Rexistrar as accións do filtro a:"
 
-#: mail/importers/elm-importer.c:105
-msgid "Evolution is importing your old Elm mail"
-msgstr "Evolution está importando o seu correo de Elm antigo"
+#: mail/evolution-mail.schemas.in.in.h:28
+#, fuzzy
+msgid "Log filter actions to the specified log file."
+msgstr "_Rexistrar as accións do filtro a:"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
-msgid "Importing..."
-msgstr "Importando..."
+#: mail/evolution-mail.schemas.in.in.h:29
+#, fuzzy
+msgid "Logfile to log filter actions"
+msgstr "_Rexistrar as accións do filtro a:"
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
-msgid "Please wait"
-msgstr "Agarde, por favor"
+#: mail/evolution-mail.schemas.in.in.h:30
+#, fuzzy
+msgid "Logfile to log filter actions."
+msgstr "_Rexistrar as accións do filtro a:"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Importando %s coma %s"
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
 
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Examinando %s"
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
 
-#: mail/importers/elm-importer.c:547
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Configuración do Correo"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Configuración do Correo"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
-"Evolution atopou ficheiros de correo de Elm.\n"
-"¿Gostaríalle importalos a Evolution?"
 
-#: mail/importers/elm-importer.c:568
-msgid "Elm"
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr "Avisar cando se envíen mensaxes cun asunto baleiro"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "Avisar cando se envíen mensaxes con só destinatarios _Bcc definidos"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "_Enviar as mensaxes en formato HTML por defecto."
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "_Enviar as mensaxes en formato HTML por defecto."
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "Amosa-lo Tempo Coma"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "Amosa-lo Tempo Coma"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Amosa-la mensaxe no estilo normal"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "_Panel de Previsualización"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+msgid "Sound file to play when new mail arrives."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+msgid "Spell check inline"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "Contacto Orixinal:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+msgid "The variable width font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Lista de Mensaxes por Fíos"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Lista de Mensaxes por Fíos"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+#, fuzzy
+msgid "Thread the message-list based on Subject"
+msgstr "Mensaxe remitida (sen asunto)"
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "Facer esta a miña conta por _defecto"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "Variable"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
 msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
@@ -12512,6 +13491,44 @@ msgstr ""
 msgid "Evolution Pine importer"
 msgstr "Compositor de correo de Evolution."
 
+#: mail/importers/elm-importer.c:105
+msgid "Evolution is importing your old Elm mail"
+msgstr "Evolution está importando o seu correo de Elm antigo"
+
+#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
+#: mail/importers/pine-importer.c:115
+msgid "Importing..."
+msgstr "Importando..."
+
+#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
+#: mail/importers/pine-importer.c:117
+msgid "Please wait"
+msgstr "Agarde, por favor"
+
+#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
+#: mail/importers/pine-importer.c:288
+#, c-format
+msgid "Importing %s as %s"
+msgstr "Importando %s coma %s"
+
+#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
+#: mail/importers/pine-importer.c:425
+#, c-format
+msgid "Scanning %s"
+msgstr "Examinando %s"
+
+#: mail/importers/elm-importer.c:547
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution atopou ficheiros de correo de Elm.\n"
+"¿Gostaríalle importalos a Evolution?"
+
+#: mail/importers/elm-importer.c:568
+msgid "Elm"
+msgstr ""
+
 #: mail/importers/netscape-importer.c:75
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
@@ -12553,12 +13570,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution está importando os datos antigos de Netscape"
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Lixo"
-
 #: mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
@@ -12568,7 +13579,7 @@ msgstr "Ficheiro local de correo %s"
 msgid "Scanning directory"
 msgstr "Explorando o directorio"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Comezando a importación"
 
@@ -12648,24 +13659,24 @@ msgid "You have not filled in all of the required information."
 msgstr "Non encheu toda a información requirida."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Editor de Contas de Evolution"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "Nome de _Usuario:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Ruta:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Non pode crear dúas contas co mesmo nome"
 
@@ -12674,35 +13685,35 @@ msgstr "Non pode crear dúas contas co mesmo nome"
 msgid "Mail to %s"
 msgstr "Mensaxe para %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "O asunto é %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Mensaxe de %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "lista de correo %s"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Respondido a"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Engadir Regra de Filtrado"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12710,146 +13721,31 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:194
-#, fuzzy
-msgid "Connecting..."
-msgstr "Conectando ao servidor..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Este cartafol non pode conter mensaxes."
-
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Non foi posible renomear o cartafol: %s"
-
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Non foi posible crear o directorio temporal: %s"
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Nova Mensaxe de Correo"
 
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Non foi posible crear a caixa de correo temporal `%s': %s"
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "Enviar _Mensaxe"
 
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Non foi posible pechar o cartafol temporal: %s"
+#: mail/mail-component.c:381
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Compoñer unha mensaxe"
 
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Escolla un cartafol de destino para importar estes datos"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Escolla un cartafol de destino para importar estes datos"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Crear un novo cartafol"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Especifica ónde crear o cartafol:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Non foi posible borrar o cartafol `%s': %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Elimina-lo cartafol '%s'"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, fuzzy, c-format
-msgid "Delete \"%s\""
-msgstr "Eliminar"
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, fuzzy, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Renomea-lo cartafol '%s'"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-#, fuzzy
-msgid "Rename Folder"
-msgstr "Renomea-lo cartafol '%s'"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "O nome de cartafol indicado non é válido: %s"
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Propiedades"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Propiedades"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "Nome do cartafol:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Vista"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Abrir nunha Nova Fiestra"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Mover"
-
-#: mail/mail-component.c:2087
-#, fuzzy
-msgid "_New Folder..."
-msgstr "_Novo Cartafol"
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "_Renomear"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Propiedades..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Identidade"
 
@@ -12919,11 +13815,11 @@ msgstr ""
 "embaixo.\n"
 "Este nome só se emprega para amosalo."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Comprobando Servicio"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Conectando ao servidor..."
 
@@ -13014,30 +13910,39 @@ msgid "C_olors"
 msgstr "P_echar"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Comprobando o novo correo"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "Comprobando o novo correo"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Cor para tarefas para hoxe"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Compoñer unha mensaxe"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 #, fuzzy
 msgid "Configuration"
 msgstr "Configuración do Correo"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -13054,333 +13959,342 @@ msgstr ""
 "\n"
 "Prema \"Finalizar\" para gardar a nova configuración."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "Por de_fecto"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Por de_fecto"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Codificación de caracteres por defecto: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Recibindo Correo"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Asinar sempre as mensaxes saíntes cando se use esta conta"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Feito"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Cartafol de borradores:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "A_ctivar"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Enderezo contén"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email _address:"
 msgstr "Enderezo de Correo:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "_Baleirar os cartafoles de lixo ao sair"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "ID do certificado:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Asistente de Contas de Evolution"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Executar accións"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "remata en"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "Opcións"
+
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propiedades"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Mensaxes remitidas"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Resaltar as citas con "
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Inline"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Gardar e Pechar"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Loading Images"
 msgstr "Cargar _Imaxes"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Configuración do Correo"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Localización da caixa do correo"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Composer"
 msgstr "Cabeceira da Mensaxe"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Message Display"
 msgstr "Visualización das _Mensaxes"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Fonts"
 msgstr "A mensaxe contén"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Configuración do Correo"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Información Opcional"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_zación:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da Clave PGP:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Escoller unha cor"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Avisar cando se envíen mensaxes con só destinatarios _Bcc definidos"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Imprimi-los contactos seleccionados"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Maildir de Qmail "
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Quote original message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_member this password"
 msgstr "Lembrar este contrasinal"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Responder-A:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Recepción de Correo"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Opcións de Recepción"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Lembrar este contrasinal"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Información Requirida"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Opcións por defecto"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Seguridade"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME Seguro"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Cartafol de mensaxes enviadas:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Mensaxes Enviadas e Borradores"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "O servidor require _autenticación"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Configuración do Servidor"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Tipo de Servidor: "
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Non se atopou a Base de Datos de configuracións"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nome do estilo:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "mbox estándar de Unix"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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:121
+#: mail/mail-config.glade.h:124
 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:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variable"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -13391,196 +14305,205 @@ msgstr ""
 "\n"
 "Prema en \"Seguinte\" para comezar. "
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Sinatura _HTML:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "Cargar _sempre as mensaxes da rede"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 #, 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:133
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Tipo de Autenticación: "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Tipo de Autenticación: "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "Comprobar _automaticamente se hai correo novo cada"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Comprobar _automaticamente se hai correo novo cada"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Sinatura _HTML:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Defaults"
 msgstr "Opcións por defecto"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Enable"
 msgstr "Activado"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Remitir Coma"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Nome Completo:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "En correo HTML"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Identity"
 msgstr "Identidade"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "xuño"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "_Cargar imaxes se o autor está no libro de enderezos"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Facer esta a miña conta por _defecto"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensaxes como Lidas despois de"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "_Nunca cargar as imaxes da rede"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 #, 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:159
+#: mail/mail-config.glade.h:165
 #, 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:160
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Recepción de Correo"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Responder a Todos"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Script:"
 msgstr "_Seguridade"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Eliminar..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Amosa-lo Tempo Coma"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Signatures"
 msgstr "Sinatura _HTML:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Standard Font:"
 msgstr "San Marino"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Terminal Font:"
 msgstr "Contacto Orixinal:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Usar conexión segura (_SSL)"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "descrición"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Examinando %s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13589,7 +14512,7 @@ msgstr ""
 "Erro durante '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13598,7 +14521,7 @@ msgstr ""
 "Erro ao efectuar a operación:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Traballando"
 
@@ -13610,118 +14533,118 @@ msgstr "Filtrando o Cartafol"
 msgid "Fetching Mail"
 msgstr "Recibindo Correo"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Non se puido armacenar o correo no ficheiro temporal %s: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Non se puido armacenar o correo no ficheiro temporal %s: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Gardando a mensaxe no cartafol"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensaxes a %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Mensaxes remitidas"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo armacenamento %s"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando o cartafol %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Creando o cartafol %s"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Refrescando o cartafol"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Importando %s coma %s"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Cartafoles Locais"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recibindo a mensaxe %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Recibindo %d mensaxe(s)"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Gardando %d mensaxe(s)"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13730,7 +14653,7 @@ msgstr ""
 "Non foi posible crear o ficheiro de saída: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13739,11 +14662,11 @@ msgstr ""
 "Erro ao gardar as mensaxes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13752,21 +14675,25 @@ msgstr ""
 "Non é posible crear ficheiro de saída: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Desconectando de %s"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Distinguir Maiúsculas"
@@ -13783,62 +14710,77 @@ msgstr "Buscar:"
 msgid "Search"
 msgstr "Buscar"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Engadir criterio"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Excepcións"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Información da Fonte"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Cancelando..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Tipo de Servidor: "
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Tipo:"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Enviar e Recibir correo"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Cancelar"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Agardando..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "O usuario cancelou a operación."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 #, fuzzy
 msgid "Enter Password"
 msgstr "Contrasinal"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "_Lembrar este contrasinal"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -13881,26 +14823,31 @@ msgstr "Sinatura _HTML:"
 msgid "Name:"
 msgstr "Nome:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaxe remitida - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Mensaxe remitida"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Abrindo cartafol %s"
+
+#: mail/mail-vfolder.c:87
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Creando o cartafol %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13909,90 +14856,90 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "CartafolesV"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 #, fuzzy
 msgid "vFolders"
 msgstr "Cartafoles"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Editar CartafolesV"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Novo CartafolV"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Non vista"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples Mensaxes Non Vistas"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Múltiples Mensaxes"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "A máis baixa"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Máis baixa"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Máis alta"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "A máis alta"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Hoxe ás %k:%M"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Onte ás %k:%M"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "O %A ás %k:%M"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "O %d de %B ás %k:%M"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
@@ -14054,11 +15001,11 @@ msgstr "Remitir"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Responder a Todos"
 
@@ -14115,44 +15062,140 @@ msgstr "_Subscribir"
 msgid "_Unsubscribe"
 msgstr "_Desubscribir"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, fuzzy, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "O shell de Evolution."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+#, fuzzy
+msgid "Folder Settings"
+msgstr "Opcións"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "389"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Renomear este grupo de atallos"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Trocar a mostra da barra de cartafoles"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Agochar a barra de atallos"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "_Prioridade:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "_Prioridade:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Interface de configuración do correo"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
 msgstr ""
-"Non foi posible borrar o cartafol:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 #, fuzzy
-msgid "Add a Folder"
-msgstr "Seleccionar Cartafol"
+msgid "Path to the default contacts folder"
+msgstr "Abrindo cartafol %s"
 
-#: shell/e-local-storage.c:179
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
-msgid "Drafts"
-msgstr "Borrador"
+msgid "Path to the default mail folder"
+msgstr "Abrindo cartafol %s"
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Entrada"
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Abrindo cartafol %s"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Saída"
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
 
-#: shell/e-local-storage.c:182
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
 #, fuzzy
-msgid "Sent"
-msgstr "Vista"
+msgid "Physical URI to the default tasks folder"
+msgstr "Abrindo cartafol %s"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Trocar a mostra da barra de cartafoles"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Trocar a mostra da barra de atallos"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "Correo Electrónico"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Non foi posible actualizar os ficheiros correctamente"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -14163,7 +15206,7 @@ msgstr ""
 "%s\n"
 "Erro: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -14172,7 +15215,7 @@ msgstr ""
 "Ocorreu un erro ao copiar ficheiros a\n"
 "`%s'."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -14183,7 +15226,7 @@ msgstr ""
 "Móvao para poder instalar os ficheiros de\n"
 "usuario de Evolution."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -14290,10 +15333,11 @@ msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+msgid "The specified folder name is not valid: %s"
+msgstr "O nome de cartafol indicado non é válido: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -14317,20 +15361,15 @@ msgstr ""
 "Non se pode crear o cartafol indicado:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-#, fuzzy
-msgid "Create New Folder"
-msgstr "Crear un _Novo Cartafol..."
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Sen_título)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr ""
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -14344,11 +15383,11 @@ msgstr ""
 "Pode seleccionar \"Automático\" se non o sabe, e Evolution tentará "
 "averigualo."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -14356,7 +15395,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14365,23 +15404,23 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 #, fuzzy
 msgid "Select importer"
 msgstr "Seleccionar Cartafol"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "O cartafol `%s' non existe."
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -14390,11 +15429,11 @@ msgstr ""
 "Non hai importador capaz de manexar\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Importando"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -14403,17 +15442,17 @@ msgstr ""
 "Importando %s.\n"
 "Comezando %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Erro ao iniciar %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Erro ao cargar %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14422,34 +15461,34 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Automático"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Nome do ficheiro:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Tipo de ficheiro:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Importar un formato de ficheiro externo"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -14457,46 +15496,28 @@ msgstr ""
 "Agarde...\n"
 "Buscando configuracións existentes"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Iniciando os Importadores Intelixentes"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "De:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Escolla un cartafol de destino para importar estes datos"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Importar"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Pechando as conexións..."
 
-#: shell/e-shell-offline-sync.c:163
-#, fuzzy, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr "Sincronizando '%s'"
-
-#: shell/e-shell-offline-sync.c:232
-#, fuzzy
-msgid "Syncing Folder"
-msgstr "Sincronizando cartafol"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, fuzzy, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Sincronizando '%s'"
-
 #: shell/e-shell-settings-dialog.c:346
 #, fuzzy
 msgid "Evolution Settings"
@@ -14537,7 +15558,7 @@ msgstr ""
 "Non se pode crear o cartafol indicado:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14546,17 +15567,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Asistente"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Novo"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Non se especificou un nome de cartafol"
@@ -14619,64 +15634,51 @@ 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:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 #, fuzzy
 msgid "_Work Online"
 msgstr "Traballar Conectado"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "_Traballar Desconectado"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Traballar Desconectado"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Ningún cartafol visualizado)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Nada)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 #, 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:2090
+#: shell/e-shell-window.c:331
 #, fuzzy
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Evolution está desconectándose"
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr "Evolution está desconectado. Prema neste botón para conectar."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Argumentos non válidos"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Non se pode rexistrar en OAF"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Non se atopou a Base de Datos de configuracións"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Erro xenérico"
 
@@ -14796,75 +15798,18 @@ msgstr "Eli_minar"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Eliminar este atallo da barra de atallos"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Erro ao gardar os atallos."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Entrada"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Atallos"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Sen erros"
-
-#: 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:575
-msgid "The specified folder type is not valid"
-msgstr "O tipo do cartafol indicado non é válido"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "Erro de E/S"
-
-#: 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:581
-msgid "The folder is not empty"
-msgstr ""
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "Non se atopou o cartafol indicado"
-
-#: 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:589
-msgid "Operation not supported"
-msgstr "Operación non soportada"
-
-#: 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:593
-msgid "The specified folder cannot be modified or removed"
-msgstr "O cartafol especificado non se pode modificar ou eliminar"
-
-#: 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: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:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr ""
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr ""
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14875,6 +15820,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completa)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Novo"
+
+#: shell/evolution-folder-selector-button.c:128
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "Abrir en %s..."
+
 #: shell/evolution-shell-component-utils.c:124
 #, fuzzy, c-format
 msgid ""
@@ -14901,87 +15857,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1187
-#, fuzzy
-msgid "CORBA error"
-msgstr "Erro de E/S"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1191
-#, fuzzy
-msgid "Invalid argument"
-msgstr "Argumentos non válidos"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1195
-#, fuzzy
-msgid "No owner"
-msgstr "Nada"
-
-#: shell/evolution-shell-component.c:1197
-#, fuzzy
-msgid "Not found"
-msgstr "Tarxeta non atopada"
-
-#: shell/evolution-shell-component.c:1199
-#, fuzzy
-msgid "Unsupported type"
-msgstr "Dete_ctar tipos soportados "
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1203
-#, fuzzy
-msgid "Unsupported operation"
-msgstr "O usuario cancelou a operación."
-
-#: shell/evolution-shell-component.c:1205
-#, fuzzy
-msgid "Internal error"
-msgstr "Outro erro"
-
-#: shell/evolution-shell-component.c:1209
-#, fuzzy
-msgid "Exists"
-msgstr "Existe"
-
-#: shell/evolution-shell-component.c:1211
-#, fuzzy
-msgid "Invalid URI"
-msgstr "Non válido"
-
-#: shell/evolution-shell-component.c:1215
-#, fuzzy
-msgid "Has subfolders"
-msgstr "Non existe o cartafol %s"
-
-#: shell/evolution-shell-component.c:1217
-#, fuzzy
-msgid "No space left"
-msgstr "Ningunha Mensaxe Seleccionada"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr ""
-
-#: shell/evolution-test-component.c:63
-#, fuzzy
-msgid "Test type"
-msgstr "Tipo de ficheiro:"
-
-#: shell/evolution-test-component.c:703
-#, fuzzy
-msgid "Evolution Test Component"
-msgstr "Compositor de correo de Evolution."
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "Active Connections"
@@ -15015,11 +15890,6 @@ msgstr "_Correo"
 msgid "_Tasks:"
 msgstr "Tarefas"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-#, fuzzy
-msgid "Folder _name:"
-msgstr "Nome do cartafol:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 #, fuzzy
 msgid "Folder _type:"
@@ -15080,25 +15950,6 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "O shell de Evolution."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-#, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Fábrica para o compoñente de correo de Evolution."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-#, fuzzy
-msgid "Folder Settings"
-msgstr "Opcións"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Prema en \"Importar\" para comezar a importar o ficheiro a Evolution. "
@@ -15141,7 +15992,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Importadores"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Importar"
 
@@ -15157,17 +16008,17 @@ msgstr "Non preguntar de novo"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution pode importar datos dos seguintes ficheiros:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "_Fiestra de Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -15199,7 +16050,7 @@ msgstr ""
 "Esperamos que desfrute do resultado do noso duro traballo, e\n"
 "agardamos con impaciencia polas súas colaboracións.\n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -15208,71 +16059,114 @@ msgstr ""
 "Graciñas\n"
 "O Equipo de Evolution\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Non preguntar de novo"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Non se pode acceder ao shell de Evolution."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Non se pode inicializar o shell de Evolution: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Comezando a importación"
 
-#: shell/main.c:532
+#: shell/main.c:530
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Iniciando os Importadores Intelixentes"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Enviar a saída da depuración de todos os compoñentes a un ficheiro."
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Seleccionar Cartafol"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "ID do certificado:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "En Progreso"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Expresión"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Enderezo de Correo:"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr "ID do certificado:"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, fuzzy, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+"Expendedor: %s\n"
+"Asunto: %s"
+
+#: smime/gui/e-cert-selector.c:117
+#, fuzzy, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+"Expendedor: %s\n"
+"Asunto: %s"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -15328,92 +16222,378 @@ msgid "Backup All"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "ID do certificado:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "ID do certificado:"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "ID do certificado:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Nome Común"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "ID do certificado:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "_Editar"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 #, fuzzy
 msgid "Email Recipient Certificate"
 msgstr "Non se especificaron destinatarios."
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Non se puido verifica-los certificados."
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Expresión"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Organización"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Organización"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Vista"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "ID do certificado:"
+
+#: smime/gui/smime-ui.glade.h:42
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "ID do certificado:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Importar"
+msgid "Certificate already exists"
+msgstr "O ID da Tarxeta xa existe"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "mes"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "mes"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "mes"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "mes"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr ", "
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "Aceptar"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "ID do certificado:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "ID do certificado:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "ID do certificado:"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "I"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+#, fuzzy
+msgid "Subject Public Key Info"
+msgstr ""
+"\n"
+"Clave Pública: "
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "O asunto é %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Incapaz de procesar o cartafol spool"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "ID do certificado:"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Non se puido verifica-los certificados."
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Opcións"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Sen Información"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "anexo"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "ID do certificado:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Croacia"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "Croacia"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Expresión"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "Servidor %s %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Ficheiro de sinatura:"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "_Inserir"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "O asunto é %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Ficheiro de sinatura:"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Introduza o seu contrasinal para %s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "ID do certificado:"
 
 #: tools/evolution-launch-composer.c:324
 #, fuzzy
@@ -15469,7 +16649,7 @@ msgstr "Copiar a selección"
 msgid "Copy to Folder..."
 msgstr "_Copiar a un Cartafol..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Cortar a selección"
 
@@ -15487,7 +16667,7 @@ msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 msgid "Move to Folder..."
 msgstr "_Mover ó Cartafol.."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Pegar o contido do portarretallos"
 
@@ -15495,8 +16675,8 @@ msgstr "Pegar o contido do portarretallos"
 msgid "Previews the contacts to be printed"
 msgstr "Previsualiza os contactos que se han imprimir"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Pre_visualización da Impresión"
@@ -15542,13 +16722,13 @@ msgstr "Parar a Carga"
 msgid "View the current contact"
 msgstr "a hora actual"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "_Accións"
 
@@ -15578,145 +16758,114 @@ msgid "_Send Message to Contact..."
 msgstr "Enviar unha _Mensaxe ao Contacto..."
 
 #: ui/evolution-calendar.xml.h:3
-#, fuzzy
-msgid "Create a new all-day event"
-msgstr "Crear unha nova cita"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Crear unha nova cita"
-
-#: ui/evolution-calendar.xml.h:5
 msgid "Create a new calendar"
 msgstr "Crear unha nova axenda"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Crear unha nova tarefa"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Crear unha nova tarefa"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Día"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 #, fuzzy
 msgid "Delete All Occurrences"
 msgstr "Borrar _Tódalas Ocorrencias"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Borrar esta cita"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "Borrar esta _Ocorrencia"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "Borrar esta _Ocorrencia"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Ir A"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Atrás"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Adiante"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Ir á _Data"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Ir á data especificada"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Ir ó día de hoxe"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "List"
 msgstr "Brétema"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Mes"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Nova C_ita"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Nova Caledonia"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Xuntanza"
-
-#: ui/evolution-calendar.xml.h:27
-msgid "New _Task"
-msgstr "Nova T_arefa"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Previsualiza a axenda que se vai imprimir"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Imprimir esta axenda"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publicar información de Libre/Ocupado para esta axenda"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Fontes"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Cartafol que contén citas e eventos"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Amosa-los Detalles"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Amosar un día"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Amosar un mes"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Amosar unha semana"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Amosar a semana laboral"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Semana"
 
@@ -15781,7 +16930,7 @@ msgstr "Gravar este elemento no disco"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Ficheiro"
 
@@ -16009,7 +17158,7 @@ msgstr "Marcar Todas como L_idas"
 msgid "Mark all visible messages as read"
 msgstr "Marcar as mensaxes visibles como se foran lidas"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Paste message(s) from the clipboard"
 msgstr "Pegar a mensaxe do portarretallos"
@@ -16067,16 +17216,6 @@ msgstr "_Inverter Selección"
 msgid "_Threaded Message List"
 msgstr "Lis_ta de Mensaxes por Fíos"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Pechar esta fiestra"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "_Pechar"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Addressbook"
@@ -16241,278 +17380,303 @@ msgstr "Remiti-lo correo seleccionado a alguén coma un anexo"
 msgid "Increase the text size"
 msgstr "Inserir ficheiro de texto..."
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Cargar _Imaxes"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Marcar como I_mportante"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Marcar como _Non Lida"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Marcar como Non Imp_ortante"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark the selected message(s) as having been read"
 msgstr "Marcar as mensaxes seleccionadas como se foran lidas"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark the selected message(s) as important"
 msgstr "Marcar as mensaxes seleccionadas coma importante"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Marcar as mensaxes seleccionadas coma non importantes"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Marcar as mensaxes seleccionadas como se non foran lidas"
+
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Marcar as mensaxes seleccionadas como se non foran lidas"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Marcar as mensaxes seleccionadas coma non importantes"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar as mensaxes seleccionadas para borralas"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Mover"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
 msgid "Move selected message(s) to another folder"
 msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Seguinte"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Next _Important Message"
 msgstr "Seguinte Mensaxe Importante"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Next _Thread"
 msgstr "Seguinte Fío"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "Next _Unread Message"
 msgstr "Seguinte Mensaxe Sen Ler"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Tarxeta non atopada"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Abrir a mensaxe seleccionada nunha nova fiestra"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Abri-la mensaxe seleccionada no compositor para re-enviala"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "P_revious Unread Message"
 msgstr "Anterior Mensaxe Sen Ler"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Resposta á Tarefa"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "Comprobar as novas mensaxes en tódolos cartafoles"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Anterior Mensaxe Importante"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Previsualizar a mensaxe que se vai imprimir"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Anterior"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Imprimir esta mensaxe"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Remiti-lo correo seleccionado a alguén"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "Buscar M_ensaxe..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Gardar a mensaxe coma un ficheiro de texto"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Buscar texto no corpo da mensaxe amosada"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "Set up the page settings for your current printer"
 msgstr "Configurar as opcións de páxina para a impresora actual"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Amosar o Código _Fonte da Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Amosa-las _Cabeceiras Completas"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Buscar texto no corpo da mensaxe amosada"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Amosa-la mensaxe no estilo normal"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Amosa-la mensaxe con tódalas cabeceiras"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Amosa-lo código fonte sen procesar da mensaxe"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Recuperar as mensaxes seleccionadas"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "CartafolV pola _Lista de Correo"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "CartafolV polo Au_tor"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "CartafolV polos _Destinatarios"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "CartafolV polo A_sunto"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 #, fuzzy
 msgid "_Attached"
 msgstr "Anexar"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "_Copiar ó Cartafol"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "_Crear Filtro Dende Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "_Remitir Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 #, fuzzy
 msgid "_Go To"
 msgstr "Ir A"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 #, fuzzy
 msgid "_Inline"
 msgstr "Inline"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 #, fuzzy
 msgid "_Larger"
 msgstr "Buscapersoas"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "Visualización das _Mensaxes"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Mover ó Cartafol"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 #, fuzzy
 msgid "_Next Message"
 msgstr "Seguinte Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "Visualización _Normal"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "_Abrir Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Anterior Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 #, fuzzy
 msgid "_Quoted"
 msgstr "Citado"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 #, fuzzy
 msgid "_Resend..."
 msgstr "_Renomear..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "_Ferramentas"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "_Recuperar"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Pechar esta fiestra"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "_Pechar"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Anexar"
@@ -16802,12 +17966,13 @@ msgid "Change Evolution's settings"
 msgstr "Evolution"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "_Saír"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Crear unha nova tarefa"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "_Fiestra de Evolution"
+msgid "E_xit"
+msgstr "_Saír"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16819,8 +17984,8 @@ msgstr ""
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "_Fiestra de Evolution"
+msgid "Open a new window"
+msgstr "Abrir nunha Nova Fiestra"
 
 #: ui/evolution.xml.h:11
 #, fuzzy
@@ -16828,58 +17993,72 @@ msgid "Pi_lot Settings..."
 msgstr "_Preferencias de Correo..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Enviar / Recibir"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "Enviar o correo na cola e recibir o correo novo"
+
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Configuración do Correo"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 #, fuzzy
 msgid "Show information about Ximian Evolution"
 msgstr "Amosar información sobre Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "_Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un informe de erro usando o Bug Buddy"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Trocar"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Trocar entre traballo conectado e desconectado"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "_FAQ de Evolution"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 #, fuzzy
 msgid "_About Ximian Evolution..."
 msgstr "_Acerca de Evolution..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "A_xuda"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 #, fuzzy
 msgid "_Import..."
 msgstr "Importando..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Novo"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Enviar / Recibir"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "Buscar Agora"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Imprimir Resumo"
@@ -17021,12 +18200,12 @@ msgstr "Definir Vistas"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "LMMXVSD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B de %Y"
 
@@ -17164,7 +18343,7 @@ msgstr "_Buscar"
 msgid "_Find Now"
 msgstr "Buscar Agora"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 #, fuzzy
 msgid "_Clear"
 msgstr "Limpar"
@@ -17183,25 +18362,265 @@ msgstr ""
 msgid "Text"
 msgstr "Proba"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Limpar"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Buscar Agora"
 
+#~ msgid "Account Name"
+#~ msgstr "Nome da Conta"
+
+#~ msgid "Server Name"
+#~ msgstr "Nome do Servidor"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Cancela-la operación de correo actual"
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "(SSL non está soportado nesta versión de evolution)"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Outros Contactos"
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Nome Completo:"
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Interface de selección de nome do Libro de Enderezos de Evolution"
 
 #, fuzzy
-#~ msgid "Family Name"
-#~ msgstr "Nome Completo:"
+#~ msgid "Add LDAP Server"
+#~ msgstr "Servidor NNTP:"
+
+#, fuzzy
+#~ msgid "LDAP Configuration Assistant"
+#~ msgstr "Configuración do Correo"
+
+#, fuzzy
+#~ msgid "Find contact in"
+#~ msgstr "Buscar un contacto"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Prema aquí para engadir un contacto *"
+
+#~ msgid "Business Address"
+#~ msgstr "Enderezo do Traballo"
+
+#~ msgid "Department"
+#~ msgstr "Departamento"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "URL libre-ocupado"
+
+#~ msgid "ISDN"
+#~ msgstr "RDSI"
+
+#~ msgid "Profession"
+#~ msgstr "Profesión"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#, fuzzy
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Abrindo armacenamento %s"
+
+#, fuzzy
+#~ msgid "Send anyway?"
+#~ msgstr "Enviar unha mensaxe"
+
+#, fuzzy
+#~ msgid "Folder _name"
+#~ msgstr "Nome do cartafol:"
+
+#, fuzzy
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "Esta mensaxe está asinada dixitalmente e comprobouse a autenticidade."
+
+#, fuzzy
+#~ msgid "No signature present"
+#~ msgstr "Ficheiro de sinatura HTML:"
+
+#, fuzzy
+#~ msgid "Connecting..."
+#~ msgstr "Conectando ao servidor..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Este cartafol non pode conter mensaxes."
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Non foi posible renomear o cartafol: %s"
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Escolla un cartafol de destino para importar estes datos"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non foi posible borrar o cartafol:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Add a Folder"
+#~ msgstr "Seleccionar Cartafol"
+
+#, fuzzy
+#~ msgid "Drafts"
+#~ msgstr "Borrador"
+
+#~ msgid "Outbox"
+#~ msgstr "Saída"
+
+#, fuzzy
+#~ msgid "Sent"
+#~ msgstr "Vista"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr "Sincronizando '%s'"
+
+#, fuzzy
+#~ msgid "Syncing Folder"
+#~ msgstr "Sincronizando cartafol"
+
+#, fuzzy
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Sincronizando '%s'"
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Ningún cartafol visualizado)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(Nada)"
+
+#~ msgid "No error"
+#~ msgstr "Sen erros"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Xa existe un cartafol co mesmo nome"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "O tipo do cartafol indicado non é válido"
+
+#~ msgid "I/O error"
+#~ msgstr "Erro de E/S"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Non hai espacio dabondo para crear o cartafol"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Non se atopou o cartafol indicado"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Función non implementada neste medio de armacenamento"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Operación non soportada"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "O tipo especificado non está soportado neste almacenamento"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "O cartafol especificado non se pode modificar ou eliminar"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
+
+#, fuzzy
+#~ msgid "CORBA error"
+#~ msgstr "Erro de E/S"
+
+#, fuzzy
+#~ msgid "Invalid argument"
+#~ msgstr "Argumentos non válidos"
+
+#, fuzzy
+#~ msgid "No owner"
+#~ msgstr "Nada"
+
+#, fuzzy
+#~ msgid "Unsupported type"
+#~ msgstr "Dete_ctar tipos soportados "
+
+#, fuzzy
+#~ msgid "Unsupported operation"
+#~ msgstr "O usuario cancelou a operación."
+
+#, fuzzy
+#~ msgid "Internal error"
+#~ msgstr "Outro erro"
+
+#, fuzzy
+#~ msgid "Exists"
+#~ msgstr "Existe"
+
+#, fuzzy
+#~ msgid "Invalid URI"
+#~ msgstr "Non válido"
+
+#, fuzzy
+#~ msgid "Has subfolders"
+#~ msgstr "Non existe o cartafol %s"
+
+#, fuzzy
+#~ msgid "No space left"
+#~ msgstr "Ningunha Mensaxe Seleccionada"
+
+#, fuzzy
+#~ msgid "Test type"
+#~ msgstr "Tipo de ficheiro:"
+
+#, fuzzy
+#~ msgid "Evolution Test Component"
+#~ msgstr "Compositor de correo de Evolution."
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "Importar"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Crear unha nova cita"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Nova C_ita"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Xuntanza"
+
+#~ msgid "New _Task"
+#~ msgstr "Nova T_arefa"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "_Fiestra de Evolution"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "_Fiestra de Evolution"
+
+#~ msgid "Toggle"
+#~ msgstr "Trocar"
+
+#~ msgid "Clear"
+#~ msgstr "Limpar"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Cancela-la operación de correo actual"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -17302,10 +18721,6 @@ msgstr "Buscar Agora"
 #~ msgstr "Compositor de correo de Evolution."
 
 #, fuzzy
-#~ msgid "Loading..."
-#~ msgstr "Agardando..."
-
-#, fuzzy
 #~ msgid "Searching..."
 #~ msgstr "Buscar M_ensaxe..."
 
@@ -17358,10 +18773,6 @@ msgstr "Buscar Agora"
 #~ msgstr "EBook non cargado\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "O ID da Tarxeta xa existe"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Operación cancelada"
 
@@ -17568,10 +18979,6 @@ msgstr "Buscar Agora"
 #~ msgstr "%x"
 
 #, fuzzy
-#~ msgid "Phone"
-#~ msgstr "Nada"
-
-#, fuzzy
 #~ msgid "Birth date"
 #~ msgstr ""
 #~ "\n"
@@ -17586,10 +18993,6 @@ msgstr "Buscar Agora"
 #~ msgstr "Principal"
 
 #, fuzzy
-#~ msgid "ID"
-#~ msgstr "I"
-
-#, fuzzy
 #~ msgid "Last Use"
 #~ msgstr "Pegar"
 
@@ -17604,10 +19007,6 @@ msgstr "Buscar Agora"
 #~ msgstr "Cartafol que contén información de contacto"
 
 #, fuzzy
-#~ msgid "LDAP Server"
-#~ msgstr "Servidor NNTP:"
-
-#, fuzzy
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "Cartafol que contén información de contacto"
 
@@ -17619,20 +19018,6 @@ msgstr "Buscar Agora"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Cartafol que contén información de contacto"
 
-#~ msgid "_Contact"
-#~ msgstr "_Contacto"
-
-#, fuzzy
-#~ msgid "Create a new contact"
-#~ msgstr "Crear un novo contacto"
-
-#~ msgid "New Contact List"
-#~ msgstr "Nova Lista de Contactos"
-
-#, fuzzy
-#~ msgid "Create a new contact list"
-#~ msgstr "Crear unha nova lista de contactos"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "O URI que ha amosar o Navegador de Cartafoles"
 
@@ -17650,9 +19035,6 @@ msgstr "Buscar Agora"
 #~ msgid "Is New Card"
 #~ msgstr "Novo"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "Sen tarxetas"
 
@@ -17701,37 +19083,6 @@ msgstr "Buscar Agora"
 #~ msgstr "Cartafol que contén elementos para-facer"
 
 #, fuzzy
-#~ msgid "New appointment"
-#~ msgstr "Nova Cita"
-
-#, fuzzy
-#~ msgid "_Appointment"
-#~ msgstr "Cita"
-
-#, fuzzy
-#~ msgid "New meeting"
-#~ msgstr "Configuración da Fonte de Novas"
-
-#, fuzzy
-#~ msgid "M_eeting"
-#~ msgstr "Xuntanza"
-
-#, fuzzy
-#~ msgid "New task"
-#~ msgstr "Nova Tarefa"
-
-#~ msgid "_Task"
-#~ msgstr "_Tarefa"
-
-#, fuzzy
-#~ msgid "New All Day Appointment"
-#~ msgstr "Nova Cita"
-
-#, fuzzy
-#~ msgid "All _Day Appointment"
-#~ msgstr "Nova C_ita"
-
-#, fuzzy
 #~ msgid "Could not update invalid object"
 #~ msgstr "Non foi posible actualizar os ficheiros correctamente"
 
@@ -17764,10 +19115,6 @@ msgstr "Buscar Agora"
 #~ msgstr "Abrir axenda"
 
 #, fuzzy
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Abrindo cartafol %s"
-
-#, fuzzy
 #~ msgid "Purging event %s"
 #~ msgstr "Examinando %s"
 
@@ -17806,10 +19153,6 @@ msgstr "Buscar Agora"
 #~ "Evolution atopou ficheiros GnomeCard.\n"
 #~ "¿Gostaríalle importalos a Evolution?"
 
-#, fuzzy
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Interface de configuración do correo"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "Cartafol que contén correo"
 
@@ -17827,25 +19170,12 @@ msgstr "Buscar Agora"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Cartafol de Lixo Virtual"
 
-#~ msgid "Properties..."
-#~ msgstr "Propiedades..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Modificar as propiedades deste cartafol"
 
 #~ msgid "You have not set a mail transport method"
 #~ msgstr "Non definiu ningún método de envío de correo"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Nova Mensaxe de Correo"
-
-#~ msgid "_Mail Message"
-#~ msgstr "Enviar _Mensaxe"
-
-#, fuzzy
-#~ msgid "Compose a new mail message"
-#~ msgstr "Compoñer unha mensaxe"
-
 #, fuzzy
 #~ msgid "New Message Post"
 #~ msgstr "Seguinte Mensaxe"
@@ -19172,10 +20502,6 @@ msgstr "Buscar Agora"
 #~ msgstr "Canadá"
 
 #, fuzzy
-#~ msgid "Curitiba"
-#~ msgstr "Croacia"
-
-#, fuzzy
 #~ msgid "Custer"
 #~ msgstr "Cortar"
 
@@ -21827,10 +23153,6 @@ msgstr "Buscar Agora"
 #~ msgstr "Data Completada:"
 
 #, fuzzy
-#~ msgid "Stauning"
-#~ msgstr "Opcións"
-
-#, fuzzy
 #~ msgid "Staverton"
 #~ msgstr "Opcións"
 
@@ -22135,10 +23457,6 @@ msgstr "Buscar Agora"
 #~ msgstr "Emiratos Árabes Unidos"
 
 #, fuzzy
-#~ msgid "Unst"
-#~ msgstr "Non vista"
-
-#, fuzzy
 #~ msgid "Uruapan"
 #~ msgstr "Xapón"
 
@@ -22203,10 +23521,6 @@ msgstr "Buscar Agora"
 #~ msgstr "Unicode"
 
 #, fuzzy
-#~ msgid "Vermont"
-#~ msgstr "mes"
-
-#, fuzzy
 #~ msgid "Vernal"
 #~ msgstr "Xeral"
 
@@ -22487,10 +23801,6 @@ msgstr "Buscar Agora"
 #~ msgstr ", "
 
 #, fuzzy
-#~ msgid " C"
-#~ msgstr ", "
-
-#, fuzzy
 #~ msgid "knots"
 #~ msgstr "nós"
 
@@ -23114,10 +24424,6 @@ msgstr "Buscar Agora"
 #~ msgstr "Calixe conxelante"
 
 #, fuzzy
-#~ msgid "Spray"
-#~ msgstr "Orballo"
-
-#, fuzzy
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Orballo nas proximidades"
 
@@ -23471,19 +24777,6 @@ msgstr "Buscar Agora"
 #~ msgid "Remove a folder added with \"Open Other User's Folder\""
 #~ msgstr "Crear un _Novo Cartafol..."
 
-#~ msgid "Send / Receive"
-#~ msgstr "Enviar / Recibir"
-
-#, fuzzy
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Enviar o correo na cola e recibir o correo novo"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Trocar a mostra da barra de cartafoles"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Trocar a mostra da barra de atallos"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Ver o cartafol seleccionado"
 
@@ -23513,9 +24806,6 @@ msgstr "Buscar Agora"
 #~ msgid "_Rename..."
 #~ msgstr "_Renomear..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Enviar / Recibir"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "Barra de _Atallos"
 
@@ -23567,10 +24857,6 @@ msgstr "Buscar Agora"
 #~ msgstr "Modifica-las preferencias"
 
 #, fuzzy
-#~ msgid "Automatically _detect links"
-#~ msgstr "Comprobar _automaticamente se hai correo novo cada"
-
-#, fuzzy
 #~ msgid "Emacs"
 #~ msgstr "Este"
 
@@ -23692,18 +24978,10 @@ msgstr "Buscar Agora"
 #~ msgstr "123"
 
 #, fuzzy
-#~ msgid "380"
-#~ msgstr "389"
-
-#, fuzzy
 #~ msgid "<- _Remove"
 #~ msgstr "_Eliminar"
 
 #, fuzzy
-#~ msgid "<< Fewer Options"
-#~ msgstr "Opcións"
-
-#, fuzzy
 #~ msgid "DN Customization"
 #~ msgstr "Personalizar"
 
@@ -24321,13 +25599,6 @@ msgstr "Buscar Agora"
 #~ msgid "_Delete this Appointment"
 #~ msgstr "_Borrar esta Cita"
 
-#~ msgid ""
-#~ "Issuer: %s\n"
-#~ "Subject: %s"
-#~ msgstr ""
-#~ "Expendedor: %s\n"
-#~ "Asunto: %s"
-
 #, fuzzy
 #~ msgid "I/O Error: %s"
 #~ msgstr "Erro de E/S"
@@ -24373,9 +25644,6 @@ msgstr "Buscar Agora"
 #~ msgid "News Servers"
 #~ msgstr "Fontes de _Novas"
 
-#~ msgid "Source Information"
-#~ msgstr "Información da Fonte"
-
 #~ msgid "newswindow1"
 #~ msgstr "fiestranovas1"
 
@@ -24396,9 +25664,6 @@ msgstr "Buscar Agora"
 #~ "O tipo do cartafol seleccionado non é válido para\n"
 #~ "a operación solicitada."
 
-#~ msgid "_Contact List"
-#~ msgstr "Lista de _Contactos"
-
 #~ msgid "Inline Text _File..."
 #~ msgstr "Introducir _Ficheiro de Texto..."
 
@@ -24414,18 +25679,11 @@ msgstr "Buscar Agora"
 #~ msgid "Send _later"
 #~ msgstr "Enviar máis _tarde"
 
-#~ msgid "Send the message later"
-#~ msgstr "Enviar a mensaxe máis tarde"
-
 #, fuzzy
 #~ msgid "_Pilot Settings..."
 #~ msgstr "_Preferencias de Correo..."
 
 #, fuzzy
-#~ msgid "Addressbook Settings"
-#~ msgstr "Fontes do Libro de Enderezos"
-
-#, fuzzy
 #~ msgid "Configuration control for the Evolution Addressbook."
 #~ msgstr "Fábrica para o compoñente Libro de Enderezos de Evolution."
 
@@ -24791,13 +26049,6 @@ msgstr "Buscar Agora"
 #~ "\n"
 #~ "Cadea Exclusiva: "
 
-#~ msgid ""
-#~ "\n"
-#~ "Public Key: "
-#~ msgstr ""
-#~ "\n"
-#~ "Clave Pública: "
-
 #, fuzzy
 #~ msgid "Waiting for connection to LDAP server..."
 #~ msgstr "Conectando ao servidor..."
@@ -24854,9 +26105,6 @@ msgstr "Buscar Agora"
 #~ msgid "Republic Of Moldova"
 #~ msgstr "República de Moldavia"
 
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "_Crear novas citas cun recordatorio por defecto"
-
 #~ msgid "First day of wee_k:"
 #~ msgstr "_Primeiro día da semana:"
 
@@ -24980,9 +26228,6 @@ msgstr "Buscar Agora"
 #~ msgid "Composer"
 #~ msgstr "Compoñedor"
 
-#~ msgid "Default Forward style is: "
-#~ msgstr "O estilo de Remitir por defecto é: "
-
 #~ msgid "Edit..."
 #~ msgstr "Editar..."
 
@@ -24992,15 +26237,9 @@ msgstr "Buscar Agora"
 #~ msgid "_Email Address:"
 #~ msgstr "_Enderezo de Correo:"
 
-#~ msgid "_Log filter actions to:"
-#~ msgstr "_Rexistrar as accións do filtro a:"
-
 #~ msgid "_Organization:"
 #~ msgstr "_Organización:"
 
-#~ msgid "_Send mail in HTML format by default."
-#~ msgstr "_Enviar as mensaxes en formato HTML por defecto."
-
 #, fuzzy
 #~ msgid "_Server Type: "
 #~ msgstr "Tipo de Servidor: "
@@ -25193,9 +26432,6 @@ msgstr "Buscar Agora"
 #~ msgid "Encrypted message not displayed"
 #~ msgstr "Non se amosa a mensaxe cifrada"
 
-#~ msgid "Encrypted message"
-#~ msgstr "Mensaxe cifrada"
-
 #~ msgid "Click icon to decrypt."
 #~ msgstr "Prema na icona para descifrar."
 
@@ -25321,9 +26557,6 @@ msgstr "Buscar Agora"
 #~ msgid "r"
 #~ msgstr "r"
 
-#~ msgid "s"
-#~ msgstr "s"
-
 #~ msgid "t"
 #~ msgstr "t"
 
@@ -25411,9 +26644,6 @@ msgstr "Buscar Agora"
 #~ msgid "Could not open folder to summarise: %s: %s"
 #~ msgstr "Non foi posible abrir o cartafol para o resume: %s: %s"
 
-#~ msgid "%d/%m/%Y"
-#~ msgstr "%d/%m/%Y"
-
 #~ msgid "%Y/%m/%d"
 #~ msgstr "%Y/%m/%d"
 
@@ -25477,9 +26707,6 @@ msgstr "Buscar Agora"
 #~ msgid "???"
 #~ msgstr "???"
 
-#~ msgid "_Company:"
-#~ msgstr "_Compañía:"
-
 #~ msgid "USA"
 #~ msgstr "Estados Unidos"
 
@@ -25823,9 +27050,6 @@ msgstr "Buscar Agora"
 #~ msgid "[%s] (forwarded message)"
 #~ msgstr "[%s] (mensaxe remitida)"
 
-#~ msgid "Forwarded message (no subject)"
-#~ msgstr "Mensaxe remitida (sen asunto)"
-
 #~ msgid ""
 #~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
 #~ "s<br><b>Subject:</b> %s<br>"
diff --git a/po/hu.po b/po/hu.po
index 821d61438a..281ebf1634 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.4.1\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-06-20 11:44+0200\n"
 "Last-Translator: Andras Timar <timar@gnome.hu>\n"
 "Language-Team: Hungarian <hu@gnome.hu>\n"
@@ -30,51 +30,183 @@ msgstr "%s betöltése sikertelen: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Nem sikerült a pilot Address application blokkját olvasni"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Névkiegészítési mappák"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "_Tanúsítványazonosító:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Postafiókok beállítása"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Névjegyek"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
+msgstr "Evolution Címjegyzék"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution Címjegyzék előugró címek"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution Címjegyzék címnéző"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution Címjegyzék kártyanéző"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook component"
+msgstr "Evolution Címjegyzék komponens"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution Címjegyzék mappanéző"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution Levelező beállító kontroll"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution mappabeállító kontroll"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Címjegyzék"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Tulajdonságok..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Törlés"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+msgid "Rename"
+msgstr "Átnevezés"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Új névjegy:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Névjegy"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "Új névjegy készítése"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Új címlista"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "_Címlista"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "Új címlista készítése"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Személyes"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Munka"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "LDAP-kiszolgáló"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Nem sikerült létrehozni %s könyvtárat: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "Nem sikerült kapcsolatba lépni az LDAP-kiszolgálóval."
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "Nem sikerült bejelentkezni az LDAP-kiszolgálóra."
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "A lekérdezést nem lehet elvégezni a DSE gyökérkönyvtárban."
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "A kiszolgáló nem támogatott keresési alapokkal válaszolt"
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Ez a kiszolgáló nem támogatja az LDAPv3 mintájú információkat"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "Hiba a sémainformációk betöltése közben"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr "A kiszolgáló nem válaszolt érvényes sémainformációval."
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Postafiók neve"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Kiszolgáló neve"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-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-storage.c:178
-msgid "Other Contacts"
-msgstr "Egyéb címtárak"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -82,7 +214,7 @@ msgstr ""
 "Nem sikerült megnyitni a címjegyzéket. Ellenőrizd, hogy az útvonal\n"
 "létezik-e, és van-e jogod az eléréséhez."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -92,7 +224,7 @@ msgstr ""
 "azt jelenti, hogy helytelen URI-t adtál meg, vagy \n"
 "az LDAP-kiszolgáló nem működik."
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -104,7 +236,7 @@ msgstr ""
 "a CVS forrásból kell lefordítanod a programot, miután letöltötted\n"
 "az OpenLDAP-t az alábbi helyről.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -118,44 +250,43 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Nem sikerült megnyitni a címjegyzéket"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "Csatlakozás az LDAP-kiszolgálóhoz névtelenül"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "Sikertelen hitelesítés.\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sÍrd be %s jelszavát (%s felhasználó)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "Név ezzel kezdődik"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "E-mail ezzel kezdődik"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Kategória"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Bármely mező tartalmazza"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Haladó..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -168,7 +299,7 @@ msgstr ""
 "a keresési feltételeket, vagy emeld meg az eredmények maximális \n"
 "számát a címtárkiszolgáló beállításainál ehhez a címjegyzékhez."
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -180,89 +311,42 @@ msgstr ""
 "feltételeket, vagy emeld meg az ehhez a címjegyzékhez tartozó\n"
 "időkorlátot a címtárkiszolgálón."
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "A háttér ehhez a címjegyzékhez alkalmatlan volt a lekérdezés elemzéséhez."
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "A háttér ehhez a kereséshez elutasította a lekérdezés elvégzését."
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "Ez a keresés nem volt sikeres."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Bármelyik kategória"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "Az URI, amit a naptár megjelenít"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "_Tanúsítványazonosító:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "Itt állíthatod be az LDAP címtárkiszolgálók elérését."
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Névjegyek"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "Címtár-kiszolgálók"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolution Címjegyzék"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Evolution Címjegyzék LDAP-beállító vezérlője"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution Címjegyzék előugró címek"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution Címjegyzék címnéző"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution Címjegyzék kártyanéző"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr "Evolution Címjegyzék komponens"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution Címjegyzék mappanéző"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution Levelező beállító kontroll"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -285,6 +369,7 @@ msgstr "  _Támogatott típusok lekérdezése"
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -318,8 +403,9 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "LDAP-kiszolgáló hozzáadása"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "Címjegyzék forrásai"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -335,9 +421,9 @@ msgid "Anonymously"
 msgstr "Névtelenül"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -347,50 +433,51 @@ msgstr ""
 "\n"
 "Kattints a \"Befejezés\" gombra a beállítások mentéséhez."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "Kapcsolódás"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "Megkülönböztető _név:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr "LDAP-kiszolgáló szerkesztése"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
 msgstr "E-mail cím:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 "Az Evolution ezt a megkülönböztető nevet használja majd hitelesítéshez a "
 "kiszolgálón"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Az Evolution ezt az e-mail címet használja majd hitelesítéshez a kiszolgálón"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "Befejezve"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Általános"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "LDAP-beállítás varázsló"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "Csoport"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Soha"
 
@@ -419,8 +506,8 @@ msgid "S_earch scope: "
 msgstr "Keresés _hatóköre: "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Keresés"
 
@@ -482,28 +569,32 @@ msgstr ""
 "szerkesztéséhez."
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 "A kijelzett név meghatározása az utolsó szükséges lépés az LDAP-kiszolgáló "
 "beállítása során."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "1. lépés: Kiszolgáló adatai"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "2. lépés: Kapcsolódás a kiszolgálóhoz"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "1. lépés: Kiszolgáló adatai"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "3. lépés: Keresés a címtárban"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "2. lépés: Kapcsolódás a kiszolgálóhoz"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "4. lépés: Név megjelenítése"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "3. lépés: Keresés a címtárban"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -515,18 +606,6 @@ msgstr "Támogatott keresési típusok"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"Első lépésként add meg az LDAP-kiszolgáló nevét és a te bejelentkezési "
-"adataidat.\n"
-"Amennyiben nem vagy biztos benne, hogy ismered ezeket az adatokat, kérdezd "
-"meg a rendszergazdát."
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -538,7 +617,7 @@ msgstr ""
 "és mennyi ideig tartson. Ha meg szeretnéd változtatni az értékeket, kérd a "
 "rendszergazda segítségét."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -549,7 +628,7 @@ msgstr ""
 "kezdődik majd. Amennyiben\n"
 "üresen hagyod, a keresés a gyökérkönyvtárban fog kezdődni."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -565,14 +644,14 @@ msgstr ""
 "alaptól lefelé. Egy \"one\" keresési területe csak egy szinttel fog a "
 "keresési alap alá menni.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
+#, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "Ez a varázsló végigvezet azokon a beállításokon, melynek eredményeképpen\n"
 "hozzáférhetővé válnak számodra az online címtárszolgáltatások egy\n"
@@ -582,13 +661,13 @@ msgstr ""
 "a kiszolgálóval kapcsolatban. Amennyiben ezek az információk nem állnak\n"
 "rendelkezésedre, keresd meg a rendszergazdát."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Ez az LDAP-kiszolgáló teljes neve. Például \"ldap.encegem.hu\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -598,7 +677,7 @@ msgstr ""
 "Ha túl\n"
 "magasra állítod ezt az értéket, jelentős mértékben lelassul a címjegyzéked."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -609,7 +688,7 @@ msgstr ""
 "beállítás, igényli az azonosító nélküli bejelentkezési lehetőséget az LDAP-"
 "kiszolgálón."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -618,6 +697,15 @@ msgstr ""
 "Ez a név jelenik majd meg az Evolution mappalistájában.\n"
 "Csak a megjelenítésben van szerepe."
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Ez a név jelenik majd meg az Evolution mappalistájában.\n"
+"Csak a megjelenítésben van szerepe."
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -646,21 +734,34 @@ msgid "Using email address"
 msgstr "E-mail cím használatával"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Amikor csak lehetséges"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+"Első lépésként add meg az LDAP-kiszolgáló nevét és a te bejelentkezési "
+"adataidat.\n"
+"Amennyiben nem vagy biztos benne, hogy ismered ezeket az adatokat, kérdezd "
+"meg a rendszergazdát."
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "_Megjelenítendő név:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "_Letöltési korlát:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -668,54 +769,52 @@ msgstr "_Letöltési korlát:"
 msgid "_Edit"
 msgstr "S_zerkesztés"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "_Bejelentkezési mód:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "_Portszám:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "Keresés _kiindulópontja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "_Kiszolgáló neve:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "_Szundi idő (percek)"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "kártya"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr "searching-tab"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Név"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution Címjegyzék névkiválasztó felülete"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Mindet törli"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Törlés"
@@ -742,23 +841,21 @@ msgstr "Hozzáadás a címjegyzékhez"
 msgid "Unnamed Contact"
 msgstr "Névtelen névjegy"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Név"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Forrás"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 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:647
-msgid "Find contact in"
-msgstr "Névjegy keresése"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution Címjegyzék névkiválasztó felülete"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Keresés"
@@ -835,7 +932,8 @@ msgid "D_epartment:"
 msgstr "_Osztály:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Részletek"
 
@@ -902,12 +1000,12 @@ msgid "_Categories..."
 msgstr "Ka_tegóriák..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Törlés"
@@ -2030,7 +2128,7 @@ msgid "Esq."
 msgstr "özv."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Teljes név"
 
@@ -2123,11 +2221,27 @@ msgstr "Címlista-szerkesztő"
 msgid "Save List as VCard"
 msgstr "Lista mentése VCard-ként"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Megváltozott névjegy:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Ellentmondó névjegy:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Többszörös névjegy észlelése"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"A megváltoztatott név vagy e-mail cím már szerepel a\n"
+"címjegyzékben. Mindenképpen hozzáadod?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Új névjegy:"
@@ -2144,22 +2258,6 @@ msgstr ""
 "Ilyen név vagy e-mail cím már van a címjegyzékben.\n"
 "Mindenképpen hozzáadod?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Megváltozott névjegy:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Ellentmondó névjegy:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"A megváltoztatott név vagy e-mail cím már szerepel a\n"
-"címjegyzékben. Mindenképpen hozzáadod?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2258,9 +2356,9 @@ msgstr "Névjegy továbbítása"
 msgid "Send Message to Contact"
 msgstr "Levél küldése ennek a személynek"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Nyomtatás"
@@ -2282,9 +2380,12 @@ msgstr "Áthelyezés mappába..."
 msgid "Cut"
 msgstr "Kivágás"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Másolás"
 
@@ -2293,16 +2394,8 @@ msgstr "Másolás"
 msgid "Paste"
 msgstr "Beillesztés"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Törlés"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "Aktuális nézet"
 
@@ -2319,166 +2412,170 @@ msgstr ""
 "felületet"
 
 #: 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:2
 msgid "Assistant"
 msgstr "Asszisztens"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Üzleti fax"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Munkahelyi telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "2. munkahelyi telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Visszahívó telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Autótelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategóriák"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Céges telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Osztály"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "2. e-mail"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "3. e-mail"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Családi név"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Tárolás mint"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "Szabad-foglalt URL"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Otthoni cím"
+#, fuzzy
+msgid "Given Name"
+msgstr "Mezőnév"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Otthoni fax"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Otthoni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "2. otthoni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Jordánia"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Főnök"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Becenév"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Megjegyzés"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Hivatal"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Szervezet"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Egyéb cím"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Egyéb fax"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Egyéb telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Személyhívó"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Elsődleges telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Foglalkozás"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Rádió"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Szerep"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Házastárs"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Beosztás"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Unst"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Webhely"
 
@@ -2571,11 +2668,19 @@ msgstr "Tagok"
 msgid "Job Title"
 msgstr "_Beosztás"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Otthoni cím"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Otthoni cím"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Egyéb cím"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2588,112 +2693,109 @@ msgstr "Otthoni fax"
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Sikerült"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Kapcsolat nélküli tároló"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Jogosultsági hiba"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "A kártya nem található"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "A kártyaazonosító már létezik"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "A protokoll nem támogatott"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Megszakítva"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "Hitelesítés sikertelen"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "Hitelesítés szükséges"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS nem elérhető"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "A címjegyzék nem létezik"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Egyéb hiba"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Mented a változtatásokat?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr "_Elvetés"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Hiba a lista hozzáadásakor"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Hiba a kártya hozzáadásakor"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Hiba a lista módosításakor"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Hiba a kártya módosításakor"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Hiba a lista törlésekor"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Hiba a kártya törlésekor"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2703,7 +2805,7 @@ msgstr ""
 "kerül egy %d új ablak is.\n"
 "Valóban meg szeretnéd jeleníteni az összes ilyen címkártyát?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2712,49 +2814,49 @@ msgstr ""
 "%s már létezik\n"
 "Szeretnéd felülírni?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "Felülírás"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Fájlmentési hiba %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Névjegy áthelyezése"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Névkártya másolása a következő helyre"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Névjegyek áthelyezése"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Névjegyek másolása"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Több VKártya"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "%s VKártyája"
@@ -2950,7 +3052,7 @@ msgstr "Margók"
 msgid "Number of columns:"
 msgstr "Oszlopok száma:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Beállítások"
 
@@ -3138,18 +3240,18 @@ msgstr "Névtelen lista"
 msgid "Split Multi-Day Events:"
 msgstr "Többnapos események felosztása:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Nem sikerült elindítani a wombat kiszolgálót"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Nem sikerült a wombatot elindítani"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nem sikerült a pilot Calendar application blokkját olvasni"
 
@@ -3157,24 +3259,83 @@ msgstr "Nem sikerült a pilot Calendar application blokkját olvasni"
 msgid "Default Priority:"
 msgstr "Alapértelmezett prioritás:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nem sikerült a pilot Calendar ToDo blokkját olvasni"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Naptár és Feladatok"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Naptár"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Állítsd be a Naptárhoz és a Feladatlistához tartozó időzónát."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution Naptár és Feladatok"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution Naptár beállító kontroll"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution Naptár ütemezőüzenet-megtekintő"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Evolution Naptár nézőke"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution Naptár/Feladat szerkesztő"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Evolution Feladatnéző"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolution Naptár és Feladatok komponens"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolution Teszt komponens"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Feladatok"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution Naptár riasztó szolgáltatás"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Kezdet:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Vég:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Evolution ébresztő"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Ébresztő %s-kor"
@@ -3249,43 +3410,173 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Ne kérdezzen meg többet ezzel a programmal kapcsolatban."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution Naptár riasztó szolgáltatás"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "A Bonobo inicializálása nem sikerült"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "A gnome-vfs inicializálása nem sikerült"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Nem sikerült létrehozni az riasztó szolgáltatás factoryját"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "érvénytelen időpont"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "iCalendar hiba"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "A mai határidejű feladatok színe"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "A mai határidejű feladatok színe"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "Találkozók _végpontjának megjelenítése a heti és a hónapnézetben"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "A nyomtatandó naptár nyomtatási képe"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#, fuzzy
+msgid "Units of default reminder"
+msgstr "Új találkozó létrehozása az alapértelmezett _emlékeztetővel"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "_Megerősítés kérése elemek törlésekor"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "_Megerősítés kérése elemek törlésekor"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Befejezett feladatok törlése"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Hét _számának megjelenítése a dátumnavigátorban"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Összefoglaló tartalmazza"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Leírás tartalmazza"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Megjegyzés tartalmazza"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Ki nem válogatott"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3297,80 +3588,110 @@ msgstr ""
 "\n"
 "Valóban törlöd ezeket a feladatokat?"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "visszatér kisebb mint"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "naponként"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%Y %B %d, %A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%b %d, %a"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%Y %b %d, %a"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%Y %B %d"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%B %d"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Naptár nyomtatása"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Új-Kaledónia"
 
-#: calendar/gui/calendar-component.c:207
-msgid "Rename"
-msgstr "Átnevezés"
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "Új találkozó"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "_Találkozó"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Személyes"
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Új találkozó létrehozása"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Munka"
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "Új értekezlet"
+
+#: calendar/gui/calendar-component.c:640
+msgid "M_eeting"
+msgstr "É_rtekezlet"
+
+#: calendar/gui/calendar-component.c:641
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Új értekezlet összehívási kérés létrehozása"
+
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Új egész napos találkozó"
+
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr "_Egész napos találkozó"
+
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Új találkozó létrehozása"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3487,7 +3808,7 @@ msgstr "Címzett:"
 msgid "With these arguments:"
 msgstr "Ezekkel az argumentumokkal:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -3503,6 +3824,10 @@ msgstr "óránként"
 msgid "minutes"
 msgstr "percenként"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3535,8 +3860,8 @@ msgstr "Levél küldése"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Összefoglaló:"
 
@@ -3565,7 +3890,7 @@ msgstr "találkozó vége"
 msgid "hour(s)"
 msgstr "óra"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "perc"
 
@@ -3619,7 +3944,7 @@ msgstr "nappal"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Péntek"
 
@@ -3633,7 +3958,7 @@ msgstr "perccel"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Hétfő"
 
@@ -3643,7 +3968,7 @@ msgstr "_V"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Szombat"
 
@@ -3657,7 +3982,7 @@ 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:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Vasárnap"
 
@@ -3675,7 +4000,7 @@ msgstr "Feladatlista"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Csütörtök"
 
@@ -3693,7 +4018,7 @@ msgstr "Időformátum:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Kedd"
 
@@ -3703,12 +4028,12 @@ msgstr "_Hét kezdete:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Szerda"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Munkahét"
 
@@ -3745,7 +4070,7 @@ msgid "_Fri"
 msgstr "_P"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Alap"
 
@@ -3785,7 +4110,7 @@ msgstr "_Sze"
 msgid "before every appointment"
 msgstr "minden találkozó előtt"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
@@ -3793,11 +4118,11 @@ msgstr ""
 "Az esemény, amit törlésre jelöltél, egy találkozó. Szeretnél küldeni egy "
 "lemondási értesítést?"
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Tényleg törölni akarod ezt az értekezletet?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
@@ -3805,11 +4130,11 @@ msgstr ""
 "A törlésre jelölt feladat elvégzésében más is részt vesz. Szeretnél küldeni "
 "egy törlési értesítést?"
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Tényleg törölni akarod ezt a feladatot?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -3817,50 +4142,50 @@ msgstr ""
 "A kitörlésre jelölt naplóbejegyzés publikus. Szeretnél küldeni egy "
 "érvénytelenítő értesítést?"
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Tényleg törölni akarod ezt a naplóbejegyzést?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Az esemény törlődött."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "A feladat törlődött."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "A naplóbejegyzés törlődött."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Változtattál. Elveted a változtatásokat, és bezárod a szerkesztőt?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Nem változtattál, bezárod a szerkesztőt?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Az esemény megváltozott."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "A feladat megváltozott."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "A naplóbejegyzés megváltozott."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Változtattál. Elveted a változásokat, és frissíted a szerkesztőt?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Nem változtattál, frissíted a szerkesztőt?"
@@ -3870,167 +4195,172 @@ msgstr "%s  Nem változtattál, frissíted a szerkesztőt?"
 msgid "Validation error: %s"
 msgstr "Érvényesítési hiba: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " - "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Befejezve"
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Befejezve"
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Esedékes "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Esedékes "
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "Nem sikerült frissíteni az objektumot"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Találkozó szerkesztése"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Időpont - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Feladat - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Napló bejegyzés - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Nincs összegzés"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Mentés másként..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Ennek a tételnek a módosításai felülírásra kerülhetnek egy beérkezett "
 "frissítés által"
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Nem sikerült megszerezni a legfrissebb változatot!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Válaszd ki az importálálandó adatok célkönyvtárát"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Tényleg törölni akarod ezt a találkozót: '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Tényleg törölni akarod ezt a névtelen találkozót?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Tényleg törölni akarod ezt a feladatot: '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Tényleg törölni akarod ezt a névtelen feladatot?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Tényleg törölni akarod ezt a naplóbejegyzést: '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Tényleg törölni akarod ezt a névtelen naplóbejegyzést?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Tényleg törölni akarsz %d találkozót?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Tényleg törölni akarsz %d feladatot?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Tényleg törölni akarsz %d naplóbejegyzést?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "Az eseményt nem sikerült törölni CORBA-hiba miatt."
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "A feladatot nem sikerült törölni CORBA-hiba miatt."
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "A naplóbejegyzést nem sikerült törölni CORBA-hiba miatt."
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Az elemet nem sikerült törölni CORBA-hiba miatt."
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "Az eseményt nem sikerült törölni, mert a hozzáférés meg lett tagadva."
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "A feladatot nem sikerült törölni, mert a hozzáférés meg lett tagadva."
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 "A naplóbejegyzést nem sikerült törölni, mert a hozzáférés meg lett tagadva."
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "Az elemet nem sikerült törölni, mert a hozzáférés meg lett tagadva."
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Az eseményt nem sikerült törölni CORBA-hiba miatt."
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "A feladatot nem sikerült törölni CORBA-hiba miatt."
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "A naplóbejegyzést nem sikerült törölni CORBA-hiba miatt."
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Az elemet nem sikerült törölni CORBA-hiba miatt."
@@ -4047,43 +4377,43 @@ msgstr "A feladat végrehajtója:"
 msgid "Enter Delegate"
 msgstr "Végrehajtó megadása"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Találkozó"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Emlékeztető"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Ismétlődés"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Ütemezés"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Értekezlet"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "Hibás a kezdés dátuma"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "Érvénytelen befejezési időpont"
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "Hibás a kezdés időpontja:"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "Helytelen befejezési időpont"
 
@@ -4153,31 +4483,31 @@ msgid "_Start time:"
 msgstr "_Kezdés időpontja:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Semmi"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr "A kiválasztott szervezőnek nincs már fiókja."
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "A szervezőt be kell állítani."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "Legalább egy résztvevő szükséges."
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Feladatkiadás..."
 
@@ -4218,21 +4548,15 @@ msgid "Member"
 msgstr "Tag"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Szerep"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Állapot"
@@ -4252,6 +4576,7 @@ msgid "_Invite Others..."
 msgstr "_Mások meghívása..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4284,6 +4609,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Nem sikerült létrehozni %s könyvtárat: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "A szervezőt be kell állítani."
@@ -4313,33 +4639,58 @@ msgstr "Naptárinformáció"
 msgid "Calendar Name"
 msgstr "Naptár"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Nem sikerült létrehozni %s könyvtárat: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Naptárinformáció"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Feladatlista"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Feladatlista"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Feladatlista"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr "Egy ismétlődő eseményt módosítasz, mit szeretnél módosítani?"
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Egy ismétlődő feladatot módosítasz, mit szeretnél módosítani?"
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr "Egy ismétlődő naplóbejegyzést módosítasz, mit szeretnél módosítani?"
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr "Csak ezt az előfordulást"
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Ezt és a jövőbeli előfordulásokat"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr "Ezt és a jövőbeli előfordulásokat"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr "Minden előfordulást"
 
@@ -4389,10 +4740,15 @@ msgstr "nap"
 msgid "on the"
 msgstr "ezen:"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "előfordulások"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Dátum és idő:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "_Hozzáadás"
@@ -4457,7 +4813,7 @@ msgstr "héten"
 msgid "year(s)"
 msgstr "évben"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
@@ -4467,31 +4823,31 @@ msgstr ""
 "\n"
 "Akarod menteni a változásaidat?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "_Változások elvetése"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 msgid "Save Event"
 msgstr "Esemény mentése"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Az értekezlet adatai létrejöttek. Elküldöd?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Az értekezlet adatai megváltoztak. Küldesz egy frissített változatot?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "A feladat adatai létrejöttek. Elküldöd?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "A feladat adatai megváltoztak. Küldesz egy frissített változatot?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Helytelen befejezési dátum"
 
@@ -4501,43 +4857,43 @@ msgid "% _Complete"
 msgstr "% kész"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Befejezve"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Magas"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "Folyamatban"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Alacsony"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Normális"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Nem indult még el"
 
@@ -4546,7 +4902,7 @@ msgid "Progress"
 msgstr "Folyamatban"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Nem megadott"
 
@@ -4568,21 +4924,21 @@ msgstr "Áll_apot:"
 msgid "_Web Page:"
 msgstr "_Weblap címe:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Egyszerű"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Kiosztás"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "A lejárat dátuma érvénytelen"
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4590,9 +4946,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "Bi_zalmas"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Leírás:"
 
@@ -4697,26 +5053,21 @@ msgstr "%s %s-kor"
 msgid "%s for an unknown trigger type"
 msgstr "%s ismeretlen kiváltó okra"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Nyilvános"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Személyes"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Bizalmas"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategóriák"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Description"
@@ -4728,28 +5079,26 @@ msgid "Start Date"
 msgstr "Kezdés dátuma"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Összefoglaló"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "szín"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Találkozó"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Szabad"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Foglalt"
 
@@ -4761,7 +5110,7 @@ msgstr "É"
 msgid "S"
 msgstr "D"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "K"
 
@@ -4769,7 +5118,7 @@ msgstr "K"
 msgid "W"
 msgstr "Ny"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4779,7 +5128,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4787,7 +5136,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Igen"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4795,17 +5144,17 @@ msgstr "Nem"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Ismeretlen"
 
@@ -4817,181 +5166,179 @@ msgstr "Ismétlődő"
 msgid "Assigned"
 msgstr "Kiosztva"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Objektumok frissítése"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Kijelölt objektumok törlése"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Objektumok frissítése"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Új _találkozó..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Ú_j egész napos esemény"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "Új értekezlet"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Új feladat"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Nyomtatás..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Beillesztés"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Ugrás a _mai napra"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "_Ugrás dátumra..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "Szabad/foglalt információ _közzététele"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "_Beállítások..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Megnyitás"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "M_entés másként..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Másolás"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "Értekezlet _tervezése..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "_Továbbítás iCalendarként..."
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Az _előfordulás törlése"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Az ö_sszes előfordulás törlése"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "_Beállítások..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "FIXME: _Weblap megnyitása"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "_Feladat kiosztása"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "_Továbbítás iCalendarként"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "_Megjelölés készként"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Kijelölt feladatok megjelölése készként"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "_Kijelölt feladatok törlése"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Kattints ide új feladat hozzáadásához"
@@ -5005,8 +5352,8 @@ msgstr "% kész"
 msgid "Alarms"
 msgstr "Ébresztők"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Kész"
 
@@ -5035,18 +5382,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d %a %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d %a %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5065,7 +5412,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%B %d, %A"
 
@@ -5078,446 +5425,445 @@ msgstr "%b %d"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "de"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "du"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr "Igen. (Összetett ismétlődés)"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "Minden nap"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "%d naponta"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "Minden héten"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "%d hetente"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr "Minden héten ekkor"
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr "%d hetente ekkor"
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " és "
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr "%s napján"
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s napján"
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "minden hónapban"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr "%d havonta"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "Minden évben"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "%d évente"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr "összesen ennyiszer: %d"
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ", véget ér"
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>Kezdődik:</b> "
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Vége:</b> "
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>Befejezve:</b> "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>Határidő:</b> "
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "iCalendar információ"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "iCalendar hiba"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Ismeretlen személy"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 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:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Nincs</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "Hely:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Állapot:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Elfogadva"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Kísérletileg elfogadva"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Elutasítva"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Válassz egy műveletet:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Frissítés"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Elfogadva"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Kísérletileg elfogadva"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Elutasítva"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Szabad/foglalt információ küldése"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Válaszoló állapotának frissítése"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Legutóbbi információ küldése"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Mégse"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, 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:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Információ az értekezletről"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> arra kér, hogy vegyél részt a(z) %s értekezleten."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Javaslat értekezletre"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Értekezlet frissítése"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Értekezletfrissítési kérés"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, 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:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Válasz az értekezletre"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> lemondta az értekezletet."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Értekezlet lemondása"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, 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:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Rossz értekezletfelhívás"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Feladatinformáció"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> arra kér, %s hogy végezz el egy feladatot."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, 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:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Feladatjavaslat"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, 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:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Feladat frissítése"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, 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:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Feladatfrissítési felhívás"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, 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:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Válasz feladatra"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, 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:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Feladat lemondása"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Rossz feladatüzenet"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, 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:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Szabad/foglalt információ"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, 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:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Szabad/foglalt kérés"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, 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:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Szabad/foglalt válasz"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Rossz szabad/foglalt üzenet"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 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:1552
+#: calendar/gui/e-itip-control.c:1550
 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:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 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:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr "A melléklet nem tartalmaz megnézhető naptárelemet"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "A naptárfájlt nem lehetett frissíteni!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Frissítés kész\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 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:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 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:1911
+#: calendar/gui/e-itip-control.c:1909
 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:1923
+#: calendar/gui/e-itip-control.c:1921
 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:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr "Hiba történt a CORBA-rendszerben\n"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr "Az elem nem található\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Nincsenek megfelelő jogosultságaid a naptár frissítéséhez\n"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "A résztvevő állapota frissítve\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 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:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Törlés befejezve"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Elküldve!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Az elemet nem lehetett elküldeni!\n"
 
@@ -5677,7 +6023,7 @@ msgstr "%a %m/%d/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
@@ -5741,48 +6087,43 @@ msgstr "Megbeszélés _kezdődik:"
 msgid "Meeting _end time:"
 msgstr "Megbeszélés _vége:"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "Ke_zdés dátuma:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 msgid "Due Date:"
 msgstr "Lejárat:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "_Prioritás:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Lap"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Feladatok megnyitása %s-kor"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nem sikerült betölteni a feladatot %s-be."
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "'%s' betöltéséhez szükséges eljárás nem támogatott"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Nincs jogosultságod megnyitni a mappát '%s'-ben"
 
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5791,48 +6132,39 @@ msgstr ""
 "Hiba a következőben %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "Feladatok befejezése..."
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "Kijelölt objektumok törlése..."
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "Tisztítás"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Feladatok"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Naptár"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, 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:1752
+#: calendar/gui/gnome-cal.c:1751
 #, 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"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Ébresztő hozzáadása %s időpontra"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5843,7 +6175,7 @@ msgstr ""
 "kapcsolódó feladat háttér összeomlott. Újra kell indítanod az Evolution "
 "programot, hogy használni tudd ezt a felületet."
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5854,58 +6186,11 @@ msgstr ""
 "kapcsolódó naptár háttér összeomlott. Újra kell indítanod az Evolution "
 "programot, hogy használni tudd ezt a felületet."
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Turin"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Naptár és Feladatok"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Naptár"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Állítsd be a Naptárhoz és a Feladatlistához tartozó időzónát."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution Naptár és Feladatok"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution Naptár beállító kontroll"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution Naptár ütemezőüzenet-megtekintő"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution Naptár nézőke"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution Naptár/Feladat szerkesztő"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution Feladatnéző"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolution Naptár és Feladatok komponens"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolution Teszt komponens"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "április"
@@ -5962,296 +6247,332 @@ msgstr "október"
 msgid "September"
 msgstr "szeptember"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "A szervezőt be kell állítani."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Legalább egy résztvevő szükséges"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Eseményinformáció"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Feladatinformáció"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Naplóinformáció"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Szabad/foglalt információ"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Naptárinformáció"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Frissítve"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Frissítés"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "Ellenjavaslat"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Szabad/foglalt információ (%s - %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "iCalendar információ"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Részt kell venned az eseményen."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "V"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "H"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "K"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Sze"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Cs"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "P"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Szo"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Kijelölt nap (%Y %b %d, %a)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%b %d, %a"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%Y %d, %a"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%Y %b %d, %a"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Kijelölt hét (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Kijelölt hónap (%Y %b)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Kijelölt év (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Feladat"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Állapot: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritás: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Százalékos készenlét: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategóriák: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Névjegyek: "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Nyomtatási kép"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Elem nyomtatása"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Nyomtatási beállítások"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Indítóikon-csoport átnevezése"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Feladatlista"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Új feladat"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Feladat"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Új feladat létrehozása"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "A megjelenítendő feladatmappa URI-ja"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6263,11 +6584,11 @@ msgstr ""
 "\n"
 "Valóban törlöd ezeket a feladatokat?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Ne kérdezze meg többet."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "Feladatok nyomtatása"
 
@@ -6295,15 +6616,15 @@ msgstr "iCalendar-fájlok (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar-fájlok (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "Emlékeztető!!"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "Naptáresemények"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6311,7 +6632,7 @@ msgstr ""
 "Az Evolution Gnome Calendar fájlokat talált.\n"
 "Szeretnéd ezeket az Evolutionbe importálni?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
@@ -7844,27 +8165,27 @@ msgstr "Csendes-óceán/Wallis"
 msgid "Pacific/Yap"
 msgstr "Csendes-óceán/Yap"
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "Ez a titkosító nem támogatja az aláírást"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "Ez a titkosító nem támogatja az ellenőrzést"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Ez a titkosító nem támogatja a titkosítást"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Ez a titkosító nem támogatja a visszafejtést"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr "Nem tudod importálni a kulcsot ezzel a titkosítással"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr "Nem tudod exportálni a kulcsot ezzel a titkosítással"
 
@@ -7916,86 +8237,86 @@ msgstr "%s mappa előkészítése a kapcsolat nélküli módhoz"
 msgid "You must be working online to complete this operation"
 msgstr "A művelet befejezéséhez hálózati kapcsolattal kell rendelkezned"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Nem sikerült csővezetéket létrehozni: '%s': %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Nem sikerült gyermekfolyamatot létrehozni: '%s': %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Érvénytelen üzenetfolyam érkezett innen: %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Mappák szinkronizálása"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Hiba a szűrő feldolgozása közben: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Hiba a szűrő végrehajtása közben: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Nem sikerült megnyitni spool mappát"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Nem sikerült feldolgozni a spool mappát"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d. levél letöltése (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Nem lehet megnyitni a levelet"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "%d. levél rossz"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Mappa szinkronizálása"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Levelek letöltése: %d/%d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Hiba a %d / %d üzenetnél"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Az üzenet letöltése sikertelen"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr "Érvénytelen argumentumok (system-flag)"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr "Érvénytelen argumentumok (user-tag)"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Hiba a szűrt keresés végrehajtása közben: %s: %s"
@@ -8027,35 +8348,35 @@ msgstr "a (match-all) egy darab logikai eredményt vár"
 msgid "Performing query on unknown header: %s"
 msgstr "Lekérdezés futtatása ismeretlen fejlécen: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nem támogatott művelet: levél hozzáfűzése: %s"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nem támogatott művelet: keresés kifejezés szerint: %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nem támogatott művelet: keresés uid szerint: %s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Levelek áthelyzése"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr "Levelek másolása"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "%d levél letöltése"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8066,15 +8387,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr "A gpg felhasználói azonosító sikertelen elemzése."
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr "A gpg jelmondat kérés sikertelen elemzése"
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8083,31 +8404,31 @@ msgstr ""
 "Meg kell adnod a jelmondatot \"%s\"\n"
 "titkos kulcsának érvényesítéséhez."
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Megszakítva"
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "A titkos kulcs érvényesítéséhez 3 alkalommal adtál meg rossz jelmondatot."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Nem várt válasz a GnuPG részéről: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr "Nincs adatszolgáltatás"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Sikertelen titkosítás: Nincs érvényes címzett megadva."
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8118,51 +8439,65 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Sikertelen GPG-zés: %s: %s\n"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Nem sikerült az adatok kiírása: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "A %s levél dekódolása sikertelen."
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr "A gpg végrehajtása sikertelen."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "Ez az üzenetrész digitális aláírással van ellátva"
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr ""
+"Nem lehet ellenőrizni a levél aláírását: nem sikerült létrehozni az "
+"ideiglenes fájlt: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Nem lehet ellenőrizni a levél aláírását: nem sikerült létrehozni az "
 "ideiglenes fájlt: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nem sikerült az adatok kiírása: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Ez az üzenetrész digitális aláírással van ellátva"
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Szövegtörzs indexelése"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Nem sikerült betölteni a levelet a szerkesztőből"
@@ -8261,15 +8596,15 @@ msgstr "Hiba az ideiglenes levélfájl írása közben: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Hiba az ideiglenes levélfájl másolása közben: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Protokoll hiba miatt sikertelen a MIME titkosítás feloldása"
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "Érvénytelen szerkezet miatt sikertelen a MIME titkosítás feloldása"
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "értelmezési hiba"
 
@@ -8597,12 +8932,12 @@ msgstr ""
 "A leveleket más mappákon futtatott lekérdezés eredményétől függően "
 "csoportosíthatod."
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "'%s' protokollhoz nincs támogatás"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8611,73 +8946,84 @@ msgstr ""
 "Nem sikerült létrehozni %s könyvtárat:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Add meg %s jelszavadat %s számára"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Nem megadott"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Aláírás szerkesztése"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Aláírás szerkesztése"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Saját aláírású tanúsítvány a láncban"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "Nem megbízható tanúsítvány"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Aláírás mentése"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Elemzési hiba"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Kiszolgáló: %s,  Típus: %s "
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "Nem sikerült megnyitni a könyvtárat: Érvénytelen művelet ezen a tárolón"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Nem sikerült létrehozni a könyvtárat: Érvénytelen művelet ezen a tárolón"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Kuka"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "június"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "Nem lehet ellenőrizni a kibocsátó tanúsítványait"
@@ -8888,7 +9234,7 @@ msgstr ""
 "Visszavont tanúsítványok listája lejárt: %s\n"
 "Kibocsátó: %s"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Nem sikerült értelmezni ezt az URL-t: `%s'"
@@ -8907,22 +9253,22 @@ msgstr "Nincs ilyen levél (%s) ezen a helyen: %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Nem lehetséges másolni vagy áthelyezni leveleket egy virtuális mappába"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nem sikerült törölni a mappát: %s: Érvénytelen művelet"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nem sikerült törölni a mappát: %s: Nincs ilyen mappa"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nem sikerült átnevezni a mappát: %s: Érvénytelen művelet"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nem sikerült átnevezni a mappát: %s: Nincs ilyen mappa"
@@ -9002,7 +9348,7 @@ msgstr "Nem lehet elhozni a levelet: %s"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9016,7 +9362,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Nincs ilyen levél"
@@ -9054,54 +9400,69 @@ msgid "Failed to cache %s: %s"
 msgstr "Nem sikerült gyorsítótárazni: %s: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Kapcsolódás a kiszolgálóhoz..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Nem sikerült kapcsolatba lépni az LDAP-kiszolgálóval."
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "Parancs"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Új levelek keresése"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 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:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Mappák"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Csak az előfizetett mappák megjelenítése"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "A kiszolgáló által nyújtott mappanevek felülbírálata"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Névtér"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Szűrők alkalmazása az új levelekre ennek a kiszolgálónak az INBOX-ában"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "Az új _levelek automatikus lekérdezése"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Levélolvasás és -tárolás IMAP-kiszolgálókon."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Jelszó"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9357,7 +9718,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Nem sikerült %s mappát %s névre átnevezni: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Az átnevezés nem sikerült '%s': %s"
@@ -9472,29 +9833,29 @@ msgstr "Új levelek keresése"
 msgid "Storing folder"
 msgstr "Mappa tárolása"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Nem sikerült zárolni a mappát: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Nem sikerült megnyitni a postaládát: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "Levél hozzáfűzése megszakítva"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nem sikerült a levelet az mbox fájlhoz hozzáfűzni: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9503,11 +9864,11 @@ msgstr ""
 "Nem sikerült betölteni a(z) %s levelet a(z) %s mappából.\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "A mappa javíthatatlanul sérültnek néz ki."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Levélírás sikertelen: sérült postafiók?"
 
@@ -9575,12 +9936,17 @@ msgstr "Nem sikerült létrehozni %s könyvtárat: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "Nem sikerült betölteni a mappát: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "A kártyaazonosító már létezik"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Nem sikerült %s mappát %s névre átnevezni: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "A megadott mappanév nem jó: %s"
@@ -9624,7 +9990,7 @@ msgstr "Nem sikerült lezárni a forrásmappát %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Nem sikerült bezárni ezt az ideiglenes mappát: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nem sikerült átnevezni ezt a mappát: %s"
@@ -9903,7 +10269,7 @@ msgstr "Törlés a kiszolgálóról %s nap múlva"
 msgid "Disable support for all POP3 extensions"
 msgstr "Az összes POP3-kiterjesztés tiltása"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -9995,7 +10361,7 @@ msgid "No such folder `%s'."
 msgstr "Nincs `%s' mappa."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10048,7 +10414,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Levélküldés a sendmail programon keresztül"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10214,7 +10580,7 @@ msgstr "SMTP-levélküldés %s kiszolgálón át"
 msgid "Cannot send message: sender address not valid."
 msgstr "Nem lehet elküldeni a levelet: a feladó címe érvénytelen."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Levél küldése"
 
@@ -10336,7 +10702,7 @@ msgstr "%.0f M"
 msgid "%.0fG"
 msgstr "%.0f G"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "melléklet"
 
@@ -10380,14 +10746,14 @@ 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:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Be kell állítanod egy postafiókot,\n"
 "mielőtt levelet küldesz."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Címjegyzékben való kereséshez kattints ide"
 
@@ -10398,45 +10764,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Válaszcím:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Feladó:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Tárgy:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Címzett:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Írd be a levél címzettjét"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Másolat:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Írd be, kik kapjanak másolatot a levélről"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Rejtett másolat:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10447,14 +10813,19 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Címzett:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr "Címzett címe"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Fájl csatolása a levélhez"
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Fájl csatolása"
@@ -10490,21 +10861,21 @@ msgstr "A fájl létezik, felülírod?"
 msgid "Error saving file: %s"
 msgstr "Fájlmentési hiba: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fájlbetöltési hiba: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fájlelérési hiba: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Nem sikerült betölteni a levelet a szerkesztőből"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10513,7 +10884,7 @@ msgstr ""
 "Nem sikerült keresni a fájlban: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10522,7 +10893,7 @@ msgstr ""
 "Nem sikerült csonkolni a  fájlt: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10531,7 +10902,7 @@ msgstr ""
 "Nem sikerült másolni a fájlleírót: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10540,7 +10911,7 @@ msgstr ""
 "Hiba a levelek automatikus mentése közben: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10549,7 +10920,7 @@ msgstr ""
 "fájlokat.\n"
 "Szeretnéd megkísérelni a visszaállításukat?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10560,28 +10931,28 @@ msgstr ""
 "\n"
 "Szeretnéd menteni a változtatásokat?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Figyelem: Módosított levél"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Fájl megnyitása"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "Aláírás:"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "Automatikusan létrehozott"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Levél írása"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10589,7 +10960,7 @@ msgstr ""
 "Nem sikerült létrehozni a szerkesztőablakot:\n"
 "Nem lehetett aktiválni a címkiválasztó kontrollt."
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10601,7 +10972,7 @@ msgstr ""
 "Ellenőrizd, hogy a megfelelő verziójú gtkhtml és\n"
 "libgtkhtml van-e telepítve.\n"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10609,7 +10980,7 @@ msgstr ""
 "Nem sikerült létrehozni a szerkesztőablakot:\n"
 "A HTML-szerkesztő komponens aktiválása sikertelen."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10618,11 +10989,13 @@ msgstr ""
 "nem szerkeszthetsz.)<b>"
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Evolution csoportmunka-programcsomag"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10876,13 +11249,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11001,7 +11374,7 @@ msgstr "Akkor"
 msgid "You must specify a folder."
 msgstr "Meg kell adnod egy mappát."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Válassz mappát"
@@ -11015,24 +11388,24 @@ msgstr ""
 "Hiba a '%s' reguláris kifejezésben:\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Fontos"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "Teendő"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Később"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Teszt"
 
@@ -11132,7 +11505,7 @@ msgstr "óta"
 msgid "months"
 msgstr "hónapok"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr " másodpercek"
 
@@ -11229,7 +11602,7 @@ msgstr "Kifejezés"
 msgid "Follow Up"
 msgstr "Nyomon követés"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "Címke"
 
@@ -11299,112 +11672,118 @@ msgid "Source Account"
 msgstr "Forráspostafiók"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Permet"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Adott fejléc"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Feldolgozás leállítása"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Tárgy"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "Állapot nincs beállítva"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "tartalmazza"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "nem tartalmazza"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "nem végződik"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "nem létezik"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "does not return"
 msgstr "nem tér vissza"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "nem úgy hangzik, mint"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "nincs az elején"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "végződik"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "létezik"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr "megjelölt"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr "után volt"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "is before"
 msgstr "előtte volt"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "nagyobb mint"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "kisebb mint"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr "nem megjelölt"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "nem"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "="
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr "visszatér nagyobb mint"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr "visszatér kisebb mint"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr "visszatér"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "úgy hangzik, mint"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "így kezdődik:"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "A(z) %s szabály megnevezés nem egyedi, kérlek válassz másikat."
@@ -11429,18 +11808,81 @@ msgstr "Szabály neve"
 msgid "Score Rules"
 msgstr "Pontszámszabályok"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Meg kell adnod a vmappa nevét."
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr "Legalább egy mappát meg kell adnod, mint forrást."
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 msgid "VFolder source"
 msgstr "VMappa-forrás"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Levélszerkesztő beállításai"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Itt állíthatod be a levelezés tulajdonságait, beleértve a biztonsági és "
+"üzenet képernyőket is."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Itt állíthatod be a helyesírás ellenőrzést, az aláírásokat és a "
+"levélszerkesztőt"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Postafiókok beállítása"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolution Levelező"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution Levelező postafiók-beállító kontroll"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Evolution Levelező komponens"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Evolution levélszerkesztő"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Levelezés levélszerkesztő beállító kontrollja"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution Levelező mappamegjelenítő"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution Levelező beállító kontroll"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Levél"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Postafiókok"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "Levelezés beállításai"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Tényleg törölni akarod ezt a postafiókot?"
@@ -11482,7 +11924,7 @@ msgid "Protocol"
 msgstr "Protokoll"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr "Névtelen"
 
@@ -11506,20 +11948,17 @@ msgstr "Parancsfájl-aláírás hozzáadása"
 msgid "Signature(s)"
 msgstr "Aláírás(ok)"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "HTML formátumú levelet küldesz. Ellenőrizd, hogy a címzettek \n"
 "akarnak-e és tudnak-e HTML formátumú leveleket fogadni:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Mindenképp elküldöd?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11527,7 +11966,7 @@ msgstr ""
 "Nincs tárgya a levélnek.\n"
 "Tényleg elküldjem?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11535,11 +11974,11 @@ msgstr ""
 "Mivel a címlista úgy van beállítva, hogy rejtse el a tagok címét, a levél "
 "csak titkos címzetteket fog tartalmazni."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "A levél csak titkos címzetteket tartalmaz."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11549,11 +11988,11 @@ msgstr ""
 "fejléc hozzáadásával.\n"
 "Mégis elküldöd?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Meg kell adnod címzetteke, mielőtt elküldhetnéd a levelet."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11565,189 +12004,401 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "_Virtuális mappa gyártása a keresésből"
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "Levél"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<kattints ide a mappa kiválasztásához>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" \"%s\"-ben"
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Új mappa létrehozása..."
 
-#: mail/em-folder-selector.c:267
-#, fuzzy
-msgid "Folder _name"
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Add meg, hogy hol hozod létre a mappát."
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
 msgstr "_Mappanév:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Nem sikerült létrehozni az ideiglenes könyvtárat: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Nem sikerült létrehozni az ideiglenes könyvtárat: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Nem sikerült létrehozni a '%s' ideiglenes fájlt: %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Nem sikerült bezárni ezt az ideiglenes mappát: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Betöltés..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, fuzzy, c-format
+msgid "%s"
+msgstr "s"
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Válassz mappát"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Új mappa létrehozása"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Nem sikerült törölni a mappát: `%s': %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Tényleg törlöd ezt a mappát: \"%s\"?"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "\"%s\" törlése"
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "\"%s\" mappa átnevezése erre:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+msgid "Rename Folder"
+msgstr "Mappa átnevezése"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Betűk beállításai"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Tulajdonságok"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "_Mappanév:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Nézet"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Megnyitás új  ablakban"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Áthelyezés"
+
+#: mail/em-folder-tree.c:1500
+msgid "_New Folder..."
+msgstr "Új _mappa..."
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "Á_tnevezés"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "_Tulajdonságok..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "S_zerkesztés új levélként..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "_Nyomtatás"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Válasz a feladónak"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Válasz a _listának"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Válasz _mindenkinek"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "Továbbítás"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr "Követés..."
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr "Befejezve _Jelölő"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "Jelölő törlése"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "_Elolvasva"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "_Olvasatlan"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "_Fontos"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "_Nem fontos"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "_Olvasatlan"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "_Fontos"
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "_Visszaállítás"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "Á_thelyezés mappába..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Másolás mappába..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "_Feladó hozzáadása a címjegyzékhez"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "_Szűrők alkalmazása"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "S_zabály gyártása levélből"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "VMappa a _tárgyra"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "VMappa a _feladóra"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "VMappa a _címzettekre"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "VMappa a _levelezőlistára"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "VMappa a feladóra"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Szű_rő a tárgyra"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Szűrő a f_eladóra"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Szűrő a _címzettekre"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Szűrő a _levelezőlistára"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Szűrő a f_eladóra"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Levél nyomtatása"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Hivatkozás helyének másolása"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Találatok:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Kiosztva"
+
+#: mail/em-format-html-display.c:597
+#, fuzzy
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr "Az üzenetet digitálisan aláírták, de nem bizonyítható, hogy hiteles."
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Aláírás szerkesztése"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Aláírás szerkesztése"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+#, fuzzy
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
 msgstr ""
-"Az üzenetet digitálisan aláírták. További információért kattints a lakat "
-"ikonra."
+"Az input_token érvénytelen aláírást tartalmaz, vagy az aláírás nem "
+"ellenőrizhető."
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "titkosítás"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "titkosítás"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Nem sikerült értelmezni a MIME-üzenetet. Megjelenítés forrásként."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Nem támogatott séma"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Nem lehet ellenőrizni a levél aláírását"
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Megtekintés beágyazva"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Rejtés"
@@ -11757,185 +12408,207 @@ msgstr "Rejtés"
 msgid "Page %d of %d"
 msgstr "%d/%d oldal"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "%s levél letöltése"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Hibás külső törzsrész."
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Mutató FTP-helyre (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Mutató helyi fájlra (%s), amely \"%s\" helyen érvényes"
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Mutató hely fájlra (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Mutató távoli adatra (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Mutató ismeretlen külső adatra (\"%s\" típus)"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-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/em-format-html.c:906 mail/em-format.c:1217
-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/em-format-html.c:930 mail/em-format.c:1190
-#, fuzzy
-msgid "No signature present"
-msgstr "Aláírás mentése"
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Nem sikerült a GNOME inicializálása"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Nem támogatott séma"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nem sikerült értelmezni a MIME-üzenetet. Megjelenítés forrásként."
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "A levél továbbítása"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Feladó"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Válaszcím"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Címzett"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Másolat"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Rejtett másolat"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "Levelező"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dátum"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "%s melléklet"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Nem sikerült értelmezni a MIME-üzenetet. Megjelenítés forrásként."
+msgid "Session not initialised"
+msgstr "Nem sikerült a GNOME inicializálása"
+
+#: mail/em-format.c:1210
+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/em-format.c:1212
+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/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Várakozás..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "%s pingelése"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Nem sikerült gyorsítótárazni: %s: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Nem sikerült csővezetéket létrehozni: '%s': %s"
 
-#: mail/em-popup.c:593
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Nem sikerült feloldani a gépnevet: `%s': %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Mentés másként..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 #, fuzzy
 msgid "Set as _Background"
 msgstr "Háttér:"
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Válasz a feladónak"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Hivatkozás megnyitása böngészőben"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Ü_zenet küldése a listának..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Címjegyzék hozzáadása"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Megnyitás ezzel: %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "Ez a kiszolgáló nem támogatja az LDAPv3 mintájú információkat"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Feliratkozás"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Mappa"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Válassz egy kiszolgálót."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Nincs kiszolgáló kiválasztva."
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Ne jelenjen meg többé ez az üzenet."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11944,27 +12617,27 @@ msgstr ""
 "Hiba a szűrőinformációk betöltése közben:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Szűrők..."
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Továbbított levél"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "ismeretlen feladó"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%Y-%m-%d, %a keltezéssel %H:%M-kor %%s ezt írta:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -11973,7 +12646,7 @@ msgstr ""
 "Nem sikerült menteni: `%s'\n"
 "  %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -11982,25 +12655,26 @@ msgstr ""
 "`%s' már létezik.\n"
 "Felülírod?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Üzenet"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Levél mentése másként..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Nem sikerült létrehozni az ideiglenes könyvtárat: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Cím:"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12009,62 +12683,432 @@ msgstr ""
 "\n"
 "Valóban törlöd ezeket a leveleket?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Levélszerkesztő beállításai"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/em-utils.c:2288
+#, fuzzy
 msgid ""
-"Configure mail preferences, including security and message display, here"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
 msgstr ""
-"Itt állíthatod be a levelezés tulajdonságait, beleértve a biztonsági és "
-"üzenet képernyőket is."
+"Ez a művelet véglegesen eltávolítja a töröltként megjelölt\n"
+"leveleket. Ha folytatod, akkor ezek a levelek örökre elvesznek.\n"
+"\n"
+"Valóban törlöd ezeket a leveleket?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/evolution-mail.schemas.in.in.h:1
+#, fuzzy
+msgid "Automatic link recognition"
+msgstr "_Hivatkozások automatikus felismerése"
+
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "_Hivatkozások automatikus felismerése"
+
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
 msgstr ""
-"Itt állíthatod be a helyesírás ellenőrzést, az aláírásokat és a "
-"levélszerkesztőt"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Postafiókok beállítása"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution Levelező"
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution Levelező postafiók-beállító kontroll"
+#: mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
+msgid "Default charset in which to compose messages"
+msgstr "A levél alapértelmezett tárgya"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution Levelező komponens"
+#: mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
+msgid "Default charset in which to compose messages."
+msgstr "A levél alapértelmezett tárgya"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution levélszerkesztő"
+#: mail/evolution-mail.schemas.in.in.h:8
+#, fuzzy
+msgid "Default charset in which to display messages"
+msgstr "Szöveg keresése a megjelenített levél törzsében"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Levelezés levélszerkesztő beállító kontrollja"
+#: mail/evolution-mail.schemas.in.in.h:9
+#, fuzzy
+msgid "Default charset in which to display messages."
+msgstr "Szöveg keresése a megjelenített levél törzsében"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution Levelező mappamegjelenítő"
+#: mail/evolution-mail.schemas.in.in.h:10
+#, fuzzy
+msgid "Default forward style"
+msgstr "A \"Továbbítás\" alapértelmezett stílusa: "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution Levelező beállító kontroll"
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default reply style"
+msgstr "A \"Továbbítás\" alapértelmezett stílusa: "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Empty Trash folders on exit"
+msgstr "_Kuka ürítése kilépéskor"
+
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "_Kuka ürítése kilépéskor"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+#, fuzzy
+msgid "Height of the message-list pane"
+msgstr "A levél elküldése később"
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "Postafiókok"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "Levelezés beállításai"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "Szűrőműveletek _naplózása ide:"
+
+#: mail/evolution-mail.schemas.in.in.h:28
+#, fuzzy
+msgid "Log filter actions to the specified log file."
+msgstr "Szűrőműveletek _naplózása ide:"
+
+#: mail/evolution-mail.schemas.in.in.h:29
+#, fuzzy
+msgid "Logfile to log filter actions"
+msgstr "Szűrőműveletek _naplózása ide:"
+
+#: mail/evolution-mail.schemas.in.in.h:30
+#, fuzzy
+msgid "Logfile to log filter actions."
+msgstr "Szűrőműveletek _naplózása ide:"
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Értesítés új levélről"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Értesítés új levélről"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr "_Kérdez, ha HTML levelet küldesz olyan címre, aki nem akar ilyet kapni"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "Kérdez, ha csak _rejtett másolat szerepel a címzettek között"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "A levelet _HTML formátumban küldi alapértelmezésként."
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "A levelet _HTML formátumban küldi alapértelmezésként."
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "Animált képek megjelenítése"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "Animált képek megjelenítése"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Levél megjelenítése a szokásos stílusban"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "_Betekintő ablaktábla"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "_Hangfájl lejátszása új üzenet beérkezésekor"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "_Helyesírás-ellenőrzés"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "_Terminál betűkészlete:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "Válaszd ki a változó szélességű betűt a HTML nyomtatásához"
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Téma szerinti levéllista"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Téma szerinti levéllista"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+#, fuzzy
+msgid "Thread the message-list based on Subject"
+msgstr "Továbbított üzenet (tárgy nélkül)"
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "L_egyen ez az alapértelmezett postafiók"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "Vá_ltozó szélességű:"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm-importáló"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox-importáló"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape Mail-importáló"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 importáló"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine-importáló"
 
 #: mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
@@ -12104,34 +13148,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm-importáló"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox-importáló"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape Mail-importáló"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 importáló"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine-importáló"
-
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -12194,12 +13210,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Az Evolution importálja a régi Netscape adatokat."
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Kuka"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "A levélszűrők beolvasása"
@@ -12208,7 +13218,7 @@ msgstr "A levélszűrők beolvasása"
 msgid "Scanning directory"
 msgstr "Mappa pásztázása"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Importálás kezdete"
 
@@ -12283,23 +13293,23 @@ msgid "You have not filled in all of the required information."
 msgstr "Nem adtad meg az összes szükséges információt."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution Postafiók-szerkesztő"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Gép:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "_Felhasználónév:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "Ú_tvonal:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Nem hozhatsz létre két egyező nevű postafiókot."
 
@@ -12308,35 +13318,35 @@ msgstr "Nem hozhatsz létre két egyező nevű postafiókot."
 msgid "Mail to %s"
 msgstr "A címzett %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "A téma %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "A feladó %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s levelezőlista"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Válasz"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Szűrőszabály hozzáadása"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "A következő szűrési szabály(ok):\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12347,143 +13357,30 @@ msgstr ""
 "eltávolított mappa használatban van\n"
 "és frissítve lett."
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "Kapcsolódás..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Ez a mappa nem tartalmazhat leveleket."
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Új levél"
 
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Nem sikerült megnyitni a megosztott mappát: %s."
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "_Levél"
 
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Nem sikerült létrehozni az ideiglenes könyvtárat: %s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "Új levél írása"
 
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Nem sikerült létrehozni a '%s' ideiglenes fájlt: %s"
-
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Nem sikerült bezárni ezt az ideiglenes mappát: %s"
-
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Válaszd ki az importálálandó adatok célkönyvtárát"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Válaszd ki az importálálandó adatok célkönyvtárát"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Új mappa létrehozása"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Add meg, hogy hol hozod létre a mappát."
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Nem sikerült törölni a mappát: `%s': %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Tényleg törlöd ezt a mappát: \"%s\"?"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "\"%s\" törlése"
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "\"%s\" mappa átnevezése erre:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-msgid "Rename Folder"
-msgstr "Mappa átnevezése"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "A megadott mappanév nem jó: %s"
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Betűk beállításai"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Tulajdonságok"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "_Mappanév:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Nézet"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Megnyitás új  ablakban"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Áthelyezés"
-
-#: mail/mail-component.c:2087
-msgid "_New Folder..."
-msgstr "Új _mappa..."
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "Á_tnevezés"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Tulajdonságok..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Azonosító"
 
@@ -12544,11 +13441,11 @@ msgstr ""
 "alkotja az Evolution postafiókot. Add meg lent a postafiók nevét. Ez a név "
 "csak az Evolution programban jelenik meg."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Szolgáltatás ellenőrzése"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Kapcsolódás a kiszolgálóhoz..."
 
@@ -12630,26 +13527,35 @@ msgid "C_olors"
 msgstr "_Színek"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Új levelek keresése"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "Helyesírás-ellenőrzés _beírás közben"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Új levelek keresése"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "Ro_sszul írt szavak színe:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Levél írása"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Beállítások"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12665,134 +13571,139 @@ msgstr ""
 "\n"
 "Kattints az \"Alkalmaz\" gombra a beállítások mentéséhez."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "_Alapértelmezett"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Alapértelmezett viselkedés"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "_Alapértelmezett karakterkódolás: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Levél törlése"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "M_indig írja alá az ebből a postafiókból kimenő leveleket"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "Ne idézze az eredeti levelet"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 "Ne írja alá az értekezlet-összehívási kérést (Outlook-kompatibilitás esetén)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Kész"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "_Piszkozatok mappa:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "E_ngedélyezés"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "Postafiókok"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "E-mail _cím:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "_Kuka ürítése kilépéskor"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Tanúsítványazonosító:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Evolution Postafiók varázsló"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Parancs végrehajtása..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "_Fix szélességű:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "<< Kevesebb választás"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "Betűk beállításai"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "Üzenetek _HTML formázása"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "_Idézetek kiemelése"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Beágyazott"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Címkék és színek"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Képek betöltése"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Levelezés beállítása"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Postafiók helye"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Levélszerkesztő"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Levél megjelenítése"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 msgid "Message Fonts"
 msgstr "Levél betűje"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Értesítés új levélről"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -12800,140 +13711,140 @@ msgstr ""
 "Megjegyzés: az első bejelentkezésig nem kapsz semmilyen figyelmeztetést a "
 "jelszó megadására."
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Egyéb információ"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "S_zervezet:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _kulcs azonosítója:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Válassz egy színt"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Kérdez, ha csak _rejtett másolat szerepel a címzettek között"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Nyomtatásnál használt betűk"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "Eredeti levél idézése"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Idézet"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "_Jelszó megjegyzése"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "Vá_laszcím:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Levelek fogadása"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "_Fogadás beállításai"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "_Jelszó megjegyzése"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Szükséges információ"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "Alapértékek"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "_Biztonság"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "Biztonságos MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr "Válaszd ki a fix szélességű betűt a HTML-hez"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr "Válaszd ki a fix szélességű betűt a HTML nyomtatásához"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr "Válaszd ki a változó szélességű betűt a HTML-hez"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 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:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Levél küldése"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "El_küldött levelek mappája"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Elküldött levelek és piszkozatok"
 
-#: mail/mail-config.glade.h:109
+#: 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:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Kiszolgáló beállítása"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Kiszolgáló _típusa: "
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Saját aláírású tanúsítvány a láncban"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "_Fájlnév megadása:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "_Helyesírás-ellenőrzés"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Szabványos Unix mbox"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12942,7 +13853,7 @@ msgstr ""
 "Ennek a parancsfájlnak a kimenete lesz az aláírásod.\n"
 "Az itt megadott név csak megjelenítés célját szolgálja."
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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 "
@@ -12952,7 +13863,7 @@ msgstr ""
 "azok a nyelvek vannak felsorolva, amelyekhez van telepítve helyesírás-"
 "ellenőrző szótár."
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12960,11 +13871,15 @@ 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:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "Vá_ltozó szélességű:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12974,169 +13889,178 @@ msgstr ""
 "\n"
 "A folytatáshoz kattints a \"Következő\" gombra."
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "_Aláírás hozzáadása"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 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:132
+#: mail/mail-config.glade.h:136
 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:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "_Hitelesítési típus:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "_Hitelesítési típus:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr "Az új _levelek automatikus lekérdezése"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "_Hangulatjelek képeinek automatikus beillesztése"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "_Hangjelzés új levél beérkezésekor"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "_Megerősítés a mappa tisztításakor"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "_Alapértelmezett aláírás:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "_Alapértékek"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Ne értesítsen, ha új levél érkezik"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "_Engedélyezés"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "_Továbbítás stílusa:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "_Teljes név:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "_HTML-levél"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "_Személyazonosság"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "június"
+
+#: mail/mail-config.glade.h:156
 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:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "L_egyen ez az alapértelmezett postafiók"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 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:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Név:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 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:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "_Hangfájl lejátszása új üzenet beérkezésekor"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 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:159
+#: mail/mail-config.glade.h:165
 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:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "_Levelek fogadása"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "_Válasz stílusa:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "_Alapértékek"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Parancsfájl:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Törlés..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "_Levél küldése"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "Animált képek megjelenítése"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Aláírás"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr "_Standard betűkészlet:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr "_Terminál betűkészlete:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "_Biztonságos kapcsolat használata (SSL):"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr "_A többi alkalmazás által használt betűkészlet használata"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "leírás"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr "%s pingelése"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13145,7 +14069,7 @@ msgstr ""
 "Hiba `%s' közben:\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13154,7 +14078,7 @@ msgstr ""
 "Hiba a művelet végrehajtása közben:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Várj"
 
@@ -13166,118 +14090,118 @@ msgstr "Mappa szűrése"
 msgid "Fetching Mail"
 msgstr "Levelek fogadása"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nem sikerült a levelet ebben az ideiglenes fájlban tárolni: %s: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Nem sikerült a levelet ebben az ideiglenes fájlban tárolni: %s: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "'%s' küldése"
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d üzenet küldése"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Hiba a %d / %d üzenetnél"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Kész."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Levél mentése a mappába"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Levelek áthelyezése %s-be"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Levelek másolása %s-be"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Mappák pásztázása \"%s\"-ben"
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Továbbított levelek"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s mappa megnyitása"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "%s tároló megnyitása"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s mappa eltávolítása"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s mappa tárolása"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Mappa frissítése"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Mappa tisztítása"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Kuka ürítése: '%s'"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Helyi mappák"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s levél letöltése"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d levél letöltése"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d levél mentése"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13286,7 +14210,7 @@ msgstr ""
 "Nem sikerült létrehozni a kimeneti fájlt: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13295,11 +14219,11 @@ msgstr ""
 "Hiba a levelek mentése közben: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Melléklet mentése"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13308,21 +14232,25 @@ msgstr ""
 "Nem lehet létrehozni a kimeneti fájlt: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nem sikerült az adatok kiírása: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Szétkapcsolódás %s kiszolgálóval"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Újrakapcsolódás %s kiszolgálóhoz"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Kis- és nagybetűk megkülönböztetése"
@@ -13339,59 +14267,74 @@ msgstr "Keresés:"
 msgid "Search"
 msgstr "Keresés"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Aláírás szerkesztése"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "titkosítás"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Forrásinformáció"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Megszakítás..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Kiszolgáló: %s,  Típus: %s "
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Útvonal: %s, Típus: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Típus: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Levelek küldése és fogadása"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 msgid "Cancel _All"
 msgstr "_Mindent megszakít"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Frissítés folyamatban..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Várakozás..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "A felhasználó megszakította a műveletet."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Írd be %s jelszavát"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Írd be a jelszót"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "_Jelszó megjegyzése"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Jelszó megjegyzése a munkafolyamat hátralevő részére"
 
@@ -13430,26 +14373,31 @@ msgstr "Írj be egy nevet ehhez az aláíráshoz."
 msgid "Name:"
 msgstr "Név:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Továbbított üzenet - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Továbbított levél"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "%s mappa megnyitása"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "vMappa beállítása: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "vMappák frissítése erre az uri-ra: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13462,88 +14410,88 @@ msgstr ""
 "    '%s'\n"
 "és frissítve lettek."
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "VMappák"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "vMappák"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "VMappa szerkesztése"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "A nem létező '%s' vmappát próbálod szerkeszteni."
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Új VMappa"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Nem nézett"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Nézett"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Megválaszolt"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Több láthatatlan levél"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Több levél"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Legalacsonyabb"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Alacsonyabb"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Magasabb"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Legmagasabb"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Ma %l:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Tegnap %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%Y %d %b"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Levéllista létrehozása"
 
@@ -13599,11 +14547,11 @@ msgstr "Továbbítás"
 msgid "No Response Necessary"
 msgstr "Nem szükséges válaszolni"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Válasz"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Válasz mindenkinek"
 
@@ -13655,41 +14603,142 @@ msgstr "_Feliratkozás"
 msgid "_Unsubscribe"
 msgstr "_Leiratkozás"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+"Speciális mappák és kapcsolat nélküli módban használt mappák viselkedésének "
+"beállítása"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Evolution Héj"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Mappabeállítások"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "380"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Indítóikon-csoport átnevezése"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Megjelenjen-e a mappasáv"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Indítósáv elrejtése"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Alapértelmezett prioritás:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Alapértelmezett prioritás:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Levelezést Levelező beállító kontrollja"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+#, fuzzy
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+"A melléklet megjelölése, hogy alapértelmezésként beágyazva jelenjen meg"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
 msgstr ""
-"Nem sikerült átvinni a mappát:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Mappa hozzáadása"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Piszkozatok"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Beérkezett levelek"
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "Alapértelmezett feladat mappa megnyitása"
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Postázandó levelek"
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Alapértelmezett feladat mappa megnyitása"
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Elküldve"
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Alapértelmezett feladat mappa megnyitása"
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Alapértelmezett feladat mappa megnyitása"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Megjelenjen-e a mappasáv"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Megjelenjen-e az indítósáv"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "E-mail"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Nem sikerült rendesen frissíteni a fájlokat."
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13700,7 +14749,7 @@ msgstr ""
 "%s\n"
 "Hiba: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13709,7 +14758,7 @@ msgstr ""
 "Hiba történt a fájlok másolása közben ide: \n"
 "`%s'."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13720,7 +14769,7 @@ msgstr ""
 "Kérlek mozgasd el a fájlt, hogy az Evolution\n"
 "települni tudjon."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13818,10 +14867,11 @@ msgstr ""
 "Nem sikerült átnevezni a mappát:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+msgid "The specified folder name is not valid: %s"
+msgstr "A megadott mappanév nem jó: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -13845,19 +14895,15 @@ msgstr ""
 "Nem sikerült elkészíteni a megadott mappát:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Új mappa létrehozása..."
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Névtelen)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Válaszd ki a futtatandó importáló típusát:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13871,11 +14917,11 @@ msgstr ""
 "Választhatod az \"Automatikus\" lehetőséget, ha nem tudod a típust, az "
 "Evolution megpróbálja felismerni."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Válaszd ki az információt, amelyet importálni szeretnél:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13883,7 +14929,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13892,21 +14938,21 @@ msgstr ""
 "%s importálása\n"
 "%d. elem importálása."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "Válassz importálót"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "`%s' fájl nem létezik."
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Evolution hiba"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -13915,11 +14961,11 @@ msgstr ""
 "Nincs olyan importáló, amely képes lenne kezelni\n"
 "%s-t"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Importálás folyamatban"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -13928,17 +14974,17 @@ msgstr ""
 "%s importálása.\n"
 "%s indítása"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Hiba %s indításakor"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Hiba %s betöltésekor"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13947,35 +14993,35 @@ msgstr ""
 "%s importálása\n"
 "1. elem importálása."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Fájlnév:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Válassz egy fájlt"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Fájltípus:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Adatok és beállítások importálása korábbi programokból"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Egyetlen fájl importálása"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -13983,47 +15029,28 @@ msgstr ""
 "Várj...\n"
 "Meglévő beállítások keresése"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Az okos importálók indítása"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "Feladó %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Válaszd ki az importálálandó adatok célkönyvtárát"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Importálás"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Kapcsolatok bezárása..."
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Hiba \"%s\" szinkronizálása közben:\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "Mappa szinkronizálása"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "\"%s\" szinkronizálása (%d / %d)"
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Az Evolution beállításai"
@@ -14058,7 +15085,7 @@ msgstr "Nem sikerült megnyitni a megosztott mappát: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "A megadott megosztott mappa nem található."
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14067,17 +15094,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Asszisztens"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Új"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Nincs mappanév megadva"
@@ -14135,64 +15156,51 @@ 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:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "_Munka a hálózatban"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "K_apcsolat nélküli munka"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Kapcsolat nélküli munka"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Nem jeleníthető meg a mappa)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(semmi)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 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:2090
+#: shell/e-shell-window.c:331
 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:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "A Ximian Evolution kapcsolat nélküli módban van. Kattints erre a gombra a "
 "hálózatra csatlakozáshoz."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Érvénytelen argumentumok"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Nem sikerült regisztrálni az OAF-ban"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "A beállítások adatbázisa nem található"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Általános hiba"
 
@@ -14305,74 +15313,18 @@ msgstr "_Törlés"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Vedd le ezt az elemet az indítósávról"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Nem sikerül elmenteni az elemeket."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Beérkezett levelek"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Indítóikonok"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Nincs hiba"
-
-#: 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:575
-msgid "The specified folder type is not valid"
-msgstr "A megadott mappatípus nem jó"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "I/O hiba"
-
-#: 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:581
-msgid "The folder is not empty"
-msgstr "A mappa nem üres."
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "A megadott mappa nem található"
-
-#: 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:589
-msgid "Operation not supported"
-msgstr "A művelet nem támogatott"
-
-#: 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: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: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:597
-msgid "Cannot create a folder with that name"
-msgstr "Nem könyvtárat létrehozni ezen a néven"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Ez a művelet nem hajtható végre kapcsolat nélküli módban"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Jelölőnégyzet"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14383,6 +15335,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% kész)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Új"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "\"%s\" \"%s\"-ben"
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14420,74 +15383,6 @@ msgstr ""
 "Az aktiválórendszer által adott hiba:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "CORBA hiba"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Megszakítva"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Érvénytelen argumentum"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Már van tulajdonos"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Nincs tulajdonos"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Nem található"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Nem támogatott típus"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Nem támogatott séma"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Nem támogatott művelet"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Belső hiba"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Létezik"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "Érvénytelen URI"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Van almappája."
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Nincs hely"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "A régi tulajdonos meghalt"
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Teszttípus"
-
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr "Evolution Teszt komponens"
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr "Aktív kapcsolatok"
@@ -14516,10 +15411,6 @@ msgstr "_Levél:"
 msgid "_Tasks:"
 msgstr "_Feladatok:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr "_Mappanév:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder _type:"
 msgstr "Mappa_típus:"
@@ -14581,24 +15472,6 @@ msgstr ""
 "\n"
 "Beállításaid mentéséhez kattints az \"Alkalmaz\" gombra. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-"Speciális mappák és kapcsolat nélküli módban használt mappák viselkedésének "
-"beállítása"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Evolution Héj"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution mappabeállító kontroll"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Mappabeállítások"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "A fájl importálásához kattints az \"Importálás\" gombra."
@@ -14637,7 +15510,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Importálók"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Importálás"
 
@@ -14653,16 +15526,16 @@ msgstr "Ne kérdezze meg többet."
 msgid "Evolution can import data from the following files:"
 msgstr "Az Evolution a következő fájlokból képes adatokat importálni:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Az Evolution most kilép..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14697,7 +15570,7 @@ msgstr ""
 "Reméljük, élvezni fogod a kemény munkánk eredményét, és várjuk\n"
 "hozzájárulásod! \n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -14705,36 +15578,48 @@ msgstr ""
 "Köszönettel\n"
 "A Ximian Evolution Csapat\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr "Ne jelenítse meg többet"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "A Ximian Evolution héj nem elérhető."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nem sikerült inicializálni a Ximian Evolution héjat: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Indítás kapcsolat nélküli módban"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Indítás online módban"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr "Az összes Evolution-összetevő kényszerített bezárása"
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Minden összetevő hibakereső üzeneteit fájlba irányítja."
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14744,31 +15629,64 @@ msgstr ""
 "egyszerre\n"
 "--Haználd a(z)%s --help parancsot további információk eléréséhez\n"
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Válassz importálót"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Tanúsítványazonosító:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "Folyamatban"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Kifejezés"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "E-mail cím:"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"A tanúsítvány lejárt: %s\n"
+"Kibocsátó: %s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, fuzzy, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+"Kibocsátó: %s\n"
+"Téma: %s"
+
+#: smime/gui/e-cert-selector.c:117
+#, fuzzy, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+"Kibocsátó: %s\n"
+"Téma: %s"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14826,91 +15744,379 @@ msgid "Backup All"
 msgstr "Blackpool"
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "_Tanúsítványazonosító:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Nem megbízható tanúsítvány"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "_Tanúsítványazonosító:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Közönséges név"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "_Tanúsítványazonosító:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 msgid "Edit"
 msgstr "Szerkesztés"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 #, fuzzy
 msgid "Email Recipient Certificate"
 msgstr "Nincs címzett megadva"
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Tanúsítványok ellenőrzése sikertelen."
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Kifejezés"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Szervezet"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Szervezeti egység"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Nézet"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "_Tanúsítványazonosító:"
+
+#: smime/gui/smime-ui.glade.h:42
+#, fuzzy
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr "Érvénytelen hitelesítésszolgáltató (CA)"
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "_Tanúsítványazonosító:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Importálás"
+msgid "Certificate already exists"
+msgstr "A kártyaazonosító már létezik"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Vermont"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+msgid "C"
+msgstr "°C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "°C"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "OK"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "É"
+
+#: smime/lib/e-cert.c:603
+#, fuzzy
+msgid "DC"
+msgstr "°C"
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "_Tanúsítványazonosító:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "_Tanúsítványazonosító:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "Nem megbízható tanúsítvány"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "Azonosító"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+#, fuzzy
+msgid "Subject Public Key Info"
+msgstr ""
+"\n"
+"Nyilvános kulcs:"
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "A téma %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Nem sikerült feldolgozni a spool mappát"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#, fuzzy
+msgid "Object Signer"
+msgstr "_Objektum"
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "Érvénytelen hitelesítésszolgáltató (CA)"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Érvénytelen hitelesítésszolgáltató (CA)"
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Nincs információ"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "melléklet"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "_Tanúsítványazonosító:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Curitiba"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "Észak-Carolina"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Kifejezés"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s %s-kor"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Tanúsítványaláírás-hiba"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "_Beszúrás"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "A téma %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Tanúsítványaláírás-hiba"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Írd be %s jelszavát"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "_Tanúsítványazonosító:"
 
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
@@ -14962,7 +16168,7 @@ msgstr "Kijelölés másolása"
 msgid "Copy to Folder..."
 msgstr "Mappába másolás..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Kijelölés kivágása"
 
@@ -14978,7 +16184,7 @@ msgstr "Névjegyek áthelyezése másik mappába..."
 msgid "Move to Folder..."
 msgstr "Áthelyezés mappába..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Vágólap beillesztése"
 
@@ -14986,8 +16192,8 @@ msgstr "Vágólap beillesztése"
 msgid "Previews the contacts to be printed"
 msgstr "A nyomtatandó névjegyek nyomtatási képe"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Nyomtatási _kép"
@@ -15032,13 +16238,13 @@ msgstr "Betöltés leállítása"
 msgid "View the current contact"
 msgstr "Az aktuális névjegy megtekintése"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "_Műveletek"
 
@@ -15067,141 +16273,110 @@ msgid "_Send Message to Contact..."
 msgstr "Levél _küldése ennek a személynek..."
 
 #: ui/evolution-calendar.xml.h:3
-#, fuzzy
-msgid "Create a new all-day event"
-msgstr "Új egész napos esemény létrehozása"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Új találkozó létrehozása"
-
-#: ui/evolution-calendar.xml.h:5
 msgid "Create a new calendar"
 msgstr "Új naptár létrehozása"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Új értekezlet összehívási kérés létrehozása"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Új feladat létrehozása"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Nap"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Az összes előfordulás törlése"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "A találkozó törlése"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Az előfordulás törlése"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Az előfordulás törlése"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Ugrás"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Ugrás visszafelé"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Ugrás előre "
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "_Dátumra ugrás"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Ugrás adott dátumra"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Ugrás a mai napra"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "Lista"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Hónap"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Új _találkozó"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Új-Kaledónia"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Új értekezlet"
-
-#: ui/evolution-calendar.xml.h:27
-msgid "New _Task"
-msgstr "Új _feladat"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "A nyomtatandó naptár nyomtatási képe"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Naptár nyomtatása"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Szabad/foglalt információ közzététele ehhez a naptárhoz"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Bourges"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Találkozókat és eseményeket tartalmazó nyilvános mappa"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Részletek"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Egy nap megjelenítése"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Egy hónap megjelenítése"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Egy hét megjelenítése"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "A munkahét megjelenítése"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Hét"
 
@@ -15266,7 +16441,7 @@ msgstr "Elem mentése lemezre"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Fájl"
 
@@ -15484,7 +16659,7 @@ msgstr "Min_degyik elolvasva"
 msgid "Mark all visible messages as read"
 msgstr "Az összes látható leveleket elolvasottnak jelöli meg"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "Üzenet(ek) beillesztése a vágólapról"
 
@@ -15542,16 +16717,6 @@ msgstr "Kijelölés meg_fordítása"
 msgid "_Threaded Message List"
 msgstr "_Téma szerinti levéllista"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Ablak bezárása"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "_Bezárás"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "_Feladó hozzáadása a címjegyzékhez"
@@ -15711,257 +16876,282 @@ msgstr "A kijelölt levél továbbítása valakinek mellékletként"
 msgid "Increase the text size"
 msgstr "Szöveg betűméretének növelése"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "_Képek betöltése"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "_Fontos"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "_Olvasatlan"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "_Nem fontos"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "A kijelölt üzenetek megjelölése olvasottként"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "A kijelölt üzenetek megjelölése fontosként"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "A kijelölt üzenetek megjelölése nem fontosként"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "A kijelölt üzenet(ek) megjelölése olvasatlanként"
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "A kijelölt üzenet(ek) megjelölése olvasatlanként"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "A kijelölt üzenetek megjelölése nem fontosként"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "A kijelölt leveleket törlésre jelöli ki"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Áthelyezés"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "A kijelölt üzenet(ek) áthelyezése egy másik mappába"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Következő"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "Következő _fontos levél"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "Következő _szál"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "_Következő olvasatlan levél"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Nem található"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Az kijelölt levél megnyitása új ablakban"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "A kijelölt levél megnyitása a szerkesztőben újraküldés céljából"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Eredeti _méret"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "_Előző olvasatlan levél"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Válasz küldése"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr "Válasz küldése egy nyilvános mappában lévő levélre"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "_Előző fontos levél"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Előnézeti képet ad a nyomtatandó levélről"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Előző"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Levél nyomtatása"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "Át_irányítás"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "A kijelölt levél átirányítás valakinek"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Helyreállítja a szöveg eredeti betűméretét"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "_Keresés a levélben..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "K_isebb"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Levél mentése szövegfájlként"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Szöveg keresése a megjelenített levél törzsében"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr "Oldalbeállítás az aktuális nyomtatóhoz"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Levél forrásának megjelenítése"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Teljes _fejléc megjelenítése"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Szöveg keresése a megjelenített levél törzsében"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Levél megjelenítése a szokásos stílusban"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Levél megjelenítése a teljes fejléccel"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Levél nyers forrásának megjelenítése"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "S_zöveg betűmérete"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "A kijelölt levelek törlésének visszavonása"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "VMappa a _levelezőlistára..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "VMappa a _feladóra..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "VMappa a _címzettekre..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "VMappa a _tárgyra..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "_Mellékletként"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "_Másolás mappába"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "Szűrő _gyártása levélből"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "Levél _továbbítása"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "_Ugrás"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "_Beágyazva"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "N_agyobb"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "Levél _megjelenítése"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "Á_thelyezés mappába"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "_Következő levél"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "_Szokásos megjelenítés"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "Levél _megnyitása"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "_Előző levél"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "_Idézetként"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "_Újraküldés..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "_Eszközök"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "_Visszaállítás"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Ablak bezárása"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "_Bezárás"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Csatolás"
@@ -16240,12 +17430,13 @@ msgid "Change Evolution's settings"
 msgstr "Az Evolution beállításainak szerkesztése"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "_Kilépés"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Új értekezlet összehívási kérés létrehozása"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "Evolution _ablak"
+msgid "E_xit"
+msgstr "_Kilépés"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16257,61 +17448,74 @@ msgstr "Adatok importálása más programokból"
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "Evolution _ablak"
+msgid "Open a new window"
+msgstr "Megnyitás új  ablakban"
 
 #: ui/evolution.xml.h:11
 msgid "Pi_lot Settings..."
 msgstr "_Pilot beállításai..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Küldés / Fogadás"
+
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr "Várakozó elemek elküldése és az új elemek letöltése"
+
+#: ui/evolution.xml.h:14
 msgid "Set up Pilot configuration"
 msgstr "A Pilot beállítása"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "A Ximian Evolution névjegyének megjelenítése"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Hibajelentés beküldése"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "_Hibajelentés beküldése"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Hibajelentés beküldése a Bug Buddy segítségével."
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Váltás"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Váltás kapcsolat nélküli munkára"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _GYIK"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "A Ximian Evolution _névjegye..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "_Súgó"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "_Importálás..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "Ú_j"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Küldés / Fogadás"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "_Keresés most"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Összefoglaló nyomtatása"
@@ -16440,12 +17644,12 @@ msgstr "Nézetek definiálása..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "HKSCPSV"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%Y %B"
 
@@ -16578,7 +17782,7 @@ msgstr "_Keresés"
 msgid "_Find Now"
 msgstr "_Keresés most"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "_Törlés"
 
@@ -16594,24 +17798,268 @@ msgstr "Altétel azonosító"
 msgid "Text"
 msgstr "Szöveg"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Törlés"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Keresés most"
 
+#~ msgid "Account Name"
+#~ msgstr "Postafiók neve"
+
+#~ msgid "Server Name"
+#~ msgstr "Kiszolgáló neve"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "Ez az Evolution-változat nem támogatja az LDAP-t"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Egyéb címtárak"
+
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "Itt állíthatod be az LDAP címtárkiszolgálók elérését."
+
+#~ msgid "Directory Servers"
+#~ msgstr "Címtár-kiszolgálók"
+
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Evolution Címjegyzék LDAP-beállító vezérlője"
+
+#~ msgid "Add LDAP Server"
+#~ msgstr "LDAP-kiszolgáló hozzáadása"
+
+#~ msgid "LDAP Configuration Assistant"
+#~ msgstr "LDAP-beállítás varázsló"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "4. lépés: Név megjelenítése"
+
+#~ msgid "Find contact in"
+#~ msgstr "Névjegy keresése"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Kattints ide névjegy hozzáadásához *"
+
+#~ msgid "Business Address"
+#~ msgstr "Munkahelyi cím"
+
+#~ msgid "Department"
+#~ msgstr "Osztály"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "Szabad-foglalt URL"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Foglalkozás"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Feladatok megnyitása %s-kor"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Mindenképp elküldöd?"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Megszakítja az aktuális levélműveletet"
+#~ msgid "Folder _name"
+#~ msgstr "_Mappanév:"
+
+#~ 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."
+
+#, fuzzy
+#~ msgid "No signature present"
+#~ msgstr "Aláírás mentése"
+
+#~ msgid "Connecting..."
+#~ msgstr "Kapcsolódás..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Ez a mappa nem tartalmazhat leveleket."
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Nem sikerült megnyitni a megosztott mappát: %s."
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Válaszd ki az importálálandó adatok célkönyvtárát"
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nem sikerült átvinni a mappát:\n"
+#~ "%s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "Mappa hozzáadása"
+
+#~ msgid "Drafts"
+#~ msgstr "Piszkozatok"
+
+#~ msgid "Outbox"
+#~ msgstr "Postázandó levelek"
+
+#~ msgid "Sent"
+#~ msgstr "Elküldve"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Hiba \"%s\" szinkronizálása közben:\n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "Mappa szinkronizálása"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "\"%s\" szinkronizálása (%d / %d)"
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Nem jeleníthető meg a mappa)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(semmi)"
+
+#~ msgid "No error"
+#~ msgstr "Nincs hiba"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "A megadott néven már létezik mappa"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "A megadott mappatípus nem jó"
+
+#~ msgid "I/O error"
+#~ msgstr "I/O hiba"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Nincs elég hely a mappa elkészítéséhez"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "A mappa nem üres."
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "A megadott mappa nem található"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "A funkció nincs még ebben a tárolóban megírva"
+
+#~ msgid "Operation not supported"
+#~ msgstr "A művelet nem támogatott"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "A megadott típus nem támogatott ebben a tárolóban."
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "A megadott mappa nem módosítható vagy törölhető"
+
+#~ 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."
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Nem könyvtárat létrehozni ezen a néven"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Ez a művelet nem hajtható végre kapcsolat nélküli módban"
+
+#~ msgid "Checkbox"
+#~ msgstr "Jelölőnégyzet"
+
+#~ msgid "CORBA error"
+#~ msgstr "CORBA hiba"
+
+#~ msgid "Interrupted"
+#~ msgstr "Megszakítva"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Érvénytelen argumentum"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Már van tulajdonos"
+
+#~ msgid "No owner"
+#~ msgstr "Nincs tulajdonos"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Nem támogatott típus"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Nem támogatott séma"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Nem támogatott művelet"
+
+#~ msgid "Internal error"
+#~ msgstr "Belső hiba"
+
+#~ msgid "Exists"
+#~ msgstr "Létezik"
+
+#~ msgid "Invalid URI"
+#~ msgstr "Érvénytelen URI"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Van almappája."
+
+#~ msgid "No space left"
+#~ msgstr "Nincs hely"
+
+#~ msgid "Old owner has died"
+#~ msgstr "A régi tulajdonos meghalt"
+
+#~ msgid "Test type"
+#~ msgstr "Teszttípus"
+
+#~ msgid "Evolution Test Component"
+#~ msgstr "Evolution Teszt komponens"
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "Importálás"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Új egész napos esemény létrehozása"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Új _találkozó"
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Mezőnév"
+#~ msgid "New _Meeting"
+#~ msgstr "Új értekezlet"
+
+#~ msgid "New _Task"
+#~ msgstr "Új _feladat"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "Evolution _ablak"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "Evolution _ablak"
+
+#~ msgid "Toggle"
+#~ msgstr "Váltás"
 
-#~ msgid "Family Name"
-#~ msgstr "Családi név"
+#~ msgid "Clear"
+#~ msgstr "Törlés"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Megszakítja az aktuális levélműveletet"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -16704,9 +18152,6 @@ msgstr "Keresés most"
 #~ msgid "VCard (.vcf, .gcrd)"
 #~ msgstr "VCard (.vcf, .gcrd)"
 
-#~ msgid "Loading..."
-#~ msgstr "Betöltés..."
-
 #~ msgid "Searching..."
 #~ msgstr "Keresés..."
 
@@ -16758,10 +18203,6 @@ msgstr "Keresés most"
 #~ msgstr "Az EBook nincs betöltve\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "A kártyaazonosító már létezik"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Művelet megszakítva"
 
@@ -16979,9 +18420,6 @@ msgstr "Keresés most"
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
 #~ msgid "Birth date"
 #~ msgstr "Születési dátum"
 
@@ -16994,9 +18432,6 @@ msgstr "Keresés most"
 #~ msgid "Arbitrary"
 #~ msgstr "Tetszőleges"
 
-#~ msgid "ID"
-#~ msgstr "Azonosító"
-
 #~ msgid "Last Use"
 #~ msgstr "Utoljára használva"
 
@@ -17009,9 +18444,6 @@ msgstr "Keresés most"
 #~ msgid "Folder containing contact information"
 #~ msgstr "Névjegyeket tartalmazó mappa"
 
-#~ msgid "LDAP Server"
-#~ msgstr "LDAP-kiszolgáló"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "Névjegyeket tartalmazó LDAP-kiszolgáló"
 
@@ -17021,18 +18453,6 @@ msgstr "Keresés most"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Kapcsolatokat tartalmazó nyilvános mappa"
 
-#~ msgid "_Contact"
-#~ msgstr "_Névjegy"
-
-#~ msgid "Create a new contact"
-#~ msgstr "Új névjegy készítése"
-
-#~ msgid "New Contact List"
-#~ msgstr "Új címlista"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "Új címlista készítése"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "Az URI amit a Mappaböngésző meg fog nyitni"
 
@@ -17048,9 +18468,6 @@ msgstr "Keresés most"
 #~ msgid "Is New Card"
 #~ msgstr "Egy új címkártya"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "0 kártya"
 
@@ -17101,30 +18518,6 @@ msgstr "Keresés most"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "Teendőket tartalmazó nyilvános mappa"
 
-#~ msgid "New appointment"
-#~ msgstr "Új találkozó"
-
-#~ msgid "_Appointment"
-#~ msgstr "_Találkozó"
-
-#~ msgid "New meeting"
-#~ msgstr "Új értekezlet"
-
-#~ msgid "M_eeting"
-#~ msgstr "É_rtekezlet"
-
-#~ msgid "New task"
-#~ msgstr "Új feladat"
-
-#~ msgid "_Task"
-#~ msgstr "_Feladat"
-
-#~ msgid "New All Day Appointment"
-#~ msgstr "Új egész napos találkozó"
-
-#~ msgid "All _Day Appointment"
-#~ msgstr "_Egész napos találkozó"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "Érvénytelen objektumot nem lehet frissíteni"
 
@@ -17170,9 +18563,6 @@ msgstr "Keresés most"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "Naptár megnyitása %s-kor"
 
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Alapértelmezett feladat mappa megnyitása"
-
 #~ msgid "Evaluation of the search expression did not yield a boolean value"
 #~ msgstr "A keresési kifejezés kiértékelése nem logikai értékre vezetett"
 
@@ -17213,9 +18603,6 @@ msgstr "Keresés most"
 #~ "Az Evolution GnomeCard fájlokat talált.\n"
 #~ "Szeretnéd ezeket az Evolutionbe importálni?"
 
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Levelezést Levelező beállító kontrollja"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "Leveleket tartalmazó mappa"
 
@@ -17231,9 +18618,6 @@ msgstr "Keresés most"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Virtuális kukamappa"
 
-#~ msgid "Properties..."
-#~ msgstr "Tulajdonságok..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Mappa tulajdonságainak módosítása"
 
@@ -17243,15 +18627,6 @@ msgstr "Keresés most"
 #~ msgid "You have unsent messages, do you wish to quit anyway?"
 #~ msgstr "Vannak el nem küldött levelek. biztos hogy kilépsz?"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Új levél"
-
-#~ msgid "_Mail Message"
-#~ msgstr "_Levél"
-
-#~ msgid "Compose a new mail message"
-#~ msgstr "Új levél írása"
-
 #~ msgid "New Message Post"
 #~ msgstr "Új levélküldés"
 
@@ -19058,9 +20433,6 @@ msgstr "Keresés most"
 #~ msgid "Cumberland"
 #~ msgstr "Cumberland"
 
-#~ msgid "Curitiba"
-#~ msgstr "Curitiba"
-
 #~ msgid "Curitiba Apt"
 #~ msgstr "Curitiba Apt"
 
@@ -22052,9 +23424,6 @@ msgstr "Keresés most"
 #~ msgid "North Bend"
 #~ msgstr "North Bend"
 
-#~ msgid "North Carolina"
-#~ msgstr "Észak-Carolina"
-
 #~ msgid "North Conway"
 #~ msgstr "North Conway"
 
@@ -23666,9 +25035,6 @@ msgstr "Keresés most"
 #~ msgid "State College"
 #~ msgstr "State College"
 
-#~ msgid "Stauning"
-#~ msgstr "Stauning"
-
 #~ msgid "Staunton"
 #~ msgstr "Staunton"
 
@@ -24257,9 +25623,6 @@ msgstr "Keresés most"
 #~ msgid "United Arab Emirates "
 #~ msgstr "Egyesült Arab Emirátusok "
 
-#~ msgid "Unst"
-#~ msgstr "Unst"
-
 #~ msgid "Upington"
 #~ msgstr "Upington"
 
@@ -24368,12 +25731,6 @@ msgstr "Keresés most"
 #~ msgid "Veracruz"
 #~ msgstr "Veracruz"
 
-#~ msgid "Vermillion"
-#~ msgstr "Vermillion"
-
-#~ msgid "Vermont"
-#~ msgstr "Vermont"
-
 #~ msgid "Vernal"
 #~ msgstr "Vernal"
 
@@ -25523,9 +26880,6 @@ msgstr "Keresés most"
 #~ msgid "Freezing haze"
 #~ msgstr "Jeges pára"
 
-#~ msgid "Spray"
-#~ msgstr "Permet"
-
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Permet a környéken"
 
@@ -25891,18 +27245,6 @@ msgstr "Keresés most"
 #~ "Mappa eltávolítása, amelyet a \"Más felhasználó mappájának megnyitása\" "
 #~ "művelettel adtak hozzá"
 
-#~ msgid "Send / Receive"
-#~ msgstr "Küldés / Fogadás"
-
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Várakozó elemek elküldése és az új elemek letöltése"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Megjelenjen-e a mappasáv"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Megjelenjen-e az indítósáv"
-
 #~ msgid "View the selected folder"
 #~ msgstr "A kijelölt mappák megtekintése"
 
@@ -25930,9 +27272,6 @@ msgstr "Keresés most"
 #~ msgid "_Rename..."
 #~ msgstr "Á_tnevezés..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Küldés / Fogadás"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "_Indítósáv"
 
@@ -25984,9 +27323,6 @@ msgstr "Keresés most"
 #~ msgid "Font Preferences"
 #~ msgstr "Betűbeállítások"
 
-#~ msgid "Automatically _detect links"
-#~ msgstr "_Hivatkozások automatikus felismerése"
-
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 
@@ -26213,18 +27549,12 @@ msgstr "Keresés most"
 #~ msgid "1234"
 #~ msgstr "1234"
 
-#~ msgid "380"
-#~ msgstr "380"
-
 #~ msgid "666"
 #~ msgstr "666"
 
 #~ msgid "<- _Remove"
 #~ msgstr "<- _Törlés"
 
-#~ msgid "<< Fewer Options"
-#~ msgstr "<< Kevesebb választás"
-
 #, fuzzy
 #~ msgid "Add (or Edit) Attribute Mappings"
 #~ msgstr "Tulajdonság hozzáadása (vagy szerkesztése) "
@@ -26819,13 +28149,6 @@ msgstr "Keresés most"
 #~ msgid "Show _folders from server: "
 #~ msgstr "_Mappák megjelenítése erről a kiszolgálóról:"
 
-#~ msgid ""
-#~ "Issuer: %s\n"
-#~ "Subject: %s"
-#~ msgstr ""
-#~ "Kibocsátó: %s\n"
-#~ "Téma: %s"
-
 #~ msgid "Welcome response error: %s: possibly non-fatal"
 #~ msgstr "Üdvüzlő válasz hiba: %s: talán nem végzetes"
 
@@ -26853,9 +28176,6 @@ msgstr "Keresés most"
 #~ "amely a szűrő futtatásakor vagy a vmappa megnyitásakor\n"
 #~ "lesz érvényben."
 
-#~ msgid "Command"
-#~ msgstr "Parancs"
-
 #~ msgid "View messages..."
 #~ msgstr "Üzenetek megtekintése..."
 
@@ -26871,9 +28191,6 @@ msgstr "Keresés most"
 #~ msgid "Create new contact list"
 #~ msgstr "Új címlista készítése"
 
-#~ msgid "_Contact List"
-#~ msgstr "_Címlista"
-
 #~ msgid "Inline Text _File..."
 #~ msgstr "Szöveg_fájl beillesztése..."
 
@@ -26940,9 +28257,6 @@ msgstr "Keresés most"
 #~ msgid "News Servers"
 #~ msgstr "Hírcsoport-kiszolgálók"
 
-#~ msgid "Source Information"
-#~ msgstr "Forrásinformáció"
-
 #~ msgid "newswindow1"
 #~ msgstr "newswindow1"
 
@@ -26965,9 +28279,6 @@ msgstr "Keresés most"
 #~ msgid "Send _later"
 #~ msgstr "_Küldés később"
 
-#~ msgid "Send the message later"
-#~ msgstr "A levél elküldése később"
-
 #~ msgid "_Pilot Settings..."
 #~ msgstr "_Pilot beállításai"
 
@@ -27061,10 +28372,6 @@ msgstr "Keresés most"
 #~ msgstr "Riga"
 
 #, fuzzy
-#~ msgid "Addressbook Settings"
-#~ msgstr "Címjegyzék forrásai"
-
-#, fuzzy
 #~ msgid "Configuration control for the Evolution Addressbook."
 #~ msgstr "Az Evolution tennivaló csatorna beállító eszköze.\n"
 
@@ -27343,13 +28650,6 @@ msgstr "Keresés most"
 #~ "\n"
 #~ "Egyedi szöveg:"
 
-#~ msgid ""
-#~ "\n"
-#~ "Public Key: "
-#~ msgstr ""
-#~ "\n"
-#~ "Nyilvános kulcs:"
-
 #~ msgid "Waiting for connection to LDAP server..."
 #~ msgstr "Várakozás a kapcsolódásra az LDAP-kiszolgálóhoz..."
 
@@ -27434,9 +28734,6 @@ msgstr "Keresés most"
 #~ msgid "Republic Of Moldova"
 #~ msgstr "Moldovai Köztársaság"
 
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "Új találkozó létrehozása az alapértelmezett _emlékeztetővel"
-
 #~ msgid "First day of wee_k:"
 #~ msgstr "A _hét első napja:"
 
@@ -27587,9 +28884,6 @@ msgstr "Keresés most"
 #~ msgid "Composer"
 #~ msgstr "Szerkesztő"
 
-#~ msgid "Default Forward style is: "
-#~ msgstr "A \"Továbbítás\" alapértelmezett stílusa: "
-
 #~ msgid "Edit..."
 #~ msgstr "Szerkesztés..."
 
@@ -27608,15 +28902,9 @@ msgstr "Keresés most"
 #~ msgid "_Email Address:"
 #~ msgstr "_Emailcím:"
 
-#~ msgid "_Log filter actions to:"
-#~ msgstr "Szűrőműveletek _naplózása ide:"
-
 #~ msgid "_Organization:"
 #~ msgstr "_Szervezet:"
 
-#~ msgid "_Send mail in HTML format by default."
-#~ msgstr "A levelet _HTML formátumban küldi alapértelmezésként."
-
 #~ msgid "_Server Type: "
 #~ msgstr "_Kiszolgáló típusa: "
 
@@ -27734,9 +29022,6 @@ msgstr "Keresés most"
 #~ msgid "F"
 #~ msgstr "°F"
 
-#~ msgid "C"
-#~ msgstr "°C"
-
 #~ msgid "Business _Fax"
 #~ msgstr "Üzleti _fax"
 
@@ -27967,9 +29252,6 @@ msgstr "Keresés most"
 #~ "Nem sikerült megnyitni ezt a fájlt: %s:\n"
 #~ "%s"
 
-#~ msgid "%d/%m/%Y"
-#~ msgstr "%d/%m/%Y"
-
 #~ msgid "%Y/%m/%d"
 #~ msgstr "%Y/%m/%d"
 
@@ -28078,9 +29360,6 @@ msgstr "Keresés most"
 #~ msgid "r"
 #~ msgstr "r"
 
-#~ msgid "s"
-#~ msgstr "s"
-
 #~ msgid "t"
 #~ msgstr "t"
 
@@ -28465,9 +29744,6 @@ msgstr "Keresés most"
 #~ msgid "[Fwd: No Subject]"
 #~ msgstr "[Fwd: tárgy nélkül]"
 
-#~ msgid "Forwarded message (no subject)"
-#~ msgstr "Továbbított üzenet (tárgy nélkül)"
-
 #~ msgid ""
 #~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
 #~ "s<br><b>Subject:</b> %s<br>"
@@ -28943,9 +30219,6 @@ msgstr "Keresés most"
 #~ msgid "sign"
 #~ msgstr "aláírás"
 
-#~ msgid "encrypt"
-#~ msgstr "titkosítás"
-
 #~ msgid "PGP"
 #~ msgstr "PGP"
 
@@ -29319,9 +30592,6 @@ msgstr "Keresés most"
 #~ msgid "FIXME: Mark as U_nread"
 #~ msgstr "FIXME: Ne_m olvasottnak jelöl"
 
-#~ msgid "_Object"
-#~ msgstr "_Objektum"
-
 #~ msgid "FIXME: _Item"
 #~ msgstr "FIXME: _Elem"
 
diff --git a/po/it.po b/po/it.po
index 7703233c75..34dab8b222 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
-"POT-Creation-Date: 2003-11-19 17:15+0100\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-11-19 19:43+0100\n"
 "Last-Translator: Marco Ciampa <ciampix@libero.it>\n"
 "Language-Team:  <tp@lists.linux.it>,<it@li.org>\n"
@@ -32,172 +32,179 @@ msgid "Could not read pilot's Address application block"
 msgstr "Impossibile leggere il blocco indirizzi del pilot"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Cartelle di autocompletamento"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Certificates"
 msgstr "Certificati"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "Configura qui l'accesso ai server di directory LDAP"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Configura qui gli account di posta elettronica"
 
 #. Fix me *
 #. can not get name, should be a bug of e-book.Anyway, should set a default name.
 #.
 #. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
 msgid "Contacts"
 msgstr "Contatti"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "Server di directory"
-
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 msgid "Evolution Addressbook"
 msgstr "Rubrica di Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Controllo di configurazione per la rubrica LDAP di Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook address pop-up"
 msgstr "Pop-up della rubrica di Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook address viewer"
 msgstr "Visualizzatore di indirizzi della rubrica di Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook card viewer"
 msgstr "Visualizzatore di card della rubrica di Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Addressbook component"
 msgstr "Componente della rubrica di Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Addressbook folder viewer"
 msgstr "Visualizzatore di cartelle della rubrica di Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution S/Mime Certificate Management Control"
 msgstr "Geatione controllo certificati S/Mime di Evolution"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr ""
+"Controllo di configurazione delle impostazioni delle cartelle di Evolution"
+
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Manager your S/Mime certificates here"
 msgstr "Gestione dei certificati S/Mime"
 
-#: addressbook/gui/component/addressbook-component.c:125
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "New Addressbook"
 msgstr "Nuova rubrica"
 
-#: addressbook/gui/component/addressbook-component.c:126
+#: addressbook/gui/component/addressbook-component.c:146
+#, fuzzy
+msgid "Properties..."
+msgstr "_Proprietà..."
+
+#: addressbook/gui/component/addressbook-component.c:147
 #: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:409 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 msgid "Delete"
 msgstr "Elimina"
 
-#: addressbook/gui/component/addressbook-component.c:127
-#: calendar/gui/calendar-component.c:410
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
 msgid "Rename"
 msgstr "Rinomina"
 
-#: addressbook/gui/component/addressbook-component.c:185
+#: addressbook/gui/component/addressbook-component.c:217
 msgid "New Contact"
 msgstr "Nuovo contatto"
 
-#: addressbook/gui/component/addressbook-component.c:186
+#: addressbook/gui/component/addressbook-component.c:218
 msgid "_Contact"
 msgstr "_Contatti"
 
-#: addressbook/gui/component/addressbook-component.c:187
+#: addressbook/gui/component/addressbook-component.c:219
 msgid "Create a new contact"
 msgstr "Crea un nuovo contatto"
 
-#: addressbook/gui/component/addressbook-component.c:192
+#: addressbook/gui/component/addressbook-component.c:224
 msgid "New Contact List"
 msgstr "Nuova elenco contatti"
 
-#: addressbook/gui/component/addressbook-component.c:193
+#: addressbook/gui/component/addressbook-component.c:225
 msgid "Contact _List"
 msgstr "E_lenco contatti"
 
-#: addressbook/gui/component/addressbook-component.c:194
+#: addressbook/gui/component/addressbook-component.c:226
 msgid "Create a new contact list"
 msgstr "Crea un nuovo elenco contatti"
 
-#: addressbook/gui/component/addressbook-component.c:336
-#: calendar/gui/calendar-component.c:693
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
 msgid "On This Computer"
 msgstr "Su questo computer"
 
 #. orange
-#: addressbook/gui/component/addressbook-component.c:346
-#: calendar/gui/calendar-component.c:701 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
 #: shell/e-config-upgrade.c:1456
 msgid "Personal"
 msgstr "Personale"
 
 #. red
-#: addressbook/gui/component/addressbook-component.c:353
-#: calendar/gui/calendar-component.c:708 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
 #: shell/e-config-upgrade.c:1455
 msgid "Work"
 msgstr "Lavoro"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "Aggiungi server LDAP"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Impossibile creare la directory per il nuovo calendario"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "Connessione al server LDAP non riuscita"
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "L'autenticazione con il server LDAP non riuscita"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "Impossibile eseguire interrogazione su DSE Root"
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "Il server ha risposto con basi di ricerca non supportate"
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Questo server non supporta le informazioni di schema LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "Errore nel caricare le informazioni di schema"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr "Il server non risponde con informazioni di schema valide"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Nome account"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Nome del server"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP non è stato abilitato in questa compilazione di Evolution"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Altri contatti"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -205,7 +212,7 @@ msgstr ""
 "Impossibile aprire questa rubrica. Controllare che \n"
 "il percorso esista e che si abbia il permesso di accedervi."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -215,7 +222,7 @@ msgstr ""
 "che è stata inserita una URI errata, oppure che il server\n"
 "LDAP non è raggiungibile."
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -227,7 +234,7 @@ msgstr ""
 "compilare il programma dai sorgenti CVS dopo aver\n"
 "scaricato Open LDAP dal collegamento sottostante.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -241,44 +248,43 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Impossibile aprire la rubrica"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "Accesso anonimo al server LDAP"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "Autenticazione non riuscita.\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sInserire la password per %s (utente %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "Il nome comincia per"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "L'Email comincia per"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "La categoria è"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Qualunque campo contiene"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Avanzato..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -291,7 +297,7 @@ msgstr ""
 "più specifica o aumentare il limite di risultati nelle preferenze \n"
 "del server di elenchi per questa rubrica."
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -303,31 +309,46 @@ msgstr ""
 "la ricerca più specifica o elevare il limite di tempo del\n"
 "server di elenchi nelle preferenze di questa rubrica."
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "Il backend per questa rubrica è incapace di elaborare questa interrogazione."
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "Il backend per questa rubrica si è rifiutato di eseguire questa "
 "interrogazione."
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "Questa interrogazione non è stata completata con successo."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Qualunque categoria"
 
-#: addressbook/gui/component/addressbook.c:1102
-msgid "URI of the contacts that the control will display"
+#: addressbook/gui/component/addressbook.c:1063
+#, fuzzy
+msgid "UID of the contacts source that the view will display"
 msgstr "URI dei contatti che il controllo visualizzerà"
 
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
+msgstr ""
+
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
@@ -348,6 +369,7 @@ msgstr "  Mostra basi supportate"
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -381,8 +403,9 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "Aggiungi server LDAP"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "Assistente configurazione LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -398,9 +421,9 @@ msgid "Anonymously"
 msgstr "Anonimamente"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -411,48 +434,49 @@ msgstr ""
 "Premere il tasto \"Fine\" per salvare le impostazioni \n"
 "inserite sino a questo punto."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "Connessione"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "_Nome distintivo:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr "Modifica server LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
 msgstr "Indirizzo Email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution utilizzerà questo DN per autenticarsi con il server"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution utilizzerà questo indirizzo Email per autenticarsi con il server"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "Finito"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Generale"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "Assistente configurazione LDAP"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "Gruppo"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Mai"
 
@@ -480,7 +504,7 @@ msgid "S_earch scope: "
 msgstr "Campo della ricerca: "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
 #: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Ricerca in corso"
@@ -542,28 +566,32 @@ msgstr ""
 "le ricerche e per la creazione e modifica dei contatti."
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 "Specificare un nome da mostrare è l'ultimo passo necessario per la "
 "configurazione di un server LDAP."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "Passo 1: informazioni sul server"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "Passo 2: connessione al server"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "Passo 1: informazioni sul server"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "Passo 3: ricerca della directory"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Passo 2: connessione al server"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "Passo 4: mostra il nome"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Passo 3: ricerca della directory"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -575,19 +603,6 @@ msgstr "Basi di ricerca supportate"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"Il primo passo nella configurazione di un server LDAP è fornire il proprio  "
-"nome e le \n"
-"informazioni di sottoscrizione. Chiedere all'amministrazione di sistema se "
-"non si è\n"
-"sicuri di queste informazioni."
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -598,7 +613,7 @@ msgstr ""
 "nelle ricerche e la durata di una ricerca. Per cambiarle rivolgersi \n"
 "all'amministratore di sistema."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -610,7 +625,7 @@ msgstr ""
 "Lasciando in bianco questo campo, la ricerca comincerà alla radice "
 "dell'albero delle directory."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -626,14 +641,14 @@ msgstr ""
 "Un'ampiezza di ricerca di \"uno\" includerà solo le voci un livello sotto la "
 "base.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
+#, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "L'assistente aiuterà ad accedere ai servizi di directory in linea\n"
 "utilizzando server LDAP (Lightweight Directory Access Protocol).\n"
@@ -642,7 +657,7 @@ msgstr ""
 "specifiche circa il server. Per richiedere questo tipo di informazioni \n"
 "contattare l'amministratore di sistema."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -650,7 +665,7 @@ msgstr ""
 "Questo è il nome completo del server ldap. Per esempio \"ldap.miazienda.com"
 "\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -659,7 +674,7 @@ msgstr ""
 "Questo è il numero massimo di voci da scaricare. L'impostazione di un \n"
 "valore troppo grande rallenterà la rubrica."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -669,7 +684,7 @@ msgstr ""
 "impostare questo come \"indirizzo Email\" richiede accesso anonimo al server "
 "ldap."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -679,6 +694,16 @@ msgstr ""
 "Evolution.\n"
 "Serve solo allo scopo di visualizzarlo."
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Questo è il nome del server che risulterà nell'elenco delle cartelle di "
+"Evolution.\n"
+"Serve solo allo scopo di visualizzarlo."
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -709,20 +734,34 @@ msgid "Using email address"
 msgstr "Uso indirizzo Email"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Quando è possibile"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+"Il primo passo nella configurazione di un server LDAP è fornire il proprio  "
+"nome e le \n"
+"informazioni di sottoscrizione. Chiedere all'amministrazione di sistema se "
+"non si è\n"
+"sicuri di queste informazioni."
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "Mostra il nome:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "Limite di _download:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -731,39 +770,39 @@ msgstr "Limite di _download:"
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "Metodo di identificazione:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "_Porta numero:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "_Base della ricerca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "Nome del _server:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "_Timeout (minuti):"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "card"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr "scheda-connessione"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr "scheda-generale"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr "scheda-ricerca"
 
@@ -776,7 +815,7 @@ msgid "Remove All"
 msgstr "Rimuovi tutti"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Rimuovi"
@@ -814,14 +853,10 @@ msgstr "Nome"
 msgid "Source"
 msgstr "Sorgente"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Seleziona contatti dalla rubrica"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "Trova contatto in"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Trova"
@@ -897,7 +932,8 @@ msgid "D_epartment:"
 msgstr "_Dipartimento:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:18
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Dettagli"
 
@@ -963,12 +999,13 @@ msgid "_Categories..."
 msgstr "Ca_tegorie..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:695
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:36
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:108 ui/evolution-tasks.xml.h:18
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
+#: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Elimina"
 
@@ -2089,7 +2126,7 @@ msgid "Esq."
 msgstr "Egr."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Nome e cognome"
 
@@ -2316,9 +2353,9 @@ msgstr "Contatto precedente"
 msgid "Send Message to Contact"
 msgstr "Invia un messaggio al contatto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:76
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Stampa"
@@ -2340,9 +2377,12 @@ msgstr "Sposta nella cartella..."
 msgid "Cut"
 msgstr "Taglia"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copia"
 
@@ -2352,7 +2392,7 @@ msgid "Paste"
 msgstr "Incolla"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "Vista corrente"
 
@@ -2369,166 +2409,171 @@ msgstr ""
 "Evolution"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "* Click here to add a contact *"
-msgstr "* Fare clic qui per aggiungere un contatto *"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Assistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Fax ufficio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Telefono ufficio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Telefono ufficio 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Telefono a cui richiamare"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Telefono auto"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Categorie"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Telefono ditta"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Dipartimento"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "Email 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "Email 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#, fuzzy
+msgid "Family Name"
+msgstr "Nome del campo"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Memorizza come"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "URL libero-occupato"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Indirizzo di casa"
+#, fuzzy
+msgid "Given Name"
+msgstr "Nome del campo"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Fax casa"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Telefono di casa"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Telefono casa 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Telefono auto"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Giordania"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Manager"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Cellulare"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Nickname"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Note"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Ufficio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Altro indirizzo"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Altro fax"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Altro telefono"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Cercapersone"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Telefono principale"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Professione"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Ruolo"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Coniuge"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Qualifica"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Senza nome"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Sito Internet"
 
@@ -2618,10 +2663,18 @@ msgstr "Elenco membri"
 msgid "Job Title"
 msgstr "Qualifica"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Indirizzo di casa"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 msgid "Work Address"
 msgstr "Indirizzo di lavoro"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Altro indirizzo"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 msgid "Home page"
@@ -2632,107 +2685,104 @@ msgstr "Pagina web"
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Completato"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:995
-#: shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Deposito non in linea"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Permesso negato"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Contact not found"
 msgstr "Contatto non trovato"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Contact ID already exists"
 msgstr "ID del contatto esiste già"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Protocollo non supportato"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Annullato"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "Autenticazione non riuscita"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "Autenticazione richiesta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS non disponibile"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "La rubrica non esiste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Altro errore"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Salvare le modifiche?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr "_Annulla"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Errore nell'aggiungere l'elenco"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Error adding contact"
 msgstr "Errore nell'aggiungere un contatto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Errore nella modifica dell'elenco"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying contact"
 msgstr "Errore nella modifica di un contatto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Errore nella rimozione dell'elenco"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 msgid "Error removing contact"
 msgstr "Errore nella rimozione di una contatto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2741,7 +2791,7 @@ msgstr ""
 "L'apertura di %d contatti causerà l'apertura di %d nuove finestre.\n"
 " Visualizzare tutti i contatti indicati?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2750,45 +2800,45 @@ msgstr ""
 "%s esiste già\n"
 "Sovrascriverlo?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "Sovrascrivi"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Errore nel salvare %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "elenco"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 msgid "Move contact to"
 msgstr "Sposta contatto su"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 msgid "Copy contact to"
 msgstr "Copia contatto su"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 msgid "Move contacts to"
 msgstr "Sposta contatti su"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 msgid "Copy contacts to"
 msgstr "Copia contatti su"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "VCard multiple"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard per %s"
@@ -2978,7 +3028,7 @@ msgstr "Margini"
 msgid "Number of columns:"
 msgstr "Numero di colonne:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Opzioni"
 
@@ -3064,7 +3114,9 @@ msgstr "Prova dell'editor dello stile di stampa dei contatti"
 
 #: addressbook/printing/test-contact-print-style-editor.c:56
 msgid "This should test the contact print style editor widget"
-msgstr "Questo dovrebbe controllare il widget dell'editor dello stile di stampa contatti"
+msgstr ""
+"Questo dovrebbe controllare il widget dell'editor dello stile di stampa "
+"contatti"
 
 #: addressbook/printing/test-print.c:52
 msgid "Contact Print Test"
@@ -3111,7 +3163,9 @@ msgstr "Esporta in modalità asincrona"
 #: addressbook/tools/evolution-addressbook-export.c:63
 msgid ""
 "The number of cards in one output file in asychronous mode,default size 100."
-msgstr "Numero di card in un file di uscita in modalità asincrona, il valore predefinito è 100."
+msgstr ""
+"Numero di card in un file di uscita in modalità asincrona, il valore "
+"predefinito è 100."
 
 #: addressbook/tools/evolution-addressbook-export.c:63
 msgid "NUMBER"
@@ -3120,7 +3174,9 @@ msgstr "NUMERO"
 #: addressbook/tools/evolution-addressbook-export.c:91
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
-msgstr "Errore sugli argomenti della riga di comando. Usare l'opzione --help per le istruzioni sull'uso."
+msgstr ""
+"Errore sugli argomenti della riga di comando. Usare l'opzione --help per le "
+"istruzioni sull'uso."
 
 #: addressbook/tools/evolution-addressbook-export.c:105
 msgid "Only support csv or vcard format."
@@ -3227,9 +3283,9 @@ msgid "Evolution's Tasks component"
 msgstr "Componente delle attività di Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1084 calendar/gui/print.c:1797
-#: calendar/gui/tasks-control.c:488
-#: calendar/importers/icalendar-importer.c:711
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
 #: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
 msgid "Tasks"
 msgstr "Attività"
@@ -3238,19 +3294,19 @@ msgstr "Attività"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Servizio di notifica dell'avviso sonoro del calendario di Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Inizio:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Fine:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Allarme di Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Allarme su %s"
@@ -3329,15 +3385,15 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Non chiedere più su questo programma in futuro."
 
-#: calendar/gui/alarm-notify/notify-main.c:154
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Impossibile inizializzare Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:157
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Impossibile inizializzare gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:166
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 "Impossibile creare la fabbrica per il servizio di notifica dell'avviso sonoro"
@@ -3346,19 +3402,153 @@ msgstr ""
 msgid "invalid time"
 msgstr "ora non valida"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "Errore iCalendar"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Colore attività di oggi"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Colore attività di oggi"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr ""
+"Mostra la scadenza degli appuntamenti nelle viste mensili e settimanali"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Anteprime del calendario da stampare"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "Chiedi conferm_a prima di cancellare"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "Chiedi conferm_a prima di cancellare"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Elimina attività completate"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Mostra i _numeri delle settimane"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Il sommario contiene"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "La descrizione contiene"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Il commento contiene"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1134
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Non corrispondenti"
 
@@ -3367,7 +3557,10 @@ msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
 "events."
-msgstr "Questa operazione cancella definitivamente tutti gli eventi più vecchi dell'ammontare di tempo impostato. Se si continua, non sarà più possibile ripristinare questi eventi."
+msgstr ""
+"Questa operazione cancella definitivamente tutti gli eventi più vecchi "
+"dell'ammontare di tempo impostato. Se si continua, non sarà più possibile "
+"ripristinare questi eventi."
 
 #: calendar/gui/calendar-commands.c:376
 msgid "Purge events older than"
@@ -3378,86 +3571,95 @@ msgstr "Elimina eventi più vecchi di"
 msgid "days"
 msgstr "giorni"
 
-#: calendar/gui/calendar-commands.c:479
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A, %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:482 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:484 calendar/gui/calendar-commands.c:489
-#: calendar/gui/calendar-commands.c:491
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:508 calendar/gui/calendar-commands.c:514
-#: calendar/gui/calendar-commands.c:520 calendar/gui/calendar-commands.c:522
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:512
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:348
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "Il calendario '%s' sarà rimosso. Sei sicuro di voler continuare?"
 
-#: calendar/gui/calendar-component.c:388
+#: calendar/gui/calendar-component.c:408
 msgid "Rename this calendar to"
 msgstr "Rinomina questo calendario come"
 
-#: calendar/gui/calendar-component.c:408
+#: calendar/gui/calendar-component.c:428
 msgid "New Calendar"
 msgstr "Nuovo calendario"
 
-#: calendar/gui/calendar-component.c:578
+#: calendar/gui/calendar-component.c:632
 msgid "New appointment"
 msgstr "Nuovo appuntamento"
 
-#: calendar/gui/calendar-component.c:579
+#: calendar/gui/calendar-component.c:633
 msgid "_Appointment"
 msgstr "_Appuntamento"
 
-#: calendar/gui/calendar-component.c:580
+#: calendar/gui/calendar-component.c:634
 msgid "Create a new appointment"
 msgstr "Crea un nuovo appuntamento"
 
-#: calendar/gui/calendar-component.c:585
+#: calendar/gui/calendar-component.c:639
 msgid "New meeting"
 msgstr "Nuova riunione"
 
-#: calendar/gui/calendar-component.c:586
+#: calendar/gui/calendar-component.c:640
 msgid "M_eeting"
 msgstr "Riunion_e"
 
-#: calendar/gui/calendar-component.c:587
+#: calendar/gui/calendar-component.c:641
 msgid "Create a new meeting request"
 msgstr "Crea una nuova richiesta di riunione"
 
-#: calendar/gui/calendar-component.c:592
+#: calendar/gui/calendar-component.c:646
 msgid "New all day appointment"
 msgstr "Nuovo appuntamento giornaliero"
 
-#: calendar/gui/calendar-component.c:593
+#: calendar/gui/calendar-component.c:647
 msgid "All _Day Appointment"
 msgstr "Appuntamento giornaliero"
 
-#: calendar/gui/calendar-component.c:594
+#: calendar/gui/calendar-component.c:648
 msgid "Create a new all-day appointment"
 msgstr "Crea un nuovo appuntamento giornaliero"
 
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
+
 #. create the remote source group
-#: calendar/gui/calendar-component.c:717
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr "Sul Web"
 
@@ -3573,7 +3775,7 @@ msgstr "Invia a:"
 msgid "With these arguments:"
 msgstr "Con questi argomenti:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:46
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr "dialogo1"
 
@@ -3589,6 +3791,10 @@ msgstr "ore"
 msgid "minutes"
 msgstr "minuti"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3621,7 +3827,7 @@ msgstr "Invia una Email"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
 #: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Indice:"
@@ -3651,7 +3857,7 @@ msgstr "termine dell'appuntamento"
 msgid "hour(s)"
 msgstr "ora(e)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minuto(i)"
 
@@ -3705,7 +3911,7 @@ msgstr "Giorni"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Venerdì"
 
@@ -3719,7 +3925,7 @@ msgstr "Minuti"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Lunedì"
 
@@ -3729,7 +3935,7 @@ msgstr "Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Sabato"
 
@@ -3743,7 +3949,7 @@ msgstr "Mostra i _numeri delle settimane"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Domenica"
 
@@ -3761,7 +3967,7 @@ msgstr "Elenco attività"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Giovedì"
 
@@ -3779,7 +3985,7 @@ msgstr "Formato dell'ora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Martedì"
 
@@ -3789,7 +3995,7 @@ msgstr "Inizio settimana:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Mercoledì"
 
@@ -3831,7 +4037,7 @@ msgid "_Fri"
 msgstr "_Ven"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Generale"
 
@@ -3872,28 +4078,28 @@ msgstr "_Mer"
 msgid "before every appointment"
 msgstr "prima di ogni appuntamento"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 "L'evento cancellato è una riunione. Spedire un'avvertimento di cancellazione?"
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Annullare e cancellare questa riunione?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr "L'evento cancellato è assegnato. Spedire una nota di cancellazione?"
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Annullare e cancellare questa attività?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -3901,54 +4107,54 @@ msgstr ""
 "La voce dell'agenda cancellata è stata pubblicata. Spedire un'avviso di "
 "cancellazione?"
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Annullare e cancellare questa voce dell'agenda?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Questo evento è stato cancellato."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Questa attività è stata cancellata."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Questa voce dell'agenda è stata cancellata."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s sono state effettuate delle modifiche. Ignorare le modifiche e chiudere "
 "l'editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s non sono state effettuate modifiche. Chiudere l'editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Questo evento è stato modificato."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Questa attività è stata modificata."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Questa voce dell'agenda è stata modificata."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s sono state effettuate delle modifiche. Ignorare le modifiche ed "
 "aggiornare l'editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s non sono state effettuate modifiche. Aggiornare l'editor?"
@@ -3958,169 +4164,173 @@ msgstr "%s non sono state effettuate modifiche. Aggiornare l'editor?"
 msgid "Validation error: %s"
 msgstr "Errore di validazione: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " a"
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Completato "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Completato "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Scadenza "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Scadenza "
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "Impossibile aggiornare l'oggetto"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Modifica appuntamenti"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Appuntamento - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Attività - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Voce nell'agenda - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Nessuna descrizione"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Salva come..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "I cambiamenti fatti a questo elemento possono essere annullati se arriva un "
 "aggiornamento"
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Impossibile ricevere la versione corrente!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+msgid "Select destination source"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Cancellare l'appuntamento `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Cancellare questo appuntamento senza nome?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Cancellare l'attività `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Cancellare questa attività senza nome?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Cancellare la voce dell'agenda `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Cancellare questa voce dell'agenda senza nome?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Cancellare %d appuntamenti?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Cancellare %d attività?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Cancellare %d voci dell'agenda?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "L'evento non può essere cancellato a causa di un errore corba"
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "L'azione non può essere cancellata a causa di un errore corba"
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 "La voce dell'agenda non può essere cancellata a causa di un errore corba"
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "L'elemento non può essere cancellato a causa di un errore corba"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 "L'evento non può essere cancellato perché ne è stato negato il permesso"
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 "L'azione non può essere cancellata perché ne è stato negato il permesso"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 "La voce dell'agenda non può essere cancellata perché ne è stato negato il "
 "permesso"
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 "L'elemento non può essere cancellato perché ne è stato negato il permesso"
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "L'evento non può essere cancellato a causa di un errore"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr "L'azione non può essere cancellata a causa di un errore"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 msgid "The journal entry could not be deleted due to an error"
 msgstr "La voce dell'agenda non può essere cancellata a causa di un errore"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "L'elemento non può essere cancellato a causa di un errore"
 
@@ -4136,43 +4346,43 @@ msgstr "Delega a:"
 msgid "Enter Delegate"
 msgstr "Inserire delegato"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Appuntamento"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Promemoria"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Ricorrenza"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Pianificazione"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Riunione"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "La data iniziale è errata"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "La data finale è errata"
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "L'ora iniziale è errata"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "L'ora finale è errata"
 
@@ -4241,31 +4451,31 @@ msgid "_Start time:"
 msgstr "_Ora di inizio:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:704
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
 #: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Nessuno"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr "L'organizzazione selezionata non ha più un account"
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "È richiesto un organizzatore."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "È richiesto almeno un partecipante."
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Delega a..."
 
@@ -4306,17 +4516,11 @@ msgid "Member"
 msgstr "Membro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Ruolo"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
@@ -4340,6 +4544,7 @@ msgid "_Invite Others..."
 msgstr "_Invita altri..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "La sorgente con nome '%s' esiste già nel gruppo selezionato"
@@ -4349,7 +4554,9 @@ msgstr "La sorgente con nome '%s' esiste già nel gruppo selezionato"
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
 "from"
-msgstr "Il gruppo '%s' è remoto. Devi specificare una locazione da cui prelevare il calendario"
+msgstr ""
+"Il gruppo '%s' è remoto. Devi specificare una locazione da cui prelevare il "
+"calendario"
 
 #: calendar/gui/dialogs/new-calendar.c:125
 #, c-format
@@ -4370,6 +4577,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Impossibile creare la directory per il nuovo calendario"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 msgid "A group must be selected"
 msgstr "È necessario selezionare un gruppo"
 
@@ -4393,33 +4601,58 @@ msgstr "Locazione calendario"
 msgid "Calendar Name"
 msgstr "Nome calendario"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Impossibile creare la directory per il nuovo calendario"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "<b>opzioni del calendario</b>"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Elenco attività"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Elenco attività"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Elenco attività"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr "Si sta modificando un evento ricorrente. Cosa si vuole modificare?"
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Si sta modificando un'azione ricorrente. Cosa si vuole modificare?"
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 "Si sta modificando una voce giornaliera ricorrente. Cosa si vuole modificare?"
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr "Solo questa istanza"
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 msgid "This and Prior Instances"
 msgstr "Questa e le precedenti istanze"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr "Questa istanza e quelle future"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr "Tutte le istanze"
 
@@ -4472,6 +4705,11 @@ msgstr "il"
 msgid "occurrences"
 msgstr "ricorrenze"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Data/ora:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "A_ggiungi"
@@ -4536,7 +4774,7 @@ msgstr "settimana(e)"
 msgid "year(s)"
 msgstr "anno(i)"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
@@ -4546,35 +4784,35 @@ msgstr ""
 "\n"
 "Salvare le modifiche?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "Non salvare"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 msgid "Save Event"
 msgstr "Salva eventi"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Le informazioni per la riunione sono state create. Inviarle?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 "Le informazioni per la riunione sono cambiate.  Inviare una versione "
 "aggiornata?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "Le informazioni di questa attività sono state create.  Inviarle?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 "Le informazioni di questa attività sono cambiate.  Inviare una versione "
 "aggiornata?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "La data completata è errata"
 
@@ -4585,42 +4823,42 @@ msgstr "% _Completato"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
-#: calendar/gui/print.c:2318
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Completato"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:231
-#: mail/message-list.c:914
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Alta"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
-#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "In corso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:235
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Bassa"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:233 mail/message-list.c:913
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Normale"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:217
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Da cominciare"
 
@@ -4629,7 +4867,7 @@ msgid "Progress"
 msgstr "In corso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Non definita"
 
@@ -4649,21 +4887,21 @@ msgstr "_Stato:"
 msgid "_Web Page:"
 msgstr "Pagina _web:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Di base"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Assegnato"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "La data dovuta è errata"
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr "La data scadenza è precedente alla data di inizio!"
 
@@ -4671,9 +4909,9 @@ msgstr "La data scadenza è precedente alla data di inizio!"
 msgid "Con_fidential"
 msgstr "Con_fidenziale"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Descrizione:"
 
@@ -4778,26 +5016,21 @@ msgstr "%s alle %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s per un'attivazione di tipo sconosciuto"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Pubblico"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Privato"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Confidenziale"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Categorie"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Description"
@@ -4809,11 +5042,12 @@ msgid "Start Date"
 msgstr "Inizio"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1083
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Sommario"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "colore"
 
@@ -4821,13 +5055,12 @@ msgstr "colore"
 msgid "component"
 msgstr "Componente"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Libero"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Occupato"
 
@@ -4839,7 +5072,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "E"
 
@@ -4873,17 +5106,17 @@ msgstr "No"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1647
-#: camel/camel-gpg-context.c:1698 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Sconosciuto"
 
@@ -4895,179 +5128,178 @@ msgstr "Ricorrente"
 msgid "Assigned"
 msgstr "Assegnato"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Aggiornamento elementi in corso"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Rimozione degli elementi selezionati in corso"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Aggiornamento elementi in corso"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Nuovo _appuntamento..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Nuovo _evento del giorno"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "Nuova riunione"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Nuova attività"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:120
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "S_tampa..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:118 ui/evolution-tasks.xml.h:20
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Incolla"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
 #: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Vai a _oggi"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "_Vai alla data..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Rende note le Informazioni sulla disponibilità"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:30
-msgid "_Settings..."
-msgstr "Impostazioni..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:670 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Apri"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:672 mail/em-popup.c:589 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:124
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Salva con nome..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:35
-#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:105
-#: ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Copia"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "Pianifica una riunione..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "Inoltra come iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "_Elimina questa ricorrenza"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Elimina _tutte le ricorrenze"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "Impostazioni..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 msgid "Open _Web Page"
 msgstr "Apri pagina _web"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "_Assegna attività"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "Inoltra come iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "_Segna come completato"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Segna attività come co_mpletata"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "_Elimina le attività selezionate"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Fare clic qui per aggiungere un'attività"
@@ -5081,8 +5313,8 @@ msgstr "% Completato"
 msgid "Alarms"
 msgstr "Avvisi sonori"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1172
-#: camel/camel-filter-driver.c:1267 mail/mail-send-recv.c:576
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Completato"
 
@@ -5111,18 +5343,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5141,7 +5373,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5154,448 +5386,447 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr "start_calendar_server(): %s"
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sì (ricorrenza complessa)"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "Ogni giorno"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "Ogni %d giorni"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "Ogni settimana"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "Ogni %d settimane"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr "Ogni settimana il "
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Ogni %d settimane il "
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " e "
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr "Il giorno %s di "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr "Il %s %s di "
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "ogni mese"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr "ogni %d mesi"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "Ogni anno"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "Ogni %d anni"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr " un totale di %d volte"
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ", che finisce di "
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>Comincia:</b>"
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Finisce:</b>"
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>Completata:</b>"
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>In scadenza:</b>"
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "Informazioni iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "Errore iCalendar"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Partecipante sconosciuto"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 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:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Nessuno</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "Posizione:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:203
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Stato:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Accettata"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Accettato con tentativo"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Annullato"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Specificare un'operazione:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Aggiornare"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:985 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Accettare"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Accettare con tentativo"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Rifiutare"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Invia informazioni sulla disponibilità"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Aggiorna stato risposta"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Invia informazioni correnti"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
 #: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annulla"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, 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:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Dettagli della riunione"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> richiede la presenza di %s ad una riunione."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Proposta di riunione"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Aggiornamento riunione"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Richiesta di aggiornamento sulla riunione"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, 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:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Risposta ad una riunione"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> ha annullato una riunione."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Annullamento riunione"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> ha mandato un messaggio incomprensibile."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Messaggio di richiesta riunione non valido"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Informazioni sull'attività"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> richiede che %s eseguito un compito."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, 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:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Proposta di attività"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, 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:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Aggiornamento attività"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, 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:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Richiesta di aggiornamento dell'attività"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, 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:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Risposta all'attività"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> ha annullato un'attività."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Annullamento attività"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Messaggio di attività errato"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, 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:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Informazioni sulla disponibilità"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, 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:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Richiesta disponibilità"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, 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:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Risposta disponibilità"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Messaggio di disponibilità errato"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr "Il messaggio non sembra ben impostato"
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "Il messaggio contiene solo richieste di tipo non supportato."
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 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:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr "L'allegato non ha nessun elemento di calendario visibile"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "Impossibile aggiornare il file di calendario!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Aggiornamento completato\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Impossibile aggiornare lo stato del partecipante dato che l'elemento non "
 "esiste più"
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "L'oggetto non è valido e non può essere aggiornato\n"
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Questa risposta non proviene da un partecipante. Aggiungerlo come "
 "partecipante?"
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 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:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr "Si è verificato un errore nel sistema CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr "Impossibile trovare l'oggetto\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Non si possiedono i diritti necessari per aggiornare il calendario\n"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Stato del partecipante aggiornato\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "Impossibile aggiornare lo stato del partecipante!\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Rimozione completata"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Elemento spedito!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "L'elemento non può essere spedito!\n"
 
@@ -5755,7 +5986,7 @@ msgstr "%a %m/%d/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
@@ -5847,12 +6078,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:739 calendar/gui/gnome-cal.c:1764
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Non si possiedono i permessi necessari per aprire la cartella in `%s'"
 
-#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1978
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5861,39 +6092,39 @@ msgstr ""
 "Errore su %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:959
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "Completamento azioni..."
 
-#: calendar/gui/e-tasks.c:982
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "Rimozione degli oggetti selezionati..."
 
-#: calendar/gui/e-tasks.c:1007
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "Pulizia"
 
-#: calendar/gui/gnome-cal.c:1603 mail/importers/netscape-importer.c:1843
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
 msgid "Calendar"
 msgstr "Calendario"
 
-#: calendar/gui/gnome-cal.c:1736
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Impossibile aprire la cartella in `%s'"
 
-#: calendar/gui/gnome-cal.c:1750
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Il metodo richiesto per aprire `%s' non è supportato"
 
-#: calendar/gui/gnome-cal.c:1807
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Aggiunta segnalazioni per %s"
 
-#: calendar/gui/gnome-cal.c:1999
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5905,7 +6136,7 @@ msgstr ""
 "è andato in crash. Per utilizzarlo nuovamente è necessario riavviare "
 "Evolution"
 
-#: calendar/gui/gnome-cal.c:2007
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5917,7 +6148,7 @@ msgstr ""
 "è andato in crash. Per utilizzarlo nuovamente è necessario riavviare "
 "Evolution"
 
-#: calendar/gui/gnome-cal.c:2847
+#: calendar/gui/gnome-cal.c:2848
 msgid "Purging"
 msgstr "Pulizia"
 
@@ -5977,296 +6208,335 @@ msgstr "Ottobre"
 msgid "September"
 msgstr "Settembre"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "È necessario impostare un organizer."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "È richiesto almeno un partecipante"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Informazioni sul calendario"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Informazioni sull'attività"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Informazioni sull'agenda"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Informazioni sulla disponibilità"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Informazioni di calendario"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Aggiornato"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "Contro-proposta"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informazioni sulla disponibilità (da %s a %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "Informazioni iCalendar"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "È richiesta la propria partecipazione all'evento."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Gi"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Giorno selezionato (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Settimana selezionata (%s  - %s) "
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Mese selezionato (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Anno selezionato (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Attività"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Stato: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorità: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percentuale completata: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorie: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Contatti: "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:565 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Anteprima di stampa"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Stampa elemento"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Impostazione pagina"
 
+#: calendar/gui/tasks-component.c:338
+#, fuzzy, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr "Il calendario '%s' sarà rimosso. Sei sicuro di voler continuare?"
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Rinomina questo calendario come"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Elenco attività"
+
+#: calendar/gui/tasks-component.c:590
+#, fuzzy
+msgid "New task"
+msgstr "Nuova attività"
+
+#: calendar/gui/tasks-component.c:591
+#, fuzzy
+msgid "_Task"
+msgstr "_Attività"
+
+#: calendar/gui/tasks-component.c:592
+#, fuzzy
+msgid "Create a new task"
+msgstr "Crea un nuovo contatto"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "La URI della cartella delle attività da visualizzare"
 
-#: calendar/gui/tasks-control.c:449
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6279,11 +6549,11 @@ msgstr ""
 "\n"
 "Cancellare comunque queste attività?"
 
-#: calendar/gui/tasks-control.c:452
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Non chiedere più in futuro."
 
-#: calendar/gui/tasks-control.c:594
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "Stampa Azioni"
 
@@ -6311,15 +6581,15 @@ msgstr "File iCalendar (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "File vCalendar (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:464
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "Promemoria!"
 
-#: calendar/importers/icalendar-importer.c:704
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "Eventi del Calendario"
 
-#: calendar/importers/icalendar-importer.c:729
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6327,7 +6597,7 @@ msgstr ""
 "Evolution ha trovato i file di Calendario di Gnome.\n"
 "Si desidera importarli in Evolution?"
 
-#: calendar/importers/icalendar-importer.c:736
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Calendario di Gnome"
 
@@ -7938,63 +8208,63 @@ msgstr "È necessario essere collegati per completare questa operazione"
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Impossibile creare pipe a '%s': %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:553
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Impossibile creare processo figlio '%s': %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Flusso di messaggi non valido ricevuto da %s: %s"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:948
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Sincronizzazione cartelle"
 
-#: camel/camel-filter-driver.c:1037 camel/camel-filter-driver.c:1410
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Errore nel filtro di smistamento: %s: %s"
 
-#: camel/camel-filter-driver.c:1046 camel/camel-filter-driver.c:1416
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Errore nell'esecuzione del filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:1113
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Impossibile aprire la cartella per lo spool"
 
-#: camel/camel-filter-driver.c:1122
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Impossibile operare sulla cartella per lo spool"
 
-#: camel/camel-filter-driver.c:1137
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Ricezione del messaggio %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1141
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Impossibile aprire il messaggio"
 
-#: camel/camel-filter-driver.c:1142 camel/camel-filter-driver.c:1154
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Errore al messaggio %d"
 
-#: camel/camel-filter-driver.c:1168 camel/camel-filter-driver.c:1262
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Sincronizzazione cartella"
 
-#: camel/camel-filter-driver.c:1229
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Ricezione messaggio %d di %d"
 
-#: camel/camel-filter-driver.c:1244
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Errore al messaggio %d di %d"
@@ -8011,7 +8281,7 @@ msgstr "Argomenti non validi per (flag di sistema)"
 msgid "Invalid arguments to (user-tag)"
 msgstr "Argomenti non validi per (selezione utente)"
 
-#: camel/camel-filter-search.c:676 camel/camel-filter-search.c:684
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Errore nell'esecuzione della ricerca con filtro: %s: %s"
@@ -8043,36 +8313,36 @@ msgstr "(match-all) richiede un singolo risultato booleano"
 msgid "Performing query on unknown header: %s"
 msgstr "É stata effettuata una ricerca su un header sconosciuto: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Impossibile aggiungere un messaggio a %s (operazione non supportata)"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Impossibile ricercare attraverso un'espressione in %s (operazione non "
 "supportata)"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Impossibile cercare attraverso l'uid in %s (operazione non supportata)"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Trasferimento dei messaggi in corso"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr "Copia messaggi in corso"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 msgid "Filtering new message(s)"
 msgstr "Filtraggio nuovi messaggi"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8083,15 +8353,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr "Analisi userid hint gpg non riuscita."
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr "Analisi richiesta passphrase gpg non riuscita."
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8100,32 +8370,32 @@ msgstr ""
 "È necessaria una passphrase per sbloccare la chiave\n"
 "per l'utente: \"%s\""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1410 camel/camel-gpg-context.c:1490
-#: camel/camel-gpg-context.c:1597 mail/mail-send-recv.c:572
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Annullato."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Sblocco della chiave segreta non riuscito: sono state fornite 3 passphrases "
 "errate."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Risposta inaspettata da GnuPG: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr "Nessun dato fornito"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Impossibile cifrare: nessun destinatario valido specificato."
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8136,59 +8406,61 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Impossibile elaborare con GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:406
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Impossibile generare i dati per la firma: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1646
-#: camel/camel-gpg-context.c:1697
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Esecuzione di gpg non riuscita: %s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1402
-#: camel/camel-gpg-context.c:1483 camel/camel-gpg-context.c:1506
-#: camel/camel-gpg-context.c:1590 camel/camel-gpg-context.c:1614
-#: camel/camel-gpg-context.c:1668 camel/camel-gpg-context.c:1719
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr "Esecuzione di gpg non riuscita."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "Questa parte del messaggio è firmata"
 
-#: camel/camel-gpg-context.c:1369 camel/camel-gpg-context.c:1378
-#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:709
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
 msgid "Cannot verify message signature: Incorrect message format"
-msgstr "Impossibile verificare la firma del messaggio: formato messaggio non valido"
+msgstr ""
+"Impossibile verificare la firma del messaggio: formato messaggio non valido"
 
-#: camel/camel-gpg-context.c:1385
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Impossibile verificare la firma di questo messaggio: impossibile creare un "
 "file temporaneo: %s"
 
-#: camel/camel-gpg-context.c:1466
+#: camel/camel-gpg-context.c:1473
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Impossibile generare i dati per la crittografia: %s"
 
-#: camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1531
 msgid "This is a digitally encrypted message part"
 msgstr "Questa parte del messaggio è cifrata"
 
-#: camel/camel-gpg-context.c:1621 camel/camel-smime-context.c:963
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
 msgid "Encrypted content"
 msgstr "Contenuto cifrato"
 
-#: camel/camel-gpg-context.c:1625
+#: camel/camel-gpg-context.c:1632
 msgid "Unable to parse message content"
 msgstr "Impossibile elaborare i contenuti del messaggio"
 
@@ -8296,7 +8568,7 @@ msgstr "Fallita la decrittografazione della parte MIME: errore di protocollo"
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "Impossibile decrittografare la parte MIME: struttura non valida"
 
-#: camel/camel-multipart-signed.c:691
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "Errore di analisi del testo"
 
@@ -8701,6 +8973,16 @@ msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Impossibile creare una cartella: operazione non supportata in questo archivio"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Cestino"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+msgid "Junk"
+msgstr "Da cestinare"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "Impossibile ricevere il certificato dall'emittente"
@@ -9074,53 +9356,68 @@ msgid "Failed to cache %s: %s"
 msgstr "Impossibile inserire nella cache %s: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Connessione al server..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Connessione al server LDAP non riuscita"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "Comando della shell"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Controllo nuova posta"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 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
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Cartelle"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Mostra solo le cartelle a cui sei iscritto"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "Sovrasrive gli spazi per i nomi delle cartelle forniti dal server"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Spazio per il Nome"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Applicare filtri ai nuovi messaggi nella INBOX su questo server"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 msgid "Automatically synchronize remote mail locally"
 msgstr "Sincronizza la posta remota localmente automaticamente"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Per leggere e memorizzare la posta su server IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Password"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9649,7 +9946,7 @@ msgstr "Impossibile chiudere la cartella sorgente %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Impossibile chiudere la cartella temporanea: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Impossibile rinominare la cartella: %s"
@@ -9931,7 +10228,7 @@ msgstr "Elimina dopo %s giorno(i)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Disabilita il supporto per tutte le estensioni POP3"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -10020,7 +10317,7 @@ msgid "No such folder `%s'."
 msgstr "Cartella `%s' non presente."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10075,7 +10372,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Posta consegnata attraverso il programma sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10369,7 +10666,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "allegato"
 
@@ -10413,11 +10710,11 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "È preferibile la visualizzazione automatica degli allegati"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 msgid "You need to configure an account before you can compose mail."
 msgstr "È necessario configurare un'account prima di poter comporre una Email."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Fare clic qui per la rubrica"
 
@@ -10428,46 +10725,46 @@ msgstr "Fare clic 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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Rispondi-a:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Da:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Oggetto:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Inserire i destinatari del messaggio"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 "Indicare gli indirizzi che riceveranno una copia conforme del messaggio"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10478,14 +10775,19 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Invia a:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr "Destinatario"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Allega un file al messaggio"
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "File allegati"
@@ -10493,13 +10795,17 @@ msgstr "File allegati"
 #: composer/e-msg-composer.c:651
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
-msgstr "Impossibile firmare i messaggi in uscita: nessun set di certificati impostato per questo account"
+msgstr ""
+"Impossibile firmare i messaggi in uscita: nessun set di certificati "
+"impostato per questo account"
 
 #: composer/e-msg-composer.c:657
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
-msgstr "Impossibile crittografare il messaggio in uscita: non è stato impostato nessun certificato di crittografazione per l'account"
+msgstr ""
+"Impossibile crittografare il messaggio in uscita: non è stato impostato "
+"nessun certificato di crittografazione per l'account"
 
 #: composer/e-msg-composer.c:788
 #, c-format
@@ -10519,21 +10825,21 @@ msgstr "Il file esiste, sovrascriverlo?"
 msgid "Error saving file: %s"
 msgstr "Errore nel salvare il file: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Errore nel caricare il file: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Errore di accesso al file: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Impossibile scaricare messaggi dall'editor"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10542,7 +10848,7 @@ msgstr ""
 "Impossibile cercare il file: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10551,7 +10857,7 @@ msgstr ""
 "Impossibile troncare il file: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10560,7 +10866,7 @@ msgstr ""
 "Impossibile copiare il descrittore di file: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10569,7 +10875,7 @@ msgstr ""
 "Errore nel salvataggio automatico del messaggio: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10578,7 +10884,7 @@ msgstr ""
 "precedente.\n"
 "Si desidera tentare di recuperarli?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10589,28 +10895,28 @@ msgstr ""
 "\n"
 "Salvare le modifiche?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Attenzione: messaggio modificato"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Apri file"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "Firma:"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "Autogenerata"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Componi un nuovo messaggio"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10618,7 +10924,7 @@ msgstr ""
 "Impossibile creare una finestra di composizione:\n"
 "impossibile attivare il controllo del selettore di indirizzi."
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10630,7 +10936,7 @@ msgstr ""
 "Assicurarsi di aver installato la versione corretta\n"
 "di gtkhtml e libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10638,7 +10944,7 @@ msgstr ""
 "Impossibile creare la finestra di composizione:\n"
 "il componente HTML non è disponibile."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10647,11 +10953,13 @@ msgstr ""
 "modificare.)<b>"
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "The Evolution groupware suite"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10908,13 +11216,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11047,19 +11355,19 @@ msgstr ""
 "Errore nell'espressione regolare `%s':\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Importante"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "Da fare"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Più tardi"
@@ -11164,7 +11472,7 @@ msgstr "fa"
 msgid "months"
 msgstr "mesi"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr " secondi"
 
@@ -11261,7 +11569,7 @@ msgstr "Espressione"
 msgid "Follow Up"
 msgstr "Segue"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:703
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "Etichetta"
 
@@ -11342,8 +11650,9 @@ msgstr "Specifica header"
 msgid "Stop Processing"
 msgstr "Arresta processo in corso"
 
-#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1462 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Oggetto"
 
@@ -11440,7 +11749,7 @@ msgid "starts with"
 msgstr "comincia per"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:918
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Il nome della regola '%s' non è unico, scegline un altro."
@@ -11526,7 +11835,7 @@ msgstr "Visualizzatore delle le cartelle di posta di Evolution"
 msgid "Evolution Mail preferences control"
 msgstr "Controllo delle preferenze della posta di Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:773
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
 #: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
 #: mail/importers/pine-importer.c:572
 msgid "Mail"
@@ -11536,7 +11845,7 @@ msgstr "Posta"
 msgid "Mail Accounts"
 msgstr "Account di posta"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
 msgid "Mail Preferences"
 msgstr "Preferenze di posta"
 
@@ -11581,7 +11890,7 @@ msgid "Protocol"
 msgstr "Protocollo"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr "Senza nome"
 
@@ -11605,20 +11914,17 @@ msgstr "Aggiungi firma script"
 msgid "Signature(s)"
 msgstr "Firme"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "Si sta spedendo un messaggio formattato in HTML. Verificare che\n"
 "i seguenti destinatari vogliano e possano ricevere posta in HTML:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Inviare comunque?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11626,7 +11932,7 @@ msgstr ""
 "Questo messaggio non ha l'oggetto.\n"
 "Inviare lo stesso?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11635,11 +11941,11 @@ msgstr ""
 "per nascondere gli indirizzi dell'elenco, questo messaggio contiene solo "
 "destinatari Bcc."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Questo messaggio contiene solo destinatari Bcc."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11649,11 +11955,11 @@ msgstr ""
 "header Apparently-To.\n"
 "Inviare lo stesso?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "È necessario specificare dei destinatari per inviare questo messaggio."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11670,222 +11976,401 @@ msgstr "Crea una cartella _virtuale dalla ricerca..."
 msgid "<click here to select a folder>"
 msgstr "<fare clic qui per selezionare una cartella>"
 
-#: mail/em-folder-selector.c:234
-msgid "Folder _name"
-msgstr "_Nome cartella"
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Crea nuova cartella"
 
-#: mail/em-folder-view.c:589 mail/em-folder-view.c:603
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Specificare dove creare la cartella:"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
+msgstr "_Nome della cartella:"
+
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Impossibile creare una directory temporanea: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Impossibile creare una directory temporanea: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Impossibile creare una directory temporanea: %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Impossibile chiudere la cartella temporanea: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+#, fuzzy
+msgid "Loading..."
+msgstr "In attesa..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Scegli cartella"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Crea nuova cartella"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Impossibile cancellare la cartella `%s': %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Cancellare la cartella \"%s\"?"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Elimina \"%s\""
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Rinominare la cartella \\\"%s\\\" in:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+msgid "Rename Folder"
+msgstr "Rinomina cartella"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr "Una cartella di nome \"%s\" esiste già. Usare un altro nome."
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Proprietà caratteri"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+#, fuzzy
+msgid "Properties"
+msgstr "_Proprietà..."
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "Nome della cartella:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Visualizza"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Apri in una nuova _finestra"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Sposta"
+
+#: mail/em-folder-tree.c:1500
+#, fuzzy
+msgid "_New Folder..."
+msgstr "Nuova cartella virtuale"
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "_Rinomina"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "_Proprietà..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:671 mail/em-popup.c:588
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "_Modifica come nuovo messaggio..."
 
-#: mail/em-folder-view.c:673
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "S_tampa"
 
-#: mail/em-folder-view.c:676 ui/evolution-mail-message.xml.h:122
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Rispondi al mittente"
 
-#: mail/em-folder-view.c:677 mail/em-popup.c:649
-#: ui/evolution-mail-message.xml.h:84
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Rispondi alla _lista"
 
-#: mail/em-folder-view.c:678 mail/em-popup.c:650
-#: ui/evolution-mail-message.xml.h:83
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Rispondi a _tutti"
 
-#: mail/em-folder-view.c:679 mail/em-popup.c:652
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "_Inoltra"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr "Segue..."
 
-#: mail/em-folder-view.c:683
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr "Flag completata"
 
-#: mail/em-folder-view.c:684
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "Flag annullata"
 
-#: mail/em-folder-view.c:687 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Segna come _letto"
 
-#: mail/em-folder-view.c:688
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "Segna come non letto"
 
-#: mail/em-folder-view.c:689
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Segna come _importante"
 
-#: mail/em-folder-view.c:690
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "Segna come non i_mportante"
 
-#: mail/em-folder-view.c:691 ui/evolution-mail-message.xml.h:51
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
 msgid "Mark as _Junk"
 msgstr "Segna come _da cancellare"
 
-#: mail/em-folder-view.c:692 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
 msgid "Mark as _Not Junk"
 msgstr "Segna come _non da cancellare"
 
-#: mail/em-folder-view.c:696
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "_Ripristina"
 
-#: mail/em-folder-view.c:699
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "_Sposta nella cartella..."
 
-#: mail/em-folder-view.c:700 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Copia nella cartella..."
 
-#: mail/em-folder-view.c:708
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "Aggiungi mittente alla ru_brica"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "Applica _filtri"
 
-#: mail/em-folder-view.c:714
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "Crea re_gola dal messaggio"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "Cartella virtuale sull'_oggetto"
 
-#: mail/em-folder-view.c:716
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "Cartella virtuale sul _mittente"
 
-#: mail/em-folder-view.c:717
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "Cartella virtuale sui _destinatari"
 
-#: mail/em-folder-view.c:718
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "Cartella virtuale sulla mailing _list"
 
-#: mail/em-folder-view.c:720
+#: mail/em-folder-view.c:730
 msgid "VFolder on Thread"
 msgstr "Cartella virtuale sull'argomento"
 
-#: mail/em-folder-view.c:724
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Filtro sull'_oggetto"
 
-#: mail/em-folder-view.c:725
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Filtro sul _mittente"
 
-#: mail/em-folder-view.c:726
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Filtro sui _destinatari"
 
-#: mail/em-folder-view.c:727
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Filtro sulla _mailing list"
 
-#: mail/em-folder-view.c:729
+#: mail/em-folder-view.c:739
 msgid "Filter on Thread"
 msgstr "Filtro sull'argomento"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1507 mail/em-folder-view.c:1545
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Predefinito"
 
-#: mail/em-folder-view.c:1579
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Stampa messaggio"
 
-#: mail/em-folder-view.c:1820
+#: mail/em-folder-view.c:1825
 msgid "_Copy Link Location"
 msgstr "_Copia indirizzo del collegamento"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, c-format
 msgid "Matches: %d"
 msgstr "Corrisponde: %d"
 
-#: mail/em-format-html-display.c:570
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Assegnato"
+
+#: mail/em-format-html-display.c:597
 msgid ""
 "This message is not signed.  There is no guarantee the sender of the message "
 "is authentic."
-msgstr "Questo messaggio non è firmato. Non c'è garanzia che il mittente sia autentico."
+msgstr ""
+"Questo messaggio non è firmato. Non c'è garanzia che il mittente sia "
+"autentico."
 
-#: mail/em-format-html-display.c:571
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Firma errata"
+
+#: mail/em-format-html-display.c:598
 msgid ""
 "This message is signed and is valid, the sender of this message is very "
 "likely who they claim to be."
-msgstr "Questo messaggio è firmato ed è valido. Chi ha spedito il messaggio è molto probabilmente chi sostiene di essere."
+msgstr ""
+"Questo messaggio è firmato ed è valido. Chi ha spedito il messaggio è molto "
+"probabilmente chi sostiene di essere."
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Firma errata"
 
-#: mail/em-format-html-display.c:572
+#: mail/em-format-html-display.c:599
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
-msgstr "La firma di questo messaggio non può essere verificata. Può essere stata alterata durante il transito."
+msgstr ""
+"La firma di questo messaggio non può essere verificata. Può essere stata "
+"alterata durante il transito."
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
 
-#: mail/em-format-html-display.c:573
+#: mail/em-format-html-display.c:600
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
-msgstr "Il messaggio è firmato con una firma valida ma chi ha spedito il messaggio non può essere verificato."
+msgstr ""
+"Il messaggio è firmato con una firma valida ma chi ha spedito il messaggio "
+"non può essere verificato."
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Interrotto"
 
-#: mail/em-format-html-display.c:579
+#: mail/em-format-html-display.c:606
 msgid ""
 "This message is not encrypted.  It's content may be viewed in transit across "
 "The Internet."
-msgstr "Il messaggio non è crittografato. Il suo contenuto può essere letto durante il tragitto attraverso Internet."
+msgstr ""
+"Il messaggio non è crittografato. Il suo contenuto può essere letto durante "
+"il tragitto attraverso Internet."
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+#, fuzzy
+msgid "Encrypted, weak"
+msgstr "Contenuto cifrato"
 
-#: mail/em-format-html-display.c:580
+#: mail/em-format-html-display.c:607
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
-msgstr "Il messaggio è crittografato, ma con un algoritmo di crittografia debole. È difficile, ma non impossibile che un estraneo abbia letto il contenuto di questo messaggio in un tempo ragionevolmente breve."
+msgstr ""
+"Il messaggio è crittografato, ma con un algoritmo di crittografia debole. È "
+"difficile, ma non impossibile che un estraneo abbia letto il contenuto di "
+"questo messaggio in un tempo ragionevolmente breve."
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "Cifra con PGP"
 
-#: mail/em-format-html-display.c:581
+#: mail/em-format-html-display.c:608
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
-msgstr "Questo messaggio è crittografato. È difficile che un estraneo possa leggere il contenuto del messaggio."
+msgstr ""
+"Questo messaggio è crittografato. È difficile che un estraneo possa leggere "
+"il contenuto del messaggio."
 
-#: mail/em-format-html-display.c:582
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+#, fuzzy
+msgid "Encrypted, strong"
+msgstr "Contenuto cifrato"
+
+#: mail/em-format-html-display.c:609
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
-msgstr "Questo messaggio è crittografato con un algoritmo di crittografia forte. Dovrebbe essere molto difficile che un estraneo riesca a vedere il contenuto di questo messaggio in un tempo ragionevole."
+msgstr ""
+"Questo messaggio è crittografato con un algoritmo di crittografia forte. "
+"Dovrebbe essere molto difficile che un estraneo riesca a vedere il contenuto "
+"di questo messaggio in un tempo ragionevole."
 
-#: mail/em-format-html-display.c:703 mail/em-format-html.c:591
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Impossibile interpretare il messaggio S/MIME: errore sconosciuto"
 
-#: mail/em-format-html-display.c:826
-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/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+msgid "Unsupported signature format"
+msgstr "Formato firma non supportato"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Impossibile verificare la firma foglia"
 
 #: mail/em-format-html-display.c:917
 msgid "_View Inline"
@@ -11900,104 +12385,86 @@ msgstr "_Nascondi"
 msgid "Page %d of %d"
 msgstr "Pagina %d di %d"
 
-#: mail/em-format-html.c:454 mail/em-format-html.c:456
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Scaricamento di '%s'"
 
-#: mail/em-format-html.c:803
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Parte esterna del messaggio malformulata."
 
-#: mail/em-format-html.c:833
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntatore al sito FTP (%s)"
 
-#: mail/em-format-html.c:844
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Puntatore al file locale (%s) valido al sito \"%s\""
 
-#: mail/em-format-html.c:846
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntatore a un file locale (%s)"
 
-#: mail/em-format-html.c:867
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntatore a dati remoti (%s)"
 
-#: mail/em-format-html.c:878
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntatore a dati esterni sconosciuti (tipo \"%s\")"
 
-#: mail/em-format-html.c:1000 mail/em-format.c:1215
-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/em-format-html.c:1001 mail/em-format.c:1213
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Questo messaggio ha una firma digitale riscontrata come autentica."
-
-#: mail/em-format-html.c:1023 mail/em-format.c:1188
-msgid "Session not initialised"
-msgstr "Sessione non inizializzata"
-
-#: mail/em-format-html.c:1034 mail/em-format.c:1199
-msgid "Unsupported signature format"
-msgstr "Formato firma non supportato"
-
-#: mail/em-format-html.c:1083
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Impossibile interpretare il messaggio MIME.  Viene visualizzato il sorgente."
 
-#: mail/em-format-html.c:1172
+#: mail/em-format-html.c:1141
 msgid "Formatting message"
 msgstr "Formattazione messaggio in corso"
 
-#: mail/em-format-html.c:1447 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Da"
 
-#: mail/em-format-html.c:1449 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Rispondi-a"
 
-#: mail/em-format-html.c:1451 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "A"
 
-#: mail/em-format-html.c:1453 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1455 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1474
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "Gestore di posta"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1501
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1504
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1515 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
@@ -12007,61 +12474,112 @@ msgstr "Data"
 msgid "%s attachment"
 msgstr "%s allegato"
 
-#: mail/em-popup.c:598
+#: mail/em-format.c:1185
+msgid "Session not initialised"
+msgstr "Sessione non inizializzata"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Questo messaggio ha una firma digitale riscontrata come autentica."
+
+#: mail/em-format.c:1212
+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/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "In attesa..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Ping a %s"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Impossibile inserire nella cache %s: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Impossibile creare pipe a '%s': %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Risoluzione host '%s' non riuscita: %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Salva con nome..."
 
-#: mail/em-popup.c:646
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr "Imposta come _sfondo"
 
-#: mail/em-popup.c:648
+#: mail/em-popup.c:649
 msgid "_Reply to sender"
 msgstr "_Rispondi al mittente"
 
-#: mail/em-popup.c:685
+#: mail/em-popup.c:697
 msgid "_Open Link in Browser"
 msgstr "Apri il c_ollegamento nel navigatore"
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:698
 msgid "Se_nd message to..."
 msgstr "Invia un _messaggio a..."
 
-#: mail/em-popup.c:687
+#: mail/em-popup.c:699
 msgid "_Add to Addressbook"
 msgstr "_Aggiungi alla rubrica"
 
-#: mail/em-popup.c:793
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Apri in %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "Questo store non supporta le sottoscrizioni o non sono abilitate."
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 msgid "Subscribed"
 msgstr "Iscritto"
 
-#: mail/em-subscribe-editor.c:612
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Cartella"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Selezionare un server."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Nessun server è stato selezionato"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Non mostrare questo messagio in futuro."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12070,25 +12588,25 @@ msgstr ""
 "Errore nel caricare le informazioni dei filtri:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 msgid "-------- Forwarded Message --------"
 msgstr "------- Messaggio inoltrato -------"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "un mittente sconosciuto"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Lì %A, %Y/%m/%d alle %H:%M, %%+05d, %%s ha scritto:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12097,7 +12615,7 @@ msgstr ""
 "Impossibile salvare su: `%s'\n"
 " %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12106,23 +12624,24 @@ msgstr ""
 "`%s' esiste già.\n"
 "Sovrascriverlo?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 msgid "message"
 msgstr "messaggio"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 msgid "Save Message..."
 msgstr "Salva messaggio..."
 
-#: mail/em-utils.c:1893
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Impossibile creare una directory temporanea: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Indirizzo"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12132,6 +12651,401 @@ msgstr ""
 "\n"
 "Cancellare comunque questi messaggi?"
 
+#: mail/em-utils.c:2288
+#, fuzzy
+msgid ""
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Questa operazione cancella definitivamente tutti i messaggi marcati come "
+"cancellati.\n"
+"Se si continua, non sarà più possibile ripristinare questi messaggi.\n"
+"\n"
+"Cancellare comunque questi messaggi?"
+
+#: mail/evolution-mail.schemas.in.in.h:1
+msgid "Automatic link recognition"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:2
+msgid "Automatic smiley recognition"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
+msgid "Default charset in which to compose messages"
+msgstr "Oggetto predefinito del messaggio."
+
+#: mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
+msgid "Default charset in which to compose messages."
+msgstr "Oggetto predefinito del messaggio."
+
+#: mail/evolution-mail.schemas.in.in.h:8
+#, fuzzy
+msgid "Default charset in which to display messages"
+msgstr "Effettua una ricerca nel messaggio visualizzato"
+
+#: mail/evolution-mail.schemas.in.in.h:9
+#, fuzzy
+msgid "Default charset in which to display messages."
+msgstr "Effettua una ricerca nel messaggio visualizzato"
+
+#: mail/evolution-mail.schemas.in.in.h:10
+#, fuzzy
+msgid "Default forward style"
+msgstr "Stile inoltro:"
+
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default reply style"
+msgstr "Stile _risposta:"
+
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Empty Trash folders on exit"
+msgstr "Svuota cestino all'uscita"
+
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Svuota cestino all'uscita"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
+msgstr "Account di posta"
+
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "Esegui le azioni"
+
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Notifica nuova posta"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Notifica nuova posta"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+"Chiedi conferma _prima di inviare messaggi HTML a contatti che non li "
+"desiderano"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "Segnala l'invio di messaggi con solo destinatari _Bcc"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "Invio posta in HTML?"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "Invio posta in HTML?"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "Mostra immagini animate"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "Mostra immagini animate"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Mostra messaggio in stile normale"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "_Anteprima"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "Avvisa con un segnale acustico quando arriva nuova posta"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "Controllo ortografico"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "Carattere del _terminale:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "Seleziona carattere HTML a larghezza variabile per la stampa"
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Elenca per discussioni"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Elenca per discussioni"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "Imposta co_me account predefinito"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "Larghezza variabile:"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr "Importatore Elm di Evolution."
@@ -12259,10 +13173,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution sta importando i vecchi dati di Netscape"
 
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1119
-msgid "Trash"
-msgstr "Cestino"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Scansione filtri di posta"
@@ -12271,7 +13181,7 @@ msgstr "Scansione filtri di posta"
 msgid "Scanning directory"
 msgstr "Scansione cartella"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Inizio importazione"
 
@@ -12346,19 +13256,19 @@ msgid "You have not filled in all of the required information."
 msgstr "Non sono state fornite tutte le informazioni richieste."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Editor degli account di Evolution"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "_Nome utente:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Percorso:"
 
@@ -12371,35 +13281,35 @@ msgstr "Non è possibile creare due account con lo stesso nome."
 msgid "Mail to %s"
 msgstr "Posta a %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Oggetto è %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Mail da %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s mailing list"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, c-format
 msgid "Replies to %s"
 msgstr "Risposta a %s"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Aggiungi una regola di filtro"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "Le seguenti regole di filtro:\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12410,23 +13320,23 @@ msgstr ""
 "    '%s'\n"
 "e quindi sono state aggiornate."
 
-#: mail/mail-component.c:211
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr "Su questo computer"
 
-#: mail/mail-component.c:362
+#: mail/mail-component.c:379
 msgid "New Mail Message"
 msgstr "Nuovo messaggio di posta"
 
-#: mail/mail-component.c:363
+#: mail/mail-component.c:380
 msgid "_Mail Message"
 msgstr "Invia _messaggio"
 
-#: mail/mail-component.c:364
+#: mail/mail-component.c:381
 msgid "Compose a new mail message"
 msgstr "Componi un nuovo messaggio di posta"
 
-#: mail/mail-component.c:445
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
@@ -12435,7 +13345,7 @@ msgstr ""
 "Il seguente errore è apparso durante la trasmissione dei dati di posta:\n"
 "%s"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Identità"
 
@@ -12497,11 +13407,11 @@ msgstr ""
 "un nome per questo account nello spazio sottostante. Questo nome è usato "
 "solo a scopo identificativo."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Verifica servizi"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Connessione al server..."
 
@@ -12582,26 +13492,35 @@ msgid "C_olors"
 msgstr "C_olori"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Controllo nuova posta"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "Controlla l'ortografia durante la digitazione"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Controllo nuova posta"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "Colore per errori di ortografia:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Composizione messaggio"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12617,269 +13536,274 @@ msgstr ""
 "\n"
 "Fare clic su \"Fine\" per salvare le impostazioni."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "Pr_edefinito"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Comportamento predefinito"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "Codice dei caratteri predefinito:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Cancellazione posta"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Firma _sempre i messaggi in uscita (predefinito)"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "Non citare il messaggio originale"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Non firmare le richieste di riunione (per compatibilità con Outlook)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Completato"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "Cartella delle bozze:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "_Abilita"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "Cartelle Email"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "Indirizzo Email:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "Svuota cestino all'uscita"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Encry_ption certificate:"
 msgstr "Certi_ficato di crittazione:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Guida agli account di Evolution"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Esegui comando..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "Larghezza fissa:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "Filtri"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "Proprietà caratteri"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "Formato messaggi in _HTML"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "Evidenzia citazioni con"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Inline"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Etichette e colori"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Caricamento immagini"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Configurazione della posta"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Collocazione della casella di posta"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Compositore messaggio"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Visualizzazione messaggio"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 msgid "Message Fonts"
 msgstr "Carattere del messaggio"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Notifica nuova posta"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Nota: non verrà richiesta una password fino alla prima connessione"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Informazioni opzionali"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "Or_ganizzazione:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "ID della _chiave PGP/GPG:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Scegliere un colore"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Segnala l'invio di messaggi con solo destinatari _Bcc"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Caratteri di stampa"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "Cita messaggio originale"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Citato"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "Ri_corda questa password"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "Rispondi-a:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Ricezione Email"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "_Opzioni di ricezione"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "Ricorda questa _password"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Informazioni richieste"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "Ripristina predefiniti"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "Sicur_ezza"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME sicuro (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr "Seleziona font a larghezza fissa HTML"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr "Seleziona carattere HTML a larghezza fissa per la stampa"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr "Seleziona carattere HTML a larghezza variabile"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr "Seleziona carattere HTML a larghezza variabile per la stampa"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Invio Email"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Cartella _messaggi inviati:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Messaggi inviati e bozze"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Il ser_ver richiede autenticazione"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Configurazione del server"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "_Tipo di server:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Si_gning certificate:"
 msgstr "Certificato di fir_ma:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "Specifica nome del _file:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "Controllo ortografico"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Mbox standard per Unix"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12889,7 +13813,7 @@ msgstr ""
 "firma. Il nome specificato avrà solo scopo \n"
 "visivo."
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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 "
@@ -12899,7 +13823,7 @@ msgstr ""
 "ortografico e la lingua. L'elenco delle lingue riflette solamente le lingue "
 "di cui si ha il dizionario installato."
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12907,11 +13831,15 @@ msgstr ""
 "Indicare il nome con il quale ci si vuole riferire a questo account.\n"
 "Per esempio: \"Lavoro\" o \"Personale\""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "Larghezza variabile:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12921,161 +13849,170 @@ msgstr ""
 "\n"
 "Fare clic su \"avanti\" per cominciare."
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "_Aggiungi firma"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "_Carica sempre le immagini dalla rete"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 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:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "Tipo di _autenticazione: "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "Tipo di _autenticazione: "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr "Controlla la posta _automaticamente ogni"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "Inserisci _automaticamente immagini delle faccine"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "Emetti un suono quando arriva nuova posta"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "_Chiedi conferma prima di eliminare definitivamente i messaggi"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "Firma pre_definita:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "Pre_definiti"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "Non notificare l'arrivo _di nuova posta"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "Abilita"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Crittografa messaggi in uscita (predefinito)"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "Stile inoltro:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "_Nome e cognome:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "Posta _HTML"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "_Identità"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Da cestinare"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "_Carica le immagini se il mittente è nella rubrica"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "Imposta co_me account predefinito"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "Segna i _messaggi come letti dopo"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "_Non caricare mai le immagini dalla rete"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "Avvisa con un segnale acustico quando arriva nuova posta"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Chiedi conferma _prima di inviare messaggi HTML a contatti che non li "
 "desiderano"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Segnala l'invio di messaggi senza oggetto"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "_Ricezione posta"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "Stile _risposta:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "_Ripristina predefiniti"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Script:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 msgid "_Select..."
 msgstr "_Seleziona..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "_Spedizione posta"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "Mostra immagini animate"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "Firme"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr "Carattere _standard:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr "Carattere del _terminale:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "_Usa connessione sicura (SSL):"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr "_Usa gli stessi caratteri delle altre applicazioni"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "descrizione"
 
@@ -13084,7 +14021,7 @@ msgstr "descrizione"
 msgid "Pinging %s"
 msgstr "Ping a %s"
 
-#: mail/mail-mt.c:256
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13093,7 +14030,7 @@ msgstr ""
 "Errore durante '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:259
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13102,7 +14039,7 @@ msgstr ""
 "Errore durante l'operazione:\n"
 "%s"
 
-#: mail/mail-mt.c:910
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "In elaborazione"
 
@@ -13171,10 +14108,6 @@ msgstr "Copia messaggi in %s"
 msgid "Scanning folders in \"%s\""
 msgstr "Scansione delle cartelle in \"%s\" in corso"
 
-#: mail/mail-ops.c:1125
-msgid "Junk"
-msgstr "Da cestinare"
-
 #: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Messaggio inoltrato"
@@ -13216,22 +14149,22 @@ msgstr "Svuotamento cestino in '%s'"
 msgid "Local Folders"
 msgstr "Cartelle Locali"
 
-#: mail/mail-ops.c:1758
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Scaricamento del messaggio %s"
 
-#: mail/mail-ops.c:1830
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Ricezione di %d messaggio(i)"
 
-#: mail/mail-ops.c:1914
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvataggiodi %d messaggio(i)"
 
-#: mail/mail-ops.c:1962
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13240,7 +14173,7 @@ msgstr ""
 "Impossibile creare il file di output: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1990
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13249,11 +14182,11 @@ msgstr ""
 "Errore nel salvare i messaggi in: %s\n"
 "%s"
 
-#: mail/mail-ops.c:2061
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Salvataggio Allegati"
 
-#: mail/mail-ops.c:2078
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13262,22 +14195,22 @@ msgstr ""
 "Impossibile creare il file di output: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2108
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Impossibile srivere i dati: %s"
 
-#: mail/mail-ops.c:2256
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Disconnessione da %s"
 
-#: mail/mail-ops.c:2256
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Riconnessione a %s in corso"
 
-#: mail/mail-ops.c:2358
+#: mail/mail-ops.c:2366
 msgid "Changing junk status"
 msgstr "Cambio stato da cestinare"
 
@@ -13297,6 +14230,21 @@ msgstr "Trova:"
 msgid "Search"
 msgstr "Cerca"
 
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Modifica firma"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Eccezioni"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Informazioni sull'account"
+
 #: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Annullamento..."
@@ -13332,24 +14280,24 @@ msgstr "Aggiornamento in corso..."
 msgid "Waiting..."
 msgstr "In attesa..."
 
-#: mail/mail-session.c:231
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Operazione annullata dall'utente."
 
-#: mail/mail-session.c:264
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Inserire la password per %s"
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Inserire la password"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "_Ricorda questa password"
 
-#: mail/mail-session.c:290
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Ricorda questa password per il resto della sessione"
 
@@ -13397,22 +14345,22 @@ msgstr "Messaggio inoltrato - %s"
 msgid "Forwarded message"
 msgstr "Messaggio inoltrato"
 
-#: mail/mail-tools.c:314
+#: mail/mail-tools.c:313
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Cartella non valida: `%s' "
 
-#: mail/mail-vfolder.c:90
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Impostazione cartella virtuale %s in corso"
 
-#: mail/mail-vfolder.c:208
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Aggiornamento cartella virtuale per %s in corso"
 
-#: mail/mail-vfolder.c:466
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13425,88 +14373,88 @@ msgstr ""
 "    '%s'\n"
 "che ora è stata rimossa, e quindi sono state aggiornate."
 
-#: mail/mail-vfolder.c:777
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "Cartelle virtuali"
 
-#: mail/mail-vfolder.c:836
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "Cartelle virtuali"
 
-#: mail/mail-vfolder.c:875
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Modifica cartella virtuale"
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Si è cercato di modificare una cartella virtuale (%s) che non esiste."
 
-#: mail/mail-vfolder.c:967
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Nuova cartella virtuale"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Non visto"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Risposto"
 
-#: mail/message-list.c:905
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Messaggi multipli non visti"
 
-#: mail/message-list.c:906
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Messaggi multipli"
 
-#: mail/message-list.c:910
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Il più basso"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Più basso"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Più alto"
 
-#: mail/message-list.c:916
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Il più alto"
 
-#: mail/message-list.c:1233
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1240
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Oggi %I:%M %p"
 
-#: mail/message-list.c:1249
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Ieri %l %M %p"
 
-#: mail/message-list.c:1261
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1271
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3073
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Generazione elenco messaggi"
 
@@ -13562,11 +14510,11 @@ msgstr "Inoltra"
 msgid "No Response Necessary"
 msgstr "Non è necessario rispondere"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:81
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Rispondi"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:82
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Rispondi a tutti"
 
@@ -13626,23 +14574,121 @@ msgstr "Configura qui il comportamento delle cartelle speciali e non in linea"
 msgid "Evolution Shell"
 msgstr "La shell di Evolution"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr ""
-"Controllo di configurazione delle impostazioni delle cartelle di Evolution"
-
 #: shell/GNOME_Evolution_Shell.server.in.in.h:4
 msgid "Folder Settings"
 msgstr "Impostazioni cartella"
 
-#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" in \"%s\""
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "80%"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Rinomina questo gruppo di collegamento"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+msgid "Default width of the folder bar pane"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Nascondi la barra dei collegamenti"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Priorità predefinita:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Priorità predefinita:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Controllo di configurazione del calendario di Evolution."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+#, fuzzy
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+"Segna allegato come da mostrare in linea come impostazione predefinita."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
+msgid ""
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Path to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+msgid "Path to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+msgid "Path to the default tasks folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "La URI della cartella delle attività da visualizzare"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+msgid "Whether to show the folder bar"
+msgstr ""
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Aggiungi una cartella"
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Nascondi la barra dei collegamenti"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "Email"
 
 #: shell/e-setup.c:144
 msgid "Could not update files correctly"
@@ -13768,11 +14814,6 @@ msgstr ""
 msgid "Really delete folder \"%s\"?"
 msgstr "Cancellare la cartella \"%s\"?"
 
-#: shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Elimina \"%s\""
-
 #: shell/e-shell-folder-commands.c:489
 #, c-format
 msgid ""
@@ -13782,26 +14823,12 @@ msgstr ""
 "Impossibile rinominare la cartella:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Rinominare la cartella \\\"%s\\\" in:"
-
-#: shell/e-shell-folder-commands.c:541
-msgid "Rename Folder"
-msgstr "Rinomina cartella"
-
 #: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Il nome della cartella specificato non è valido: %s"
 
-#: shell/e-shell-folder-commands.c:554
-#, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr "Una cartella di nome \"%s\" esiste già. Usare un altro nome."
-
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
 msgstr "La cartella selezionata non appartiene ad un altro utente"
@@ -13824,19 +14851,15 @@ msgstr ""
 "Impossibile creare la cartella specificata:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Crea nuova cartella"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Senza nome)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Selezionare il tipo di importazione da effettuare:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13850,11 +14873,11 @@ msgstr ""
 "Si può selezionare \"Automatico\"  nel caso non si conosca il tipo di file, "
 "in questo caso Evolution tenterà rilevarlo automaticamente."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Selezionare il tipo di informazioni che si desidera importare:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13866,7 +14889,7 @@ msgstr ""
 "non ha trovato impostazioni da importare. Se si desidera\n"
 "provare ancora, fare clic sul tasto \"Indietro\".\n"
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13875,21 +14898,21 @@ msgstr ""
 "Importazione %s\n"
 "Importazione dell'oggetto %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "Seleziona importatore"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "Il file %s non esiste"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Errore in Evolution"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -13898,11 +14921,11 @@ msgstr ""
 "Non c'è un importatore adatto a gestire\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Importazione"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -13911,17 +14934,17 @@ msgstr ""
 "Importazione di %s.\n"
 "Avvio di %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Errore nell'avvio di %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Errore nel caricare: %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13930,31 +14953,31 @@ msgstr ""
 "Importazione %s\n"
 "Importazione dell'oggetto 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Automatico"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 msgid "_Filename:"
 msgstr "Nome del _file:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Scegliere un file"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 msgid "File _type:"
 msgstr "_Tipo di file:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 msgid "Import data and settings from _older programs"
 msgstr "Importa dati e impostazioni da programmi vecchi"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 msgid "Import a _single file"
 msgstr "Importa un file _singolo"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -13962,46 +14985,27 @@ msgstr ""
 "Attendere...\n"
 "Ricerca di impostazioni esistenti"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Avvio degli importatori intelligenti"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "Da %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Selezionare una cartella destinazione per importare questi dati"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 msgid "_Import"
 msgstr "_Importa"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Chiusura connessione..."
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Errore durante la sincronizzazione \"%s\":\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "Sincronizzazione cartella"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Sincronizzazione \"%s\" (%d di %d) ..."
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Impostazioni di Evolution"
@@ -14036,7 +15040,7 @@ msgstr "Impossibile aprire la cartella condivisa: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Impossibile trovare la cartella condivisa specificata."
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14044,11 +15048,13 @@ msgid ""
 "\n"
 "Do you want to quit using the Assistant now?"
 msgstr ""
-"Se si esce dall'assistente di Evolution ora, tutte le informazioni fin qui fornite saranno perse. È necessario eseguire nuovamente l'assistente prima di usare Evolution.\n"
+"Se si esce dall'assistente di Evolution ora, tutte le informazioni fin qui "
+"fornite saranno perse. È necessario eseguire nuovamente l'assistente prima "
+"di usare Evolution.\n"
 "\n"
 "Vuoi davvero uscire dall'assitente?"
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 msgid "Quit Assistant"
 msgstr "Esci dall'assistente"
 
@@ -14123,19 +15129,33 @@ msgstr "_Non in linea"
 msgid "Work Offline"
 msgstr "Non in linea"
 
-#: shell/e-shell.c:987
+#: shell/e-shell-window.c:324
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-window.c:331
+msgid "Ximian Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-window.c:337
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Argomenti non validi"
 
-#: shell/e-shell.c:989
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Impossibile registrare su OAF"
 
-#: shell/e-shell.c:991
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Database di configurazione non trovato"
 
-#: shell/e-shell.c:993
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Errore generico"
 
@@ -14239,10 +15259,6 @@ msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Apri la cartella relativa a questo collegamento in una nuova finestra"
 
 #: shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "_Rinomina"
-
-#: shell/e-shortcuts-view.c:427
 msgid "Rename this shortcut"
 msgstr "Rinomina questo collegamento"
 
@@ -14276,6 +15292,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completata)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Nuovo"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "\"%s\" in \"%s\""
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14313,66 +15340,6 @@ msgstr ""
 "L'errore dal sistema di attivazione è:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "Errore CORBA"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Interrotto"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Argomento non valido"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Ha già un proprietario"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Nessun proprietario"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Non trovato"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Tipo non supportato"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Schema non supportato"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Operazione non supportata"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Errore interno"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Esiste"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "URI non valida"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Ha delle sottocartelle"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Spazio esaurito"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "Il proprietario precedente è scomparso"
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr "Connessioni attive"
@@ -14401,18 +15368,10 @@ msgstr "_Posta:"
 msgid "_Tasks:"
 msgstr "_Attività:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr "_Nome della cartella:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder _type:"
 msgstr "_Tipo di cartella:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Specificare dove creare la cartella:"
-
 #: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "Apri la cartella degli altri utenti"
@@ -14510,7 +15469,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Importatori"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:27
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Importa"
 
@@ -14526,7 +15485,7 @@ msgstr "Non chiedere di nuovo"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution può importare dati dai seguenti file:"
 
-#: shell/main.c:114 shell/main.c:557
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -14591,7 +15550,8 @@ msgid ""
 "Evolution.\n"
 msgstr ""
 "Attenzione: Evolution non può aggiornare i vostri dati dalla versione %s.\n"
-"I dati non sono stati cancellati ma non è possibile visualizzarli con questa versione di Evolution.\n"
+"I dati non sono stati cancellati ma non è possibile visualizzarli con questa "
+"versione di Evolution.\n"
 
 #: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
@@ -14602,27 +15562,27 @@ msgstr "Impossibile inizializzare la shell di Ximian Evolution."
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Impossibile inizializzare la shell di Ximian Evolution: %s"
 
-#: shell/main.c:524
+#: shell/main.c:526
 msgid "Start Evolution activating the specified component"
 msgstr "Attivazione del componente Evolution specificato."
 
-#: shell/main.c:526
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Inizia in modalità non in linea"
 
-#: shell/main.c:528
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Inizia in modalità in linea"
 
-#: shell/main.c:531
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr "Forza la chiusura di tutti i componenti di Evolution"
 
-#: shell/main.c:534
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Inviare l'output del debugging di tutte i componenti ad un file."
 
-#: shell/main.c:561
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14631,31 +15591,55 @@ msgstr ""
 "%s: --online e --offline non possono essere usati insieme.\n"
 "  Usa %s --help per ulteriori informazioni.\n"
 
-#: smime/gui/certificate-manager.c:134 smime/gui/certificate-manager.c:275
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+msgid "Select a cert to import..."
+msgstr "Seleziona un certificato da importare..."
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 msgid "Certificate Name"
 msgstr "Nome certificato:"
 
-#: smime/gui/certificate-manager.c:140 smime/gui/certificate-manager.c:287
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 msgid "Purposes"
 msgstr "Scopi"
 
-#: smime/gui/certificate-manager.c:146 smime/gui/smime-ui.glade.h:35
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr "Numero di serie"
 
-#: smime/gui/certificate-manager.c:152
+#: smime/gui/certificate-manager.c:174
 msgid "Expires"
 msgstr "Scadenza"
 
-#: smime/gui/certificate-manager.c:196 smime/gui/certificate-manager.c:330
-msgid "Select a cert to import..."
-msgstr "Seleziona un certificato da importare..."
-
-#: smime/gui/certificate-manager.c:281
+#: smime/gui/certificate-manager.c:323
 msgid "E-Mail Address"
 msgstr "Indirizzo Email"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"Certificato scaduto: %s\n"
+"Emittente: %s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<non fa parte di un certificato>"
@@ -14708,122 +15692,360 @@ msgstr "Salvataggio completo"
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
-msgstr "Prima di fidarvi di questo CA per qualsiasi scopo sarebbe auspicabile che esaminiate attentamente le sue politiche e procedure di sicurezza (se accessibili)."
+msgstr ""
+"Prima di fidarvi di questo CA per qualsiasi scopo sarebbe auspicabile che "
+"esaminiate attentamente le sue politiche e procedure di sicurezza (se "
+"accessibili)."
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
 msgid "Certificate"
 msgstr "Certificato"
 
 #: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Certificato insicuro (untrusted)"
+
+#: smime/gui/smime-ui.glade.h:16
 msgid "Certificate details"
 msgstr "Dettagli del certificato"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:17
 msgid "Common Name (CN)"
 msgstr "Nome comune (CN)"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:18
 msgid "Contact Certificates"
 msgstr "Certificati del contatto"
 
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:21
 #, no-c-format
 msgid "Do you want to trust \"%s\" for the following purposes?"
 msgstr "Vuoi fidarti di \"%s\" per gli usi seguenti?"
 
-#: smime/gui/smime-ui.glade.h:21
+#: smime/gui/smime-ui.glade.h:22
 msgid "Dummy window only"
 msgstr "Solo finestra vuota"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:23
 msgid "Edit"
 msgstr "Modifica"
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "Certificato contenuti Email"
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:25
 msgid "Email Signer Certificate"
 msgstr "Certificato firmatario Email"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:26
 msgid "Expires On"
 msgstr "Scade il"
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr "Emesso il"
 
-#: smime/gui/smime-ui.glade.h:29
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr "Impronta digitale MD5"
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:31
 msgid "Organization (O)"
 msgstr "Organizzazione (O)"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:32
 msgid "Organizational Unit (OU)"
 msgstr "Unità organizzativa (OU)"
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr "Impronta digitale SHA1"
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr "Certificato del client SSL"
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr "Certificato del server SSL"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/gui/smime-ui.glade.h:37
 msgid "Trust this CA to identify email users."
 msgstr "Fidati di questo CA per identificare gli utenti Email."
 
-#: smime/gui/smime-ui.glade.h:37
+#: smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify software developers."
 msgstr "Fidati di questi CA per identificare gli sviluppatori software."
 
-#: smime/gui/smime-ui.glade.h:38
+#: smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify web sites."
 msgstr "Fidati di questo CA per identificare i siti web."
 
-#: smime/gui/smime-ui.glade.h:39
+#: smime/gui/smime-ui.glade.h:40
 msgid "View"
 msgstr "Visualizza"
 
-#: smime/gui/smime-ui.glade.h:40
+#: smime/gui/smime-ui.glade.h:41
 msgid "View Certificate"
 msgstr "Visualizza certificato"
 
-#: smime/gui/smime-ui.glade.h:41
+#: smime/gui/smime-ui.glade.h:42
 msgid "You have been asked to trust a new Certificate Authority (CA)."
 msgstr "È richiesto di fidarsi di una nuova Autorità di Certificazione (CA)."
 
-#: smime/gui/smime-ui.glade.h:42
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Avete certificati dalle seguenti organizzazioni che Vi identificano:"
 
-#: smime/gui/smime-ui.glade.h:43
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
-msgstr "Si possiede i certificati su file che identificano queste autorità di certificazione:"
+msgstr ""
+"Si possiede i certificati su file che identificano queste autorità di "
+"certificazione:"
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr "Avete certificati su file che identificano queste persone:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
 msgstr "I Vostri certificati"
 
-#: smime/lib/e-cert-db.c:443
+#: smime/lib/e-cert-db.c:494
 msgid "Certificate already exists"
 msgstr "Il certificato esiste già"
 
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%m/%d/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Personale"
+
+#: smime/lib/e-cert.c:488
+msgid "Version 1"
+msgstr ""
+
+#: smime/lib/e-cert.c:491
+msgid "Version 2"
+msgstr ""
+
+#: smime/lib/e-cert.c:494
+msgid "Version 3"
+msgstr ""
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr "Cc"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "OK"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "Nome certificato:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "Nome certificato:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "Certificato insicuro (untrusted)"
+
+#: smime/lib/e-cert.c:621
+msgid "UID"
+msgstr ""
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Oggetto è %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Impossibile operare sulla cartella per lo spool"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "Autorità di Certificazione (CA) non valida"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Autorità di Certificazione (CA) non valida"
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "in entrata"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Nessuna informazione"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "allegato"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "Nome certificato:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Croazia"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+msgid "Not Critical"
+msgstr ""
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Espressione"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s alle %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Firma del certificato non riuscita"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "Emesso il"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Oggetto è %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Firma del certificato non riuscita"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Inserire la password per %s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "I Vostri certificati"
+
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
 msgstr "Un allegato da aggiungere."
@@ -14842,7 +16064,8 @@ msgstr "Descrizione dell'allegato."
 
 #: tools/evolution-launch-composer.c:328
 msgid "Mark attachment to be shown inline by default."
-msgstr "Segna allegato come da mostrare in linea come impostazione predefinita."
+msgstr ""
+"Segna allegato come da mostrare in linea come impostazione predefinita."
 
 #: tools/evolution-launch-composer.c:329
 msgid "Default subject for the message."
@@ -14898,7 +16121,7 @@ msgid "Previews the contacts to be printed"
 msgstr "Anteprime dei contatti da stampare"
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:77
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Anteprima di sta_mpa"
@@ -14947,7 +16170,7 @@ msgstr "Mostra il contatto corrente"
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: 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:103
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
@@ -15355,7 +16578,7 @@ msgstr "Segna _tutti come letti"
 msgid "Mark all visible messages as read"
 msgstr "Segna tutti i messaggi visibili come letti"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "Incolla messaggio(i) dagli Appunti"
 
@@ -15409,10 +16632,6 @@ msgstr "Ca_rtella"
 msgid "_Invert Selection"
 msgstr "_Inverti selezione"
 
-#: ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Proprietà..."
-
 #: ui/evolution-mail-list.xml.h:28
 msgid "_Threaded Message List"
 msgstr "Elenca per _discussioni"
@@ -15574,260 +16793,265 @@ msgstr "Inoltra come allegato il messaggio selezionato a qualcuno"
 msgid "Increase the text size"
 msgstr "Aumenta la dimensione del testo"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Carica le _immagini"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Segna come i_mportante"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Segna come _non letto"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Segna come non im_portante"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "Segna i messaggi selezionati come se fossero stati letti"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "Segna i messaggi selezionati come importanti"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected message(s) as junk"
 msgstr "Segna i messaggi selezionati come da cestinare"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:57
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Segna i messaggi selezionati come non da cestinare"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Segna i messaggi selezionati come se non fossero stati letti"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Segna i messaggi selezionati come non importanti"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Segna i messaggi selezionati per cancellarli"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Sposta"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "Sposta i messaggi in un'altra cartella"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Successivo"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "Messaggio _importante successivo"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "Discussione successiva"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "Messaggo non letto successivo"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Non trovato"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Apre il messaggio selezionato in una nuova finestra"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 "Apre il messaggio selezionato in una finestra di composizione per rinviarlo"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Dimensione _predefinita"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "Messaggio non letto p_recedente"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:73
 msgid "Post a Repl_y"
 msgstr "Ris_pondi al messaggio"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr "Rispondi al messaggio in una cartella pubblica"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "Messaggio importante pr_ecedente"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Anteprima del messaggio da stampare"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Precedente"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Stampa questo messaggio"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "Re_invia"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Reinvia (rimbalza) il messaggio selezionato a qualcuno"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Reimpostare il testo alla dimensione originale"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "S_earch in Message..."
 msgstr "C_erca nel messaggio..."
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "Più _piccolo"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Salva il messaggio come un file di testo"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Effettua una ricerca nel messaggio visualizzato"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr "Imposta i parametri della pagina per la stampante corrente"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Mostra _sorgente dell'Email"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Mostra intesta_zioni complete"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Mostra un cursore lampeggiante nel corpo del messaggio"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Mostra messaggio in stile normale"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Mostra messaggio con tutte le intestazioni dell'Email"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Mostra il sorgente grezzo del messaggio"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "Dimensione del _testo"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Annulla la cancellazione del messaggio selezionato"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "Cartella virtuale sulla mailing _list..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "Cartella virtuale sul _mittente..."
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "Cartella virtuale sui _destinatari..."
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "Cartella virtuale sull'_oggetto..."
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "_Allegato"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "_Copia nella cartella"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "_Crea filtro dal messaggio"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "_Inoltra messaggio"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "Vai a"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "Più _grande"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "Visualizzazione _messaggio"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Sposta nella cartella"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "Messaggio successivo"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "Visualizzazione _normale"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "_Apri messaggio"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "Messaggio _precedente"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "_Citato"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "_Rispedisci..."
 
-#: ui/evolution-mail-message.xml.h:125 ui/evolution.xml.h:31
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "S_trumenti"
 
-#: ui/evolution-mail-message.xml.h:126
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "_Ripristina"
 
@@ -15841,11 +17065,6 @@ msgstr "Chiudi questa finestra"
 msgid "_Close"
 msgstr "_Chiudi"
 
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
-msgid "_View"
-msgstr "_Visualizza"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Allega"
@@ -16417,10 +17636,6 @@ msgstr "Ucraino"
 msgid "Visual"
 msgstr "Visuale"
 
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Nuovo"
-
 #: widgets/misc/e-charset-picker.c:168
 #, c-format
 msgid "Unknown character set: %s"
@@ -16491,3 +17706,115 @@ msgstr "Testo"
 msgid "Find _Now"
 msgstr "_Trova ora"
 
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "Configura qui l'accesso ai server di directory LDAP"
+
+#~ msgid "Directory Servers"
+#~ msgstr "Server di directory"
+
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Controllo di configurazione per la rubrica LDAP di Evolution."
+
+#~ msgid "Account Name"
+#~ msgstr "Nome account"
+
+#~ msgid "Server Name"
+#~ msgstr "Nome del server"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "LDAP non è stato abilitato in questa compilazione di Evolution"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Altri contatti"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Passo 4: mostra il nome"
+
+#~ msgid "Find contact in"
+#~ msgstr "Trova contatto in"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Fare clic qui per aggiungere un contatto *"
+
+#~ msgid "Business Address"
+#~ msgstr "Indirizzo ufficio"
+
+#~ msgid "Department"
+#~ msgstr "Dipartimento"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "URL libero-occupato"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Professione"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Inviare comunque?"
+
+#~ msgid "Folder _name"
+#~ msgstr "_Nome cartella"
+
+#~ 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."
+
+#~ msgid "Add a Folder"
+#~ msgstr "Aggiungi una cartella"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Errore durante la sincronizzazione \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "Sincronizzazione cartella"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Sincronizzazione \"%s\" (%d di %d) ..."
+
+#~ msgid "CORBA error"
+#~ msgstr "Errore CORBA"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Argomento non valido"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Ha già un proprietario"
+
+#~ msgid "No owner"
+#~ msgstr "Nessun proprietario"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Tipo non supportato"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Schema non supportato"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Operazione non supportata"
+
+#~ msgid "Internal error"
+#~ msgstr "Errore interno"
+
+#~ msgid "Exists"
+#~ msgstr "Esiste"
+
+#~ msgid "Invalid URI"
+#~ msgstr "URI non valida"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Ha delle sottocartelle"
+
+#~ msgid "No space left"
+#~ msgstr "Spazio esaurito"
+
+#~ msgid "Old owner has died"
+#~ msgstr "Il proprietario precedente è scomparso"
diff --git a/po/ja.po b/po/ja.po
index c93e42507f..223bb266e8 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: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-05-01 15:33+0900\n"
 "Last-Translator: Takuo KITAME <kitame@debian.org>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -31,57 +31,195 @@ msgid "Could not read pilot's Address application block"
 msgstr ""
 "�ѥ����åȤΥ��ɥ쥹���ץꥱ�������֥��å����ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "��ư�䴰�ե����"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "ǧ�� ID(_C):"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "�᡼�륢������Ȥ�¾����������/�Խ����ޤ�"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Ϣ����"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "���ɥ쥹Ģ���Խ�"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "���ɥ쥹Ģ�Υ��ɥ쥹��ݥåץ��åפ��뤿��Υե����ȥ�"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution ���ɥ쥹Ģ�ߥ˥����ɥӥ塼��"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution ���ɥ쥹Ģ�ߥ˥����ɥӥ塼��"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolution ���ɥ쥹Ģ�ߥ˥����ɥӥ塼��"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution ���ɥ쥹Ģ�ߥ˥����ɥӥ塼��"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution �᡼��¹ԥ��ޥꥳ��ݡ��ͥ��"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution ����ݡ����Τ���Υե����ȥ�"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "���ɥ쥹Ģ"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "�ץ��ѥƥ�..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "���"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+msgid "Rename"
+msgstr "��͡���"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "����Ϣ����:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "Ϣ����(_C)"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "����Ϣ�����������ޤ�"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "����Ϣ����ꥹ��"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "Ϣ����ꥹ��(_C)"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "����Ϣ����ꥹ�Ȥ����"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "�ѡ����ʥ�"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "�Ż�"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "LDAP ������"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "�ǥ��쥯�ȥ� %s ���������ޤ���Ǥ���: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "LDAP �����Ф���³����ޤ���"
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "LDAP �����Фˤ�����ǧ�ڽ���ޤ���"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "IMAP �����Фα����� %s �����ޤ�Ǥ��ޤ���"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "�ե��륿����Υ�������˥��顼:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP �����Фα����� %s �����ޤ�Ǥ��ޤ���"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "���������̾"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "������̾"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(���� Evolution �� SSL �򥵥ݡ��Ȥ��Ƥ��ޤ���)"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "¾��Ϣ����"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -89,7 +227,7 @@ msgstr ""
 "���Υ��ɥ쥹Ģ�򳫤����Ȥ�����ޤ���Ǥ���. �ѥ���¸�ߤ�, ����������\n"
 "����äƤ��뤫�ɤ��������å����Ƥ�������"
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -100,7 +238,7 @@ msgstr ""
 "�����Ϥ�����, ���뤤�� LDAP �����Ф�����Ƥ��뤫�Τɤ��餫\n"
 "���̣���ޤ�"
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -112,7 +250,7 @@ msgstr ""
 "���� OpenLDAP ����������� CVS ����������ץ�������\n"
 "����ѥ��뤷�ʤ���Фʤ�ޤ���\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -127,11 +265,11 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "���ɥ쥹Ģ�򳫤����Ȥ�����ޤ���"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr ""
@@ -139,36 +277,35 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s (user %s) �Τ���Υѥ���ɤ����Ϥ��Ƥ�������"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "̾�������Τ�λϤޤ�"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "Email �����Τ�ΤǻϤޤ�"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "���ƥ����"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "�ե�����ɤ����Τ�Τ�ޤ�"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "�ܺ�..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -176,7 +313,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -184,95 +321,41 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "���٤ƤΥ��ƥ���"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "��������ɽ������ URI"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "ǧ�� ID(_C):"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
 msgstr ""
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Ϣ����"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "�ǥ��쥯�ȥꥵ���С�"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "���ɥ쥹Ģ���Խ�"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Evolution �Υ��ɥ쥹Ģ��̾�����򥤥󥿡��ե�����"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "���ɥ쥹Ģ�Υ��ɥ쥹��ݥåץ��åפ��뤿��Υե����ȥ�"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution ���ɥ쥹Ģ�ߥ˥����ɥӥ塼��"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution ���ɥ쥹Ģ�ߥ˥����ɥӥ塼��"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Evolution ���ɥ쥹Ģ�ߥ˥����ɥӥ塼��"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution ���ɥ쥹Ģ�ߥ˥����ɥӥ塼��"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution �᡼��¹ԥ��ޥꥳ��ݡ��ͥ��"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -296,6 +379,7 @@ msgstr "���ѤǤ��륿���פ�����å�(_C)"
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -331,8 +415,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Add LDAP Server"
-msgstr "LDAP ������"
+msgid "Addressbook Creation Assistant"
+msgstr "���ɥ쥹Ģ�Υ�����"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -349,59 +433,59 @@ msgstr "ƿ̾"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 #, fuzzy
 msgid "Connecting"
 msgstr "%s �˺���³��"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "�ꥹ��̾(_N):"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Edit LDAP Server"
 msgstr "LDAP ������"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address:"
 msgstr "�Żҥ᡼�륢�ɥ쥹(_A):"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Finished"
 msgstr "����(_I)"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "����"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "LDAP ���ꥢ���������"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "���롼��"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "̵��"
 
@@ -425,8 +509,8 @@ msgid "S_earch scope: "
 msgstr "�����ϰ�(_C): "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 #, fuzzy
 msgid "Searching"
 msgstr "������..."
@@ -472,27 +556,28 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:47
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-#, fuzzy
-msgid "Step 1: Server Information"
-msgstr "����������"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
-msgid "Step 2: Connecting to Server"
-msgstr "�����Ф���³��..."
+msgid "Step 2: Server Information"
+msgstr "����������"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr ""
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "�����Ф���³��..."
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr ""
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "�����Ф���³��..."
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -504,14 +589,6 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -519,7 +596,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -527,7 +604,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -537,37 +614,36 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 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:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 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:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -575,6 +651,13 @@ msgid ""
 "It is for display purposes only. "
 msgstr "����̾���ϥ�������Ȥ�ɽ���Ƥ��ޤ���ɽ�����뤿������Τ�ΤǤ���"
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr "����̾���ϥ�������Ȥ�ɽ���Ƥ��ޤ���ɽ�����뤿������Τ�ΤǤ���"
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -601,21 +684,29 @@ msgid "Using email address"
 msgstr "�����͹��ʪ�ν���Ǥ�"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "��ǽ�ʤ��"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "ɽ��̾(_D):"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "���������������(_D):"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -623,54 +714,53 @@ msgstr "���������������(_D):"
 msgid "_Edit"
 msgstr "�Խ�(_E)"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "��������᥽�å�(_L):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "�ݡ����ֹ�(_P):"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "�����١���(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "������̾(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "�����ॢ����(ʬ)(_T):"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "������"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "̾��"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution �Υ��ɥ쥹Ģ��̾�����򥤥󥿡��ե�����"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "���٤ƺ��"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "���"
@@ -699,25 +789,21 @@ msgstr "Ϣ������ɲ�"
 msgid "Unnamed Contact"
 msgstr "̾���Τʤ�Ϣ����"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "̾��"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "������"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "���ɥ쥹Ģ����Ϣ���������"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-#, fuzzy
-msgid "Find contact in"
-msgstr "�����Ԥ����Τ�Τ�ޤ�"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution �Υ��ɥ쥹Ģ��̾�����򥤥󥿡��ե�����"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
 msgid "Find"
@@ -798,7 +884,8 @@ msgid "D_epartment:"
 msgstr "����(_E):"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "�ܺ�"
 
@@ -868,12 +955,12 @@ msgid "_Categories..."
 msgstr "���ƥ���(_T)..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "���(_D)"
@@ -2018,7 +2105,7 @@ msgid "Esq."
 msgstr "Esq."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "�ե�͡���"
 
@@ -2116,11 +2203,27 @@ msgstr "Ϣ����ꥹ�ȥ��ǥ���"
 msgid "Save List as VCard"
 msgstr "VCard ����¸"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "�ѹ����Ϣ����:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "���ͤ��Ƥ���Ϣ����:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "��ʣ����Ϣ����򸡽Ф��ޤ���"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"�ѹ���������Ϣ�����̾�����뤤�ϥ᡼�륢�ɥ쥹��\n"
+"���Υե�����ˤ��Ǥ�¸�ߤ��Ƥ��ޤ����ɲä��Ƥ��������Ǥ���?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "����Ϣ����:"
@@ -2137,22 +2240,6 @@ msgstr ""
 "����Ϣ�����̾�����뤤�ϥ᡼�륢�ɥ쥹�Ϥ��Υե������\n"
 "���Ǥ�¸�ߤ��Ƥ��ޤ����ɲä��Ƥ��������Ǥ���?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "�ѹ����Ϣ����:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "���ͤ��Ƥ���Ϣ����:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"�ѹ���������Ϣ�����̾�����뤤�ϥ᡼�륢�ɥ쥹��\n"
-"���Υե�����ˤ��Ǥ�¸�ߤ��Ƥ��ޤ����ɲä��Ƥ��������Ǥ���?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2254,9 +2341,9 @@ msgstr "Ϣ�����ž��"
 msgid "Send Message to Contact"
 msgstr "Ϣ����إ�å�����������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "����"
@@ -2278,9 +2365,12 @@ msgstr "�ե�����ذ�ư..."
 msgid "Cut"
 msgstr "�ڼ��"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "���ԡ�"
 
@@ -2289,16 +2379,8 @@ msgstr "���ԡ�"
 msgid "Paste"
 msgstr "Ž���դ�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "���"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "���ߤΥӥ塼"
 
@@ -2311,166 +2393,170 @@ msgid ""
 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:2
 msgid "Assistant"
 msgstr "�����������"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "�Ż��� FAX"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "�Ż�������"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "�Ż������� 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "�Ƥ��ᤷ������"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "�ֺ�����"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "���ƥ���"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "��Ҥ�����"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "����"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "�᡼��"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "�᡼��2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "�᡼��3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "��"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "��̾"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "����/¿˻ URL"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "�Ȥν���"
+#, fuzzy
+msgid "Given Name"
+msgstr "��"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "�Ȥ� FAX"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "�Ȥ�����"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "�Ȥ����� 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "����"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "���硼����"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "�ޥ͡�����"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "�˥å��͡���"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "����"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "��̳��"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "���"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "����¾�ν���"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "����¾�� FAX"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "����¾������"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "�ݥ��٥�"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "���翦"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "�饸��"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "����"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "�۶���"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "�ƥ�å���"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "�ɾ�(���Ĥ�)"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "̤��"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "�����֥�����"
 
@@ -2576,11 +2662,19 @@ msgstr "����"
 msgid "Job Title"
 msgstr "����(_J):"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "�Ȥν���"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "�Ȥν���"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "����¾�ν���"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2593,120 +2687,117 @@ msgstr "�Ȥ� FAX"
 msgid "Blog"
 msgstr "�ʱ�"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "����"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "�����ʥ��顼"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "��ݥ��ȥꥪ�ե饤��"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "���Ĥ�����ޤ���"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "�����ɤ����Ĥ���ޤ���"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "������ID�Ϥ��Ǥ�¸�ߤ��ޤ�"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "�ץ��ȥ���ϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "����󥻥뤷�ޤ���"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "ǧ�ڤ˼��Ԥ��ޤ���"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "ǧ�ڤ�ɬ�פȤ��Ƥ��ޤ�"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS �����ѤǤ��ޤ���"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "���ɥ쥹Ģ��¸�ߤ��ޤ���"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "����¾�Υ��顼"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "�ѹ�����¸�������Ǥ���?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 #, fuzzy
 msgid "_Discard"
 msgstr "�����ɤΰ���"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "�ꥹ�Ȥ��ɲäǥ��顼��ȯ�����ޤ���"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "�����ɤ��ɲäǥ��顼��ȯ�����ޤ���"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "�ꥹ�Ȥν�����˥��顼��ȯ�����ޤ���"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "�����ɤ�����˥��顼��ȯ�����ޤ���"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "�ꥹ�Ȥκ����˥��顼��ȯ�����ޤ���"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "�����ɤκ����˥��顼��ȯ�����ޤ���"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2715,51 +2806,51 @@ msgstr ""
 "%s�Ϥ��Ǥ�¸�ߤ��ޤ�\n"
 "�����˾�񤭤��ޤ���?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, fuzzy
 msgid "Overwrite"
 msgstr "�ե�������񤭤��ޤ���?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, fuzzy, c-format
 msgid "Error saving %s: %s"
 msgstr "�ե��������¸��˥��顼: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 #, fuzzy
 msgid "list"
 msgstr "̸"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "�����ɤʤ�"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "�����ɤʤ�"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "�����ɤʤ�"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "�����ɤʤ�"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "ʣ���� VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "%s �� VCard"
@@ -2956,7 +3047,7 @@ msgstr "�ޡ�����"
 msgid "Number of columns:"
 msgstr "���:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "���ץ����"
 
@@ -3144,18 +3235,18 @@ msgstr "̾���Τʤ��ꥹ��"
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "wombat �����Ф򳫻Ϥ��뤳�Ȥ�����ޤ���Ǥ���"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "wombat �򳫻Ϥ��뤳�Ȥ�����ޤ���Ǥ���"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 "�ѥ����åȤΥ��������ץꥱ�������֥��å����ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
@@ -3164,25 +3255,91 @@ msgstr ""
 msgid "Default Priority:"
 msgstr "�ǥե����ͥ����:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 "�ѥ����åȤ� ToDo ���ץꥱ�������֥��å����ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "�������ȥ�����"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "������"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "�������ȥ�����"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution ����ݡ����Τ���Υե����ȥ�"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution ������ iTip/iMip �ӥ塼��"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution ������ iTip/iMip �ӥ塼��"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution �˥塼�����ǥ���"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution �˥塼�����ǥ���"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolution �������¹ԥ��ޥꥳ��ݡ��ͥ��"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolution �᡼�륳��ݡ���"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "������"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "���顼�����Υ����ӥ��Τ���Υե����ȥ�"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "����:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "��λ:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Evolution ���顼��"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "%s �˥��顼��"
@@ -3258,44 +3415,173 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "���٤ȼ��䤷�ʤ�"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "���顼�����Υ����ӥ��Τ���Υե����ȥ�"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo �ν����������ޤ���Ǥ���"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs �ν����������ޤ���Ǥ���"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "���顼�����Υ����ӥ��ե����ȥ���������ޤ���Ǥ���"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "�����ʻ���"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "iCalendar ���顼"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "���������¤ο�"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "���������¤ο�"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "���ݥ���Ȥν�λ���֤򽵴֤ȷ�֤�ɽ��(_S)"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "��������륫�����Υץ�ӥ塼��ɽ�����ޤ�"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#, fuzzy
+msgid "Units of default reminder"
+msgstr "ɸ��Υ�ޥ�����ǿ������ݥ���Ȥ�������ޤ�"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "�����ƥ�κ�����˳�ǧ��Ȥ�(_A)"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "�����ƥ�κ�����˳�ǧ��Ȥ�(_A)"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "���򤷤��������������ޤ�"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "���եʥӥ������ǽ��ֹ��ɽ��(_N)"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "���ޥ꤬���Τ�Τ�ޤ�"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "�������ޤ�"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "�����Ȥ����Τ�Τ�ޤ�"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "�԰���"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3307,80 +3593,111 @@ msgstr ""
 "\n"
 "�����ˤ����Υ�å�������õ�ޤ���?"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "�����Τ�Τ�꾮����"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "��"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%Yǯ%m��%d�� %A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%m/%d (%a)"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%Y/%m/%d (%a)"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%Yǯ%m��%d��"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%m��%d��"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "���Υ�������������ޤ�"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "�˥塼����ɥ˥�"
 
-#: calendar/gui/calendar-component.c:207
-msgid "Rename"
-msgstr "��͡���"
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "�������ݥ����"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "���ݥ����(_A)"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "�ѡ����ʥ�"
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "�������ݥ���Ȥ�������ޤ�"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "�Ż�"
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "�����ߡ��ƥ���"
+
+#: calendar/gui/calendar-component.c:640
+#, fuzzy
+msgid "M_eeting"
+msgstr "���"
+
+#: calendar/gui/calendar-component.c:641
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "�����ߡ��ƥ����׵����"
+
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "�����������ݥ����"
+
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr "�������ݥ����(_D)"
+
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "�������ݥ���Ȥ�������ޤ�"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3503,7 +3820,7 @@ msgstr "����"
 msgid "With these arguments:"
 msgstr "�����ΰ�����Ȥ�:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr ""
 
@@ -3519,6 +3836,10 @@ msgstr "��"
 msgid "minutes"
 msgstr "ʬ"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3552,8 +3873,8 @@ msgstr "���λ��˥᡼�����������:"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "���ޥ�:"
 
@@ -3582,7 +3903,7 @@ msgstr "���ݥ���Ȥν�λ"
 msgid "hour(s)"
 msgstr "��"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "ʬ"
 
@@ -3636,7 +3957,7 @@ msgstr "����"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "������"
 
@@ -3650,7 +3971,7 @@ msgstr "ʬ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "������"
 
@@ -3660,7 +3981,7 @@ msgstr "��(_U)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "������"
 
@@ -3674,7 +3995,7 @@ msgstr "���եʥӥ������ǽ��ֹ��ɽ��(_N)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "������"
 
@@ -3692,7 +4013,7 @@ msgstr "�������ꥹ��"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "������"
 
@@ -3710,7 +4031,7 @@ msgstr "���֤ν�:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "������"
 
@@ -3720,12 +4041,12 @@ msgstr "���������(_E):"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "����"
 
@@ -3762,7 +4083,7 @@ msgid "_Fri"
 msgstr "��(_F)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "����(_G)"
 
@@ -3802,76 +4123,76 @@ msgstr "��(_W)"
 msgid "before every appointment"
 msgstr "����ɽ������"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "�����ˤ��β�Ĥ򥭥�󥻥뤷������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "�����ˤ��Υ������򥭥�󥻥뤷������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "�����ˤ��λ��������򥭥�󥻥뤷������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "���Υ��٥�ȤϺ������ޤ���"
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "���Υ������Ϻ������ޤ���"
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "���λ��������Ϻ������ޤ���"
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s ���ѹ����ޤ������������ѹ����˴����ƥ��ǥ������Ĥ��ޤ���?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s ���ѹ�����Ƥޤ��󡣥��ǥ������Ĥ��ޤ���?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "���Υ��٥�Ȥ��ѹ�����ޤ���"
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "���Υ��������ѹ�����ޤ���"
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "���λ����������ѹ�����ޤ���"
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
@@ -3881,162 +4202,167 @@ msgstr ""
 msgid "Validation error: %s"
 msgstr "̤�ΤΥ��顼: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (��� "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "��� "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (���� "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "���� "
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "���֥������Ȥ򹹿��Ǥ��ޤ���Ǥ���"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "���ݥ���Ȥ��Խ�"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "���ݥ���� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "������ - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "�������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "���ޥ�Ϥ���ޤ���"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "��̾����¸..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "���Υǡ����򥤥�ݡ��Ȥ���������Υե���������򤷤Ƥ�������"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "�����˥��ݥ���� `%s' �������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "�����˥����ȥ�ʤ��Υ��ݥ���Ȥ������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "�����˥����� `%s' �������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "�����˥����ȥ�ʤ��Υ������������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "�����˻������� `%s' �������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "�����˥����ȥ�ʤ��λ��������������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "������ %d �ĤΥ��ݥ���Ȥ������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "������ %d �ĤΥ������������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "������ %d �Ĥλ��������������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "���λ��������Ϻ������ޤ���"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr ""
 
@@ -4052,45 +4378,45 @@ msgstr "��Ǥ��:"
 msgid "Enter Delegate"
 msgstr "��Ǥ�������"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "���ݥ����"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "��¥��"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "�����֤�"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "�������塼��"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "���"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "������"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 #, fuzzy
 msgid "Start time is wrong"
 msgstr "���ϻ���(_S):"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr ""
 
@@ -4160,31 +4486,31 @@ msgid "_Start time:"
 msgstr "���ϻ���(_S):"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "�ʤ�"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "��żԤ�ɬ�פǤ�."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "��Ǥ��(_D)..."
 
@@ -4225,21 +4551,15 @@ msgid "Member"
 msgstr "����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "����"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "���ơ�����"
@@ -4259,6 +4579,7 @@ msgid "_Invite Others..."
 msgstr "¾�ξ���(_I)..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4291,6 +4612,7 @@ msgid "Could not create directory for new calendar"
 msgstr "�ǥ��쥯�ȥ� %s ���������ޤ���Ǥ���: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "��żԤ�ɬ�ܤǤ�"
@@ -4320,32 +4642,57 @@ msgstr "����������"
 msgid "Calendar Name"
 msgstr "������"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "�ǥ��쥯�ȥ� %s ���������ޤ���Ǥ���: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "����������"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "�������ꥹ��"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "�������ꥹ��"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "�������ꥹ��"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 msgid "This and Prior Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 #, fuzzy
 msgid "All Instances"
 msgstr "���٤Ƥξ��(_L)"
@@ -4399,10 +4746,15 @@ msgstr "��"
 msgid "on the"
 msgstr "��"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "�����"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "����/����:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "�ɲ�(_D)"
@@ -4467,7 +4819,7 @@ msgstr "��"
 msgid "year(s)"
 msgstr "ǯ"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 #, fuzzy
 msgid ""
 "This event has been changed, but has not been saved.\n"
@@ -4478,33 +4830,33 @@ msgstr ""
 "\n"
 "�ѹ�����¸���ޤ���?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 #, fuzzy
 msgid "Save Event"
 msgstr "������������"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 #, fuzzy
 msgid "The meeting information has been created. Send it?"
 msgstr "��ľ���Ϲ�������ޤ�������������Τ��������ޤ���?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "��� "
@@ -4515,43 +4867,43 @@ msgid "% _Complete"
 msgstr "% ��λ"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "��λ���ޤ���"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "�⤤"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "������"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "�㤤"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "����"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "���Ϥ��Ƥ��ʤ�"
 
@@ -4560,7 +4912,7 @@ msgid "Progress"
 msgstr "������"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "̤���"
 
@@ -4582,21 +4934,21 @@ msgstr "���ơ�����(_S):"
 msgid "_Web Page:"
 msgstr "�����֥ڡ�����URL(_W):"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "����"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "������"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4604,9 +4956,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "��̩(_F)"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "����:"
 
@@ -4711,26 +5063,21 @@ msgstr "%s �� %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s ��̤�Τ�ȯư������"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "����"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "��Ū"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "��̩"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "���ƥ���"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4743,28 +5090,26 @@ msgid "Start Date"
 msgstr "������"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "���ޥ�"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "��"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "���ݥ����"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "����"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "�ӥ���"
 
@@ -4776,7 +5121,7 @@ msgstr "��"
 msgid "S"
 msgstr "��"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "��"
 
@@ -4784,7 +5129,7 @@ msgstr "��"
 msgid "W"
 msgstr "��"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4794,7 +5139,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4802,7 +5147,7 @@ msgstr ""
 msgid "Yes"
 msgstr "�Ϥ�"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4810,17 +5155,17 @@ msgstr "������"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "̤��"
 
@@ -4832,184 +5177,182 @@ msgstr "�����֤�"
 msgid "Assigned"
 msgstr "�����ƺѤ�"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "���򤷤�Ϣ����������ޤ�"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "�������ݥ����(_A)..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "�����������٥��"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 #, fuzzy
 msgid "New Meeting"
 msgstr "���"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "����������"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "����(_P)..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "Ž���դ�(_P)"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "�����ذ�ư(_T)"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "�������ذ�ư(_G)..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "����/¿˻ ����θ���(_P)"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "����(_S)..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "����(_O)"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "��̾����¸(_S)..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "���ԡ�(_C)"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "�ߡ��ƥ��󥰤Υ������塼��(_S)..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "iCalender�Ȥ���ž��(_F)..."
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "����������(_O)"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "���٤Ƥν��������(_A)"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "����(_S)..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 #, fuzzy
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "��å������򳫤�(_O)"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "�����������(_A)"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "iCalender�Ȥ���ž��(_F)"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "��λ�Ȥ��ƥޡ���(_M)"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "���򤵤줿��������λ�Ȥ��ƥޡ���(_M)"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "���򤷤�����������(_D)"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "���������ɲä���ˤϤ����򥯥�å�"
@@ -5023,8 +5366,8 @@ msgstr "% ��λ"
 msgid "Alarms"
 msgstr "���顼��"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "��λ���ޤ���"
 
@@ -5053,18 +5396,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5083,7 +5426,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%B %d %A"
 
@@ -5096,461 +5439,460 @@ msgstr "%b/%d"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "����"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "���"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "ñ��ʷ����֤�(_S)"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
 msgid "Every day"
 msgstr "��"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, fuzzy, c-format
 msgid "Every %d days"
 msgstr "%d ��"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 #, fuzzy
 msgid "Every week"
 msgstr "��"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, fuzzy, c-format
 msgid "Every %d weeks"
 msgstr "%d ����"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, fuzzy, c-format
 msgid "Every %d weeks on "
 msgstr "%d ����"
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 #, fuzzy
 msgid " and "
 msgstr "��"
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 #, fuzzy
 msgid "every month"
 msgstr "���(_H)"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 #, fuzzy
 msgid "Every year"
 msgstr "��"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>��λ:</b>"
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>���:</b>"
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>����:</b>"
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "iCalendar ����:"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "iCalendar ���顼"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "̤�Το�"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>�ʤ�</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "���:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "���ơ�����:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "��������"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "����"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "���ष��"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 #, fuzzy
 msgid "Choose an action:"
 msgstr "��������������"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 #, fuzzy
 msgid "Update"
 msgstr "�������򹹿�"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 #, fuzzy
 msgid "Accept"
 msgstr "��������"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "����"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 #, fuzzy
 msgid "Decline"
 msgstr "���ष��"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "����/¿˻ ����"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "����������"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "����󥻥�"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> �ϸ������줿��ľ���Ǥ�"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "��ľ���"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, 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:1271
+#: calendar/gui/e-itip-control.c:1269
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ������׵ᤷ�ޤ���"
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "��Ĥ����"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> �ϲ�Ĥ��׵���������ޤ���"
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "�����"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> �ϸ������줿��ľ���Ǥ�"
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "��Ĥι����׵�"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> �ϲ�Ĥ��׵���������ޤ���"
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "��Ĥ˴ؤ�������"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> �ϲ�Ĥ򥭥�󥻥뤷�ޤ���"
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "��Ĥ򥭥�󥻥�"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> �ϲ�Ĥ򥭥�󥻥뤷�ޤ���"
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "�����ʲ�ĥ�å�����"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> �ϸ������줿��ľ���Ǥ�"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "����������"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ������׵ᤷ�ޤ���"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, fuzzy, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ������׵ᤷ�ޤ���"
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "�����������"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> �ϲ�Ĥ��׵���������ޤ���"
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "�������򹹿�"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "�ǿ��Υ�������������"
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "�������ι����׵�"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> �ϥ������γ�����Ƥ��������ޤ���"
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "�������˴ؤ�������"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> �ϥ������򥭥�󥻥뤷�ޤ���"
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "�������򥭥�󥻥�"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "�����ʥ�������å�����"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> �϶���/¿˻ �����������ޤ���"
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "����/¿˻ ����"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ������׵ᤷ�ޤ���"
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "����/¿˻ ���׵�"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ����˴ؤ����������ޤ���"
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "����/¿˻ ���ֿ�"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "������ ����/¿˻ ��å�����"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "�ե�����Dz�����ǽ�ʥ��顼��ȯ�������褦�Ǥ�"
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "���Υ�å�������̤�б����׵��ޤ�Ǥ��ޤ�"
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "���������ե�����Ϲ����Ǥ��ޤ���Ǥ���!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "������λ\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "�������ե�������ɤ߹�����˥��顼��ȯ�����ޤ���"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Bug buddy �ϼ¹ԤǤ��ޤ���Ǥ���"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "`%s' �Υե�����򳫤����Ȥ�����ޤ���Ǥ���"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "���������ե�����Ϲ����Ǥ��ޤ���Ǥ���!\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "�����λ"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "�����ƥ������!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -5713,7 +6055,7 @@ msgstr "%Y/%m/%d (%a)"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
@@ -5777,100 +6119,86 @@ msgstr "��ij��ϻ���(_S):"
 msgid "Meeting _end time:"
 msgstr "��Ľ�λ����(_E):"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "������(_R):"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "����(_D):"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "ͥ����(_P):"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "�ڡ���"
 
-#: calendar/gui/e-tasks.c:715
-#, fuzzy, c-format
-msgid "Opening tasks at %s"
-msgstr "��¸���줿 %s �򥪡��ץ���"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "'%s' �Υ��������ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "'%s' ���ɤ߹��ळ�Ȥ��׵ᤵ���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "`%s' �Υե�����򳫤����Ȥ�����ޤ���Ǥ���"
 
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "%s �γ�����˥��顼��ȯ�����ޤ���"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "���"
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "���򤷤�Ϣ����������ޤ�"
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 #, fuzzy
 msgid "Expunging"
 msgstr "�ե����������"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "������"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "������"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s' �Υե�����򳫤����Ȥ�����ޤ���Ǥ���"
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "'%s' �򳫤����Ȥ��׵ᤵ���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "���顼��"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5878,7 +6206,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5886,64 +6214,11 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "�ȥ륳��"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "�������ȥ�����"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "������"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "�������ȥ�����"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution ����ݡ����Τ���Υե����ȥ�"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution ������ iTip/iMip �ӥ塼��"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Evolution ������ iTip/iMip �ӥ塼��"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution �˥塼�����ǥ���"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Evolution �˥塼�����ǥ���"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolution �������¹ԥ��ޥꥳ��ݡ��ͥ��"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolution �᡼�륳��ݡ���"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "4 ��"
@@ -6000,308 +6275,344 @@ msgstr "10 ��"
 msgid "September"
 msgstr "9 ��"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "��żԤ�ɬ�ܤǤ�"
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 #, fuzzy
 msgid "Event information"
 msgstr "����������"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 #, fuzzy
 msgid "Task information"
 msgstr "����������"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 #, fuzzy
 msgid "Journal information"
 msgstr "���ץ����"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "����/¿˻ ����"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 #, fuzzy
 msgid "Calendar information"
 msgstr "����������"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 #, fuzzy
 msgid "Updated"
 msgstr "�������򹹿�"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 #, fuzzy
 msgid "Refresh"
 msgstr "�ꥹ�Ȥ򹹿�"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "����/¿˻ ����"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 #, fuzzy
 msgid "iCalendar information"
 msgstr "����������"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1 ��"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2 ��"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3 ��"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4 ��"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5 ��"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6 ��"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7 ��"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8 ��"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9 ��"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10 ��"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11 ��"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12 ��"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13 ��"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14 ��"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15 ��"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16 ��"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17 ��"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18 ��"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19 ��"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20 ��"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21 ��"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22 ��"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23 ��"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24 ��"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25 ��"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26 ��"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27 ��"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28 ��"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29 ��"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30 ��"
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31 ��"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "��"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "��"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "��"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "��"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "��"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "��"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "��"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "���򤷤����� [%Y/%m/%d (%a)]"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%m/%d (%a)"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%Y/%d (%a)"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%Y/%b/%d (%a)"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "���򤷤��� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "���򤷤��� (%Y/%b)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "���򤷤�ǯ (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 #, fuzzy
 msgid "Task"
 msgstr "������(_T)"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, fuzzy, c-format
 msgid "Status: %s"
 msgstr "���ơ�����(_S):"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "ͥ����(_P):"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, fuzzy, c-format
 msgid "Percent Complete: %i"
 msgstr "���:"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, fuzzy, c-format
 msgid "URL: %s"
 msgstr "URL:"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, fuzzy, c-format
 msgid "Categories: %s"
 msgstr ""
 "\n"
 "��̳ʬ��: "
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 #, fuzzy
 msgid "Contacts: "
 msgstr "Ϣ����(_N):"
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "�����ץ�ӥ塼"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "�����ƥ�����"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "�ץ�󥿤�����"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "���Υ��硼�ȥ��åȤ��͡���"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "�������ꥹ��"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "����������"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "������(_T)"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "������������������ޤ�"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "�������ե������ɽ������ URI"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 #, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -6314,11 +6625,11 @@ msgstr ""
 "\n"
 "�����ˤ����Υ�å�������õ�ޤ���?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "���٤ȼ��䤷�ʤ�"
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 #, fuzzy
 msgid "Print Tasks"
 msgstr "�����ɤΰ���"
@@ -6351,17 +6662,17 @@ msgstr "������������"
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 #, fuzzy
 msgid "Reminder!!"
 msgstr "��¥��"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 #, fuzzy
 msgid "Calendar Events"
 msgstr "������������"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6370,7 +6681,7 @@ msgstr ""
 "Evolution �� Pine �᡼��ե������ȯ�����ޤ���\n"
 "Evolution �إ���ݡ��Ȥ��Ƥ��������Ǥ���?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "������"
@@ -7985,28 +8296,28 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "������Ϥ��ΰŹ�򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "�٥�ե����Ϥ��ΰŹ�򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "��沽�Ϥ��ΰŹ�򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "���沽�Ϥ��ΰŹ�򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 #, fuzzy
 msgid "You may not import keys with this cipher"
 msgstr "���沽�Ϥ��ΰŹ�򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 #, fuzzy
 msgid "You may not export keys with this cipher"
 msgstr "���沽�Ϥ��ΰŹ�򥵥ݡ��Ȥ��Ƥ��ޤ���"
@@ -8056,89 +8367,89 @@ msgstr "�ե���� '%s' ����¸��"
 msgid "You must be working online to complete this operation"
 msgstr "����ư���λ���뤿��˥���饤��Ǻ�Ȥ��ʤ���Фʤ�ޤ���"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "��å������Υ���å���˼��Ԥ��ޤ��� %s: %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "��å������Υ���å���˼��Ԥ��ޤ��� %s: %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "�ǥ��쥯�ȥ� %s ���������ޤ���Ǥ���: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "�ե������Ʊ����"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "�ե��륿�ι�ʸ������˥��顼: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "�ե��륿�¹���˥��顼: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "���ס���ե�����򳫤����Ȥ�����ޤ���"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "���ס���ե������������뤳�Ȥ�����ޤ���"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "������ %d ������� (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "��å������򳫤����Ȥ�����ޤ���"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "��å����� %d �Ǽ��Ԥ��ޤ���"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "�ե������Ʊ����"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "������ %d / %d �������"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "��å����� %d / %d �ϼ��Ԥ��ޤ���"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "��å������Υǥ����ɤ˼��Ԥ��ޤ���"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "�����ʰ����Ǥ�"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "�����ʰ����Ǥ�"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "�ե��륿�����¹���˥��顼: %s: %s"
@@ -8170,36 +8481,36 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr "̤�ΤΥإå��ǥ������¹Ԥ��Ƥ��ޤ�: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "̤�б������: ����ɽ���Ǥθ���: %s ��"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "̤�б������: uid �Ǥθ���: %s ��"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "��å��������ư"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 #, fuzzy
 msgid "Copying messages"
 msgstr "%s �إ�å������򥳥ԡ���"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "%d �̤Υ�å������������"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8207,47 +8518,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "����󥻥뤷�ޤ���"
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "POP�����Ф���ͽ�����ʤ�����������ޤ���: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 #, fuzzy
 msgid "No data provided"
 msgstr "���ꤵ�줿�ե�����Ϥ���ޤ���"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "���Υ�å�������Ź沽�Ǥ��ޤ���: �����Ԥ����ꤵ��Ƥ��ޤ���"
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8255,49 +8566,61 @@ msgid ""
 "%s"
 msgstr "��å������Υ���å���˼��Ԥ��ޤ��� %s: %s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "��å������Υ���å���˼��Ԥ��ޤ��� %s: %s"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "�ǡ�����񤭽Ф����Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "��å������Υǥ����ɤ˼��Ԥ��ޤ���"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "��å������Υǥ����ɤ˼��Ԥ��ޤ���"
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr "���Υ�å�����������Ǥ��ޤ���: ��ȥե����������Ǥ��ޤ���Ǥ���: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "���Υ�å�����������Ǥ��ޤ���: ��ȥե����������Ǥ��ޤ���Ǥ���: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "�ǡ�����񤭽Ф����Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "�Ź沽���줿��å�����"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "���ǥ��������å��������������ޤ���Ǥ���"
@@ -8397,15 +8720,15 @@ msgstr "�᡼���ȥե�����ν񤭹�����˥��顼: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "�᡼���ȥե�����Υ��ԡ���˥��顼: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 #, fuzzy
 msgid "parse error"
 msgstr "����¾�Υ��顼"
@@ -8723,12 +9046,12 @@ msgstr "���ۥե�����᡼��ץ��Х���"
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "�ץ��ȥ��� `%s' �����ѤǤ���ץ��Х����Ϥ���ޤ���"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8737,71 +9060,82 @@ msgstr ""
 "�ǥ��쥯�ȥ� %s ���������ޤ���:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "���ʤ��� %s �ѥ��ե졼�� ( %s ��) �����Ϥ��Ƥ�������"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "̤���"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "��̾���Խ�"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "��̾���Խ�"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "����ե����졼�����ǡ����١������ߤĤ���ޤ���"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "ǧ�� ID"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "��̾����¸"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "����¾�Υ��顼"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "������: %s, ����: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "�ե����������Ǥ��ޤ���: ���Υ��ȥ��Ǥ����������Ǥ�"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "�ե����������Ǥ��ޤ���: ���Υ��ȥ��Ǥ����������Ǥ�"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "����Ȣ"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "6 ��"
+
 #: camel/camel-tcp-stream-openssl.c:568
 #, fuzzy
 msgid "Unable to get issuer's certificate"
@@ -9007,7 +9341,7 @@ msgid ""
 "Issuer: %s"
 msgstr "ǧ�� ID"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL `%s' ����Ϥ��뤳�Ȥ�����ޤ���Ǥ���"
@@ -9027,22 +9361,22 @@ msgstr "%s �� %s �Τ褦�ʥ�å������Ϥ���ޤ���"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "���٤ƤΥե�����ο���᡼�������å����ޤ�"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "�ե���������Ǥ��ޤ���: %s: ���������Ǥ�"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "�ե���������Ǥ��ޤ���: %s: ���Τ褦�ʥե�����Ϥ���ޤ���"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "�ե�������͡���Ǥ��ޤ���: %s: ���������Ǥ�"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "�ե�������͡���Ǥ��ޤ���: %s: ���Τ褦�ʥե�����Ϥ���ޤ���"
@@ -9120,7 +9454,7 @@ msgstr "��å������Υǥ����ɤ˼��Ԥ��ޤ���"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9134,7 +9468,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "���Τ褦�ʥ�å������Ϥ���ޤ���"
@@ -9172,54 +9506,71 @@ msgid "Failed to cache %s: %s"
 msgstr "��å������Υ���å���˼��Ԥ��ޤ��� %s: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "�����Ф���³��..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "LDAP �����Ф���³����ޤ���"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr ""
+"\n"
+"����: "
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "����᡼��Υ����å�"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Check for new messages in all folders"
 msgstr "���٤ƤΥե�����ο���᡼�������å����ޤ�"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "�ե����"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "���ɤ����ե��������ɽ��"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "�����Ф��󶡤���ե�����Υ͡��ॹ�ڡ������ͥ�褹��"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "�͡��ॹ�ڡ���"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "���Υ����о�� INBOX ��ˤ��뿷����å������إե��륿��Ŭ�Ѥ���"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "����᡼���ưŪ�˥����å�����ֳ�(_A)"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP �����Фǥ᡼����ɤ�������Ѥ��뤿��Τ�ΤǤ�"
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "�ѥ����"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9473,7 +9824,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "�ե������ %s ���� %s ��̾���ѹ����뤳�Ȥ�����ޤ���Ǥ���: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "�ե�������͡������ޤ���Ǥ���: %s"
@@ -9592,30 +9943,30 @@ msgstr "������������������"
 msgid "Storing folder"
 msgstr "�ե��������¸��"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s �Υե�������å���������뤳�Ȥ�����ޤ���: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "mailbox�򳫤����Ȥ�����ޤ���: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "���ϥ���󥻥뤷�ޤ���"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "mbox �ե�����˥�å��������ɲý���ޤ���: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9624,11 +9975,11 @@ msgstr ""
 "��å����� %s ��ե���� %s �����������ޤ���\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "�ե�����Dz�����ǽ�ʥ��顼��ȯ�������褦�Ǥ�"
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "��å������β��˼��Ԥ��ޤ���: �ְ�ä��᡼��ܥå����Ǥ���?"
 
@@ -9696,12 +10047,17 @@ msgstr "�ǥ��쥯�ȥ� %s ���������ޤ���Ǥ���: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "�ե�������������ޤ���: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "������ID�Ϥ��Ǥ�¸�ߤ��ޤ�"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "�ե������ %s ���� %s ��̾���ѹ����뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "���ꤵ�줿�ե����̾��ͭ���ǤϤ���ޤ���: %s"
@@ -9745,7 +10101,7 @@ msgstr "���Υե���� %s ���Ĥ��뤳�Ȥ�����ޤ���Ǥ���: %s"
 msgid "Could not close temp folder: %s"
 msgstr "��ȥե�������Ĥ��뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "�ե�������͡������ޤ���Ǥ���: %s"
@@ -10029,7 +10385,7 @@ msgstr "%s ����˺������"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -10120,7 +10476,7 @@ msgid "No such folder `%s'."
 msgstr "���Τ褦�ʥե���� `%s' �Ϥ���ޤ���"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10175,7 +10531,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmail ��ͳ�ǥ᡼����ۿ�"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10346,7 +10702,7 @@ msgstr "%s ��ͳ�� SMTP �᡼����ۿ����ޤ�"
 msgid "Cannot send message: sender address not valid."
 msgstr "��å���������������ޤ���: �����ԤΥ��ɥ쥹������������ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "��������������"
 
@@ -10475,7 +10831,7 @@ msgstr "%.1fM"
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "ź��"
 
@@ -10520,14 +10876,14 @@ msgstr "MIME ������:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "���ʤ��ϥ᡼�������������˥桼�������\n"
 "����򤹤�ɬ�פ�����ޤ�"
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "���ɥ쥹Ģ�Τ���ˤ����ǥ���å�"
 
@@ -10538,45 +10894,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "�ֿ���:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "���п�:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "��̾:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "��å������μ����Ԥ����Ϥ��ޤ�"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "��å������Υ����ܥ󥳥ԡ���������륢�ɥ쥹�����Ϥ��ޤ�"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10587,14 +10943,19 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr "�����"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "��å������إե������ź�դ��ޤ�"
+
 #: composer/e-msg-composer-select-file.c:119
 #, fuzzy
 msgid "Attach file(s)"
@@ -10631,21 +10992,21 @@ msgstr "�ե������¸�ߤ��ޤ�����񤭤��ޤ���?"
 msgid "Error saving file: %s"
 msgstr "�ե��������¸��˥��顼: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "�ե�����Υ�������˥��顼: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "�ե�����Υ���������˥��顼: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "���ǥ��������å��������������ޤ���Ǥ���"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10654,7 +11015,7 @@ msgstr ""
 "�ե�����������Ǥ��ޤ���: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10663,7 +11024,7 @@ msgstr ""
 "�ե�������ڤ�ͤ�뤳�Ȥ�����ޤ���: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10672,7 +11033,7 @@ msgstr ""
 "�ե�����������Ǥ��ޤ���: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10681,7 +11042,7 @@ msgstr ""
 "��å������μ�ư��¸��˥��顼: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10689,7 +11050,7 @@ msgstr ""
 "Evolution �� ����Υ��å�������¸����Ƥ��ʤ��ե������ȯ�����ޤ�����\n"
 "������ꥫ�Хꤷ�Ƥߤޤ���?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10700,34 +11061,34 @@ msgstr ""
 "\n"
 "�ѹ�����¸���ޤ���?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "�ٹ�: �ѹ����줿��å�����"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "�ե�����򳫤�"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "��̾:"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "��ư����"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "��å�������������ޤ�"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10738,7 +11099,7 @@ msgstr ""
 "�᡼�륳��ݡ��ͥ�Ȥˤޤ���������Ƥ��ʤ�����\n"
 "��å���������������ɥ���������뤳�Ȥ�����ޤ���Ǥ���"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10747,18 +11108,20 @@ msgstr ""
 "�᡼�륳��ݡ��ͥ�Ȥˤޤ���������Ƥ��ʤ�����\n"
 "��å���������������ɥ���������뤳�Ȥ�����ޤ���Ǥ���"
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Evolution ���롼�ץ�������������"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -11008,13 +11371,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11144,7 +11507,7 @@ msgstr "����"
 msgid "You must specify a folder."
 msgstr "��������̾:"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "�ե����������"
@@ -11158,24 +11521,24 @@ msgstr ""
 "����ɽ�� '%s' �ǥ��顼�Ǥ�:\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "����"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "To Do"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "���"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "�ƥ���"
 
@@ -11280,7 +11643,7 @@ msgstr "��"
 msgid "months"
 msgstr "��"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr " ��"
 
@@ -11379,7 +11742,7 @@ msgstr "ɽ��"
 msgid "Follow Up"
 msgstr "�ե��������å�"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr ""
 
@@ -11449,120 +11812,126 @@ msgid "Source Account"
 msgstr "���������������"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "���"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "����Υإå�"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "�������"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "��̾"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "̤���ꥹ�ơ�����"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "�����Τ�Τ�ޤ�"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "�����Τ�Τ�ޤޤʤ�"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "�����Τ�Τǽ���ʤ�"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "��¸�ߤ��ʤ�"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 #, fuzzy
 msgid "does not return"
 msgstr "��¸�ߤ��ʤ�"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "�����Τ�ΤΤ褦�Ǥʤ�"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "�����Τ�ΤǻϤޤ�ʤ�"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "�����Τ�Τǽ����"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "��¸�ߤ���"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 #, fuzzy
 msgid "is Flagged"
 msgstr "�ե饰"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 #, fuzzy
 msgid "is after"
 msgstr "���������"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "is before"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "�����Τ�Τ���礭��"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "�����Τ�Τ�꾮����"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 #, fuzzy
 msgid "is not Flagged"
 msgstr "�ե饰"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "�����Τ�ΤǤϤʤ�"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "�����Τ�ΤȰ��פ���"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 #, fuzzy
 msgid "returns greater than"
 msgstr "�����Τ�Τ���礭��"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 #, fuzzy
 msgid "returns less than"
 msgstr "�����Τ�Τ�꾮����"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 #, fuzzy
 msgid "returns"
 msgstr "�Ż�"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "�����Τ�ΤΤ褦�˸�����"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "�����Τ�Τdz��Ϥ���"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
@@ -11588,19 +11957,86 @@ msgstr "�롼��̾: "
 msgid "Score Rules"
 msgstr "�������롼��"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "���β��ۥե������̾�������ꤷ�Ƥ�������"
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 #, fuzzy
 msgid "VFolder source"
 msgstr "���ۥե�����Υ�����"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "����ݡ���������"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#, fuzzy
+msgid "Configure your email accounts here"
+msgstr "�᡼�륢������Ȥ�¾����������/�Խ����ޤ�"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution ����ݡ����Τ���Υե����ȥ�"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Evolution �᡼�륳��ݡ���"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Evolution �᡼�륳��ݡ���"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution ����ݡ����Τ���Υե����ȥ�"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution �᡼��ե�����ǥ����ץ쥤����ݡ��ͥ��"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolution �᡼��¹ԥ��ޥꥳ��ݡ��ͥ��"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "�᡼��"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "�᡼�륢�������"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "�᡼������"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "�����ˤ��Υ�������Ȥ������Ƥ��������Ǥ���?"
@@ -11643,7 +12079,7 @@ msgid "Protocol"
 msgstr "�ץ��ȥ���"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 #, fuzzy
 msgid "Unnamed"
 msgstr "̾���Τʤ�Ϣ����"
@@ -11668,18 +12104,15 @@ msgstr "������ץȽ�̾���ɲ�"
 msgid "Signature(s)"
 msgstr "��̾"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "�Ȥˤ�����������?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11687,28 +12120,28 @@ msgstr ""
 "���Υ�å������Ϸ�̾������ޤ���\n"
 "�������������ޤ���?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "���Υ�å������� Bcc �������ꤵ��Ƥ��ޤ���"
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "���Υ�å���������������Ŭ�ڤʼ����Ԥ���ꤷ�ʤ���Фʤ�ޤ���"
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11720,193 +12153,408 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "�������鲾�ۥե���������(_V)..."
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "�᡼��"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<�ե���������򤹤뤿��ˤ����򥯥�å����Ƥ�������>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, fuzzy, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "%s �˳���..."
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#, fuzzy
+msgid "Create New Folder"
+msgstr "�����ե���������(_N)..."
+
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "�ե������������������ꤷ�Ƥ�������:"
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
-msgid "Folder _name"
+msgid "Folder _name:"
 msgstr "�ե����̾:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "��ȥǥ��쥯�ȥ���������ޤ���Ǥ���: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "��ȥǥ��쥯�ȥ���������ޤ���Ǥ���: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "��ȥե����������Ǥ��ޤ���Ǥ��� '%s': %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "��ȥե�������Ĥ��뤳�Ȥ�����ޤ���Ǥ���: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "�ɤ߹�����..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "�ե����������"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "�����ե������������ޤ�"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "�ե���� `%s' �������뤳�Ȥ�����ޤ���Ǥ���: %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "�ե�����������ޤ� '%s'"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "\"%s\" ����"
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "�ե���� \"%s\" ���͡���"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+#, fuzzy
+msgid "Rename Folder"
+msgstr "�ե�������͡���"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "�ե���ȥץ��ѥƥ�"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "�ץ��ѥƥ�"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "�ե����̾(_F):"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "ɽ��(_V)"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "����������ɥ��dz���"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "��ư"
+
+#: mail/em-folder-tree.c:1500
+msgid "_New Folder..."
+msgstr "�����ե����(_N)..."
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "��͡���(_R)"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "�ץ��ѥƥ�(_P)..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "������å������Ȥ����Խ�..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "����(_P)"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "�����Ԥ��ֿ�(_R)"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "�ꥹ�Ȥ��ֿ�(_L)"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "�������ֿ�(_A)"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "ž��(_F)"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "��λ���ޤ���"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "���ꥢ"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "�����ѤߤȤ��ƥޡ���(_K)"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "̤�ɤȤ��ƥޡ���(_U)"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "���פȤ��ƥޡ���(_I)"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "����פȤ��ƥޡ���(_M)"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "̤�ɤȤ��ƥޡ���(_U)"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "���פȤ��ƥޡ���(_I)"
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "������(_N)"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "�ե�����ذ�ư(_V)..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "�ե�����إ��ԡ�(_C)..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "�����Ԥ򥢥ɥ쥹Ģ���ɲ�"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "�ե��륿Ŭ��"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "��å���������롼������(_L)"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "��̾�β��ۥե����(_S)"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "�����Ԥβ��ۥե����(_N)"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "�����Ԥβ��ۥե����(_R)"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե����(_L)"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "�����Ԥβ��ۥե����(_N)"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "��̾�Υե��륿(_J)"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "�����ԤΥե��륿(_D)"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "�����ԤΥե��륿(_C)"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "�᡼��󥰥ꥹ�ȤΥե��륿(_M)"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "�����ԤΥե��륿(_D)"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "�ǥե����"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "�����������"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "���򥳥ԡ�"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "����:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "�����ƺѤ�"
+
+#: mail/em-format-html-display.c:597
 #, fuzzy
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr "���Υ�å������ϥǥ������̾���쿮��Ǥ����ΤǤ�"
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr "���Υ�å������ϥǥ������̾���줿��ΤǤ���, ������������ޤ���"
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "��̾���Խ�"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "��̾���Խ�"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "̤���"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+#, fuzzy
+msgid "Encrypted, weak"
+msgstr "�Ź沽���줿��å�����"
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "PGP �ˤ��Ź沽"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+#, fuzzy
+msgid "Encrypted, strong"
+msgstr "�Ź沽���줿��å�����"
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "MIME ��å���������Ͻ���ޤ���Ǥ���, ��������ɽ�����ޤ�"
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "�桼���ˤ�ä����򥭥�󥻥뤵��ޤ���"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "ǧ�ڤξ����˼��Ԥ��ޤ���"
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "����饤��ɽ��"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "����"
@@ -11916,184 +12564,206 @@ msgstr "����"
 msgid "Page %d of %d"
 msgstr "������ %d / %d �������"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "������ %s �������"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ������ (%s) ��ؤ��Ƥ��ޤ�"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "��������ե����� (%s) ��ؤ��Ƥ��ޤ�"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "��⡼�ȥǡ��� (%s) ��ؤ��Ƥ��ޤ�"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "̤�Τγ����ǡ��� (\"%s\" ������) ��ؤ��Ƥ��ޤ�"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "���Υ�å������ϥǥ������̾���줿��ΤǤ���, ������������ޤ���"
-
-#: mail/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "���Υ�å������ϥǥ������̾���쿮��Ǥ����ΤǤ�"
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-#, fuzzy
-msgid "No signature present"
-msgstr "HTML ��̾�ե�����:"
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "GNOME �ν����������ޤ���Ǥ���"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "�桼���ˤ�ä����򥭥�󥻥뤵��ޤ���"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME ��å���������Ͻ���ޤ���Ǥ���, ��������ɽ�����ޤ�"
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "��å��������ư"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "���п�"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "�ֿ���"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "����"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "�᡼��"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "����"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "%s ��ź��"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "MIME ��å���������Ͻ���ޤ���Ǥ���, ��������ɽ�����ޤ�"
+msgid "Session not initialised"
+msgstr "GNOME �ν����������ޤ���Ǥ���"
 
-#: mail/em-popup.c:593
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "���Υ�å������ϥǥ������̾���쿮��Ǥ����ΤǤ�"
+
+#: mail/em-format.c:1212
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr "���Υ�å������ϥǥ������̾���줿��ΤǤ���, ������������ޤ���"
+
+#: mail/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "�Ե���..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "%s ��������"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "��å������Υ���å���˼��Ԥ��ޤ��� %s: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "��å������Υ���å���˼��Ԥ��ޤ��� %s: %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "��å������Υ���å���˼��Ԥ��ޤ��� %s: %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "��̾����¸..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "�����Ԥ��ֿ�(_R)"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "�֥饦���ǥ�󥯤򳫤�"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "�ꥹ�Ȥإ�å�����������(_M)..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "���ɥ쥹Ģ���ɲ�"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "%s �˳���..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "IMAP �����Фα����� %s �����ޤ�Ǥ��ޤ���"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "����"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "�ե����"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "����������"
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "���򤵤줿�����ФϤ���ޤ���"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "���Υ�å����������٤�ɽ�����ʤ�"
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12102,27 +12772,27 @@ msgstr ""
 "�ե��륿����Υ�������˥��顼:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "�ե��륿"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "ž�����줿��å�����"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "������������"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%Yǯ%m��%d��(%a)��%H��%Mʬ�� %%s ۩��:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12131,7 +12801,7 @@ msgstr ""
 "��å��������������ޤ���: %s\n"
 "  %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12140,26 +12810,39 @@ msgstr ""
 "%s�Ϥ��Ǥ�¸�ߤ��ޤ�\n"
 "�����˾�񤭤��ޤ���?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "������"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "��å���������̾����¸..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "��ȥǥ��쥯�ȥ���������ޤ���Ǥ���: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "����(_A):"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
+msgid ""
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"�������Ϻ���˥ޡ�������Ƥ��뤹�٤ƤΥ�å�������õ�ޤ�������³�Ԥ�"
+"��ȡ������Υ�å������򸵤��᤻�ʤ��ʤ�ޤ���\n"
+"\n"
+"�����ˤ����Υ�å�������õ�ޤ���?"
+
+#: mail/em-utils.c:2288
 #, fuzzy
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12168,103 +12851,386 @@ msgstr ""
 "\n"
 "�����ˤ����Υ�å�������õ�ޤ���?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "����ݡ���������"
+#: mail/evolution-mail.schemas.in.in.h:1
+#, fuzzy
+msgid "Automatic link recognition"
+msgstr "��ưŪ�˥�󥯤򸡽Ф���(_D)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "��ưŪ�˥�󥯤򸡽Ф���(_D)"
+
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:6
 #, fuzzy
-msgid "Configure your email accounts here"
-msgstr "�᡼�륢������Ȥ�¾����������/�Խ����ޤ�"
+msgid "Default charset in which to compose messages"
+msgstr "���򤵤줿��å��������ڤ���"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/evolution-mail.schemas.in.in.h:7
 #, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
+msgid "Default charset in which to compose messages."
+msgstr "���򤵤줿��å��������ڤ���"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution ����ݡ����Τ���Υե����ȥ�"
+msgid "Default charset in which to display messages"
+msgstr "ɽ�����줿��å��������Τδޤޤ��ƥ����Ȥ򸡺����ޤ�"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
-msgid "Evolution Mail component"
-msgstr "Evolution �᡼�륳��ݡ���"
+msgid "Default charset in which to display messages."
+msgstr "ɽ�����줿��å��������Τδޤޤ��ƥ����Ȥ򸡺����ޤ�"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Evolution �᡼�륳��ݡ���"
+msgid "Default forward style"
+msgstr "�ǥե���Ȥ�ž����ˡ: "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution ����ݡ����Τ���Υե����ȥ�"
+msgid "Default reply style"
+msgstr "�ǥե���Ȥ�ž����ˡ: "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
 #, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution �᡼��ե�����ǥ����ץ쥤����ݡ��ͥ��"
+msgid "Empty Trash folders on exit"
+msgstr "��λ���˥���Ȣ����ˤ���(_T)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Evolution �᡼��¹ԥ��ޥꥳ��ݡ��ͥ��"
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "��λ���˥���Ȣ����ˤ���(_T)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+#, fuzzy
+msgid "Height of the message-list pane"
+msgstr "��ǥ�å��������������ޤ�"
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "�᡼�륢�������"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "�᡼������"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
 
-#: mail/importers/elm-importer.c:105
-msgid "Evolution is importing your old Elm mail"
-msgstr "Evolution �� ���ʤ��θŤ� Elm �᡼��򥤥�ݡ�����"
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
-msgid "Importing..."
-msgstr "����ݡ�����..."
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
-msgid "Please wait"
-msgstr "���Ф餯���Ԥ���������"
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "%s �� %s �Ȥ��ƥ���ݡ�����"
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
 
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "%s ��������"
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "���ξ���ư���¹�:"
 
-#: mail/importers/elm-importer.c:547
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "�����᡼������"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "�����᡼������"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
-"Evolution �� Elm �᡼��ե������ȯ�����ޤ���\n"
-"Evolution �إ���ݡ��Ȥ��Ƥ��������Ǥ���?"
 
-#: mail/importers/elm-importer.c:568
-msgid "Elm"
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+"HTML �᡼���˾��Ǥ��ʤ������ HTML �᡼���������������Τ餻��(_P)"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "�������� Bcc �������ꤵ��Ƥ��ʤ������Τ餻��(_O)"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "�ǥե���Ȥ� HTML �����Υ᡼�����������(_S)"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "�ǥե���Ȥ� HTML �����Υ᡼�����������(_S)"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "���˥᡼����������ɽ��(_S)"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "���˥᡼����������ɽ��(_S)"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "�̾�Υ�å�������ɽ�����ޤ�"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "�ץ�ӥ塼�ڥ���(_P)"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "����᡼�������Dz����Ĥ餹(_P)"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "���ڥ�����å�(_C)"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "�����ߥʥ�ե����(_T):"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+msgid "The variable width font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "��å������ꥹ�Ȥ򥹥�åɲ����ޤ�"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "��å������ꥹ�Ȥ򥹥�åɲ����ޤ�"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "���Υ�������Ȥ��������ꤹ��(_M)"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "�ѿ�"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
 msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
@@ -12299,6 +13265,44 @@ msgstr ""
 msgid "Evolution Pine importer"
 msgstr "Evolution �᡼�륳��ݡ���"
 
+#: mail/importers/elm-importer.c:105
+msgid "Evolution is importing your old Elm mail"
+msgstr "Evolution �� ���ʤ��θŤ� Elm �᡼��򥤥�ݡ�����"
+
+#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
+#: mail/importers/pine-importer.c:115
+msgid "Importing..."
+msgstr "����ݡ�����..."
+
+#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
+#: mail/importers/pine-importer.c:117
+msgid "Please wait"
+msgstr "���Ф餯���Ԥ���������"
+
+#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
+#: mail/importers/pine-importer.c:288
+#, c-format
+msgid "Importing %s as %s"
+msgstr "%s �� %s �Ȥ��ƥ���ݡ�����"
+
+#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
+#: mail/importers/pine-importer.c:425
+#, c-format
+msgid "Scanning %s"
+msgstr "%s ��������"
+
+#: mail/importers/elm-importer.c:547
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution �� Elm �᡼��ե������ȯ�����ޤ���\n"
+"Evolution �إ���ݡ��Ȥ��Ƥ��������Ǥ���?"
+
+#: mail/importers/elm-importer.c:568
+msgid "Elm"
+msgstr ""
+
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -12340,12 +13344,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "����Ȣ"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "�᡼��ե��륿�򥹥������"
@@ -12354,7 +13352,7 @@ msgstr "�᡼��ե��륿�򥹥������"
 msgid "Scanning directory"
 msgstr "�ǥ��쥯�ȥ��������"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "����ݡ��ȳ���"
 
@@ -12430,23 +13428,23 @@ msgid "You have not filled in all of the required information."
 msgstr "ɬ�פʾ���Τ��٤Ƥ����Ƥ��ޤ���"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution ��������ȥ��ǥ���"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "�ۥ���(_H):"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "�桼��̾(_N):"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "�ѥ�(_P):"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Ʊ��̾���Υ�������Ȥ�2�ĺ����Ǥ��ޤ���"
 
@@ -12455,35 +13453,35 @@ msgstr "Ʊ��̾���Υ�������Ȥ�2�ĺ����Ǥ��ޤ���"
 msgid "Mail to %s"
 msgstr "%s �إ᡼��"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "��̾�� %s �Ǥ�"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "%s ����᡼��"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s �᡼��󥰥ꥹ��"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "�ֿ���"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "�ե��륿�롼����ɲ�"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12491,144 +13489,30 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "��³��..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "���Υե�����ˤϥ�å������Ϥ���ޤ���"
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "�����᡼���å�����"
 
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "�ե�������͡������ޤ���Ǥ���: %s"
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "��å�������᡼��(_M)"
 
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "��ȥǥ��쥯�ȥ���������ޤ���Ǥ���: %s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "�����᡼���å�������������ޤ�"
 
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "��ȥե����������Ǥ��ޤ���Ǥ��� '%s': %s"
-
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "��ȥե�������Ĥ��뤳�Ȥ�����ޤ���Ǥ���: %s"
-
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "���Υǡ����򥤥�ݡ��Ȥ���������Υե���������򤷤Ƥ�������"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "���Υǡ����򥤥�ݡ��Ȥ���������Υե���������򤷤Ƥ�������"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "�����ե������������ޤ�"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "�ե������������������ꤷ�Ƥ�������:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "�ե���� `%s' �������뤳�Ȥ�����ޤ���Ǥ���: %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "�ե�����������ޤ� '%s'"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "\"%s\" ����"
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "�ե���� \"%s\" ���͡���"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-#, fuzzy
-msgid "Rename Folder"
-msgstr "�ե�������͡���"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "���ꤵ�줿�ե����̾��ͭ���ǤϤ���ޤ���: %s"
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "�ե���ȥץ��ѥƥ�"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "�ץ��ѥƥ�"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "�ե����̾(_F):"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "ɽ��(_V)"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "����������ɥ��dz���"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "��ư"
-
-#: mail/mail-component.c:2087
-msgid "_New Folder..."
-msgstr "�����ե����(_N)..."
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "��͡���(_R)"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "�ץ��ѥƥ�(_P)..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "�桼������"
 
@@ -12694,11 +13578,11 @@ msgstr ""
 "�ʲ��ˤ��Υ�������Ȥ�̾�������Ϥ��Ƥ�������������̾����ɽ����Ū������\n"
 "���Ѥ���ޤ���"
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "�����ӥ�������å���"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "�����Ф���³��..."
 
@@ -12780,26 +13664,35 @@ msgid "C_olors"
 msgstr "��(_O)"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "����᡼��Υ����å�"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "�����ԥ���˥��ڥ�����å��򤹤�(_T)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "����᡼��Υ����å�"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "���ڥ�ߥ���ñ��ˤĤ�����(_M):"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "����"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -12816,286 +13709,291 @@ msgstr ""
 "\n"
 "\"��λ\" �򥯥�å������������¸���Ƥ�������"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "�ǥե����(_F)"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "�ǥե���Ȥ�ư��"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "�ǥե���ȤΥ���饯�����󥳡��ǥ���(_E):"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "�᡼��κ��"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "���Υ�������ȤǤΥ�å����������ˤϾ�˽�̾����(_A)"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "���Υ�å�����������Ѥ��ʤ�"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "�ߡ��ƥ����׵�ˤϽ�̾���ʤ� (Outlook�Ȥθߴ����Τ����)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "��λ"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "��ƥե����(_F):"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "ͭ��(_N)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "�Żҥ᡼�륢�������"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "�Żҥ᡼�륢�ɥ쥹(_A):"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "��λ���˥���Ȣ����ˤ���(_T)"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "ǧ�� ID(_C):"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Evolution��������ȥ����������"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "���ޥ�ɤ�¹�..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "������(_X):"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "���ץ����"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "�ե���ȥץ��ѥƥ�"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "HTML�ǥ�å�����������(_H)"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "���ο��ǰ��Ѥ�Ĵ����(_q)"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "����饤��"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "��٥�ȿ�"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "�������ɤ߹���"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "�᡼�������"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "�᡼��ܥå����ξ��"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "��å���������ݡ�����"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "��å�����ɽ��"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 msgid "Message Fonts"
 msgstr "��å������ե����"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "�����᡼������"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "����: �ǽ����³�ޤǡ��ѥ���ɤ����Ϥ��뤳�ȤϤ���ޤ���."
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "�ɲþ���"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "���(_G):"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG���� ID(_K):"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "���顼������"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "�������� Bcc �������ꤵ��Ƥ��ʤ������Τ餻��(_O)"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "�ץ�ƥ����åɥץ饤�Х���(PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "�����ե����"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "���Υ�å����������"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "����"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "���Υѥ���ɤ򵭲�(_M)"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "�ֿ���(_P):"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "�᡼��μ�����"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "�������ץ����(_O)"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "���Υѥ���ɤ򵭲�(_P)"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "ɬ�ܾ���"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "���������᤹"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "�������ƥ�(_E)"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "�����奢 MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "�᡼���������"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "�����ѥ�å������ե����(_M):"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "�����Ѥ���ƥ�å�����"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "�����Ф�ǧ�ڤ�ɬ��(_V)"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "�������(_T):"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "����ե����졼�����ǡ����١������ߤĤ���ޤ���"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "�ե�����̾�����(_F):"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "���ڥ�����å�(_C)"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "ɸ��Ū�� UNIX �� mbox �ե�����"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13103,12 +14001,16 @@ msgstr ""
 "���Υ�������Ȥ򻲾Ȥ��뤿��˹�����̾�������ꤷ�Ƥ�������.\n"
 "�㤨��: \"�Ż�\" �� \"�ѡ����ʥ�\""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "�ѿ�"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -13119,171 +14021,180 @@ msgstr ""
 "\n"
 "\"��\" �򥯥�å����ƻϤ�Ƥ�������"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "��̾���ɲ�(_A)"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "��˲�����ͥåȤ����ɤ߹���(_A)"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr "���Υ�������ȤǤΥ�å����������ˤϾ�˽�̾����(_A)"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "ǧ�ڼ���(_A): "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "ǧ�ڼ���(_A): "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "����᡼���ưŪ�˥����å�����ֳ�(_A)"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "��ưŪ���ޥ��꡼���᡼������������(_A)"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "�����᡼�뤬���夷����ӡ��פ��Ĥ餹(_B)"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "�ե�����Ǥκ����ǧ(_C)"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "�ǥե���Ƚ�̾(_D):"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "�ǥե����(_D)"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "�����᡼�뤬���夷�Ƥ��Τ餻�ʤ�(_D)"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "ͭ��(_E)"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "ž����������(_F):"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "�ե�͡���(_F):"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "HTML �᡼��(_H)"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "�桼������(_I)"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "6 ��"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "�����Ԥ����ɥ쥹Ģ�ˤ�����������ɤ߹���(_L)"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "���Υ�������Ȥ��������ꤹ��(_M)"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "���λ��ַв᤹��ȥ�å����������Ѥߤˤ���(_M):"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "̾��(_N):"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "������ͥåȤ����ɤ߹��ޤʤ�(_N)"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "����᡼�������Dz����Ĥ餹(_P)"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "HTML �᡼���˾��Ǥ��ʤ������ HTML �᡼���������������Τ餻��(_P)"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "�������˷�̾�����ξ����Τ餻��(_P)"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "�᡼�����(_R)"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "�ֿ���������(_R):"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "���������᤹(_R)"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "������ץ�(_S):"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "���..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "�᡼������(_S)"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "���˥᡼����������ɽ��(_S)"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "��̾(_S)"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr "ɸ��ե����(_S):"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr "�����ߥʥ�ե����(_T):"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "�������ƥ����ݸ�줿��³(SSL)�����(_U):"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr "¾�Υ��ץꥱ��������Ʊ���ե���Ȥ���Ѥ���(_U)"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "����"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "%s ��������"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13292,7 +14203,7 @@ msgstr ""
 "'%s' �κݤ˥��顼��ȯ�����ޤ���:\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13301,7 +14212,7 @@ msgstr ""
 "���ν������Ƥ���֤˥��顼��ȯ�����ޤ���:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "�����"
 
@@ -13313,118 +14224,118 @@ msgstr "�ե������ե��륿��"
 msgid "Fetching Mail"
 msgstr "�᡼��������"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "��ȥե����� %s �إ᡼�����¸�˼��Ԥ��ޤ���: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "��ȥե����� %s �إ᡼�����¸�˼��Ԥ��ޤ���: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" ��������"
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "������ %d / %d ��������"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "��å����� %d / %d �ϼ��Ԥ��ޤ���"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "��λ���ޤ���"
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "�ե�����إ�å���������¸��"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "%s �إ�å��������ư��"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "%s �إ�å������򥳥ԡ���"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" ����Υե������������"
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "��å�������ž��"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "�ե���� %s �򥪡��ץ���"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "��¸���줿 %s �򥪡��ץ���"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "�ե���� %s ������"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "�ե���� '%s' ����¸��"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "�ե�����򹹿���"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "�ե����������"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "%s �� %s �Ȥ��ƥ���ݡ�����"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "��������ե����"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "������ %s �������"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d �̤Υ�å������������"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d �̤Υ�å���������¸��"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13433,7 +14344,7 @@ msgstr ""
 "���ϥե�������������ޤ���: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13442,11 +14353,11 @@ msgstr ""
 "�ե��������¸��˥��顼: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "ź�դ���¸��"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13455,21 +14366,25 @@ msgstr ""
 "���ϥե�������������ޤ���: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "�ǡ�����񤭽Ф����Ȥ�����ޤ���Ǥ���: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s �Ȥ���³���ڤäƤ��ޤ�"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s �˺���³��"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "��ʸ��/��ʸ������̤���"
@@ -13486,60 +14401,75 @@ msgstr "����:"
 msgid "Search"
 msgstr "����"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "��̾���Խ�"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "�㳰"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "����������"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "����󥻥���..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "������: %s, ����: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "����: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "�᡼���������"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 #, fuzzy
 msgid "Cancel _All"
 msgstr "���٤ƥ���󥻥�"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "������..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "�Ե���..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "�桼���ˤ�ä����򥭥�󥻥뤵��ޤ���"
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s �Τ���Υѥ���ɤ����Ϥ��Ƥ�������"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "�ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "���Υѥ���ɤ򵭲�(_R)"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -13578,26 +14508,31 @@ msgstr "���ν�̾��̾�������Ϥ��Ƥ�������."
 msgid "Name:"
 msgstr "̾��:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "��å�������ž�����ޤ��� - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "ž�����줿��å�����"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "�ե���� %s �򥪡��ץ���"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "���ۥե�����������: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "URI �β��ۥե�����򹹿���: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13606,89 +14541,89 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "���ۥե����"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 #, fuzzy
 msgid "vFolders"
 msgstr "�ե����"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "���ۥե�������Խ�"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "�������ۥե����"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "̤��"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "����"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "�����Ѥ�"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "ʣ����̤�ɥ�å�����"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "ʣ���Υ�å�����"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "�Ǥ��㤤"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "�㤤"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "�⤤"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "�Ǥ�⤤"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "������ %p %l:%M"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "������ %p %l:%M"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%p %l:%M (%a)"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%m�� %d�� %p %l:%M"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%Yǯ %m�� %d��"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "��å������ꥹ�Ȥ������"
 
@@ -13745,11 +14680,11 @@ msgstr "ž��"
 msgid "No Response Necessary"
 msgstr "�ֿ���ɬ��̵��"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "�ֿ�"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "�������ֿ�"
 
@@ -13802,44 +14737,139 @@ msgstr "����(_S)"
 msgid "_Unsubscribe"
 msgstr "���ɲ��(_U)"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Evolution ������"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "�ե��������"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "389"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "���Υ��硼�ȥ��åȥ��롼�פ��͡��ष�ޤ�"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "�ե�����С���ɽ�����뤫�ɤ������ؤ��ޤ�"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "���硼�ȥ��åȥС��򱣤��ޤ�"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "�ǥե����ͥ����:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "�ǥե����ͥ����:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "�᡼������Υ��󥿡��ե�����"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
 msgstr ""
-"�ե����ž���Ǥ��ޤ���:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 #, fuzzy
-msgid "Add a Folder"
-msgstr "�ե����������"
+msgid "Path to the default contacts folder"
+msgstr "�ե���� %s �򥪡��ץ���"
 
-#: shell/e-local-storage.c:179
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
-msgid "Drafts"
-msgstr "���"
+msgid "Path to the default mail folder"
+msgstr "�ե���� %s �򥪡��ץ���"
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "����Ȣ"
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "�ե���� %s �򥪡��ץ���"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "����Ȣ"
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
 
-#: shell/e-local-storage.c:182
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
 #, fuzzy
-msgid "Sent"
-msgstr "����"
+msgid "Physical URI to the default tasks folder"
+msgstr "�ե���� %s �򥪡��ץ���"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "�ե�����С���ɽ�����뤫�ɤ������ؤ��ޤ�"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "���硼�ȥ��åȥС���ɽ�����뤫�ɤ������ؤ��ޤ�"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "�᡼��"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "�������ե�����򹹿�����ޤ���Ǥ���"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13850,7 +14880,7 @@ msgstr ""
 "\n"
 "���顼: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13859,7 +14889,7 @@ msgstr ""
 "�ե������ `%s' �إ��ԡ����\n"
 "���顼��ȯ�����ޤ���"
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13870,7 +14900,7 @@ msgstr ""
 "Evolution �桼���ե�����Υ��󥹥ȡ����\n"
 "���Ƥ��뤿��˰�ư���Ʋ�����"
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13970,10 +15000,11 @@ msgstr ""
 "�ե�������͡���Ǥ��ޤ���:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+msgid "The specified folder name is not valid: %s"
+msgstr "���ꤵ�줿�ե����̾��ͭ���ǤϤ���ޤ���: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -13997,20 +15028,15 @@ msgstr ""
 "���ꤵ�줿�ե������������뤳�Ȥ�����ޤ���:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-#, fuzzy
-msgid "Create New Folder"
-msgstr "�����ե���������(_N)..."
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(�����ȥ�ʤ�)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr ""
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -14024,11 +15050,11 @@ msgstr ""
 "�⤷ʬ����ʤ��ʤ� \"��Ư\" �����򤹤뤳�Ȥ����衤Evolution �ϲ����ߤ��"
 "���礦"
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -14036,7 +15062,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14045,23 +15071,23 @@ msgstr ""
 "%s �򥤥�ݡ�����\n"
 "�����ƥ� %d �򥤥�ݡ�����"
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 #, fuzzy
 msgid "Select importer"
 msgstr "�ե����������"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "�ե���� %s ��¸�ߤ��ޤ���"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -14070,11 +15096,11 @@ msgstr ""
 "�������Ȥ�����륤��ݡ��Ȥ�����ޤ���\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "����ݡ�����"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -14083,17 +15109,17 @@ msgstr ""
 "%s �򥤥�ݡ�����\n"
 "%s �򳫻Ϥ��ޤ�"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "%s �γ�����˥��顼��ȯ�����ޤ���"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "%s �Υ�������˥��顼��ȯ�����ޤ���"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14102,80 +15128,62 @@ msgstr ""
 "%s �򥤥�ݡ�����\n"
 "�����ƥ� 1 �򥤥�ݡ�����"
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "��Ư"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "�ե�����̾:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "�ե����������"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "�ե��������:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "¾�Υץ������Υǡ���������ߤޤ�"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "���󥰥�ե�����򥤥�ݡ��Ȥ��ޤ�"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "%s ����:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "���Υǡ����򥤥�ݡ��Ȥ���������Υե���������򤷤Ƥ�������"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "����ݡ���"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "��³���Ĥ��Ƥ��ޤ�..."
 
-#: shell/e-shell-offline-sync.c:163
-#, fuzzy, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr "�ե������Ʊ����"
-
-#: shell/e-shell-offline-sync.c:232
-#, fuzzy
-msgid "Syncing Folder"
-msgstr "�ե������Ʊ����"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, fuzzy, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "�ե������Ʊ����"
-
 #: shell/e-shell-settings-dialog.c:346
 #, fuzzy
 msgid "Evolution Settings"
@@ -14216,7 +15224,7 @@ msgstr ""
 "���ꤵ�줿�ե������������뤳�Ȥ�����ޤ���:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14225,17 +15233,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "�����������"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "����"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "���ꤵ�줿�ե�����Ϥ���ޤ���"
@@ -14297,64 +15299,51 @@ msgstr "�������硼�ȥ��åȤ�������ޤ�"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "���硼�ȥ��åȤˤ������ե���������򤷤ޤ�:"
 
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "����饤����(_W)"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "���ե饤����(_W)"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "���ե饤����"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(ɽ�������ե�����Ϥ���ޤ���)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(�ʤ�)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution �ϸ��ߥ���饤��Ǥ������ե饤��ˤ���ˤϤ��Υܥ���򥯥��"
 "�����Ƥ�������"
 
-#: shell/e-shell-view.c:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution �ϥ��ե饤�������Ǥ�"
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution �ϸ��ߥ��ե饤��Ǥ�������饤��ˤ���ˤϤ��Υܥ���򥯥��"
 "�����Ƥ�������"
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "�����ʰ����Ǥ�"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "OAF ����Ͽ����ޤ���"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "����ե����졼�����ǡ����١������ߤĤ���ޤ���"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "����Ū�ʥ��顼"
 
@@ -14471,75 +15460,18 @@ msgstr "���(_M)"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "���硼�ȥ��åȥС����餳�Υ��硼�ȥ��åȤ������ޤ�"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "���硼�ȥ��åȤ���¸��˥��顼��ȯ�����ޤ���"
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "����Ȣ"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "���硼�ȥ��å�"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "���顼�Ϥ���ޤ���"
-
-#: shell/e-storage.c:573
-msgid "A folder with the same name already exists"
-msgstr "Ʊ��̾���Υե���������Ǥ�¸�ߤ��Ƥ��ޤ�"
-
-#: shell/e-storage.c:575
-msgid "The specified folder type is not valid"
-msgstr "���ꤵ�줿�ե�������̤�ͭ���ǤϤ���ޤ���"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "I/O ���顼"
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr "�ե������������뽽ʬ�ʶ���������ޤ���"
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr ""
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "���ꤵ�줿�ե�����ϸ��դ���ޤ���Ǥ���"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "��ǽ�Ϥ��ε������֤Ǥϼ�������Ƥ��ޤ���"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "���ϥ��ݡ��Ȥ���Ƥ��ޤ���"
-
-#: shell/e-storage.c:591
-msgid "The specified type is not supported in this storage"
-msgstr "���ꤵ�줿���̤Ϥ��ε������֤Ǥϥ��ݡ��Ȥ���Ƥ��ޤ���"
-
-#: shell/e-storage.c:593
-msgid "The specified folder cannot be modified or removed"
-msgstr "���ꤵ�줿�ե�������ѹ�������Ǥ��ޤ���Ǥ���"
-
-#: shell/e-storage.c:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr ""
-
-#: shell/e-storage.c:597
-#, fuzzy
-msgid "Cannot create a folder with that name"
-msgstr "%s �Υե�������å���������뤳�Ȥ�����ޤ���: %s"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr ""
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr ""
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14550,6 +15482,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ��λ)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "����"
+
+#: shell/evolution-folder-selector-button.c:128
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "%s �˳���..."
+
 #: shell/evolution-shell-component-utils.c:124
 #, fuzzy, c-format
 msgid ""
@@ -14576,87 +15519,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1187
-#, fuzzy
-msgid "CORBA error"
-msgstr "I/O ���顼"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1191
-#, fuzzy
-msgid "Invalid argument"
-msgstr "�����ʰ����Ǥ�"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1195
-#, fuzzy
-msgid "No owner"
-msgstr "����"
-
-#: shell/evolution-shell-component.c:1197
-#, fuzzy
-msgid "Not found"
-msgstr "�����ɤ����Ĥ���ޤ���"
-
-#: shell/evolution-shell-component.c:1199
-#, fuzzy
-msgid "Unsupported type"
-msgstr "���ݡ��Ȥ��줿���̤�����å�(_C)"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1203
-#, fuzzy
-msgid "Unsupported operation"
-msgstr "�桼���ˤ�ä����򥭥�󥻥뤵��ޤ���"
-
-#: shell/evolution-shell-component.c:1205
-#, fuzzy
-msgid "Internal error"
-msgstr "����¾�Υ��顼"
-
-#: shell/evolution-shell-component.c:1209
-#, fuzzy
-msgid "Exists"
-msgstr "��¸�ߤ���"
-
-#: shell/evolution-shell-component.c:1211
-#, fuzzy
-msgid "Invalid URI"
-msgstr "����"
-
-#: shell/evolution-shell-component.c:1215
-#, fuzzy
-msgid "Has subfolders"
-msgstr "���Τ褦�ʥե���� %s �Ϥ���ޤ���"
-
-#: shell/evolution-shell-component.c:1217
-#, fuzzy
-msgid "No space left"
-msgstr "���򤵤줿��å������Ϥ���ޤ���"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr ""
-
-#: shell/evolution-test-component.c:63
-#, fuzzy
-msgid "Test type"
-msgstr "�ե��������:"
-
-#: shell/evolution-test-component.c:703
-#, fuzzy
-msgid "Evolution Test Component"
-msgstr "Evolution �᡼�륳��ݡ���"
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "Active Connections"
@@ -14686,11 +15548,6 @@ msgstr "�᡼��(_M):"
 msgid "_Tasks:"
 msgstr "������(_T)"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-#, fuzzy
-msgid "Folder _name:"
-msgstr "�ե����̾:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 #, fuzzy
 msgid "Folder _type:"
@@ -14745,24 +15602,6 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Evolution ������"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-#, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution ����ݡ����Τ���Υե����ȥ�"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "�ե��������"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -14803,7 +15642,7 @@ msgstr ""
 msgid "Importers"
 msgstr "����ݡ���"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "����ݡ���"
 
@@ -14819,16 +15658,16 @@ msgstr "���Υ�å����������٤�ɽ�����ʤ�"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution �ϼ��Υǡ����򥤥�ݡ��ȤǤ��ޤ�:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Evolution �Ϥ������޽�λ��Ǥ�..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14859,73 +15698,116 @@ msgstr ""
 "�桹�Ϥ��ʤ����桹�����̤�ڤ��ळ�Ȥ�˾��Ǥ��ޤ��������Ʋ桹��\n"
 "Ǯ���ˤ��ʤ��ι׸����Ԥ������Ƥ��ޤ�!\n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Ximian Evolution��������\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr "���٤ȿҤͤʤ�"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ximian Evolution ������˥��������Ǥ��ޤ���"
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ximian Evolution ������ν�������Ǥ��ޤ���: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "���ե饤��⡼�ɤdz���"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "����饤��⡼�ɤdz���"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "���٤ƤΥ���ݡ��ͥ�ȤΥǥХå����Ϥ�ե����������"
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "�ե����������"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "ǧ�� ID(_C):"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "������"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "ɽ��"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "�Żҥ᡼�륢�ɥ쥹:"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr "ǧ�� ID"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, fuzzy, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+"ȯ��: %s\n"
+"�о�: %s"
+
+#: smime/gui/e-cert-selector.c:117
+#, fuzzy, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+"ȯ��: %s\n"
+"�о�: %s"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14981,92 +15863,378 @@ msgid "Backup All"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "ǧ�� ID(_C):"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "ǧ�� ID"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "ǧ�� ID(_C):"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "����Ū��̾��"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "ǧ�� ID(_C):"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "�Խ�(_E)"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 #, fuzzy
 msgid "Email Recipient Certificate"
 msgstr "�����Ԥ����ꤵ��Ƥ��ޤ���"
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "ǧ�ڤξ����˼��Ԥ��ޤ���"
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "ɽ��"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "���"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "���"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "ɽ��(_V)"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "ǧ�� ID(_C):"
+
+#: smime/gui/smime-ui.glade.h:42
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "ǧ�� ID(_C):"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "����ݡ���"
+msgid "Certificate already exists"
+msgstr "������ID�Ϥ��Ǥ�¸�ߤ��ޤ�"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%Y/%m/%d"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "��"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "��"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "��"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "��"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr "�ݻ�"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "��"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "OK"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "��"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "ǧ�� ID(_C):"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "ǧ�� ID(_C):"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "ǧ�� ID"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "I"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+#, fuzzy
+msgid "Subject Public Key Info"
+msgstr ""
+"\n"
+"������: "
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "��̾�� %s �Ǥ�"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "���ס���ե������������뤳�Ȥ�����ޤ���"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "ǧ�� ID"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "ǧ�ڤξ����˼��Ԥ��ޤ���"
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "����"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "����ʤ�"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "ź��"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "ǧ�� ID(_C):"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "����"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+msgid "Not Critical"
+msgstr ""
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "ɽ��"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s �� %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "��̾�ե�����:"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "����(_I)"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "��̾�� %s �Ǥ�"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "��̾�ե�����:"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "%s �Τ���Υѥ���ɤ����Ϥ��Ƥ�������"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "ǧ�� ID(_C):"
 
 #: tools/evolution-launch-composer.c:324
 #, fuzzy
@@ -15120,7 +16288,7 @@ msgstr "���򤵤줿��Τ򥳥ԡ����ޤ�"
 msgid "Copy to Folder..."
 msgstr "�ե�����إ��ԡ�..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "���򤵤줿��Τ��ڤ���ޤ�"
 
@@ -15136,7 +16304,7 @@ msgstr "�̤Υե������Ϣ������ư..."
 msgid "Move to Folder..."
 msgstr "�ե�����ذ�ư..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "����åץܡ��ɤ�Ž���դ��ޤ�"
 
@@ -15144,8 +16312,8 @@ msgstr "����åץܡ��ɤ�Ž���դ��ޤ�"
 msgid "Previews the contacts to be printed"
 msgstr "���������Ϣ�����ץ�ӥ塼����"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "�����ץ�ӥ塼(_V)"
@@ -15191,13 +16359,13 @@ msgstr "�Ӥ߹��ߤ���ߤ��ޤ�"
 msgid "View the current contact"
 msgstr "���߻���"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "ư��(_A)"
 
@@ -15227,145 +16395,114 @@ msgstr "Ϣ����إ�å�����������(_S)..."
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "�����������ݥ���Ȥ�������ޤ�"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "�������ݥ���Ȥ�������ޤ�"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "�����ե������������ޤ�"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "�����ߡ��ƥ����׵����"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "������������������ޤ�"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "��"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 #, fuzzy
 msgid "Delete All Occurrences"
 msgstr "���٤Ƥν��������(_A)"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "���Υ��ݥ���Ȥ���"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "����������(_O)"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "����������(_O)"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "��ư"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "���˰�ư"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "��˰�ư"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "�������˰�ư(_D)"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "�������˰�ư���ޤ�"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "�����ذ�ư"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "List"
 msgstr "̸"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "��"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "�������ݥ����(_A)"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "�˥塼����ɥ˥�"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "���"
-
-#: ui/evolution-calendar.xml.h:27
-msgid "New _Task"
-msgstr "����������(_T)"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "��������륫�����Υץ�ӥ塼��ɽ�����ޤ�"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "���Υ�������������ޤ�"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "������"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "�����ե�����ϥ��ݥ���Ȥȥ��٥�Ȥ�ޤ�Ǥޤ�"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "�ܺ٤�ɽ��"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "1����ɽ�����ޤ�"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "1�����ɽ�����ޤ�"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "1���֤�ɽ�����ޤ�"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "ʿ����ɽ�����ޤ�"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "��"
 
@@ -15430,7 +16567,7 @@ msgstr "�ǥ������ˤ��ι��ܤ���¸���ޤ�"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "�ե�����(_F)"
 
@@ -15650,7 +16787,7 @@ msgstr "�����ѤߤȤ��Ƥ��٤ƥޡ���(_E)"
 msgid "Mark all visible messages as read"
 msgstr "�����ѤߤȤ��Ƥ��٤ƤΥ�å�������ޡ������ޤ�"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "��å������򥯥�åץܡ��ɤ���Ž���դ��ޤ�"
 
@@ -15706,16 +16843,6 @@ msgstr "�����ȿž(_I)"
 msgid "_Threaded Message List"
 msgstr "��å������ꥹ�Ȥ򥹥�åɲ�(_T)"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "���Υ�����ɥ����Ĥ��ޤ�"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "�Ĥ���(_C)"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "�����Ԥ򥢥ɥ쥹Ģ���ɲ�(_d)"
@@ -15874,258 +17001,283 @@ msgstr "ź�դȤ���ï�������򤵤줿��å�������ž�����ޤ�"
 msgid "Increase the text size"
 msgstr "ʸ�������������"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "�������ɤ߹���(_I)"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "���פ˥ޡ���(_M)"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "̤�ɤȤ��ƥޡ���(_N)"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "���פǤʤ��˥ޡ���(_O)"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "���򤵤줿��å����������ѤߤȤ��ƥޡ������ޤ�"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "���򤵤줿��å���������פȤ��ƥޡ������ޤ�"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "���򤵤줿��å���������פǤʤ��Ȥ��ƥޡ������ޤ�"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "���򤵤줿��å�������̤�ɤȤ��ƥޡ������ޤ�"
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "���򤵤줿��å�������̤�ɤȤ��ƥޡ������ޤ�"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "���򤵤줿��å���������פǤʤ��Ȥ��ƥޡ������ޤ�"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "���򤵤줿��å������˺���ޡ����򤷤ޤ�"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "��ư"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "���򤵤줿��å��������̤Υե�����ذ�ư���ޤ�"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "��"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "���ν��פʥ�å�����(_I)"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "���Υ���å�(_T)"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "����̤�ɥ�å�����(_U)"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "�����ɤ����Ĥ���ޤ���"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "����������ɥ������򤵤줿��å������򳫤��ޤ�"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "���򤵤줿��å������򥳥�ݡ����dz����������ޤ�"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "�����礭��(_Z)"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "����̤�ɥ�å�����(_R)"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "�ֿ���ݥ���"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr "�����ե�����˥�å��������ֿ�����Ƥ��ޤ�"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "���ν��פʥ�å�����(_E)"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "���������å������Υץ�ӥ塼"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "��"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "���Υ�å����������"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "������쥯��(_D)"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "���򤵤줿��å������������쥯��(�Х���)���ޤ�"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "ʸ���������򸵤��礭�����ᤷ�ޤ�"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "��å������θ���(_E)"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "������(_M)"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "�ƥ����ȥե�����إ�å���������¸���ޤ�"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "ɽ�����줿��å��������Τδޤޤ��ƥ����Ȥ򸡺����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "Set up the page settings for your current printer"
 msgstr "���ߤΥץ�󥿤Υڡ��������Ԥ��ޤ�"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "�᡼��Υ�������ɽ��(_S)"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "���٤ƤΥإå���ɽ��(_H)"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "ɽ�����줿��å��������Τδޤޤ��ƥ����Ȥ򸡺����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "�̾�Υ�å�������ɽ�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "���٤ƤΥ᡼��إå���ޤ�ƥ�å�������ɽ�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "��å������Υ�������ɽ�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "�ƥ����ȥ�����"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "���򤵤줿��å������������ä��ޤ�"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե����(_L)..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "�����Ԥβ��ۥե����(_N)..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "�����Ԥβ��ۥե����(_R)..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "��̾�β��ۥե����(_S)..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "ź��(_A)"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "�ե�����إ��ԡ�(_C)"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "��å���������ե��륿�����(_C)"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "��å�������ž��(_F)"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "��ư(_G)"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "����饤��(_I)"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "�礭��(_L)"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "��å�����ɽ��(_M)"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "�ե�����ذ�ư(_M)"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "���Υ�å�����(_N)"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "�̾�ɽ��(_N)"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "��å������򳫤�(_O)"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "���Υ�å�����(_P)"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "����(_Q)"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "������(_R)"
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "�ġ���(_T)"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "������(_U)"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "���Υ�����ɥ����Ĥ��ޤ�"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "�Ĥ���(_C)"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "ź��"
@@ -16412,12 +17564,13 @@ msgid "Change Evolution's settings"
 msgstr "Evolution ��������ѹ����ޤ�"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "��λ(_X)"
+#, fuzzy
+msgid "Create a new window"
+msgstr "�����ߡ��ƥ����׵����"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "Evolution ������ɥ�(_W)"
+msgid "E_xit"
+msgstr "��λ(_X)"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16429,61 +17582,74 @@ msgstr "¾�Υץ������Υǡ���������ߤޤ�"
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "Evolution ������ɥ�(_W)"
+msgid "Open a new window"
+msgstr "����������ɥ��dz���"
 
 #: ui/evolution.xml.h:11
 msgid "Pi_lot Settings..."
 msgstr "Pilot ������(_L)..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "������"
+
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr "���塼�ˤ�����ܤ��������ƿ������ܤ�������ޤ�"
+
+#: ui/evolution.xml.h:14
 msgid "Set up Pilot configuration"
 msgstr "Pilot�������Ԥ��ޤ�"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Ximian Evolution �ˤĤ��Ƥξ����ɽ�����ޤ�"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "�Զ���������"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "�Զ���������(_B)"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddy��Ȥä��Զ���������"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "���ؤ�"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "���ե饤���Ȥ��ɤ��������ؤ��ޤ�"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution FAQ(_F)"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "Ximian Evolution �ˤĤ���(_A)..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "�إ��(_H)"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "����ݡ���(_I)..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "����(_N)"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "������(_S)"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "����������(_F)"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "���ޥ�����"
@@ -16614,12 +17780,12 @@ msgstr "�ӥ塼�����"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%Y %B"
 
@@ -16753,7 +17919,7 @@ msgstr "����(_S)"
 msgid "_Find Now"
 msgstr "����������(_F)"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "���ꥢ(_C)"
 
@@ -16769,24 +17935,259 @@ msgstr "���ֹ���ID"
 msgid "Text"
 msgstr "�ƥ�����"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "���ꥢ"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "����������"
 
+#~ msgid "Account Name"
+#~ msgstr "���������̾"
+
+#~ msgid "Server Name"
+#~ msgstr "������̾"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "���ߤΥ᡼�����򥭥�󥻥뤷�ޤ�"
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "(���� Evolution �� SSL �򥵥ݡ��Ȥ��Ƥ��ޤ���)"
+
+#~ msgid "Other Contacts"
+#~ msgstr "¾��Ϣ����"
+
+#~ msgid "Directory Servers"
+#~ msgstr "�ǥ��쥯�ȥꥵ���С�"
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "��"
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Evolution �Υ��ɥ쥹Ģ��̾�����򥤥󥿡��ե�����"
 
-#~ msgid "Family Name"
-#~ msgstr "��"
+#, fuzzy
+#~ msgid "Add LDAP Server"
+#~ msgstr "LDAP ������"
+
+#~ msgid "LDAP Configuration Assistant"
+#~ msgstr "LDAP ���ꥢ���������"
+
+#, fuzzy
+#~ msgid "Find contact in"
+#~ msgstr "�����Ԥ����Τ�Τ�ޤ�"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Ϣ������ɲä��뤿��ˤ����򥯥�å� *"
+
+#~ msgid "Business Address"
+#~ msgstr "�Ż��ν���"
+
+#~ msgid "Department"
+#~ msgstr "����"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "����/¿˻ URL"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "���翦"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#, fuzzy
+#~ msgid "Opening tasks at %s"
+#~ msgstr "��¸���줿 %s �򥪡��ץ���"
+
+#~ msgid "Send anyway?"
+#~ msgstr "�Ȥˤ�����������?"
+
+#, fuzzy
+#~ msgid "Folder _name"
+#~ msgstr "�ե����̾:"
+
+#, fuzzy
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr "���Υ�å������ϥǥ������̾���쿮��Ǥ����ΤǤ�"
+
+#, fuzzy
+#~ msgid "No signature present"
+#~ msgstr "HTML ��̾�ե�����:"
+
+#~ msgid "Connecting..."
+#~ msgstr "��³��..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "���Υե�����ˤϥ�å������Ϥ���ޤ���"
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "�ե�������͡������ޤ���Ǥ���: %s"
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "���Υǡ����򥤥�ݡ��Ȥ���������Υե���������򤷤Ƥ�������"
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "�ե����ž���Ǥ��ޤ���:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Add a Folder"
+#~ msgstr "�ե����������"
+
+#, fuzzy
+#~ msgid "Drafts"
+#~ msgstr "���"
+
+#~ msgid "Outbox"
+#~ msgstr "����Ȣ"
+
+#, fuzzy
+#~ msgid "Sent"
+#~ msgstr "����"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr "�ե������Ʊ����"
+
+#, fuzzy
+#~ msgid "Syncing Folder"
+#~ msgstr "�ե������Ʊ����"
+
+#, fuzzy
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "�ե������Ʊ����"
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(ɽ�������ե�����Ϥ���ޤ���)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(�ʤ�)"
+
+#~ msgid "No error"
+#~ msgstr "���顼�Ϥ���ޤ���"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Ʊ��̾���Υե���������Ǥ�¸�ߤ��Ƥ��ޤ�"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "���ꤵ�줿�ե�������̤�ͭ���ǤϤ���ޤ���"
+
+#~ msgid "I/O error"
+#~ msgstr "I/O ���顼"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "�ե������������뽽ʬ�ʶ���������ޤ���"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "���ꤵ�줿�ե�����ϸ��դ���ޤ���Ǥ���"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "��ǽ�Ϥ��ε������֤Ǥϼ�������Ƥ��ޤ���"
+
+#~ msgid "Operation not supported"
+#~ msgstr "���ϥ��ݡ��Ȥ���Ƥ��ޤ���"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "���ꤵ�줿���̤Ϥ��ε������֤Ǥϥ��ݡ��Ȥ���Ƥ��ޤ���"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "���ꤵ�줿�ե�������ѹ�������Ǥ��ޤ���Ǥ���"
+
+#, fuzzy
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "%s �Υե�������å���������뤳�Ȥ�����ޤ���: %s"
+
+#, fuzzy
+#~ msgid "CORBA error"
+#~ msgstr "I/O ���顼"
+
+#, fuzzy
+#~ msgid "Invalid argument"
+#~ msgstr "�����ʰ����Ǥ�"
+
+#, fuzzy
+#~ msgid "No owner"
+#~ msgstr "����"
+
+#, fuzzy
+#~ msgid "Unsupported type"
+#~ msgstr "���ݡ��Ȥ��줿���̤�����å�(_C)"
+
+#, fuzzy
+#~ msgid "Unsupported operation"
+#~ msgstr "�桼���ˤ�ä����򥭥�󥻥뤵��ޤ���"
+
+#, fuzzy
+#~ msgid "Internal error"
+#~ msgstr "����¾�Υ��顼"
+
+#, fuzzy
+#~ msgid "Exists"
+#~ msgstr "��¸�ߤ���"
+
+#, fuzzy
+#~ msgid "Invalid URI"
+#~ msgstr "����"
+
+#, fuzzy
+#~ msgid "Has subfolders"
+#~ msgstr "���Τ褦�ʥե���� %s �Ϥ���ޤ���"
+
+#, fuzzy
+#~ msgid "No space left"
+#~ msgstr "���򤵤줿��å������Ϥ���ޤ���"
+
+#, fuzzy
+#~ msgid "Test type"
+#~ msgstr "�ե��������:"
+
+#, fuzzy
+#~ msgid "Evolution Test Component"
+#~ msgstr "Evolution �᡼�륳��ݡ���"
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "����ݡ���"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "�����������ݥ���Ȥ�������ޤ�"
+
+#~ msgid "New _Appointment"
+#~ msgstr "�������ݥ����(_A)"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "���"
+
+#~ msgid "New _Task"
+#~ msgstr "����������(_T)"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "Evolution ������ɥ�(_W)"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "Evolution ������ɥ�(_W)"
+
+#~ msgid "Toggle"
+#~ msgstr "���ؤ�"
+
+#~ msgid "Clear"
+#~ msgstr "���ꥢ"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "���ߤΥ᡼�����򥭥�󥻥뤷�ޤ�"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -16874,9 +18275,6 @@ msgstr "����������"
 #~ msgid "Evolution VCard importer"
 #~ msgstr "Evolution VCard ����ݡ�����"
 
-#~ msgid "Loading..."
-#~ msgstr "�ɤ߹�����..."
-
 #~ msgid "Searching..."
 #~ msgstr "������..."
 
@@ -16931,10 +18329,6 @@ msgstr "����������"
 #~ msgstr "EBook �ϥ����ɤ���Ƥ��ޤ���\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "������ID�Ϥ��Ǥ�¸�ߤ��ޤ�"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "���ϥ���󥻥뤷�ޤ���"
 
@@ -17052,9 +18446,6 @@ msgstr "����������"
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#~ msgid "Phone"
-#~ msgstr "����"
-
 #~ msgid "Birth date"
 #~ msgstr "������"
 
@@ -17066,10 +18457,6 @@ msgstr "����������"
 #~ msgstr "�ץ饤�ޥ�"
 
 #, fuzzy
-#~ msgid "ID"
-#~ msgstr "I"
-
-#, fuzzy
 #~ msgid "Last Use"
 #~ msgstr "Ž���դ�"
 
@@ -17083,9 +18470,6 @@ msgstr "����������"
 #~ msgid "Folder containing contact information"
 #~ msgstr "Ϣ�������Τ���ե����"
 
-#~ msgid "LDAP Server"
-#~ msgstr "LDAP ������"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "Ϣ�������Τ���LDAP������"
 
@@ -17095,18 +18479,6 @@ msgstr "����������"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Ϣ�������Τ�������ե����"
 
-#~ msgid "_Contact"
-#~ msgstr "Ϣ����(_C)"
-
-#~ msgid "Create a new contact"
-#~ msgstr "����Ϣ�����������ޤ�"
-
-#~ msgid "New Contact List"
-#~ msgstr "����Ϣ����ꥹ��"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "����Ϣ����ꥹ�Ȥ����"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "�ե�����֥饦����ɽ������ URI"
 
@@ -17124,9 +18496,6 @@ msgstr "����������"
 #~ msgid "Is New Card"
 #~ msgstr "�˥塼��"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "�����ɤʤ�"
 
@@ -17173,31 +18542,6 @@ msgstr "����������"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "�����ե������ ToDo ���ܤ�ޤ�Ǥ��ޤ�"
 
-#~ msgid "New appointment"
-#~ msgstr "�������ݥ����"
-
-#~ msgid "_Appointment"
-#~ msgstr "���ݥ����(_A)"
-
-#~ msgid "New meeting"
-#~ msgstr "�����ߡ��ƥ���"
-
-#, fuzzy
-#~ msgid "M_eeting"
-#~ msgstr "���"
-
-#~ msgid "New task"
-#~ msgstr "����������"
-
-#~ msgid "_Task"
-#~ msgstr "������(_T)"
-
-#~ msgid "New All Day Appointment"
-#~ msgstr "�����������ݥ����"
-
-#~ msgid "All _Day Appointment"
-#~ msgstr "�������ݥ����(_D)"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "�����ʥ��֥������Ȥ򹹿��Ǥ��ޤ���Ǥ���"
 
@@ -17231,10 +18575,6 @@ msgstr "����������"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "�ե���� %s �򥪡��ץ���"
 
-#, fuzzy
-#~ msgid "Opening default tasks folder"
-#~ msgstr "�ե���� %s �򥪡��ץ���"
-
 #~ msgid "Please enter your password for %s"
 #~ msgstr "%s �Τ���Τ��ʤ��Υѥ���ɤ����Ϥ��Ƥ�������"
 
@@ -17261,10 +18601,6 @@ msgstr "����������"
 #~ "Evolution �� GnomeCard �ե������ȯ�����ޤ���\n"
 #~ "Evolution �إ���ݡ��Ȥ��Ƥ��������Ǥ���?"
 
-#, fuzzy
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "�᡼������Υ��󥿡��ե�����"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "�᡼���ޤ�ե����"
 
@@ -17280,24 +18616,12 @@ msgstr "����������"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "���ۤ���Ȣ�ե����"
 
-#~ msgid "Properties..."
-#~ msgstr "�ץ��ѥƥ�..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "���Υե�����Υץ��ѥƥ����ѹ�"
 
 #~ msgid "You have not set a mail transport method"
 #~ msgstr "�᡼��ž���᥽�åɤ����꤬����ޤ���"
 
-#~ msgid "New Mail Message"
-#~ msgstr "�����᡼���å�����"
-
-#~ msgid "_Mail Message"
-#~ msgstr "��å�������᡼��(_M)"
-
-#~ msgid "Compose a new mail message"
-#~ msgstr "�����᡼���å�������������ޤ�"
-
 #~ msgid "New Message Post"
 #~ msgstr "������å������ݥ���"
 
@@ -20861,10 +22185,6 @@ msgstr "����������"
 #~ msgstr "���:"
 
 #, fuzzy
-#~ msgid "Stauning"
-#~ msgstr "����"
-
-#, fuzzy
 #~ msgid "Staverton"
 #~ msgstr "����"
 
@@ -21141,10 +22461,6 @@ msgstr "����������"
 #~ msgstr "����ꥫ�罰��"
 
 #, fuzzy
-#~ msgid "Unst"
-#~ msgstr "̤��"
-
-#, fuzzy
 #~ msgid "Uruapan"
 #~ msgstr "����"
 
@@ -21209,10 +22525,6 @@ msgstr "����������"
 #~ msgstr "Unicode"
 
 #, fuzzy
-#~ msgid "Vermont"
-#~ msgstr "��"
-
-#, fuzzy
 #~ msgid "Vernal"
 #~ msgstr "����"
 
@@ -21466,10 +22778,6 @@ msgstr "����������"
 #~ msgstr "�ڻ�"
 
 #, fuzzy
-#~ msgid " C"
-#~ msgstr "�ݻ�"
-
-#, fuzzy
 #~ msgid "knots"
 #~ msgstr "knots"
 
@@ -22021,10 +23329,6 @@ msgstr "����������"
 #~ msgstr "��ɹ���Τ��"
 
 #, fuzzy
-#~ msgid "Spray"
-#~ msgstr "���"
-
-#, fuzzy
 #~ msgid "Spray in the vicinity"
 #~ msgstr "���٤ǿ��"
 
@@ -22302,18 +23606,6 @@ msgstr "����������"
 #~ msgid "Remove a folder added with \"Open Other User's Folder\""
 #~ msgstr "\"¾�Υ桼���Υե�����򳫤�\"���ɲä����ե������������"
 
-#~ msgid "Send / Receive"
-#~ msgstr "������"
-
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "���塼�ˤ�����ܤ��������ƿ������ܤ�������ޤ�"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "�ե�����С���ɽ�����뤫�ɤ������ؤ��ޤ�"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "���硼�ȥ��åȥС���ɽ�����뤫�ɤ������ؤ��ޤ�"
-
 #~ msgid "View the selected folder"
 #~ msgstr "���򤵤줿�ե������ɽ�����ޤ�"
 
@@ -22341,9 +23633,6 @@ msgstr "����������"
 #~ msgid "_Rename..."
 #~ msgstr "��͡���(_R)..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "������(_S)"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "���硼�ȥ��åȥС�(_S)"
 
@@ -22389,9 +23678,6 @@ msgstr "����������"
 #~ msgid "Font Preferences"
 #~ msgstr "�ե��������"
 
-#~ msgid "Automatically _detect links"
-#~ msgstr "��ưŪ�˥�󥯤򸡽Ф���(_D)"
-
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 
@@ -22490,18 +23776,10 @@ msgstr "����������"
 #~ msgstr "����ץ륢�ɥ쥹Ģ����ȥ�����Τ���Υե����ȥ�"
 
 #, fuzzy
-#~ msgid "380"
-#~ msgstr "389"
-
-#, fuzzy
 #~ msgid "<- _Remove"
 #~ msgstr "��� (_R)"
 
 #, fuzzy
-#~ msgid "<< Fewer Options"
-#~ msgstr "���ץ����"
-
-#, fuzzy
 #~ msgid "DN Customization"
 #~ msgstr "����ʤ�"
 
@@ -23099,13 +24377,6 @@ msgstr "����������"
 #~ msgid "_Delete this Appointment"
 #~ msgstr "���Υ��ݥ���Ȥ���(_D)"
 
-#~ msgid ""
-#~ "Issuer: %s\n"
-#~ "Subject: %s"
-#~ msgstr ""
-#~ "ȯ��: %s\n"
-#~ "�о�: %s"
-
 #, fuzzy
 #~ msgid "I/O Error: %s"
 #~ msgstr "I/O ���顼"
@@ -23150,9 +24421,6 @@ msgstr "����������"
 #~ msgid "News Servers"
 #~ msgstr "�˥塼���ե�����(_N)"
 
-#~ msgid "Source Information"
-#~ msgstr "����������"
-
 #~ msgid "Save to Disk..."
 #~ msgstr "�ǥ���������¸..."
 
@@ -23170,9 +24438,6 @@ msgstr "����������"
 #~ "���򤷤��ե�����μ��̤��׵ᤵ�줿���Τ����\n"
 #~ "ͭ���ǤϤ���ޤ���"
 
-#~ msgid "_Contact List"
-#~ msgstr "Ϣ����ꥹ��(_C)"
-
 #~ msgid "Inline Text _File..."
 #~ msgstr "����饤��ƥ����ȥե�����(_F)..."
 
@@ -23188,17 +24453,10 @@ msgstr "����������"
 #~ msgid "Send _later"
 #~ msgstr "�������(_L)"
 
-#~ msgid "Send the message later"
-#~ msgstr "��ǥ�å��������������ޤ�"
-
 #~ msgid "_Pilot Settings..."
 #~ msgstr "Pilot ������(_M)..."
 
 #, fuzzy
-#~ msgid "Addressbook Settings"
-#~ msgstr "���ɥ쥹Ģ�Υ�����"
-
-#, fuzzy
 #~ msgid "Could not query for schema information"
 #~ msgstr ""
 #~ "̵�����ԲIJ�ʥȥ졼������:\n"
@@ -23540,25 +24798,11 @@ msgstr "����������"
 
 #~ msgid ""
 #~ "\n"
-#~ "Comment: "
-#~ msgstr ""
-#~ "\n"
-#~ "����: "
-
-#~ msgid ""
-#~ "\n"
 #~ "Unique String: "
 #~ msgstr ""
 #~ "\n"
 #~ "Ǥ�դ�ʸ����: "
 
-#~ msgid ""
-#~ "\n"
-#~ "Public Key: "
-#~ msgstr ""
-#~ "\n"
-#~ "������: "
-
 #~ msgid "Waiting for connection to LDAP server..."
 #~ msgstr "LDAP �����Фؤ���³���Ե���..."
 
@@ -23609,9 +24853,6 @@ msgstr "����������"
 #~ msgid "Business _Fax"
 #~ msgstr "�Ż��� FAX(_F)"
 
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "ɸ��Υ�ޥ�����ǿ������ݥ���Ȥ�������ޤ�"
-
 #~ msgid "First day of wee_k:"
 #~ msgstr "���λϤ�(_K):"
 
@@ -23726,9 +24967,6 @@ msgstr "����������"
 #~ msgid "Composer"
 #~ msgstr "�᡼�����"
 
-#~ msgid "Default Forward style is: "
-#~ msgstr "�ǥե���Ȥ�ž����ˡ: "
-
 #~ msgid "Edit..."
 #~ msgstr "�Խ�..."
 
@@ -23741,9 +24979,6 @@ msgstr "����������"
 #~ msgid "_Organization:"
 #~ msgstr "���(_O):"
 
-#~ msgid "_Send mail in HTML format by default."
-#~ msgstr "�ǥե���Ȥ� HTML �����Υ᡼�����������(_S)"
-
 #, fuzzy
 #~ msgid "_Server Type: "
 #~ msgstr "�������:"
@@ -23918,9 +25153,6 @@ msgstr "����������"
 #~ msgid "Encrypted message not displayed"
 #~ msgstr "�Ź沽���줿��å�������ɽ�����ޤ���"
 
-#~ msgid "Encrypted message"
-#~ msgstr "�Ź沽���줿��å�����"
-
 #~ msgid "Click icon to decrypt."
 #~ msgstr "��������򥯥�å��������沽���Ƥ�������"
 
@@ -24072,10 +25304,6 @@ msgstr "����������"
 #~ msgstr "�ե�����򥵥ޥ饤�����뤳�Ȥ�����ޤ���Ǥ���: %s: %s"
 
 #, fuzzy
-#~ msgid "%d/%m/%Y"
-#~ msgstr "%Y/%m/%d"
-
-#, fuzzy
 #~ msgid "%Y/%m/%d"
 #~ msgstr "%Y/%m/%d (%a)"
 
diff --git a/po/ko.po b/po/ko.po
index a05838dd2d..a053aaee8f 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: AC_PACKAGE_NAME AC_PACKAGE_VERSION\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-06-07 08:32+0900\n"
 "Last-Translator: Young-Ho, Cha <ganadist at mizi.com>\n"
 "Language-Team: GTP Korean <gnome-kr-translation@gnome.or.kr>\n"
@@ -32,69 +32,207 @@ msgstr "주소록을 열 수 없습니다"
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "자동완성 폴더"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Certificates"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "메일 계정과 다른 세부사항을 만들거나 편집합니다"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "연락처"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
+msgstr "Evolution 주소록"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution 주소록 minicard 보기"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution 주소록 minicard 보기"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution 주소록 minicard 보기"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolution 주소록 minicard 보기"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution 주소록 minicard 보기"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "메일 기본 설정"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "주소록"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "설정..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "지우기"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "이름바꿈(_R)"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "새 연락처:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "연락처(_C)"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "새로운 연락처를 만듭니다"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "새 연락처 목록"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "새 연락처 목록"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "새 연락처 목록을 만듭니다"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+#, fuzzy
+msgid "Personal"
+msgstr "일반 정보"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+#, fuzzy
+msgid "Work"
+msgstr "닷새씩"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "LDAP 서버"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr ""
+"%s 디렉토리를 만들 수 없습니다:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "LDAP 서버에 연결 실패"
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "LDAP 서버에서 인증 실패"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr "연락처 정보를 가지고 있는 폴더"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP 서버의 답변에 %s 정보가 담겨있지않습니다"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-#, fuzzy
-msgid "Account Name"
-msgstr "계정 이름"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-#, fuzzy
-msgid "Server Name"
-msgstr "서버 이름(_S):"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(이 evolution 빌드는 SSL을 지원하지 않습니다)"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "다른 연락처"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is unreachable."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -102,7 +240,7 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -113,45 +251,44 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "주소록을 열 수 없습니다"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr "KPOP 서버에서 인증할수 없음: %s"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s(사용자 %s)의 열쇠글을 입력하십시오"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "다음으로 이름 시작"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "다음으로 메일주소 시작"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "분류"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "필드에 다음 포함"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "고급..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -159,7 +296,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -167,93 +304,41 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "아무 분류"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "달력에 보여줄 URI"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Certificates"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
 msgstr ""
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "연락처"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "디렉토리 서버"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolution 주소록"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Evolution 주소록 이름 선택 인터페이스"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution 주소록 minicard 보기"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution 주소록 minicard 보기"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution 주소록 minicard 보기"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Evolution 주소록 minicard 보기"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution 주소록 minicard 보기"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "메일 기본 설정"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -277,6 +362,7 @@ msgstr "지원하는 형식인지 확인(_C) "
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -310,8 +396,9 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "LDAP 서버 더하기"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "설정"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -328,58 +415,57 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "연결중"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "목록 이름(_n):"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr "LDAP 서버 고치기"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
 msgstr "전자우편 주소:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution은 이 메일 주소로 서버에 인증할때 사용합니다"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr "Evolution은 이 메일 주소로 서버에 인증할 때 사용합니다"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Finished"
 msgstr "찾기(_i)"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "일반 정보"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
-msgid "LDAP Configuration Assistant"
-msgstr "설정"
+msgid "Group:"
+msgstr "단체"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Never"
 msgstr "덴버"
@@ -403,8 +489,8 @@ msgid "S_earch scope: "
 msgstr "찾기 범위(_E): "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "찾는중"
 
@@ -449,27 +535,28 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:47
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-#, fuzzy
-msgid "Step 1: Server Information"
-msgstr "필요한 정보"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
-msgid "Step 2: Connecting to Server"
-msgstr "서버에 연결중..."
+msgid "Step 2: Server Information"
+msgstr "필요한 정보"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr ""
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "서버에 연결중..."
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr ""
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "서버에 연결중..."
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -481,14 +568,6 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -496,7 +575,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -504,7 +583,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -514,37 +593,36 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 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:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 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:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -552,6 +630,13 @@ msgid ""
 "It is for display purposes only. "
 msgstr "계정을 인식할때 사용할 이름입니다. 표시할 목적으로만 사용됩니다."
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr "계정을 인식할때 사용할 이름입니다. 표시할 목적으로만 사용됩니다."
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -578,22 +663,30 @@ msgid "Using email address"
 msgstr "전자우편 주소:"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Display name:"
 msgstr "표시(_D)"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -601,60 +694,59 @@ msgstr ""
 msgid "_Edit"
 msgstr "고치기(_E)"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 #, fuzzy
 msgid "_Port number:"
 msgstr "포트(_P):"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 #, fuzzy
 msgid "_Search base:"
 msgstr "검색 범위(_c):"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "서버 이름(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid "cards"
 msgstr "카드 없음"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "connecting-tab"
 msgstr "%s로 다시 연결중"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid "general-tab"
 msgstr "일반 정보"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "searching-tab"
 msgstr "검색중"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "이름"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution 주소록 이름 선택 인터페이스"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "전부 지우기"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "지우기"
@@ -683,25 +775,22 @@ msgstr "연락처에 더하기"
 msgid "Unnamed Contact"
 msgstr "이름없는 연락처"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "이름"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 #, fuzzy
 msgid "Source"
 msgstr "구독"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "주소록에서 연락처 선택"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "주소록 찾기"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution 주소록 이름 선택 인터페이스"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
 msgid "Find"
@@ -780,7 +869,8 @@ msgid "D_epartment:"
 msgstr "부서(_E):"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "자세히"
 
@@ -848,12 +938,12 @@ msgid "_Categories..."
 msgstr "분류(_T)..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "지우기(_D)"
@@ -1994,7 +2084,7 @@ msgid "Esq."
 msgstr ""
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "정식 이름"
 
@@ -2090,11 +2180,25 @@ msgstr "연락처 목록 편집기"
 msgid "Save List as VCard"
 msgstr "VCard로 목록 저장"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "바뀐 연락처:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "충돌하는 연락처:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "번복되는 연락처 인식"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "새 연락처:"
@@ -2111,20 +2215,6 @@ msgstr ""
 "이 폴더에 이 연락처의 이름이나 메일주소가 있습니다.\n"
 "어쨋든 더하시겠습니까?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "바뀐 연락처:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "충돌하는 연락처:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2226,9 +2316,9 @@ msgstr "주소 전달"
 msgid "Send Message to Contact"
 msgstr "연락처로 메세지 보냄"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "인쇄"
@@ -2250,9 +2340,12 @@ msgstr "폴더로 이동..."
 msgid "Cut"
 msgstr "자르기"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "복사"
 
@@ -2261,16 +2354,8 @@ msgstr "복사"
 msgid "Paste"
 msgstr "붙이기"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "지우기"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "현재 보기"
 
@@ -2283,166 +2368,170 @@ msgid ""
 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:2
 msgid "Assistant"
 msgstr "조수"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "직장 팩스"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "직장 전화"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "직장 전화 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "카 폰"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "분류"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "회사 전화"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "부서"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "이메일"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "이메일 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "이메일 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#, fuzzy
+msgid "Family Name"
+msgstr "정식 이름"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "파일로 저장"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "집 주소"
+#, fuzzy
+msgid "Given Name"
+msgstr "정식 이름"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "집 팩스"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "집 전화"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "집 전화 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "전화"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "조단"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "휴대 전화"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "별명"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "노트"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "사무실"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "조직"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "다른 주소"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "기타 팩스"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "다른 전화"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "삐삐"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "기본 전화"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "직업"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "배우자"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+msgid "TTYTDD"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "제목"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "제목없음"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "웹 사이트"
 
@@ -2544,11 +2633,19 @@ msgstr "구성원"
 msgid "Job Title"
 msgstr "직함(_J):"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "집 주소"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "집 주소"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "다른 주소"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2561,173 +2658,170 @@ msgstr "집 팩스"
 msgid "Blog"
 msgstr "씩 영원히"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "알 수 없는 에러"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "허가권 거부"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "카드를 찾을 수 없습니다"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "카드 ID가 이미 있습니다"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "프로토콜 지원되지 않음"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "취소됨"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "인증 실패."
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Authentication Required"
 msgstr "인증이 필요함"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #, fuzzy
 msgid "Addressbook does not exist"
 msgstr "폴더 `%s'는 존재하지 않습니다."
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "다른 오류"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "바뀐 것을 저장하길 원하십니까?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 #, fuzzy
 msgid "_Discard"
 msgstr "카드 인쇄하기"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "목록 더하는중 오류"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "카드 더하는중 오류"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "목록 수정중 오류"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "목록 수정중 오류"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "목록 지우는중 오류"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "카드 지우는중 오류"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, fuzzy
 msgid "Overwrite"
 msgstr "파일을 덮어쓸까요?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, fuzzy, c-format
 msgid "Error saving %s: %s"
 msgstr "파일 저장중 오류 발생: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "카드 없음"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "카드 없음"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "카드 없음"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "카드 없음"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -2923,7 +3017,7 @@ msgstr "여백"
 msgid "Number of columns:"
 msgstr "열 수:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "설정"
 
@@ -3110,18 +3204,18 @@ msgstr "이름없는 목록"
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "wombat 서버를 시작할 수가 없습니다"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "wombat을 시작할 수 없습니다"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -3130,24 +3224,88 @@ msgstr ""
 msgid "Default Priority:"
 msgstr "우선순위(_P):"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "달력과 작업"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "달력"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "달력과 작업"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution 주소록 minicard 보기"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution 계정 편집기"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution 알림"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolution 메일 작성기."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolution 메일 작성기."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "작업"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "알람 기능을 위한 팩토리"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "시작:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "끝:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Evolution 알림"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "%s에 알림"
@@ -3212,127 +3370,280 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "이 메세지를 다시 보지 않습니다."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "알람 기능을 위한 팩토리"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo를 초기화 할 수 없습니다"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs를 초기화 할 수 없습니다"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "알람 기능 서비스 팩토리를 만들 수가 없습니다"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "잘못된 시간"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "iCalendar 오류"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+msgid "Color of tasks that are due today"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+msgid "Color of tasks that are overdue"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+msgid "Show where events end in week and month views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "인쇄될 달력을 미리봅니다"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "항목을 지울 때 확인하기(_A)"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "항목을 지울 때 확인하기(_A)"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "선택한 작업을 지웁니다"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+msgid "Whether to show week numbers in date navigator"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "요약에 포함"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "설명에 포함"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "주석에 포함"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
 "events."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "보다 적음"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "날"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%Y년 %B %d일 %A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%b %d일 %a"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%Y년 %b %d일 %a"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%Y년 %B %d일"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%B %d일"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "이 달력을 인쇄합니다"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "뉴 칼레도니아"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "새 약속"
+
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "약속(_A)"
+
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "새 약속을 만듭니다"
+
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "새 회의"
+
+#: calendar/gui/calendar-component.c:640
 #, fuzzy
-msgid "Rename"
-msgstr "이름바꿈(_R)"
+msgid "M_eeting"
+msgstr "회의"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:641
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "새 작업을 만듭니다"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
+#: calendar/gui/calendar-component.c:646
 #, fuzzy
-msgid "Personal"
-msgstr "일반 정보"
+msgid "New all day appointment"
+msgstr "새 약속"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
+#: calendar/gui/calendar-component.c:647
 #, fuzzy
-msgid "Work"
-msgstr "닷새씩"
+msgid "All _Day Appointment"
+msgstr "새 약속(_A)"
+
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "새 약속을 만듭니다"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3457,7 +3768,7 @@ msgstr "보냄"
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr ""
 
@@ -3473,6 +3784,10 @@ msgstr "시"
 msgid "minutes"
 msgstr "분"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3506,8 +3821,8 @@ msgstr "이메일 보내기"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "요약"
 
@@ -3536,7 +3851,7 @@ msgstr "약속 끝"
 msgid "hour(s)"
 msgstr "시간"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "분"
 
@@ -3590,7 +3905,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "금요일"
 
@@ -3604,7 +3919,7 @@ msgstr "분"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "월요일"
 
@@ -3614,7 +3929,7 @@ msgstr "일(_U)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "토요일"
 
@@ -3628,7 +3943,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "일요일"
 
@@ -3646,7 +3961,7 @@ msgstr "작업 목록"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "목요일"
 
@@ -3664,7 +3979,7 @@ msgstr "시간 형식:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "화요일"
 
@@ -3674,12 +3989,12 @@ msgstr "주의 시작(_E):"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "수요일"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "닷새씩"
 
@@ -3716,7 +4031,7 @@ msgid "_Fri"
 msgstr "금(_F)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "일반"
 
@@ -3756,76 +4071,76 @@ msgstr "수(_W)"
 msgid "before every appointment"
 msgstr "전에 알려주기"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
@@ -3835,162 +4150,166 @@ msgstr ""
 msgid "Validation error: %s"
 msgstr "알 수 없는 오류: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (완료됨 "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "완료됨 "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (기한 "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "기한 "
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 #, fuzzy
 msgid "Could not update object"
 msgstr "객체를 갱신할 수가 없습니다"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "약속 고치기"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "약속 - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "작업 - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "여행 일정 - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "요약 없음"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "다른 이름으로 저장..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+msgid "Select destination source"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "정말로 약속 `%s'을(를) 지우기를 원하십니까"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "정말로 이 제목없는 약속을 지우기를 원하십니까"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "정말로 작업 `%s'을(를) 지우기를 원하십니까"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "정말로 이 제목없는 작업을 지우기를 원하십니까"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "정말로 여행일정 `%s'을(를) 지우기를 원하십니까"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "정말로 이 제목없는 여행일정을 지우기를 원하십니까"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "정말로 약속 `%d'을(를) 지우기를 원하십니까?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "정말로 작업 `%d'을(를) 지우기를 원하십니까?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "정말로 여행일정 `%d'을(를) 지우기를 원하십니까?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 msgid "The journal entry could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr ""
 
@@ -4006,45 +4325,45 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "약속"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "알림"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "반복"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "회의"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "시작한 날"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 #, fuzzy
 msgid "Start time is wrong"
 msgstr "시작 시간(_S):"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr ""
 
@@ -4114,31 +4433,31 @@ msgid "_Start time:"
 msgstr "시작 시간(_S):"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "없음"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr ""
 
@@ -4179,21 +4498,15 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr ""
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "상태"
@@ -4213,6 +4526,7 @@ msgid "_Invite Others..."
 msgstr "다른 이들을 초대(_I)..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4249,6 +4563,7 @@ msgstr ""
 "%s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "서버가 선택되지 않았습니다"
@@ -4278,32 +4593,59 @@ msgstr "달력 정보"
 msgid "Calendar Name"
 msgstr "달력"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr ""
+"%s 디렉토리를 만들 수 없습니다:\n"
+"%s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "달력 정보"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "작업 목록"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "작업 목록"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "작업 목록"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 msgid "This and Prior Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 #, fuzzy
 msgid "All Instances"
 msgstr "고급"
@@ -4356,10 +4698,15 @@ msgstr "일"
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr ""
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "날짜/시간:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "더하기(_D)"
@@ -4424,7 +4771,7 @@ msgstr "주"
 msgid "year(s)"
 msgstr "년"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 #, fuzzy
 msgid ""
 "This event has been changed, but has not been saved.\n"
@@ -4435,32 +4782,32 @@ msgstr ""
 "\n"
 "바뀐 내용을 저장하시겠습니까?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 #, fuzzy
 msgid "Save Event"
 msgstr "달력"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "완료됨 "
@@ -4471,43 +4818,43 @@ msgid "% _Complete"
 msgstr "% 완료"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "완료됨"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "높음"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "진행중"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "낮음"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "보통"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "시작 안함"
 
@@ -4516,7 +4863,7 @@ msgid "Progress"
 msgstr "진행중"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "정의안됨"
 
@@ -4538,21 +4885,21 @@ msgstr "상태(_S):"
 msgid "_Web Page:"
 msgstr "홈페이지 주소(_W):"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "기본"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4560,9 +4907,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "비밀(_F)"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "설명:"
 
@@ -4667,26 +5014,21 @@ msgstr ""
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "공용"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "개인"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "비밀"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "분류"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4699,28 +5041,26 @@ msgid "Start Date"
 msgstr "시작한 날"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "요약"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "색상"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "약속"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr ""
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "바쁨"
 
@@ -4732,7 +5072,7 @@ msgstr "북"
 msgid "S"
 msgstr "남"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "동"
 
@@ -4740,14 +5080,14 @@ msgstr "동"
 msgid "W"
 msgstr "서"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4755,7 +5095,7 @@ msgstr ""
 msgid "Yes"
 msgstr "예"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4763,17 +5103,17 @@ msgstr "아니오"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "알 수 없음"
 
@@ -4785,185 +5125,183 @@ msgstr "반복됨"
 msgid "Assigned"
 msgstr "예약됨"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
+msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
-msgid "Deleting selected objects"
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "새 약속(_A)..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 #, fuzzy
 msgid "New Meeting"
 msgstr "회의"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "새 작업"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "인쇄(_P)..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "붙이기(_P)"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "오늘로 이동(_T)"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "날짜로 이동(_G)..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "사용자 정보"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "설정(_S)..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "열기(_O)"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "다른이름으로 저장(_S)..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "복사하기(_C)"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "회의 만듬(_M)"
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "i_Calendar로 전달합니다"
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "설정(_S)..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "메세지 열기(_O)"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "작업 할당(_A)"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "iCalendar로 전달(_F)"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "작업 완료 표시(_M)"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "선택한 작업 지우기(_D)"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "작업을 더하려면 누르십시오"
@@ -4977,8 +5315,8 @@ msgstr "% 완료"
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "완료"
 
@@ -5007,18 +5345,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d %a %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d %a %p %I:%M:%S"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5034,7 +5372,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%B %d일 %A"
 
@@ -5047,451 +5385,450 @@ msgstr "%m %d"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "오전"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "오후"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "간단한 반복(_S)"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
 msgid "Every day"
 msgstr "매"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, fuzzy, c-format
 msgid "Every %d days"
 msgstr " %d 일씩"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 #, fuzzy
 msgid "Every week"
 msgstr "매"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, fuzzy, c-format
 msgid "Every %d weeks"
 msgstr "%d 주씩"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, fuzzy, c-format
 msgid "Every %d weeks on "
 msgstr "%d 주씩"
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 #, fuzzy
 msgid "every month"
 msgstr "한달씩(_H)"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 #, fuzzy
 msgid "Every year"
 msgstr "매"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "완료됨 "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "iCalendar 정보"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "iCalendar 오류"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "위치:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "상태:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "승인됨"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "잠정적"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "확인"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "적용"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "취소"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "회의 정보"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "회의 계획"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "작업 정보"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Bug buddy를 실행할수 없습니다."
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "`%s'에있는 폴더를 열수가 없습니다"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -5654,7 +5991,7 @@ msgstr "%Y/%m/%D %a"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
@@ -5718,100 +6055,86 @@ msgstr "회의 시작 시간(_S):"
 msgid "Meeting _end time:"
 msgstr "회의 종료 시간(_E):"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "시작 날짜(_R):"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "마감 일자(_D):"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "우선순위(_P):"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "쪽"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "`%s'에있는 폴더를 열수가 없습니다"
 
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "%s을(를) 읽는중 오류 발생"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "완료 날짜"
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "선택한 연락처를 지웁니다"
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 #, fuzzy
 msgid "Expunging"
 msgstr "폴더 비우기"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "작업"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "달력"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s'에 있는 폴더를 열 수가 없습니다"
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "%s에 알림"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5819,7 +6142,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5827,62 +6150,11 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "터키어"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "달력과 작업"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "달력"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "달력과 작업"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Evolution 주소록 minicard 보기"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution 계정 편집기"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Evolution 알림"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolution 메일 작성기."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolution 메일 작성기."
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "사월"
@@ -5939,298 +6211,334 @@ msgstr "시월"
 msgid "September"
 msgstr "구월"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "작업 정보"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "여행 정보"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "달력 정보"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 #, fuzzy
 msgid "Refresh"
 msgstr "목록 다시읽음"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "사용자 정보"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 #, fuzzy
 msgid "iCalendar information"
 msgstr "달력 정보"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1일"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2일"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3일"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4일"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5일"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6일"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7일"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8일"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9일"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10일"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11일"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12일"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13일"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14일"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15일"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16일"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17일"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18일"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19일"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20일"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21일"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22일"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23일"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24일"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25일"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26일"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27일"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28일"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29일"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30일"
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31일"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "일"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "월"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "화"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "수"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "목"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "금"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "토"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "선택된 날(%Y년 %b %d일 %a)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%b %d %a"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%Y %d %a"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%Y년 %b %d일 %a"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "선택된 주 (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "선택된 달 (%Y년 %b)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "선택한 년도 (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "작업"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "상태: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "우선순위: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "퍼센트 완료: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "분류: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "연락처:"
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "인쇄 미리보기"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "항목 인쇄"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "인쇄 설정"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "이 바로가기 이름바꿈"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "작업 목록"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "새 작업"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "작업(_T)"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "새 작업을 만듭니다"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "보여줄 작업 폴더의 URI"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6238,11 +6546,11 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "다시 묻지 않습니다."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 #, fuzzy
 msgid "Print Tasks"
 msgstr "카드 인쇄하기"
@@ -6274,23 +6582,23 @@ msgstr ""
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 #, fuzzy
 msgid "Reminder!!"
 msgstr "알림"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 #, fuzzy
 msgid "Calendar Events"
 msgstr "달력"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "달력"
@@ -7828,27 +8136,27 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr ""
 
@@ -7899,91 +8207,91 @@ msgstr "%s 폴더를 저장중"
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "메세지에 파일을 첨부합니다"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "메세지에 파일을 첨부합니다"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr ""
 "%s 디렉토리를 생성할 수가 없습니다:\n"
 "%s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "폴더 동기중"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "필터 분석중 오류: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "필터 실행중 오류: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "스풀 폴더를 열 수 없습니다"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "스풀 폴더를 진행할 수 없습니다"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "메세지 %d개(%d%%)를 가져오는 중"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "메세지를 열 수 없음"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "메세지 %d개에서 실패"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "폴더 동기화"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%2$d중 %1$d메시지 가져오는중"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%2$d중 %1$d메시지 에서 실패"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "메세지에 파일을 첨부합니다"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "첨부"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "첨부"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "필터 찾기 실행중 오류: %s: %s"
@@ -8015,36 +8323,36 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "지원되지 않는 동작: 표현식으로 찾기: %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "지원되지 않는 동작: uid로 찾기: %s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "메세지 옮기는중"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 #, fuzzy
 msgid "Copying messages"
 msgstr "메시지들을 %s로 복사"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "메세지 %d개 가져오는중"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8052,46 +8360,46 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "취소됨."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "IMAP server로부터 예상치못한 답변: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 #, fuzzy
 msgid "No data provided"
 msgstr "파일이름이 주어지지 않음"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8099,49 +8407,61 @@ msgid ""
 "%s"
 msgstr "메세지에 파일을 첨부합니다"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "메세지에 파일을 첨부합니다"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "데이타를 쓸 수가 없습니다: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "메세지에 파일을 첨부합니다"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "메세지에 파일을 첨부합니다"
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr "임시 파일을 만들수 없음: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "임시 파일을 만들수 없음: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "데이타를 쓸 수가 없습니다: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "포함"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "잘못된 메세지 내용"
@@ -8240,15 +8560,15 @@ msgstr "메일 임시파일을 쓰는중 오류발생: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "메일 임시파일을 복사하는 중 오류발생: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 #, fuzzy
 msgid "parse error"
 msgstr "다른 오류"
@@ -8548,12 +8868,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8562,71 +8882,82 @@ msgstr ""
 "%s 디렉토리를 만들 수 없습니다:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "%s의 열쇠글을 입력하십시오"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "정의안됨"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "조건 추가"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "조건 추가"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 msgid "Signing certificate not found"
 msgstr ""
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 msgid "Signing certificate not trusted"
 msgstr ""
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "서명 저장"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "다른 오류"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "서버: %s, 형식: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "폴더를 얻을수 없습니다: %s: %s"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "폴더를 얻을수 없습니다: %s: %s"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "휴지통"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "유월"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr ""
@@ -8815,7 +9146,7 @@ msgid ""
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, fuzzy, c-format
 msgid "Could not parse URL `%s'"
 msgstr "데이타를 쓸 수가 없습니다: %s"
@@ -8835,22 +9166,22 @@ msgstr "그런 메세지 없음: %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "모든 폴더에서 새 메세지 확인"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "폴더를 얻을수 없습니다: %s: %s"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "폴더를 얻을수 없습니다: %s: %s"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "폴더를 얻을수 없습니다: %s: %s"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "폴더를 얻을수 없습니다: %s: %s"
@@ -8929,7 +9260,7 @@ msgstr "메세지에 파일을 첨부합니다"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -8943,7 +9274,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "그런 메세지 없음"
@@ -8983,54 +9314,69 @@ msgid "Failed to cache %s: %s"
 msgstr "메세지에 파일을 첨부합니다"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "서버에 연결중..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "LDAP 서버에 연결 실패"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "회사"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "새 편지 확인중"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Check for new messages in all folders"
 msgstr "모든 폴더에서 새 메세지 확인"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "폴더"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "구독하는 폴더만 보이기"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "이 서버의 INBOX에 있는 새로운 메세지에 거르개 적용"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "새 편지를 자동으로 확인(_A)"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP서버에 편지를 읽고 저장"
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "열쇠글"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9279,7 +9625,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr ""
@@ -9401,30 +9747,30 @@ msgstr "메시지들을 저장"
 msgid "Storing folder"
 msgstr "폴더 동기화"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "폴더를 얻을수 없습니다: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "작업 취소"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9433,11 +9779,11 @@ msgstr ""
 "메세지를 얻을 수 없음: %2$s 폴더에서 %1$s\n"
 "  %3$s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -9501,14 +9847,19 @@ msgstr ""
 msgid "Cannot create folder: %s: %s"
 msgstr "폴더를 얻을 수 없습니다: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "카드 ID가 이미 있습니다"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr ""
 "서명 파일 %s을 열 수가 없습니다:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "지정하신 폴더의 이름이 적절하지않습니다"
@@ -9556,7 +9907,7 @@ msgstr ""
 msgid "Could not close temp folder: %s"
 msgstr "임시 폴더를 닫을수 없음: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
@@ -9850,7 +10201,7 @@ msgstr "이 일정를 삭제합니다"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -9930,7 +10281,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "센드메일"
 
@@ -9983,7 +10334,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmail을 통해서 메일을 보냅니다"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr ""
 
@@ -10146,7 +10497,7 @@ msgstr ""
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "메세지를 보냄"
 
@@ -10268,7 +10619,7 @@ msgstr ""
 msgid "%.0fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "첨부"
 
@@ -10313,11 +10664,11 @@ msgstr "MIME 형식:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "주소록"
 
@@ -10328,45 +10679,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "답장 주소:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "보낸 사람:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "제목:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "받는 사람:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "메세지를 받을 사람을 입력하세요"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "참조:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "메세지의 사본을 받을 사람의 주소를 입력하세요"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "숨은 참조:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10375,16 +10726,21 @@ msgstr "참조 목록에는 없지만 메세지의 사본을 받을 사람들의
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "포트(_P):"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 #, fuzzy
 msgid "Posting destination"
 msgstr "설명 없음"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "메세지에 파일을 첨부합니다"
+
 #: composer/e-msg-composer-select-file.c:119
 #, fuzzy
 msgid "Attach file(s)"
@@ -10418,21 +10774,21 @@ msgstr "파일이 있습니다, 덮어쓸까요?"
 msgid "Error saving file: %s"
 msgstr "파일 저장중 오류 발생: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "파일을 읽는중 오류 발생: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "파일 저장중 오류 발생: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10441,7 +10797,7 @@ msgstr ""
 "출력파일을 생성할 수가 없습니다: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10450,7 +10806,7 @@ msgstr ""
 "출력파일을 생성할 수가 없습니다: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10459,7 +10815,7 @@ msgstr ""
 "출력파일을 생성할 수가 없습니다: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10468,13 +10824,13 @@ msgstr ""
 "%s로 메시지 저장중 오류 발생:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10485,34 +10841,34 @@ msgstr ""
 "\n"
 "바뀐 내용을 저장하시겠습니까?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "경고: 바뀐 메세지"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "파일 열기"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "서명:"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "자동으로 만들어짐"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "메일 메세지를 작성합니다"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10523,7 +10879,7 @@ msgstr ""
 "아직 신상 정보가 입력이 되어있지 않았기때문에\n"
 "메시지 작성창을 만들 수가 없습니다."
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10532,18 +10888,20 @@ msgstr ""
 "아직 신상 정보가 입력이 되어있지 않았기때문에\n"
 "메시지 작성창을 만들 수가 없습니다."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Evolution 그룹웨어 모음"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10791,13 +11149,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -10926,7 +11284,7 @@ msgstr "동작 선택"
 msgid "You must specify a folder."
 msgstr "이 거르개에 이름을 주어야 합니다."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "폴더 선택"
@@ -10940,25 +11298,25 @@ msgstr ""
 "정규식 '%s'에서 에러:\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "중요"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 #, fuzzy
 msgid "Later"
 msgstr "이후"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "테스트"
 
@@ -11052,7 +11410,7 @@ msgstr ""
 msgid "months"
 msgstr "달"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "초"
 
@@ -11150,7 +11508,7 @@ msgstr "표현"
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 #, fuzzy
 msgid "Label"
 msgstr "로렐"
@@ -11223,119 +11581,125 @@ msgid "Source Account"
 msgstr ""
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "사모아"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "제목"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "상태 설정"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "포함"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "포함하지 않음"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "끝나지 않음"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "존재하지 않음"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 #, fuzzy
 msgid "does not return"
 msgstr "존재하지 않음"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "시작히지 않음"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 #, fuzzy
 msgid "is after"
 msgstr "이후"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "is before"
 msgstr "이전"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "보다 큼"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "보다 적음"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 #, fuzzy
 msgid "returns greater than"
 msgstr "보다 큼"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 #, fuzzy
 msgid "returns less than"
 msgstr "보다 적음"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 #, fuzzy
 msgid "returns"
 msgstr "바쁨"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr ""
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
@@ -11361,19 +11725,86 @@ msgstr "규칙 이름: "
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr ""
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 #, fuzzy
 msgid "VFolder source"
 msgstr "가상 폴더 소스"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "편지 작성기 기본 설정"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#, fuzzy
+msgid "Configure your email accounts here"
+msgstr "메일 계정과 다른 세부사항을 만들거나 편집합니다"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution 계정 편집기"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Evolution 메일 작성기."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Evolution 메일 작성기."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution 메일 작성기."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution 메일 작성기."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "메일 기본 설정"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "편지"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "편지 계정"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "메일 기본 설정"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "정말로 이 계정을 지우기를 원하십니까?"
@@ -11416,7 +11847,7 @@ msgid "Protocol"
 msgstr "프로토콜"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 #, fuzzy
 msgid "Unnamed"
 msgstr "이름없는 연락처"
@@ -11444,19 +11875,15 @@ msgstr "조건 추가"
 msgid "Signature(s)"
 msgstr "서명"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 
-#: mail/em-composer-utils.c:129
-#, fuzzy
-msgid "Send anyway?"
-msgstr "이메일 보내기"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11464,28 +11891,28 @@ msgstr ""
 "이 메세지는 제목이 없습니다.\n"
 "정말로 보내겠습니까?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11495,187 +11922,399 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "찾은 것에서 가상 폴더 만들기(_V)"
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "편지"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<폴더를 고를려면 여길 누르세요>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, fuzzy, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "%s에서 열기..."
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "새 폴더 만들기"
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "폴더 만들 곳을 지정하세요:"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
-msgid "Folder _name"
+msgid "Folder _name:"
 msgstr "폴더 이름:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "임시 디렉토리를 만들 수가 없습니다: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "임시 디렉토리를 만들 수가 없습니다: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "임시 디렉토리를 만들 수가 없습니다: %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "임시 폴더를 닫을수 없음: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "읽는 중..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "폴더 선택"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "새 폴더를 만듭니다"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "폴더 `%s'을(를) 지울 수 없습니다: %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "폴더를 얻을수 없습니다: %s: %s"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, fuzzy, c-format
+msgid "Delete \"%s\""
+msgstr "삭제"
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, fuzzy, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "%s 폴더를 열기"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+#, fuzzy
+msgid "Rename Folder"
+msgstr "폴더 이름바꿈"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "글꼴 설정"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "등록 정보"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "폴더 이름(_F):"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "보기(_V)"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "새 창에서 열기"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "이동"
+
+#: mail/em-folder-tree.c:1500
+msgid "_New Folder..."
+msgstr "새 폴더(_N)..."
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "이름바꿈(_R)"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "설정(_P)..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "새 메세지로 고침(_E)..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "인쇄(_P)"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "보낸 이에게 답장(_R)"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "목록에 답장(_L)"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "전체에 답장(_A)"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "전달(_F)"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr "표시 완료(_G)"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "표시 비움(_E)"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "읽은 것으로 표시(_K)"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "읽지 않은 것으로 표시(_U)"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "중요한 것으로 표시(_I)"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "중요하지 않은 것으로 표시(_M)"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "읽지 않은 것으로 표시(_U)"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "중요한 것으로 표시(_I)"
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "되살림(_N)"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "폴더로 옮김(_V)..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "폴더로 복사(_C)..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "보낸이를 주소록에 더하기"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "거르개 적용(_Y)"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "메시지로부터 거르게 만들기(_T)"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "제목에따른 가상폴더(_S)"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "보낸이에 따른 가상폴더(_N)"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "받은이에 따른 가상폴더(_R)"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "메일링 리스트에 대한 가상폴더(_L)"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "보낸이에 따른 가상폴더(_N)"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "제목에 대한 거르게(_J)"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "보낸이에 대한 거르게(_D)"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "받은이에 대한 거르게(_C)"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "메일링 리스트에 대한 거르개(_M)"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "보낸이에 대한 거르게(_D)"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "기본값"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "메세지 인쇄"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "링크위치 복사"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "일치함:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "예약됨"
+
+#: mail/em-format-html-display.c:597
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr ""
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "조건 추가"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "조건 추가"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "정의안됨"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "PGP 암호화"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "MIME 메세지를 분석할 수 없습니다. 소스로 보여줍니다."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "사용자 정보"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "알 수 없는 오류: %s"
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "포함해서 전달(_I)"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "숨김"
@@ -11685,210 +12324,233 @@ msgstr "숨김"
 msgid "Page %d of %d"
 msgstr "%2$d중 %1$d쪽"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "메세지 %s을(를) 가져오기"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-
-#: mail/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-msgid "No signature present"
-msgstr ""
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Bonobo를 초기화 할 수 없습니다"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "사용자 정보"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME 메세지를 분석할 수 없습니다. 소스로 보여줍니다."
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "메세지 옮기는중"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "보낸이"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "답장 주소"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "받는이"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "참조"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "숨은 참조"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 #, fuzzy
 msgid "Mailer"
 msgstr "편지"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "날짜"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "%s 첨부"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "MIME 메세지를 분석할 수 없습니다. 소스로 보여줍니다."
+msgid "Session not initialised"
+msgstr "Bonobo를 초기화 할 수 없습니다"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/em-format.c:1212
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "기다리는 중..."
 
-#: mail/em-popup.c:593
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "\"%s\" 보내는 중"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "메세지에 파일을 첨부합니다"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "메세지에 파일을 첨부합니다"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "메세지에 파일을 첨부합니다"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "다른 이름으로 저장..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "보낸 이에게 답장(_R)"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "브라우져에서 링크 열기"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "목록으로 메세지 보냄(_M)..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "보낸이를 주소록에 더합니다"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "%s에서 열기..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "구독"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "폴더"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "서버를 선택하십시오."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "서버가 선택되지 않았습니다"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "이 메세지를 다시 보지 않습니다."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "거르개"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "전달된 메시지"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr ""
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%Y-%m-%d %a %H:%M, %%s이(가) 씀:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -11897,131 +12559,419 @@ msgstr ""
 "메세지를 얻을 수 없음: %s\n"
 "  %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
 "Overwrite it?"
 msgstr "파일이 있습니다, 덮어쓸까요?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "메세지"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "다른이름으로 메세지 저장..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "주소"
+
+#: mail/em-utils.c:2262
 #, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "임시 디렉토리를 만들 수가 없습니다: %s"
+msgid ""
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2288
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "편지 작성기 기본 설정"
+#: mail/evolution-mail.schemas.in.in.h:1
+msgid "Automatic link recognition"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+#: mail/evolution-mail.schemas.in.in.h:2
+msgid "Automatic smiley recognition"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:6
 #, fuzzy
-msgid "Configure your email accounts here"
-msgstr "메일 계정과 다른 세부사항을 만들거나 편집합니다"
+msgid "Default charset in which to compose messages"
+msgstr "선택한 메세지를 자릅니다"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/evolution-mail.schemas.in.in.h:7
 #, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
+msgid "Default charset in which to compose messages."
+msgstr "선택한 메세지를 자릅니다"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution 계정 편집기"
+msgid "Default charset in which to display messages"
+msgstr "보이는 메세지의 본문에서 텍스트를 찾습니다"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
-msgid "Evolution Mail component"
-msgstr "Evolution 메일 작성기."
+msgid "Default charset in which to display messages."
+msgstr "보이는 메세지의 본문에서 텍스트를 찾습니다"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Evolution 메일 작성기."
+msgid "Default forward style"
+msgstr "전달 모양(_F):"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution 메일 작성기."
+msgid "Default reply style"
+msgstr "답장 모양(_R):"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
 #, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution 메일 작성기."
+msgid "Empty Trash folders on exit"
+msgstr "마칠때 휴지통 폴더 비움(_T)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "메일 기본 설정"
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "마칠때 휴지통 폴더 비움(_T)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "편지 계정"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "메일 기본 설정"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
 
-#: mail/importers/elm-importer.c:105
-msgid "Evolution is importing your old Elm mail"
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
 msgstr ""
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
-msgid "Importing..."
-msgstr "가져오는 중..."
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
-msgid "Please wait"
-msgstr "잠시 기다리십시오"
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
 msgstr ""
 
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "동작 선택"
+
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/importers/elm-importer.c:547
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "새 편지 알림"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "새 편지 알림"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/importers/elm-importer.c:568
-msgid "Elm"
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:44
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "HTML 편지 보내기?"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "HTML 편지 보내기?"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "그림 움직임 보임(_S)"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "그림 움직임 보임(_S)"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "보통 형식으로 메세지를 보여줍니다"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "미리보기(_P)"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "메일이 도착하면 소리로 알림(_P)"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "맞춤법 검사(_C)"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "터미널 글꼴(_T):"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+msgid "The variable width font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "연관된 메세지 목록"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "연관된 메세지 목록"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "내 기본 계정으로 하기(_M)"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "가변폭(_A):"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
 msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
@@ -12056,6 +13006,42 @@ msgstr ""
 msgid "Evolution Pine importer"
 msgstr "Evolution 메일 작성기."
 
+#: mail/importers/elm-importer.c:105
+msgid "Evolution is importing your old Elm mail"
+msgstr ""
+
+#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
+#: mail/importers/pine-importer.c:115
+msgid "Importing..."
+msgstr "가져오는 중..."
+
+#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
+#: mail/importers/pine-importer.c:117
+msgid "Please wait"
+msgstr "잠시 기다리십시오"
+
+#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
+#: mail/importers/pine-importer.c:288
+#, c-format
+msgid "Importing %s as %s"
+msgstr ""
+
+#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
+#: mail/importers/pine-importer.c:425
+#, c-format
+msgid "Scanning %s"
+msgstr ""
+
+#: mail/importers/elm-importer.c:547
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: mail/importers/elm-importer.c:568
+msgid "Elm"
+msgstr ""
+
 #: mail/importers/netscape-importer.c:75
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
@@ -12097,12 +13083,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "휴지통"
-
 #: mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
@@ -12113,7 +13093,7 @@ msgstr "로컬 편지 파일 %s"
 msgid "Scanning directory"
 msgstr "IMAP 폴더를 살펴봅니다"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 #, fuzzy
 msgid "Starting import"
 msgstr "시작 날짜(_S):"
@@ -12185,23 +13165,23 @@ msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution 계정 편집기"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "호스트(_H):"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "사용자이름(_N):"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "경로(_P):"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -12210,35 +13190,35 @@ msgstr ""
 msgid "Mail to %s"
 msgstr "%s에 편지 보냄"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "제목이 %s임"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "%s이(가) 보낸 편지"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s 메일링 리스트"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "답장"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "거르게 규칙을 더하기"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12249,142 +13229,30 @@ msgstr ""
 "    '%s'\n"
 "가 새로 고쳐졌습니다."
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "연결중..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr ""
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "새 편지 메세지"
 
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "`%s'에있는 폴더를 열수가 없습니다"
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "편지 만들기(_M)"
 
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "임시 디렉토리를 만들 수가 없습니다: %s"
-
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "임시 디렉토리를 만들 수가 없습니다: %s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "새로운 메일 메세지를 작성합니다"
 
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "임시 폴더를 닫을수 없음: %s"
-
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-msgid "Select destination to copy folder into"
-msgstr ""
-
-#: mail/mail-component.c:1643
-msgid "Select destination to move folder into"
-msgstr ""
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "새 폴더를 만듭니다"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "폴더 만들 곳을 지정하세요:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "폴더 `%s'을(를) 지울 수 없습니다: %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "폴더를 얻을수 없습니다: %s: %s"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, fuzzy, c-format
-msgid "Delete \"%s\""
-msgstr "삭제"
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, fuzzy, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "%s 폴더를 열기"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-#, fuzzy
-msgid "Rename Folder"
-msgstr "폴더 이름바꿈"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, fuzzy, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "지정하신 폴더의 이름이 적절하지않습니다"
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "글꼴 설정"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "등록 정보"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "폴더 이름(_F):"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "보기(_V)"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "새 창에서 열기"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "이동"
-
-#: mail/mail-component.c:2087
-msgid "_New Folder..."
-msgstr "새 폴더(_N)..."
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "이름바꿈(_R)"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "설정(_P)..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "신원"
 
@@ -12438,11 +13306,11 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "서비스 확인중"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "서버에 연결중..."
 
@@ -12525,26 +13393,35 @@ msgid "C_olors"
 msgstr "색상(_O)"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "새 편지 확인"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "입력할 때 맞춤법 검사(_T)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "새 편지 확인"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "맞춤법이 틀린 글자의 색상(_M):"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "메세지 만들기"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "설정"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12554,289 +13431,294 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "기본값(_F)"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default Behavior"
 msgstr "기본값"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "기본 글자 인코딩(_E):"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "편지 지우기"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "이 계정을 쓸 때 나가는 메세지에 항상 서명함(_Y)"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "원래 메세지를 인용하지 않음"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "완료"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "임시 보관함 폴더(_F):"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "사용(_N)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "메일 계정"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "전자우편 주소(_A):"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "마칠때 휴지통 폴더 비움(_T)"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "연락처 목록(_L)"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Evolution 계정 마법사"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "명령 실행..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "고정폭(_X):"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "거르개"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "글꼴 설정"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "HTML 형식 메세지(_H)"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "인용문은 다음 색깔로 강조(_Q)"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "포함"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "저장후 마침"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "그림 읽음"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "메일 설정"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "편지함 위치"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "메세지 작성기"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "메세지 보이기"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 msgid "Message Fonts"
 msgstr "메세지 글꼴"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "새 편지 알림"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "알림: 처음 연결이 되면 열쇠글을 물어보는 창이 뜰 것입니다"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "선택 사항 정보"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "조직(_G):"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP 키 ID(_K):"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr ""
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "인쇄 글꼴"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "원래 메세지를 인용"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "인용"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "이 열쇠글 기억(_M)"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "답장 주소(_P):"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "편지를 받음"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "받기 옵션(_O)"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "이 열쇠글 기억(_P)"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "필요한 정보"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "기본값"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "보안(_E)"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "보안 MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "편지를 보냄"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "보낸 편지함 메세지 폴더(_M):"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "임시 보관함의 메세지를 보냅니다"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "서버가 인증을 요구합니다(_V)"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "서버 설정"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "서버 종류(_T): "
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Si_gning certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "파일이름 지정(_F):"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "맞춤법 검사(_C)"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "표준 유닉스 mbox"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12844,11 +13726,15 @@ msgstr ""
 "이 계정에 쓸 이름을 입력하십시오.\n"
 "예: \"작업용\" 또는 \"개인용\""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "가변폭(_A):"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -12859,171 +13745,180 @@ msgstr ""
 "\n"
 "시작하려면 \"다음\"을 누르십시오. "
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "서명 더하기(_A)"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "항상 그림 읽음(_A)"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "인증 형식(_A):"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "인증 형식(_A): "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "새 편지를 자동으로 확인(_A)"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "자동으로 이모티콘 그림 넣기(_A)"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "새 메일이 도착하면 삑 소리냄(_B)"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "폴더를 지울 때 확인9_C)"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "기본 서명(_D):"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "기본값(_D)"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "새 메일 도착을 알리지 않음(_D)"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "사용(_E)"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "전달 모양(_F):"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "전체이름(_F):"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "HTML 편지(_H)"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "신원(_I)"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "유월"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "보낸이가 주소록에 있으면 그림 보임(_L)"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "내 기본 계정으로 하기(_M)"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "읽은 후 메세지 표시(_M)"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "이름(_N):"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "그림을 보이지 않음(_N)"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "메일이 도착하면 소리로 알림(_P)"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "편지 받기(_R)"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "답장 모양(_R):"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Script:"
 msgstr "보안(_S)"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "지우기..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "편지 보내기(_S)"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "그림 움직임 보임(_S)"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "서명(_S)"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr "보통 글꼴(_S):"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr "터미널 글꼴(_T):"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "보안 연결(SSL) 사용(_U):"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr "다른 프로그램과 같은 글꼴 쓰기(_U)"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "설명"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "\"%s\" 보내는 중"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13032,7 +13927,7 @@ msgstr ""
 "'%s'중 오류:\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13041,7 +13936,7 @@ msgstr ""
 "작업 수행중 에러가 발생했습니다:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr ""
 
@@ -13053,118 +13948,118 @@ msgstr "폴더 거르는 중"
 msgid "Fetching Mail"
 msgstr "편지 가져오는 중"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "메세지에 파일을 첨부합니다"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "메세지에 파일을 첨부합니다"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" 보내는 중"
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%2$d개 중 %1$d개 메세지 보냄"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "%2$d중 %1$d메시지 실패"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "완료됨"
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "메세지를 폴더로 저장"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "메시지들을 %s(으)로 옮김"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "메시지들을 %s(으)로 복사"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\"의 폴더 찾는 중"
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "전달된 메시지"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s 폴더를 열기"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s 폴더를 지우는중"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s 폴더를 저장중"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "폴더 비우기"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "로컬 폴더"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "메세지 %s을(를) 가져오기"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "메세지 %d개 가져오는중"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "메시지 %d개 저장중"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13173,7 +14068,7 @@ msgstr ""
 "출력파일을 만들 수가 없습니다: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13182,11 +14077,11 @@ msgstr ""
 "%s(으)로 메시지 저장중 오류 발생:\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "첨부 저장"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13195,21 +14090,25 @@ msgstr ""
 "출력 파일을 만들 수 없음: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "데이타를 쓸 수가 없습니다: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s에서 연결 끊는 중"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s(으)로 다시 연결중"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "대소문자 가림"
@@ -13227,60 +14126,75 @@ msgstr "찾기:"
 msgid "Search"
 msgstr "찾기(_S)"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "조건 추가"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "예외"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "계정 정보"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "취소 중..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "서버: %s, 형식: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "경로: %s, 형식: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "형식: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "편지 주고받기"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 #, fuzzy
 msgid "Cancel _All"
 msgstr "모두 취소"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "새로 고치는중..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "기다리는 중..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "사용자가 취소한 동작."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s의 열쇠글을 입력하십시오"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "열쇠글 입력"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "이 열쇠글 기억(_R)"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "이 세션에서 이 비밀번호를 기억"
@@ -13321,26 +14235,31 @@ msgstr ""
 msgid "Name:"
 msgstr "이름:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "전달된 메시지 - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "전달된 메시지"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "%s 폴더를 열기"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "가상 폴더 설정: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "가상폴더의 uri 새로 고침: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13353,88 +14272,88 @@ msgstr ""
 "    '%s'\n"
 "가 새로 고쳐졌습니다."
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "가상 폴더"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "가상 폴더"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "가상폴더 고치기"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "없는 가상 폴더 '%s'을(를) 고치려 합니다."
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "새 가상폴더"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "보지않았음"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "봤음"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "답장함"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "여러개의 보지않은 메세지"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "여러 메세지"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "가장 낮음"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "낮음"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "높음"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "가장 높음"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "오늘 %p %l:%M"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "어제 %p %l:%M "
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %p %l:%M"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%m %d %p %l:%M"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%Y년 %b %d일"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "메세지 목록 작성중"
 
@@ -13496,11 +14415,11 @@ msgstr "전달"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "답장"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "전체 답장"
 
@@ -13556,39 +14475,139 @@ msgstr "구독(_S)"
 msgid "_Unsubscribe"
 msgstr "구독 중지(_U)"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, fuzzy, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Evolution 쉘."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "폴더 설정"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "80%"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "이 바로가기 그룹의 이름을 바꿉니다"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "폴더 막대를 보여줄 것인지 토글합니다"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "바로가기 막대를 감춤니다"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "우선순위(_P):"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "우선순위(_P):"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "메일 설정 인터페이스"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr "폴더를 얻을수 없습니다: %s: %s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
+msgstr ""
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "폴더 더하기"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "임시 보관함"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "받은 편지함"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "%s 폴더를 열기"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "%s 폴더를 열기"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "%s 폴더를 열기"
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "보낼 편지함"
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "보낸 편지함"
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "%s 폴더를 열기"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "폴더 막대를 보여줄 것인지 토글합니다"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "바로가기 막대를 보여줄 것인지 토글합니다"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "이메일"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "제대로 파일들을 고칠 수가 없습니다"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13599,14 +14618,14 @@ msgstr ""
 "만들 수 없습니다\n"
 "오류: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, fuzzy, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr "파일을 읽는 도중 에러 발생"
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13614,7 +14633,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13713,10 +14732,11 @@ msgid ""
 "%s"
 msgstr "폴더를 얻을수 없습니다: %s: %s"
 
-#: shell/e-shell-folder-commands.c:554
-#, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
+#, fuzzy, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "지정하신 폴더의 이름이 적절하지않습니다"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -13738,19 +14758,15 @@ msgstr ""
 "지정한 폴더를 만들 수 없습니다:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "새 폴더 만들기"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(제목없음)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr ""
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13759,11 +14775,11 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13771,7 +14787,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13780,22 +14796,22 @@ msgstr ""
 "%s을(를) 가져오는 중\n"
 "아이템 %d개를 가져옴."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 #, fuzzy
 msgid "Select importer"
 msgstr "폴더 선택"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "파일 %s은(는) 없습니다."
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Evolution 오류"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -13804,11 +14820,11 @@ msgstr ""
 "다음을 가져올 수 있는 도구가 없습니다\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "가져오기"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -13817,17 +14833,17 @@ msgstr ""
 "%s을(를) 가져오기.\n"
 "%s을(를) 시작합니다"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr "%s을(를) 읽는중 오류 발생"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "%s을(를) 읽는중 오류 발생"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13836,82 +14852,62 @@ msgstr ""
 "%s을(를) 가져오는 중\n"
 "아이템 1을 가져옴."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "자동"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "파일 이름:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "파일을 고르세요"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "파일 종류:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "다른 프로그램에서 데이터를 가져옵니다"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "가져오기"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "%s 에서:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "가져오기"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "연결 닫는중..."
 
-#: shell/e-shell-offline-sync.c:163
-#, fuzzy, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"'%s'중 오류:\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-#, fuzzy
-msgid "Syncing Folder"
-msgstr "폴더 동기화"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr ""
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Evolution 설정"
@@ -13951,7 +14947,7 @@ msgstr ""
 "명시된 폴더를 생성할 수 없습니다:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -13960,17 +14956,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "조수"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "새로 만들기"
-
 #: shell/e-shell-utils.c:116
 #, fuzzy
 msgid "No folder name specified."
@@ -14036,60 +15026,47 @@ msgstr "새로운 바로가기를 만듭니다"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "온라인 작업(_W)"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "오프라인 작업(_W)"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "오프라인에서 작업"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(보여줄 폴더가 없음)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr ""
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(없음)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "일반 오류"
 
@@ -14206,77 +15183,18 @@ msgstr "지우기(_M)"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "받은 편지함"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "바로가기"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "에러 없음"
-
-#: shell/e-storage.c:573
-msgid "A folder with the same name already exists"
-msgstr "같은 이름의 폴더가 이미 존재합니다"
-
-#: shell/e-storage.c:575
-msgid "The specified folder type is not valid"
-msgstr "지정된 폴터 형식이 올바르지 않습니다"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "입출력 오류"
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr "폴더를 만들기에 충분한 공간이 없음"
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr ""
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "지정된 폴더를 찾을 수 없습니다"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr ""
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "작동이 지원되지 않음"
-
-#: shell/e-storage.c:591
-msgid "The specified type is not supported in this storage"
-msgstr "이 저장매체에 지정된 형식이 지원되지 않습니다"
-
-#: shell/e-storage.c:593
-#, fuzzy
-msgid "The specified folder cannot be modified or removed"
-msgstr "지정된 폴더를 찾을수 없습니다"
-
-#: shell/e-storage.c:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr ""
-
-#: shell/e-storage.c:597
-#, fuzzy
-msgid "Cannot create a folder with that name"
-msgstr "폴더를 얻을수 없습니다: %s: %s"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr ""
-
-#: shell/e-storage-set-view.etspec.h:1
-#, fuzzy
-msgid "Checkbox"
-msgstr "죄장"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14287,6 +15205,17 @@ msgstr ""
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 완료)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "새로 만들기"
+
+#: shell/evolution-folder-selector-button.c:128
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "%s에서 열기..."
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14316,83 +15245,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "CORBA 오류"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1191
-#, fuzzy
-msgid "Invalid argument"
-msgstr "첨부"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1195
-#, fuzzy
-msgid "No owner"
-msgstr "(이름 없음)"
-
-#: shell/evolution-shell-component.c:1197
-#, fuzzy
-msgid "Not found"
-msgstr "파일이 발견되지 않았습니다"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1203
-#, fuzzy
-msgid "Unsupported operation"
-msgstr "사용자 정보"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "내부 오류"
-
-#: shell/evolution-shell-component.c:1209
-#, fuzzy
-msgid "Exists"
-msgstr "종료(_x)"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "잘못된 URI"
-
-#: shell/evolution-shell-component.c:1215
-#, fuzzy
-msgid "Has subfolders"
-msgstr "%s같은 폴더가 없음"
-
-#: shell/evolution-shell-component.c:1217
-#, fuzzy
-msgid "No space left"
-msgstr "메세지를 받았습니다"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr ""
-
-#: shell/evolution-test-component.c:63
-#, fuzzy
-msgid "Test type"
-msgstr "파일 종류:"
-
-#: shell/evolution-test-component.c:703
-#, fuzzy
-msgid "Evolution Test Component"
-msgstr "Evolution 메일 작성기."
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "Active Connections"
@@ -14422,11 +15274,6 @@ msgstr "편지(_M):"
 msgid "_Tasks:"
 msgstr "작업(_T):"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-#, fuzzy
-msgid "Folder _name:"
-msgstr "폴더 이름:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 #, fuzzy
 msgid "Folder _type:"
@@ -14481,23 +15328,6 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Evolution 쉘."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "폴더 설정"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Evolution으로 파일을 가져오실려면 \"가져오기\"를 누르세요."
@@ -14533,7 +15363,7 @@ msgstr ""
 msgid "Importers"
 msgstr "가져오기"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "가져오기"
 
@@ -14549,16 +15379,16 @@ msgstr "다시 물어보지 않습니다"
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Evolution을 마칩니다..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14578,7 +15408,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -14586,67 +15416,106 @@ msgstr ""
 "고맙습니다\n"
 "Ximian Evolution 팀\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr "다시 물어보지 않습니다"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ximian Evolution 쉘에 접근할 수 없습니다."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ximian Evolution 쉘을 초기화 할 수 없습니다: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "오프라인 모드에서 시작"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "온라인 모드에서 시작"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "폴더 선택"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "임시 폴더를 닫을수 없음: %s"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "진행중"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "표현"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "전자우편 주소 합침"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr "임시 폴더를 닫을수 없음: %s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14699,88 +15568,368 @@ msgid "Backup All"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "임시 폴더를 닫을수 없음: %s"
+
+#: smime/gui/smime-ui.glade.h:15
+msgid "Certificate Authority Trust"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "임시 폴더를 닫을수 없음: %s"
+
+#: smime/gui/smime-ui.glade.h:17
 msgid "Common Name (CN)"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "연락처 목록(_L)"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "고치기(_E)"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 msgid "Email Signer Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "표현"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "조직"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "조직"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "보기(_V)"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "임시 폴더를 닫을수 없음: %s"
+
+#: smime/gui/smime-ui.glade.h:42
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "가져오기"
+msgid "Certificate already exists"
+msgstr "카드 ID가 이미 있습니다"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%Y/%m/%d"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "달"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "달"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "달"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "달"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr "섭씨"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "북"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "확인"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "북"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "남"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "임시 폴더를 닫을수 없음: %s"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "임시 폴더를 닫을수 없음: %s"
+
+#: smime/lib/e-cert.c:618
+msgid "Certificate Authority Key Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "ID"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "제목이 %s임"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "스풀 폴더를 진행할 수 없습니다"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+msgid "SSL Certificate Authority"
+msgstr ""
+
+#: smime/lib/e-cert.c:781
+msgid "Email Certificate Authority"
+msgstr ""
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "시작:"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "정보 없음"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "첨부"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "임시 폴더를 닫을수 없음: %s"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "모리타니아"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "노스 캐롤리나"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "표현"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s (%s)"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "임시 폴더를 닫을수 없음: %s"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "삽입(_I)"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "제목이 %s임"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "임시 폴더를 닫을수 없음: %s"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "%s의 열쇠글을 입력하십시오"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "연락처 목록(_L)"
 
 #: tools/evolution-launch-composer.c:324
 #, fuzzy
@@ -14838,7 +15987,7 @@ msgstr "선택한 것을 복사합니다"
 msgid "Copy to Folder..."
 msgstr "폴더로 복사(_C)..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "선택한 것을 자릅니다"
 
@@ -14856,7 +16005,7 @@ msgstr "메세지를 다른 폴더로 이동합니다"
 msgid "Move to Folder..."
 msgstr "폴더로 이동(_M)..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "클립보드에서 붙여넣습니다"
 
@@ -14864,8 +16013,8 @@ msgstr "클립보드에서 붙여넣습니다"
 msgid "Previews the contacts to be printed"
 msgstr "인쇄될 연락처를 미리봅니다"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "인쇄 미리보기(_V)"
@@ -14911,13 +16060,13 @@ msgstr "읽기 중지"
 msgid "View the current contact"
 msgstr "현재 시각"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "행동(_A)"
 
@@ -14948,143 +16097,111 @@ msgstr "연락처로 메세지를 보냄(_M)..."
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "새 약속을 만듭니다"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "새 약속을 만듭니다"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "새 폴더를 만듭니다"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "새 작업을 만듭니다"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "새 작업을 만듭니다"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "하루씩"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "이 항목를 지웁니다"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "이 폴더를 지웁니다"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "가기"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "뒤로 가기"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "앞으로 가기"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "날짜로 이동(_D)"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "지정한 날로 가기"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "오늘로 가기"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "목록"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "한달씩"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "새 약속(_A)"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "뉴 칼레도니아"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "회의"
-
-#: ui/evolution-calendar.xml.h:27
-#, fuzzy
-msgid "New _Task"
-msgstr "새 작업"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "인쇄될 달력을 미리봅니다"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "이 달력을 인쇄합니다"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "시"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 msgid "Purge old appointments and meetings"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "자세히 보기"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "하루씩 봅니다"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "한달씩 봅니다"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "한주씩 봅니다"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "닷새씩 봅니다"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "한주씩"
 
@@ -15149,7 +16266,7 @@ msgstr "이 항목을 디스크에 저장합니다"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "파일(_F)"
 
@@ -15374,7 +16491,7 @@ msgstr "전부를 읽은 것으로 표시(_E)"
 msgid "Mark all visible messages as read"
 msgstr "보이는 모든 메세지를 읽은 것으로 표시합니다"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Paste message(s) from the clipboard"
 msgstr "클립보드에서 메세지를 붙입니다"
@@ -15431,16 +16548,6 @@ msgstr "선택 반전(_I)"
 msgid "_Threaded Message List"
 msgstr "연관된 메세지 목록(_T)"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "이 창을 닫습니다"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "닫기(_C)"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "보낸이를 주소록에 더하기(_D)"
@@ -15600,266 +16707,291 @@ msgstr "선택한 메세지를 다른 사람에게 첨부하여 전달합니다"
 msgid "Increase the text size"
 msgstr "글자 크기를 키웁니다"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "그림 읽음(_I)"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "중요한 것으로 표시(_M)"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "읽지 않은 것으로 표시(_N)"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "중요하지 않은 것으로 표시(_O)"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark the selected message(s) as having been read"
 msgstr "선택한 메세지를 읽은 것으로 표시합니다"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark the selected message(s) as important"
 msgstr "선택한 메세지를 중요한 것으로 표시합니다 "
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "선택한 메세지를 중요하지 않은 것으로 표시합니다"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "선택한 메세지를 읽지 않은 것으로 표시합니다"
+
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Mark the selected message(s) as not having been read"
 msgstr "선택한 메세지를 읽지 않은 것으로 표시합니다"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
 msgstr "선택한 메세지를 중요하지 않은 것으로 표시합니다"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "선택한 메세지를 삭제한 것으로 표시합니다"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "이동"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "선택한 메세지를 다른 폴더로 옮깁니다"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "다음"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "다음 중요한 메세지(_I)"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "다음 글타래(_T)"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "읽지 않은 다음 메세지(_U)"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "파일이 발견되지 않았습니다"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "선택한 메세지 새 창에서 엽니다"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "선택한 메세지를 다시 보내기 위해 편지 작성기에서 엽니다"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "원래 크기(_Z)"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "이전에 읽지 않은 메세지(_R)"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "답장 부치기"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "메세지를 폴더로 저장"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "이전의 중요한 메세지"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "인쇄될 메시지를 미리봅니다"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "이전"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "이 메세지 인쇄"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "선택한 메세지를 다른 사람에게 전달합니다"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "글자를 원래 크기로 맞춥니다"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "메세지 찾기(_E)..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "작게(_M)"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "메세지를 텍스트 파일로 저장합니다"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "보이는 메세지의 본문에서 텍스트를 찾습니다"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "Set up the page settings for your current printer"
 msgstr "현재 프린터의 쪽 설정을 합니다"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "메일 소스 보기(_S)"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "모든 헤더 보기(_H)"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "보이는 메세지의 본문에서 텍스트를 찾습니다"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "보통 형식으로 메세지를 보여줍니다"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "메일의 모든 머릿말과 함께 메세지를 보여줍니다"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "메세지의 메일 소스를 보여줍니다"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "글자 크기(_Z)"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "선택한 메세지를 되살립니다"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "메일링 리스트에 대한 가상폴더(_L)..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "보낸이에 대한 가상폴더(_N)..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "받는이에 대한 가상폴더(_R)..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "제목에 대한 가상폴더(_S)..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "첨부(_A)"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "폴더로 복사(_C)"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "메시지로부터 거르게 만들기(_C)"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "메시지 전달(_F)"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "가기(_G)"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 #, fuzzy
 msgid "_Inline"
 msgstr "포함해서 전달(_I)"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "크게(_L)"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "메세지 보임(_M)"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "폴더로 이동(_M)"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "다음 메세지(_N)"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "보통으로 보임(_N)"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "메세지 열기(_O)"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "이전 메세지(_P)"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "인용(_Q)"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "다시 보냄(_R)..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "도구(_T)"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "되살림(_U)"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "이 창을 닫습니다"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "닫기(_C)"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "첨부"
@@ -16142,12 +17274,13 @@ msgid "Change Evolution's settings"
 msgstr "Evolution설정을 바꿉니다"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "마침(_X)"
+#, fuzzy
+msgid "Create a new window"
+msgstr "새 작업을 만듭니다"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "Evolution 창(_W)"
+msgid "E_xit"
+msgstr "마침(_X)"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16159,61 +17292,74 @@ msgstr "다른 프로그램에서 데이터를 가져옵니다"
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "Evolution 창(_W)"
+msgid "Open a new window"
+msgstr "새 창에서 열기"
 
 #: ui/evolution.xml.h:11
 msgid "Pi_lot Settings..."
 msgstr "파일롯 설정(_L)..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "보내고 받기"
+
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr "밀린 편지를 보내고 새 편지를 받습니다"
+
+#: ui/evolution.xml.h:14
 msgid "Set up Pilot configuration"
 msgstr "파일럿을 설정합니다"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Ximian Evolution에 대한 정보를 보여줍니다"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "버그 제보"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "버그 제보(_B)"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddy로 버그제보를 합니다"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "토글"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "오프라인 작업으로 할 것인지 토글합니다."
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution 잦은 질문들"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "Ximian Evolution은(_A)..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "도움말(_H)"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "가져오기(_I)..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "새로 만들기(_N)"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "보내고 받기(_S)"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "지금 찾기(_F)"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "인쇄 요약"
@@ -16341,12 +17487,12 @@ msgstr "보기 지정..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "월화수목금토일"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%Y년 %B"
 
@@ -16480,7 +17626,7 @@ msgstr "찾기(_S)"
 msgid "_Find Now"
 msgstr "지금 찾기(_F)"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "비움(_C)"
 
@@ -16497,21 +17643,217 @@ msgstr ""
 msgid "Text"
 msgstr "테스트"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "비움"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "지금 찾기"
 
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "현재 메일 동작을 취소합니다"
+#~ msgid "Account Name"
+#~ msgstr "계정 이름"
+
+#, fuzzy
+#~ msgid "Server Name"
+#~ msgstr "서버 이름(_S):"
+
+#, fuzzy
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "(이 evolution 빌드는 SSL을 지원하지 않습니다)"
+
+#~ msgid "Other Contacts"
+#~ msgstr "다른 연락처"
+
+#~ msgid "Directory Servers"
+#~ msgstr "디렉토리 서버"
+
+#, fuzzy
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Evolution 주소록 이름 선택 인터페이스"
+
+#~ msgid "Add LDAP Server"
+#~ msgstr "LDAP 서버 더하기"
+
+#~ msgid "Find contact in"
+#~ msgstr "주소록 찾기"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* 연락처에 더하기 *"
+
+#~ msgid "Business Address"
+#~ msgstr "직장 주소"
+
+#~ msgid "Department"
+#~ msgstr "부서"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "직업"
+
+#, fuzzy
+#~ msgid "Send anyway?"
+#~ msgstr "이메일 보내기"
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "정식 이름"
+#~ msgid "Folder _name"
+#~ msgstr "폴더 이름:"
+
+#~ msgid "Connecting..."
+#~ msgstr "연결중..."
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "`%s'에있는 폴더를 열수가 없습니다"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr "폴더를 얻을수 없습니다: %s: %s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "폴더 더하기"
+
+#~ msgid "Drafts"
+#~ msgstr "임시 보관함"
+
+#~ msgid "Outbox"
+#~ msgstr "보낼 편지함"
+
+#~ msgid "Sent"
+#~ msgstr "보낸 편지함"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "'%s'중 오류:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Syncing Folder"
+#~ msgstr "폴더 동기화"
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(보여줄 폴더가 없음)"
+
+#~ msgid "(None)"
+#~ msgstr "(없음)"
+
+#~ msgid "No error"
+#~ msgstr "에러 없음"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "같은 이름의 폴더가 이미 존재합니다"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "지정된 폴터 형식이 올바르지 않습니다"
+
+#~ msgid "I/O error"
+#~ msgstr "입출력 오류"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "폴더를 만들기에 충분한 공간이 없음"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "지정된 폴더를 찾을 수 없습니다"
+
+#~ msgid "Operation not supported"
+#~ msgstr "작동이 지원되지 않음"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "이 저장매체에 지정된 형식이 지원되지 않습니다"
+
+#, fuzzy
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "지정된 폴더를 찾을수 없습니다"
+
+#, fuzzy
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "폴더를 얻을수 없습니다: %s: %s"
+
+#, fuzzy
+#~ msgid "Checkbox"
+#~ msgstr "죄장"
+
+#~ msgid "CORBA error"
+#~ msgstr "CORBA 오류"
+
+#, fuzzy
+#~ msgid "Invalid argument"
+#~ msgstr "첨부"
+
+#, fuzzy
+#~ msgid "No owner"
+#~ msgstr "(이름 없음)"
+
+#, fuzzy
+#~ msgid "Unsupported operation"
+#~ msgstr "사용자 정보"
+
+#~ msgid "Internal error"
+#~ msgstr "내부 오류"
+
+#, fuzzy
+#~ msgid "Exists"
+#~ msgstr "종료(_x)"
+
+#~ msgid "Invalid URI"
+#~ msgstr "잘못된 URI"
+
+#, fuzzy
+#~ msgid "Has subfolders"
+#~ msgstr "%s같은 폴더가 없음"
+
+#, fuzzy
+#~ msgid "No space left"
+#~ msgstr "메세지를 받았습니다"
+
+#, fuzzy
+#~ msgid "Test type"
+#~ msgstr "파일 종류:"
+
+#, fuzzy
+#~ msgid "Evolution Test Component"
+#~ msgstr "Evolution 메일 작성기."
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "가져오기"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "새 약속을 만듭니다"
+
+#~ msgid "New _Appointment"
+#~ msgstr "새 약속(_A)"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "회의"
+
+#, fuzzy
+#~ msgid "New _Task"
+#~ msgstr "새 작업"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "Evolution 창(_W)"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "Evolution 창(_W)"
+
+#~ msgid "Toggle"
+#~ msgstr "토글"
+
+#~ msgid "Clear"
+#~ msgstr "비움"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "현재 메일 동작을 취소합니다"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -16605,9 +17947,6 @@ msgstr "지금 찾기"
 #~ msgid "VCard (.vcf, .gcrd)"
 #~ msgstr "VCard (.vcf, .gcrd)"
 
-#~ msgid "Loading..."
-#~ msgstr "읽는 중..."
-
 #~ msgid "Searching..."
 #~ msgstr "찾는 중..."
 
@@ -16654,10 +17993,6 @@ msgstr "지금 찾기"
 #~ msgstr "첨부"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "카드 ID가 이미 있습니다"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "작업 취소"
 
@@ -16686,9 +18021,6 @@ msgstr "지금 찾기"
 #~ msgid "Evolution Addressbook local backend"
 #~ msgstr "Evolution 주소록 minicard 보기"
 
-#~ msgid "Company"
-#~ msgstr "회사"
-
 #~ msgid "Mobile"
 #~ msgstr "휴대전화"
 
@@ -16716,9 +18048,6 @@ msgstr "지금 찾기"
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#~ msgid "Phone"
-#~ msgstr "전화"
-
 #~ msgid "Birth date"
 #~ msgstr "생일"
 
@@ -16730,9 +18059,6 @@ msgstr "지금 찾기"
 #~ msgid "Arbitrary"
 #~ msgstr "에리트리아"
 
-#~ msgid "ID"
-#~ msgstr "ID"
-
 #, fuzzy
 #~ msgid "Last Use"
 #~ msgstr "붙이기"
@@ -16744,9 +18070,6 @@ msgstr "지금 찾기"
 #~ msgid "Folder containing contact information"
 #~ msgstr "연락처 정보를 가지고 있는 폴더"
 
-#~ msgid "LDAP Server"
-#~ msgstr "LDAP 서버"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "연락처 정보를 가지고 있는 LDAP 서버"
 
@@ -16758,18 +18081,6 @@ msgstr "지금 찾기"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "연락처 정보를 가지고 있는 폴더"
 
-#~ msgid "_Contact"
-#~ msgstr "연락처(_C)"
-
-#~ msgid "Create a new contact"
-#~ msgstr "새로운 연락처를 만듭니다"
-
-#~ msgid "New Contact List"
-#~ msgstr "새 연락처 목록"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "새 연락처 목록을 만듭니다"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "폴더 탐색기가 보여줄 URI"
 
@@ -16817,33 +18128,6 @@ msgstr "지금 찾기"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "해야 할일을 담고 있는 폴더"
 
-#~ msgid "New appointment"
-#~ msgstr "새 약속"
-
-#~ msgid "_Appointment"
-#~ msgstr "약속(_A)"
-
-#~ msgid "New meeting"
-#~ msgstr "새 회의"
-
-#, fuzzy
-#~ msgid "M_eeting"
-#~ msgstr "회의"
-
-#~ msgid "New task"
-#~ msgstr "새 작업"
-
-#~ msgid "_Task"
-#~ msgstr "작업(_T)"
-
-#, fuzzy
-#~ msgid "New All Day Appointment"
-#~ msgstr "새 약속"
-
-#, fuzzy
-#~ msgid "All _Day Appointment"
-#~ msgstr "새 약속(_A)"
-
 #, fuzzy
 #~ msgid "Could not update invalid object"
 #~ msgstr "객체를 갱신할 수가 없습니다"
@@ -16864,10 +18148,6 @@ msgstr "지금 찾기"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "%s에서 달력 열기"
 
-#, fuzzy
-#~ msgid "Opening default tasks folder"
-#~ msgstr "%s 폴더를 열기"
-
 #~ msgid "Please enter your password for %s"
 #~ msgstr "%s의 열쇠글을 입력하십시오"
 
@@ -16887,10 +18167,6 @@ msgstr "지금 찾기"
 #~ msgid "Could not create a PGP signature context"
 #~ msgstr "메시지 작성 창을 만들 수가 없습니다"
 
-#, fuzzy
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "메일 설정 인터페이스"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "메일을 포함하는 폴더"
 
@@ -16908,18 +18184,6 @@ msgstr "지금 찾기"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "가상 휴지통 폴더"
 
-#~ msgid "Properties..."
-#~ msgstr "설정..."
-
-#~ msgid "New Mail Message"
-#~ msgstr "새 편지 메세지"
-
-#~ msgid "_Mail Message"
-#~ msgstr "편지 만들기(_M)"
-
-#~ msgid "Compose a new mail message"
-#~ msgstr "새로운 메일 메세지를 작성합니다"
-
 #~ msgid "New Message Post"
 #~ msgstr "새 메세지 부치기"
 
@@ -18054,10 +19318,6 @@ msgstr "지금 찾기"
 #~ msgstr "캐나다"
 
 #, fuzzy
-#~ msgid "Curitiba"
-#~ msgstr "모리타니아"
-
-#, fuzzy
 #~ msgid "Custer"
 #~ msgstr "자르기"
 
@@ -19508,9 +20768,6 @@ msgstr "지금 찾기"
 #~ msgid "Norfolk"
 #~ msgstr "노퍽섬"
 
-#~ msgid "North Carolina"
-#~ msgstr "노스 캐롤리나"
-
 #, fuzzy
 #~ msgid "North Conway"
 #~ msgstr "노르웨이"
@@ -20168,10 +21425,6 @@ msgstr "지금 찾기"
 #~ msgstr "사모아"
 
 #, fuzzy
-#~ msgid "Samos"
-#~ msgstr "사모아"
-
-#, fuzzy
 #~ msgid "Samsun"
 #~ msgstr "일(_n)"
 
@@ -20449,10 +21702,6 @@ msgstr "지금 찾기"
 #~ msgstr "완료된 날짜:"
 
 #, fuzzy
-#~ msgid "Stauning"
-#~ msgstr "시작:"
-
-#, fuzzy
 #~ msgid "Staverton"
 #~ msgstr "시작:"
 
@@ -20796,10 +22045,6 @@ msgstr "지금 찾기"
 #~ msgstr "유니코드"
 
 #, fuzzy
-#~ msgid "Vermont"
-#~ msgstr "달"
-
-#, fuzzy
 #~ msgid "Vernal"
 #~ msgstr "일반 정보"
 
@@ -21028,9 +22273,6 @@ msgstr "지금 찾기"
 #~ msgid " F"
 #~ msgstr "화씨"
 
-#~ msgid " C"
-#~ msgstr "섭씨"
-
 #~ msgid "knots"
 #~ msgstr "노트"
 
@@ -21239,18 +22481,6 @@ msgstr "지금 찾기"
 #~ msgid "Open this folder in an other window"
 #~ msgstr "다른 창에서 이 폴더를 엽니다"
 
-#~ msgid "Send / Receive"
-#~ msgstr "보내고 받기"
-
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "밀린 편지를 보내고 새 편지를 받습니다"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "폴더 막대를 보여줄 것인지 토글합니다"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "바로가기 막대를 보여줄 것인지 토글합니다"
-
 #~ msgid "View the selected folder"
 #~ msgstr "선택된 폴더 보기"
 
@@ -21278,9 +22508,6 @@ msgstr "지금 찾기"
 #~ msgid "_Rename..."
 #~ msgstr "이름바꿈(_R)..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "보내고 받기(_S)"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "바로가기 막대(_S)"
 
diff --git a/po/lt.po b/po/lt.po
index 55a2550623..31e9965812 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: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-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"
@@ -30,61 +30,201 @@ msgstr "Negalėjau įkelti %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Nepavyko perskaityti piloto Address programos bloko"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Užbaigimo data"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Certificates"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Sukurti ir keisti pašto sąskaitas ir kitas nuostatas"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Kontaktai"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Redaguoti adresų knygelę"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Adresų knygelės adreso ???? gamykla"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution adresų knygelės mažų kortelių vaizduoklė"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution adresų knygelės mažų kortelių vaizduoklė"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolution adresų knygelės mažų kortelių vaizduoklė"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution adresų knygelės mažų kortelių vaizduoklė"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution pašto komponento."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Testinio komponento gamykla."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Adresų knygelė"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Savybės..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Ištrinti"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+msgid "Rename"
+msgstr "Pervadinti"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Naujas kontaktas:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Kontaktas"
+
+#: addressbook/gui/component/addressbook-component.c:219
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Sukurti naują kontaktą"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Naujas kontaktų sąrašas"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "Kontaktų _sąrašas"
+
+#: addressbook/gui/component/addressbook-component.c:226
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Sukurti naują kontaktų sąrašą"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr ""
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+#, fuzzy
+msgid "Work"
+msgstr "Dirbama"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "LDAP serveris"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Negalėjau sukurti katalogo %s: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr "Negalėjau prisijungti prie LDAP serverio."
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
 "Negalėjau autentikuotis į IMAP serverį.\n"
 "%s\n"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "IMAP serverio atsakyme nebuvo %s informacijos"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Klaida, įkeliant filtro informaciją:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP serverio atsakyme nebuvo %s informacijos"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Sąskaitos vardas"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Serverio vardas"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "Nurodytas tipas šioje saugykloje nepalaikomas"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Kiti kontaktai"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -92,7 +232,7 @@ msgstr ""
 "Mes negalėjome atidaryti šios adresų knygelės. Prašom patikrinti, ar\n"
 "kelias egzistuoja ir ar turi teises jį pasiekti."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -103,7 +243,7 @@ msgstr ""
 "kad arba tu įvedei neteisingą URI, arba tavo LDAP serveris\n"
 "neveikia"
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -115,7 +255,7 @@ msgstr ""
 "tu turi sukompiliuoti programą iš CVS šaltinio, prieš tai\n"
 "parsisiuntęs OpenLDAP iš žemiau esančio adreso.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -130,49 +270,48 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Negaliu atidaryti adresų knygelės"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr ""
 "Negalėjau autentikuotis į IMAP serverį.\n"
 "%s\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "Įvesk %s slaptažodį (vartotojas %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 #, fuzzy
 msgid "Name begins with"
 msgstr "baigiasi su"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 #, fuzzy
 msgid "Email begins with"
 msgstr "baigiasi su"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Kategorija yra"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Bet kuris laukas turi savyje"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Išsami..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -180,7 +319,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -188,94 +327,41 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Bet kuri kategorija"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "URI, kurį rodys kalendorius"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Certificates"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
 msgstr ""
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Kontaktai"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Redaguoti adresų knygelę"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "_Adresų knygelės konfigūravimas..."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Adresų knygelės adreso ???? gamykla"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution adresų knygelės mažų kortelių vaizduoklė"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution adresų knygelės mažų kortelių vaizduoklė"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Evolution adresų knygelės mažų kortelių vaizduoklė"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution adresų knygelės mažų kortelių vaizduoklė"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution pašto komponento."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -299,6 +385,7 @@ msgstr " _Patikrinti, kokie tipai palaikomi"
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -333,8 +420,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Add LDAP Server"
-msgstr "LDAP serveris"
+msgid "Addressbook Creation Assistant"
+msgstr "Adresų knygelės šaltinis"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -353,61 +440,60 @@ msgstr "Anoniminis"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 #, fuzzy
 msgid "Connecting"
 msgstr "Vėl jungiamasi prie %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "Sąrašo _vardas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Edit LDAP Server"
 msgstr "LDAP serveris"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address:"
 msgstr "El. pašto adresas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution naudos šį el. pašto adresą autentikuotis į pašto serverį"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr "Evolution naudos šį el. pašto adresą autentikuotis į pašto serverį"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Finished"
 msgstr "Rast_i"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Esmė"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
-msgid "LDAP Configuration Assistant"
-msgstr "Konfigūravimas"
+msgid "Group:"
+msgstr "Grupė"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Never"
 msgstr "_kas"
@@ -432,8 +518,8 @@ msgid "S_earch scope: "
 msgstr "Paieškos _sritis: "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Ieškoma"
 
@@ -478,27 +564,28 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:47
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-#, fuzzy
-msgid "Step 1: Server Information"
-msgstr "Šaltinio informacija"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
-msgid "Step 2: Connecting to Server"
-msgstr "Jungiamasi prie serverio..."
+msgid "Step 2: Server Information"
+msgstr "Šaltinio informacija"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr ""
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Jungiamasi prie serverio..."
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr ""
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Jungiamasi prie serverio..."
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -511,14 +598,6 @@ msgstr "Nepalaikoma schema"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -526,7 +605,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -534,7 +613,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -544,37 +623,36 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 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:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 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:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -584,6 +662,15 @@ msgstr ""
 "Šis vardas bus naudojamas nurodyti tavo sąskaitai. Jis skirtas tiktai "
 "vaizdavimui."
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Šis vardas bus naudojamas nurodyti tavo sąskaitai. Jis skirtas tiktai "
+"vaizdavimui."
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -610,22 +697,30 @@ msgid "Using email address"
 msgstr "El. pašto adresas:"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Display name:"
 msgstr "Vaiz_davimas"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -633,61 +728,60 @@ msgstr ""
 msgid "_Edit"
 msgstr "K_eisti"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Prievadas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 #, fuzzy
 msgid "_Search base:"
 msgstr "Paieškos _pagrindas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "_Serverio vardas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Užtildymo laikas (minutėmis)"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid "cards"
 msgstr "Nėra kortelių"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Vėl jungiamasi prie %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid "general-tab"
 msgstr "Esmė"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "searching-tab"
 msgstr "Ieškoma"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Vardas"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution adresų knygelės vardų pasirinkimo sąsaja."
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Pašalinti visus"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Pašalinti"
@@ -716,25 +810,21 @@ msgstr "Pridėti prie kontaktų"
 msgid "Unnamed Contact"
 msgstr "Bevardis kontaktas"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Vardas"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Šaltinis"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Pasirinkti kontaktus iš adresų knygelės"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-#, fuzzy
-msgid "Find contact in"
-msgstr "Rasti kontaktą"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution adresų knygelės vardų pasirinkimo sąsaja."
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
 msgid "Find"
@@ -818,7 +908,8 @@ msgid "D_epartment:"
 msgstr "_Departamentas:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalės"
 
@@ -892,12 +983,12 @@ msgid "_Categories..."
 msgstr "Ka_tegorijos..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Ištrinti"
@@ -2041,7 +2132,7 @@ msgid "Esq."
 msgstr "Esq."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Pilnas vardas"
 
@@ -2138,11 +2229,27 @@ msgstr "Kontaktų sąrašo redaktorius"
 msgid "Save List as VCard"
 msgstr "Išsaugoti kaip VCard"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Pakeistas kontaktas:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Konfliktuojantis kontaktas:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Rastas pasikartojantis kontaktas"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Pakeistasis šio kontakto el. paštas ar vardas jau yra\n"
+"šiame aplanke. Ar norėtum jį vis tiek pridėti?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Naujas kontaktas:"
@@ -2159,22 +2266,6 @@ msgstr ""
 "Šio kontakto el. pašto adresas arba vardas jau yra šiame\n"
 "aplanke.  Ar vis tiek norėtum jį pridėti?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Pakeistas kontaktas:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Konfliktuojantis kontaktas:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"Pakeistasis šio kontakto el. paštas ar vardas jau yra\n"
-"šiame aplanke. Ar norėtum jį vis tiek pridėti?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2283,9 +2374,9 @@ msgstr "Persiųsti kontaktą"
 msgid "Send Message to Contact"
 msgstr "Siųsti laišką kontaktui"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Spausdinti"
@@ -2309,9 +2400,12 @@ msgstr "Perkelti į aplanką..."
 msgid "Cut"
 msgstr "Iškirpti"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopijuoti"
 
@@ -2320,16 +2414,8 @@ msgstr "Kopijuoti"
 msgid "Paste"
 msgstr "Įdėti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Ištrinti"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 #, fuzzy
 msgid "Current View"
 msgstr "_Esamas vaizdas"
@@ -2343,166 +2429,170 @@ msgid ""
 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:2
 msgid "Assistant"
 msgstr "Asistento"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Darbo faksas"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Darbo telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Darbo telefonas 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Atsakiklio telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Automobilio telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategorijos"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Kompanijos telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Departamentas"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "El. paštas"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "El. paštas 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "El. paštas 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Pavardė"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Saugoti kaip"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "Laisvas-užsiėmęs URL"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Namų adresas"
+#, fuzzy
+msgid "Given Name"
+msgstr "Pavardė"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Namų faksas"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Namų telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Namų telefonas 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Joks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Jordanas"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Vadybininkas"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobilus telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Pravardė"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Pastaba"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Ofisas"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organizacija"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Kitas adresas"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Kitas faksas"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Kitas telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Ieškas"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Pagrindinis telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Profesija"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Rolė"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Sutuoktinis"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Teleksas"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Titulas"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Nematytas"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Tinklapis"
 
@@ -2608,11 +2698,19 @@ msgstr "Nariai"
 msgid "Job Title"
 msgstr "_Pareigos:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Namų adresas"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Namų adresas"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Kitas adresas"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2625,123 +2723,120 @@ msgstr "Namų faksas"
 msgid "Blog"
 msgstr "amžinai"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Sėkmė"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Nežinoma klaida"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Saugykla atsijungta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Priėjimas uždraustas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Kortelė nerasta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Kortelės ID jau egzistuoja"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Protokolas nepalaikomas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Nutraukta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "Autentikacija nepavyko."
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Autentikacija būtina"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #, fuzzy
 msgid "Addressbook does not exist"
 msgstr "Nėra tokios bylos %s"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Kita klaida"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Ar nori išsaugoti pakeitimus?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 #, fuzzy
 msgid "_Discard"
 msgstr "Spausdinti kortelę"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Klaida pridedant sąrašą"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Klaida pridedant kortelę"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Klaida modifikuojant sąrašą"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Klaida modifikuojant kortelę"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Klaida pašalinant sąrašą"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Klaida pašalinant kortelę"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2750,50 +2845,50 @@ msgstr ""
 "%s jau egzistuoja.\n"
 "Ar nori įrašyti vietoj jo?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, fuzzy
 msgid "Overwrite"
 msgstr "Užrašyti bylą?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, fuzzy, c-format
 msgid "Error saving %s: %s"
 msgstr "Klaida išsaugant bylą: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "kortele.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "sąrašas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Nėra kortelių"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Nėra kortelių"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Nėra kortelių"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Nėra kortelių"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Keletas VCard kortelių"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "%s VCard"
@@ -2990,7 +3085,7 @@ msgstr "Paraštės"
 msgid "Number of columns:"
 msgstr "Stulpelių skaičius:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Parinktys"
 
@@ -3181,18 +3276,18 @@ msgstr "Bevardis kontaktų sąrašas"
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Negalėjau paleisti wombat serverio"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Negalėjau paleisti wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nepavyko perskaityti piloto Calendar programos bloko"
 
@@ -3201,27 +3296,94 @@ msgstr "Nepavyko perskaityti piloto Calendar programos bloko"
 msgid "Default Priority:"
 msgstr "_Svarbumas:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Negalėjau perskaityti piloto ToDo programos bloko"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Kalendoriaus ir užduočių nuostatos"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Kalendorius"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Kalendoriaus ir užduočių nuostatos"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution pašto nustatymas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution kalendoriaus iTip/iMip vaizduoklė"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution kalendoriaus iTip/iMip vaizduoklė"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution naujienų tvarkyklė"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution naujienų tvarkyklė"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolution pašto komponento."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolution pašto rašyklė."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Užduotys"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Aliarmo pranešimo tarnyba"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 #, fuzzy
 msgid "Starting:"
 msgstr "Nuostatos"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 #, fuzzy
 msgid "Ending:"
 msgstr "Indeksuojama:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Perspėti %s"
@@ -3291,45 +3453,174 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Kitą kartą nebeklausti."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Aliarmo pranešimo tarnyba"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Negalėjau inicializuoti Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Negalėjau inicializuoti gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "Negalėjau sukurti laikino katalogo: %s"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "blogas laikas"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "Kalendorius"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Spalva vėluojamoms užduotims"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Spalva vėluojamoms užduotims"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "Rodyti įvykių pa_baigos laikus savaitės ir mėnesio rodiniuose"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Peržiūrėti kalendorių prieš spausdinant"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#, fuzzy
+msgid "Units of default reminder"
+msgstr "Kurti naujus įvykius su įprasta _užuomina"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "P_aprašyti patvirtinimo trinant elementus"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "P_aprašyti patvirtinimo trinant elementus"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Ištrinti pažymėtas užduotis"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Rodyti savaičių _numerius datos navigatoriuje"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Santrauka turi savyje"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Aprašymas turi savyje"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Komentaras turi savyje"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Netinkantys"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3341,81 +3632,115 @@ msgstr ""
 "\n"
 "Tikrai ištrinti tuos laiškus?"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "yra mažesnis už"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "dienų"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A, %Y m. %B %d d."
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a, %b %d"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a, %Y %b %d"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%Y m. %B %d d."
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%B %d"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Spausdinti šį kalendorių"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Naujoji Kaledonija"
 
-#: calendar/gui/calendar-component.c:207
-msgid "Rename"
-msgstr "Pervadinti"
+#: calendar/gui/calendar-component.c:632
+#, fuzzy
+msgid "New appointment"
+msgstr "Naujas įvykis"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:633
+#, fuzzy
+msgid "_Appointment"
+msgstr "Įvykis"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr ""
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Sukurti naują įvykį"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
+#: calendar/gui/calendar-component.c:639
 #, fuzzy
-msgid "Work"
-msgstr "Dirbama"
+msgid "New meeting"
+msgstr "Naujienų šaltinių nuostatos"
+
+#: calendar/gui/calendar-component.c:640
+#, fuzzy
+msgid "M_eeting"
+msgstr "Susitikimas"
+
+#: calendar/gui/calendar-component.c:641
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Sukurti naują užduotį"
+
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Naujas įvykis"
+
+#: calendar/gui/calendar-component.c:647
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "Naujas į_vykis"
+
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Sukurti naują įvykį"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3538,7 +3863,7 @@ msgstr "Siųsti"
 msgid "With these arguments:"
 msgstr "Su tokiais argumentais:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr ""
 
@@ -3554,6 +3879,10 @@ msgstr "valandų"
 msgid "minutes"
 msgstr "minučių"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3587,8 +3916,8 @@ msgstr "Pasiųsti laišką"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Apžvalga:"
 
@@ -3617,7 +3946,7 @@ msgstr "įvykio pabaigą"
 msgid "hour(s)"
 msgstr "valandą(as)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minutę(es)"
 
@@ -3672,7 +4001,7 @@ msgstr "Dienų"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Penktadienis"
 
@@ -3686,7 +4015,7 @@ msgstr "Minučių"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Pirmadienis"
 
@@ -3697,7 +4026,7 @@ msgstr "_Sek"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Šeštadienis"
 
@@ -3711,7 +4040,7 @@ msgstr "Rodyti savaičių _numerius datos navigatoriuje"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Sekmadienis"
 
@@ -3731,7 +4060,7 @@ msgstr "_Užduočių sąrašas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Ketvirtadienis"
 
@@ -3749,7 +4078,7 @@ msgstr "Laiko formatas:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Antradienis"
 
@@ -3759,12 +4088,12 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Trečiadienis"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Darbo savaitė"
 
@@ -3802,7 +4131,7 @@ msgid "_Fri"
 msgstr "Pe_n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Esmė"
 
@@ -3847,78 +4176,78 @@ msgstr "_Tre"
 msgid "before every appointment"
 msgstr "prieš įvykio pradžią"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Ar tu tikrai nori atšaukti ir ištrinti šį susitikimą?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Ar tu tikrai nori atšaukti ir ištrinti šią užduotį?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Ar tu tikrai nori atšaukti ir ištrinti šį žurnalo įrašą?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Šis įvykis buvo ištrintas."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Ši užduotis buvo ištrinta."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Šis žurnalo įrašas buvo ištrintas."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Tu kažką pakeitei. Užmiršti tuos pakeitimus ir uždaryti redaktorių?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Tu nieko nepakeitei, uždaryti redaktorių?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Šis įvykis buvo pakeistas."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Ši užduotis buvo pakeista."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Šis žurnalo įrašas buvo pakeistas."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Tu kažką pakeitei. Užmiršti tuos pakeitimus ir atnaujinti redaktorių?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Tu nieko nepakeitei, atnaujinti redaktorių?"
@@ -3928,166 +4257,171 @@ msgstr "%s  Tu nieko nepakeitei, atnaujinti redaktorių?"
 msgid "Validation error: %s"
 msgstr "Nežinoma klaida: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " iki "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Užbaigta "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Užbaigta "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 #, fuzzy
 msgid "Could not update object"
 msgstr "Negalėjau tvarkingai atnaujinti bylų"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Keisti įvykį"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Įvykis -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Užduotis -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Žurnalo įrašas -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Nėra apžvalgos"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Išsaugoti kaip..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Nepavyko gauti esamos versijos!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Pasirink aplanką, į kurį importuoti šiuos duomenis"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Ar tu tikrai nori ištrinti įvykį „%s“?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Ar tu tikrai nori ištrinti šį bevardį įvykį?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Ar tu tikrai nori ištrinti užduotį „%s“?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Ar tu tikrai nori ištrinti šią bevardę užduotį?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Ar tu tikrai nori ištrinti žurnalo įrašą „%s“?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Ar tu tikrai nori ištrinti šį bevardį žurnalo įrašą?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Ar tu tikrai nori ištrinti %d įvykių?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Ar tu tikrai nori ištrinti %d užduočių?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Ar tu tikrai nori ištrinti %d žurnalo įrašų?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 #, fuzzy
 msgid "The item could not be deleted due to a corba error"
 msgstr "Elementas negalėjo būti išsiųstas!\n"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Elementas negalėjo būti išsiųstas!\n"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Elementas negalėjo būti išsiųstas!\n"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Elementas negalėjo būti išsiųstas!\n"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Elementas negalėjo būti išsiųstas!\n"
@@ -4104,45 +4438,45 @@ msgstr "Pavesti kam:"
 msgid "Enter Delegate"
 msgstr "Įvesti, kam pavedama"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Įvykis"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Užuomina"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Pasikartojimas"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Dienotvarkė"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Susitikimas"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Pradžios data"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 #, fuzzy
 msgid "Start time is wrong"
 msgstr "_Pradžios laikas:"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr ""
 
@@ -4215,32 +4549,32 @@ msgid "_Start time:"
 msgstr "_Pradžios laikas:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Joks"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "Organizatorius yra būtinas."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 #, fuzzy
 msgid "At least one attendee is required."
 msgstr "Reikalingas bent vienas dalyvis"
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Pavesti kam..."
 
@@ -4281,21 +4615,15 @@ msgid "Member"
 msgstr "Narys"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Rolė"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Būsena"
@@ -4315,6 +4643,7 @@ msgid "_Invite Others..."
 msgstr "Pakv_iesti kitus..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4347,6 +4676,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Negalėjau sukurti katalogo %s: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "Turi būti nurodytas organizatorius."
@@ -4376,32 +4706,57 @@ msgstr "kalendoriaus informacija"
 msgid "Calendar Name"
 msgstr "Kalendorius"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Negalėjau sukurti katalogo %s: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "kalendoriaus informacija"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "_Užduočių sąrašas"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "_Užduočių sąrašas"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "_Užduočių sąrašas"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 msgid "This and Prior Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 #, fuzzy
 msgid "All Instances"
 msgstr "_Visos stotys:"
@@ -4456,10 +4811,15 @@ msgstr "diena"
 msgid "on the"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "kartą(us) pasitaikys"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Data/Laikas:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "Pri_dėti"
@@ -4524,7 +4884,7 @@ msgstr "savaitę(es)"
 msgid "year(s)"
 msgstr "metus"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 #, fuzzy
 msgid ""
 "This event has been changed, but has not been saved.\n"
@@ -4535,34 +4895,34 @@ msgstr ""
 "\n"
 "Ar norėtum išsaugoti pakeitimus?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 #, fuzzy
 msgid "Save Event"
 msgstr "Kalendoriaus žinutė"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 #, fuzzy
 msgid "The meeting information has been created. Send it?"
 msgstr "Susitikimo informacija buvo pakeista. Siųsti atnaujintą informaciją?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Susitikimo informacija buvo pakeista. Siųsti atnaujintą informaciją?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 #, fuzzy
 msgid "The task assignment information has been created. Send it?"
 msgstr "Užduoties informacija buvo pakeista. Siųsti atnaujintą informaciją?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "Užduoties informacija buvo pakeista. Siųsti atnaujintą informaciją?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "Užbaigta "
@@ -4573,43 +4933,43 @@ msgid "% _Complete"
 msgstr "% Užbaigta"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Užbaigta"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Aukštas"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "Vykdoma"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Žemas"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Normalus"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Nepradėta"
 
@@ -4618,7 +4978,7 @@ msgid "Progress"
 msgstr "Pažanga"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Neapibrėžtas"
 
@@ -4640,21 +5000,21 @@ msgstr "_Būsena:"
 msgid "_Web Page:"
 msgstr "_Tinklapio adresas:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Esmė"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Priskyrimas"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4662,9 +5022,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "S_laptas"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Aprašymas:"
 
@@ -4769,26 +5129,21 @@ msgstr ""
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Viešas"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Asmeniškas"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Slaptas"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategorijos"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4801,29 +5156,27 @@ msgid "Start Date"
 msgstr "Pradžios data"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Apžvalga"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " spalva"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Įvykis"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Laisvas"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Užimtas"
 
@@ -4835,7 +5188,7 @@ msgstr "Š"
 msgid "S"
 msgstr "P"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "R"
 
@@ -4843,7 +5196,7 @@ msgstr "R"
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4853,7 +5206,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4861,7 +5214,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Taip"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4869,17 +5222,17 @@ msgstr "Ne"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Nežinomas"
 
@@ -4891,191 +5244,189 @@ msgstr "Pasikartojantis"
 msgid "Assigned"
 msgstr "Priskirtas"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Ištrinti pažymėtus kontaktus"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Naujas į_vykis..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Naujas visos _dienos įvykis"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 #, fuzzy
 msgid "New Meeting"
 msgstr "Susitikimas"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Nauja užduotis"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "S_pausdinti..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "Į_dėti"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Eiti į šia_ndieną"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "_Eiti į datą..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Skelbti laisvas/užimtas informaciją"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-#, fuzzy
-msgid "_Settings..."
-msgstr "_Pašto nuostatos..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "Ati_daryti"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Iš_saugoti kaip..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Kopijuoti"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Įtraukti s_usitikimą į dienotvarkę"
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Persiųsti kaip i_Calendar"
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Ištrinti šį _pasitaikymą"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Ištrinti _visus pasitaikymus"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+#, fuzzy
+msgid "_Settings..."
+msgstr "_Pašto nuostatos..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 #, fuzzy
 msgid "30%"
 msgstr "389"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 #, fuzzy
 msgid "80%"
 msgstr "389"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Atidaryti laišką"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Priskirti užduotį"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Persiųsti kaip i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "_Pažymėti užbaigta"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Pažymėti užduotis užbaigtomis"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "_Ištrinti pažymėtas užduotis"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Spausk čia, kad pridėtum užduotį"
@@ -5089,8 +5440,8 @@ msgstr "% Užbaigta"
 msgid "Alarms"
 msgstr "Perspėjimai"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Užbaigta"
 
@@ -5119,18 +5470,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %Y-%m-%d %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y-%m-%d %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5149,7 +5500,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A, %B %e"
 
@@ -5162,146 +5513,146 @@ msgstr "%b %d"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr " "
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr " "
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "_Paprastas pakartojimas"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
 msgid "Every day"
 msgstr "Kas"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, fuzzy, c-format
 msgid "Every %d days"
 msgstr "%d dienų"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 #, fuzzy
 msgid "Every week"
 msgstr "Kas"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, fuzzy, c-format
 msgid "Every %d weeks"
 msgstr "%d savaičių"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, fuzzy, c-format
 msgid "Every %d weeks on "
 msgstr "%d savaičių"
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 #, fuzzy
 msgid " and "
 msgstr "Smėlis"
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 #, fuzzy
 msgid "every month"
 msgstr "Vienas _mėnuo"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 #, fuzzy
 msgid "Every year"
 msgstr "Kas"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Susitikimo pa_baigos laikas:"
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Užbaigta "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "kalendoriaus informacija"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Kalendorius"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 #, fuzzy
 msgid "An unknown person"
 msgstr "nežinomas siuntėjas"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 #, fuzzy
 msgid "Location:"
 msgstr ""
@@ -5309,341 +5660,340 @@ msgstr ""
 "Geogr. vietovė: "
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 #, fuzzy
 msgid "Status:"
 msgstr "_Būsena:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Priimtas"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Negalutinis"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Atmestas"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Pasirink veiksmą"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 #, fuzzy
 msgid "Update"
 msgstr "Data"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Gerai"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 #, fuzzy
 msgid "Accept"
 msgstr "Priimtas"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "Negalutinis"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 #, fuzzy
 msgid "Decline"
 msgstr "Atmestas"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "_Skelbti laisvas/užimtas informaciją"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Susitikimo informacija"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Nutraukti"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "Sužinoti naujausią susitikimo informaciją"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Susitikimo informacija"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, 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:1271
+#: calendar/gui/e-itip-control.c:1269
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1270
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Susitikimas"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1277
+#: calendar/gui/e-itip-control.c:1275
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Susitikimo pa_baigos laikas:"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1282
+#: calendar/gui/e-itip-control.c:1280
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Susitikimo pa_baigos laikas:"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, 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:1290
+#: calendar/gui/e-itip-control.c:1288
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Susitikimas"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "Gauti naujausią informaciją apie užduotį"
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Susitikimo informacija"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "Ieškoti laiške"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "Gauti naujausią informaciją apie užduotį"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
 #, fuzzy
 msgid "Task Information"
 msgstr "Informacija"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, 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:1338
+#: calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
 #, fuzzy
 msgid "Task Proposal"
 msgstr "Susitikimas"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, 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:1344
+#: calendar/gui/e-itip-control.c:1342
 #, fuzzy
 msgid "Task Update"
 msgstr "buvo po"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, 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:1349
+#: calendar/gui/e-itip-control.c:1347
 #, fuzzy
 msgid "Task Update Request"
 msgstr "buvo po"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, 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:1357
+#: calendar/gui/e-itip-control.c:1355
 #, fuzzy
 msgid "Task Reply"
 msgstr "Atsakyti"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "Gauti naujausią informaciją apie užduotį"
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Nutraukti veiksmą"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Kalendoriaus žinutė"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "_Skelbti laisvas/užimtas informaciją"
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1391
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "_Skelbti laisvas/užimtas informaciją"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "_Skelbti laisvas/užimtas informaciją"
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1396
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "_Laisvas-užsiėmęs URL"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, 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:1403
+#: calendar/gui/e-itip-control.c:1401
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "_Laisvas-užsiėmęs URL"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Praeitą laišką"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Atrodo, jog aplankas yra neatkuriamai sugadintas."
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "Šiame laiške yra tik Bcc gavėjai."
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalendoriaus byla negalėjo būti atnaujinta!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Atnaujinimas užbaigtas\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Įvyko klaida parsiunčiant naujienų šaltinį"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Elementas negalėjo būti išsiųstas!\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 #, 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:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Dalyvio būsena atnaujinta\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Dalyvio būsena atnaujinta\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Pašalinimas užbaigtas"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Elementas išsiųstas!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Elementas negalėjo būti išsiųstas!\n"
 
@@ -5806,7 +6156,7 @@ msgstr "%a %Y-%m-%d"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
@@ -5870,100 +6220,86 @@ msgstr "Susitikimo _pradžios laikas:"
 msgid "Meeting _end time:"
 msgstr "Susitikimo pa_baigos laikas:"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "P_radžios data:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "_Kada reikia:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "_Svarbumas:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Puslapis"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Atidaromos užduotys iš %s"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Negalėjau įkelti užduočių į „%s“"
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metodas, reikalingas įkelti „%s“, nepalaikomas"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, 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:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "Klaida pradedant %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Užbaigimo data"
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Ištrinti pažymėtus kontaktus"
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 #, fuzzy
 msgid "Expunging"
 msgstr "Išvalyti"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Užduotys"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Kalendorius"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Negalėjau atidaryti aplanko su „%s“"
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metodas, reikalingas atidaryti „%s“, nepalaikomas"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Perspėti %s"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5971,7 +6307,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5979,65 +6315,11 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Turkų"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#, fuzzy
-msgid "Calendar and Tasks"
-msgstr "Kalendoriaus ir užduočių nuostatos"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Kalendorius"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Kalendoriaus ir užduočių nuostatos"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution pašto nustatymas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution kalendoriaus iTip/iMip vaizduoklė"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Evolution kalendoriaus iTip/iMip vaizduoklė"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution naujienų tvarkyklė"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Evolution naujienų tvarkyklė"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolution pašto komponento."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolution pašto rašyklė."
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Balandis"
@@ -6094,309 +6376,346 @@ msgstr "Spalis"
 msgid "September"
 msgstr "Rugsėjis"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Turi būti nurodytas organizatorius."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 #, fuzzy
 msgid "At least one attendee is necessary"
 msgstr "Reikalingas bent vienas dalyvis"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 #, fuzzy
 msgid "Event information"
 msgstr "kalendoriaus informacija"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 #, fuzzy
 msgid "Task information"
 msgstr "Informacija"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 #, fuzzy
 msgid "Journal information"
 msgstr "Nebūtina informacija"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "_Skelbti laisvas/užimtas informaciją"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 #, fuzzy
 msgid "Calendar information"
 msgstr "kalendoriaus informacija"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 #, fuzzy
 msgid "Updated"
 msgstr "Data"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 #, fuzzy
 msgid "Refresh"
 msgstr "Atnaujinti sąrašą"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "_Skelbti laisvas/užimtas informaciją"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 #, fuzzy
 msgid "iCalendar information"
 msgstr "kalendoriaus informacija"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Tu turi būti įvykio dalyvis."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1-a"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2-a"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3-a"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4-a"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5-a"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6-ta"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7-ta"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8-ta"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9-ta"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10-ta"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11-ta"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12-ta"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13-ta"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14-ta"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15-ta"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16-ta"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17-ta"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18-ta"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19-ta"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20-ta"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21-a"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22-a"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23-a"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24-ta"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25-ta"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26-ta"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27-ta"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28-ta"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29-ta"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30-ta"
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31-a"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Sk"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Pr"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "An"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Tr"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Kt"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Pn"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Št"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Pasirinkta diena (%a, %Y %d %b)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a, %Y %b %d"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Pasirinkta savaitė (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Pasirinktas mėnuo (%Y %b)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Pasirinkti metai (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 #, fuzzy
 msgid "Task"
 msgstr "_Užduotis"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, fuzzy, c-format
 msgid "Status: %s"
 msgstr "_Būsena:"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "_Svarbumas:"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, fuzzy, c-format
 msgid "Percent Complete: %i"
 msgstr "Procentų užbaigta"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, fuzzy, c-format
 msgid "URL: %s"
 msgstr "URL:"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, fuzzy, c-format
 msgid "Categories: %s"
 msgstr ""
 "\n"
 "Kategorijos: "
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 #, fuzzy
 msgid "Contacts: "
 msgstr "Ko_ntaktai:"
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Spaudinio peržiūra"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Spausdinti elementą"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Spausdinimo nuostatos"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Pervadinti šią trumpę"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "_Užduočių sąrašas"
+
+#: calendar/gui/tasks-component.c:590
+#, fuzzy
+msgid "New task"
+msgstr "Nauja užduotis"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Užduotis"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Sukurti naują užduotį"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "Vaizduojamo užduočių aplanko URI"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 #, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -6409,11 +6728,11 @@ msgstr ""
 "\n"
 "Tikrai ištrinti tuos laiškus?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Kitą kartą nebeklausti."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Spausdinti korteles"
@@ -6446,17 +6765,17 @@ msgstr "Kalendoriaus žinutė"
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Užuomina"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Kalendoriaus žinutė"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6465,7 +6784,7 @@ msgstr ""
 "Evolution rado Pine pašto bylų.\n"
 "Ar norėtum jas importuoti į Evolution?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Atidaryti kalendorių"
@@ -8056,32 +8375,32 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 #, fuzzy
 msgid "Signing is not supported by this cipher"
 msgstr "Nurodytas tipas šioje saugykloje nepalaikomas"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 #, fuzzy
 msgid "Verifying is not supported by this cipher"
 msgstr "Nurodytas tipas šioje saugykloje nepalaikomas"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 #, fuzzy
 msgid "Encryption is not supported by this cipher"
 msgstr "Nurodytas tipas šioje saugykloje nepalaikomas"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "Nurodytas tipas šioje saugykloje nepalaikomas"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 #, fuzzy
 msgid "You may not import keys with this cipher"
 msgstr "Nurodytas tipas šioje saugykloje nepalaikomas"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 #, fuzzy
 msgid "You may not export keys with this cipher"
 msgstr "Nurodytas tipas šioje saugykloje nepalaikomas"
@@ -8137,89 +8456,89 @@ msgstr "Įrašomas aplankas '%s'"
 msgid "You must be working online to complete this operation"
 msgstr "Tu turi dirbti prisijungęs, kad užbaigtum šį veiksmą"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Nepavyko iškoduoti laiško."
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Nepavyko iškoduoti laiško."
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Negalėjau sukurti katalogo %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Sinchronizuojami aplankai"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Klaida nagrinėjant filtrą: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Klaida vykdant filtrą: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Negaliu atidaryti kaupo aplanko"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Negaliu apdoroti kaupo aplanko"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Gaunamas laiškas %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Negaliu atidaryti laiško"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nesėkmė ties laišku %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Sinchronizuojamas aplankas"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Gaunamas laiškas %d iš %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Nesėkmė ties laišku %d iš %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Nepavyko iškoduoti laiško."
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Blogi argumentai"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Blogi argumentai"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Klaida vykdant filtro paiešką: %s: %s"
@@ -8251,40 +8570,40 @@ msgstr "(match-all) reikalauja vienintelio loginio rezultato"
 msgid "Performing query on unknown header: %s"
 msgstr "Vykdoma užklausa nežinomai antraštei: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Klaida vykdant paieškos išraišką „%s“:\n"
 "%s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Klaida vykdant paieškos išraišką „%s“:\n"
 "%s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Perkeliami laiškai"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 #, fuzzy
 msgid "Copying messages"
 msgstr "Laiškai kopijuojami į %s"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Gaunami %d laiškai"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8292,47 +8611,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Nutraukta."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Netikėtas atsakymas iš POP serverio: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 #, fuzzy
 msgid "No data provided"
 msgstr "Nenurodytas aplanko vardas."
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 #, 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:1114
+#: camel/camel-gpg-context.c:1121
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8340,49 +8659,61 @@ msgid ""
 "%s"
 msgstr "Nepavyko iškoduoti laiško."
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Nepavyko iškoduoti laiško."
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Negalėjau įrašyti duomenų: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nepavyko iškoduoti laiško."
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Nepavyko iškoduoti laiško."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr "Negalėjau sukurti laikinos bylos: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Negalėjau sukurti laikinos bylos: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Negalėjau įrašyti duomenų: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Užšifruotas laiškas"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Nepavyko gauti laiško iš redaktoriaus"
@@ -8481,15 +8812,15 @@ msgstr "Klaida įrašant laikiną pašto bylą: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Klaida kopijuojant laikiną pašto bylą: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 #, fuzzy
 msgid "parse error"
 msgstr "Kita klaida"
@@ -8805,12 +9136,12 @@ msgstr "Virtualių aplankų pašto tiekėjas."
 msgid "For reading mail as a query of another set of folders"
 msgstr "Pašto skaitymui naudojant užklausą iš kitų aplankų aibės"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Protokolui „%s“ nėra tiekėjo."
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8819,72 +9150,83 @@ msgstr ""
 "Negalėjau sukurti katalogo %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Prašau įvesti tavo %s slaptažodį dėl %s"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Nenurodyta"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Pridėti sąlygą"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Pridėti sąlygą"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Konfigūracijos duombazė nerasta"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 msgid "Signing certificate not trusted"
 msgstr ""
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Išsaugoti parašą"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Kita klaida"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Serveris: %s, tipas: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Negaliu sukurti aplanko užrakto ant %s: %s"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Negaliu sukurti aplanko užrakto ant %s: %s"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Šiukšlės"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "Birželis"
+
 #: camel/camel-tcp-stream-openssl.c:568
 #, fuzzy
 msgid "Unable to get issuer's certificate"
@@ -9086,7 +9428,7 @@ msgid ""
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Negalėjau išnagrinėti URL „%s“"
@@ -9106,22 +9448,22 @@ msgstr "Nėra tokio laiško %s aplanke %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Patikrinti, ar yra naujų laiškų visuose aplankuose"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Negaliu ištrinti aplanko: %s: Bloga operacija"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Negaliu ištrinti aplanko: %s: Nėra tokio aplanko"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Negaliu pervadinti aplanko: %s: Bloga operacija"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Negaliu pervadinti aplanko: %s: Nėra tokio aplanko"
@@ -9199,7 +9541,7 @@ msgstr "Nepavyko iškoduoti laiško."
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9213,7 +9555,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Nėra tokio laiško"
@@ -9251,54 +9593,69 @@ msgid "Failed to cache %s: %s"
 msgstr "Nepavyko iškoduoti laiško."
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Jungiamasi prie serverio..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Negalėjau prisijungti prie LDAP serverio."
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "_Kompanija:"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Tikrinama, ar yra naujų laiškų"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 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:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Aplankai"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Rodyti tik užsakytus aplankus"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Vardų zona"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Pritaikyti filtrus naujiems laiškams šio serverio INBOX aplanke"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Automatiškai tikrinti paštą kas"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Pašto skaitymui ir rašymui IMAP serveriuose."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9552,7 +9909,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Negalėjau pervadinti aplanko „%s“ į %s: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Negalėjau pervadinti aplanko: %s"
@@ -9672,30 +10029,30 @@ msgstr "Ieškoma naujų laiškų"
 msgid "Storing folder"
 msgstr "Įrašomas aplankas"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Negaliu sukurti aplanko užrakto ant %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Negaliu atidaryti pašto dėžutės: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "Veiksmas nutrauktas"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Negaliu pridurti laiško prie mbox bylos: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9704,11 +10061,11 @@ msgstr ""
 "Negaliu gauti laiško: %s iš aplanko %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Atrodo, jog aplankas yra neatkuriamai sugadintas."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Nepavyko sukurti laiško: Sugadinta pašto dėžutė?"
 
@@ -9776,12 +10133,17 @@ msgstr "Negalėjau sukurti katalogo %s: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "Negalėjau gauti aplanko „%s“: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "Kortelės ID jau egzistuoja"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Negalėjau pervadinti aplanko „%s“ į %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Nurodytas aplanko vardas yra negalimas: %s"
@@ -9825,7 +10187,7 @@ msgstr "Negalėjau uždaryti šaltinio aplanko %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Negalėjau uždaryti laikino aplanko:  %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Negalėjau pervadinti aplanko: %s"
@@ -10110,7 +10472,7 @@ msgstr "Ištrinti po %s dienos(ų)"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -10202,7 +10564,7 @@ msgid "No such folder `%s'."
 msgstr "Nėra tokio aplanko „%s“."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10256,7 +10618,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Pašto siuntimas per sendmail programą"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10429,7 +10791,7 @@ msgstr "SMTP pašto siuntimas per %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Negaliu siųsti laiško: siuntėjo adresas neteisingas."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Siunčiamas laiškas"
 
@@ -10558,7 +10920,7 @@ msgstr "%.1fM"
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "priedas"
 
@@ -10603,14 +10965,14 @@ msgstr "MIME tipas:"
 msgid "Suggest automatic display of attachment"
 msgstr "Pasiūlyti automatinį priedo parodymą"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Tu turi susitvarkyti asmenybę,\n"
 "tik tada galėsi kurti laiškus."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Paspausk čia, jei reikia adresų knygelės"
 
@@ -10621,45 +10983,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Atsakyti-kam:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Nuo:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Tema:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Kam:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Įvesk laiško gavėjus"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Įvesk adresus, kurie gaus šio laiško carbon copy"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10670,16 +11032,21 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "_Prievadas:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 #, fuzzy
 msgid "Posting destination"
 msgstr "aprašymas"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Prisegti bylą prie šio laiško"
+
 #: composer/e-msg-composer-select-file.c:119
 #, fuzzy
 msgid "Attach file(s)"
@@ -10716,21 +11083,21 @@ msgstr "Byla egzistuoja, užrašyti?"
 msgid "Error saving file: %s"
 msgstr "Klaida išsaugant bylą: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Klaida įkeliant bylą: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Klaida prieinant prie bylos: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Nepavyko gauti laiško iš redaktoriaus"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10739,7 +11106,7 @@ msgstr ""
 "Negaliu sukurti išvesties bylos: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10748,7 +11115,7 @@ msgstr ""
 "Negaliu sukurti išvesties bylos: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10757,7 +11124,7 @@ msgstr ""
 "Negaliu sukurti išvesties bylos: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10766,7 +11133,7 @@ msgstr ""
 "Klaida automatiškai išsaugant laišką: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10774,7 +11141,7 @@ msgstr ""
 "Ximian Evolution rado neišsaugotų bylų iš praeitos sesijos.\n"
 "Ar norėtum pabandyti jas atkurti?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10785,35 +11152,35 @@ msgstr ""
 "\n"
 "Ar norėtum išsaugoti jo pakeitimus?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Įspėjimas: Pakeistas laiškas"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Atidaryti bylą"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 #, fuzzy
 msgid "Signature:"
 msgstr "Išsaugoti parašą"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Sukurti laišką"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10824,7 +11191,7 @@ msgstr ""
 "Negalėjau sukurti rašyklės lango:\n"
 "Nepavyko aktyvuoti HTML redaktoriaus komponento."
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10832,19 +11199,22 @@ msgstr ""
 "Negalėjau sukurti rašyklės lango:\n"
 "Nepavyko aktyvuoti HTML redaktoriaus komponento."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr ""
+"Ačiū\n"
+"Ximian Evolution komanda\n"
 
 #: data/evolution.desktop.in.in.h:2
 #, fuzzy
-msgid "Ximian Evolution"
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution _FAQ"
 
 #: data/evolution.keys.in.h:1
@@ -11094,13 +11464,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11230,7 +11600,7 @@ msgstr "Tada"
 msgid "You must specify a folder."
 msgstr "Stiliaus vardas:"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Pasirink aplanką"
@@ -11244,26 +11614,26 @@ msgstr ""
 "Klaida reguliarioje išraiškoje „%s“:\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Svarbus"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 #, fuzzy
 msgid "To Do"
 msgstr "Togas"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 #, fuzzy
 msgid "Later"
 msgstr "po"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Bandyti"
 
@@ -11369,7 +11739,7 @@ msgstr " "
 msgid "months"
 msgstr "mėnesių"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "sekundžių"
 
@@ -11469,7 +11839,7 @@ msgstr "Išraiška"
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr ""
 
@@ -11542,120 +11912,126 @@ msgid "Source Account"
 msgstr "Šaltinio sąskaita"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Samoa"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Savita antraštė"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Sustabdyti vykdymą"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Tema"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "Priskirti būseną"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "turi savyje"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "neturi savyje"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "nesibaigia"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "neegzistuoja"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 #, fuzzy
 msgid "does not return"
 msgstr "neegzistuoja"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "neskamba panašiai į"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "neprasideda su"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "baigiasi su"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "egzistuoja"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 #, fuzzy
 msgid "is after"
 msgstr "buvo po"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "is before"
 msgstr "buvo prieš"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "yra didesnis už"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "yra mažesnis už"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 #, fuzzy
 msgid "is not Flagged"
 msgstr "nėra"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "nėra"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "yra"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 #, fuzzy
 msgid "returns greater than"
 msgstr "yra didesnis už"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 #, fuzzy
 msgid "returns less than"
 msgstr "yra mažesnis už"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 #, fuzzy
 msgid "returns"
 msgstr "Darb"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "skamba panašiai į"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "prasideda su"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
@@ -11681,20 +12057,90 @@ msgstr "Taisyklės pavadinimas:"
 msgid "Score Rules"
 msgstr "Įverčio taisyklės"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "Keisti šio aplanko pavadinimą"
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr "Tu turi nurodyti bent vieną aplanką kaip šaltinį"
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 #, fuzzy
 msgid "VFolder source"
 msgstr "vAplankų šaltiniai"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#, fuzzy
+msgid "Composer Preferences"
+msgstr "Kalendoriaus nuostatos"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#, fuzzy
+msgid "Configure your email accounts here"
+msgstr "Sukurti ir keisti pašto sąskaitas ir kitas nuostatas"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution pašto nustatymas"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Evolution pašto rašyklė."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Evolution pašto rašyklė."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution pašto nustatymas"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution pašto aplanko vaizdavimo komponentas."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolution pašto komponento."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Paštas"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Pašto sąskaita"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "Kalendoriaus nuostatos"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Ar tu tikrai nori ištrinti šią sąskaitą?"
@@ -11739,7 +12185,7 @@ msgid "Protocol"
 msgstr "Puerto Rikas"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 #, fuzzy
 msgid "Unnamed"
 msgstr "Bevardis kontaktas"
@@ -11769,21 +12215,17 @@ msgstr "Pridėti sąlygą"
 msgid "Signature(s)"
 msgstr "_HTML parašas:"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
-#, fuzzy
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "Tu siunti HTML formatuotą laišką, bet sekantys gavėjai nemėgsta HTML "
 "formatuoto pašto:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Siųsti vistiek?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11791,7 +12233,7 @@ msgstr ""
 "Šis laiškas neturi temos.\n"
 "Tikrai siųsti?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11799,11 +12241,11 @@ msgstr ""
 "Kadangi kontaktų sąrašas, kuriam tu siunti, yra sukonfigūruotas slėpti "
 "sąrašo adresus, šiame laiške bus tik Bcc gavėjai."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Šiame laiške yra tik Bcc gavėjai."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 #, fuzzy
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -11811,11 +12253,11 @@ msgid ""
 "Send anyway?"
 msgstr "Gali būti, kad pašto serveris"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Tu turi nurodyti gavėjus, kad galėtum išsiųsti šį laišką."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11828,200 +12270,416 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Sukurti _virtualų aplanką iš laiško"
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "Paštas"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<spausk čia, kad pasirinktum aplanką>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, fuzzy, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "Atidaryti su %s..."
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Sukurti _naują aplanką..."
+
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Nurodyk, kur sukurti aplanką:"
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
-msgid "Folder _name"
+msgid "Folder _name:"
 msgstr "Aplanko pavadinimas:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Negalėjau sukurti laikino katalogo: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Negalėjau sukurti laikino katalogo: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Negalėjau sukurti laikino katalogo: %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Negalėjau uždaryti laikino aplanko:  %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Įkeliama..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Pasirink aplanką"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Sukurti naują aplanką"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Negalėjau ištrinti aplanko „%s“: %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Ištrinti aplanką '%s'"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Ištrinti \"%s\""
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Pervadinti aplanką „%s“ į:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+#, fuzzy
+msgid "Rename Folder"
+msgstr "Pervadinti aplanką"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Sąskaitos savybės"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Savybės"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "Aplanko pavadinimas:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Rodyti"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Atidaryti naujame lange"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Perkelti"
+
+#: mail/em-folder-tree.c:1500
+#, fuzzy
+msgid "_New Folder..."
+msgstr "_Naujas aplankas"
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "Pe_rvadinti"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "_Savybės..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "_Taisyti kaip naują laišką..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "S_pausdinti"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Atsakyti siuntėjui"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Atsakyti į _konferenciją"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Atsakyti _visiems"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "P_ersiųsti"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Užbaigta"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Išvalyti"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Pažymėti s_kaitytu"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Pažymėti _neskaitytu"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Pažymėti svarb_iu"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Pažymėti nesva_rbiu"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Pažymėti _neskaitytu"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Pažymėti svarb_iu"
+
+#: mail/em-folder-view.c:706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "S_ugrąžinti"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Perkelti į aplanką..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "K_opijuoti į aplanką..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Pridėti siuntėją į adresų knygelę"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Pritaikyti filtrus"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Sukurti _taisyklę iš laiško"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "vAplankas pagal _Temą"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "vAplankas pagal Siu_ntėją"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "vAplankas pagal _Gavėjus"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "vAplankas pagal _Konferenciją"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "vAplankas pagal Siuntėją"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Filtras pagal T_emą"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Filtras pagal Si_untėją"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Filtras pagal Ga_vėjus"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Filtras pagal K_onferenciją"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filtras pagal Si_untėją"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default"
 msgstr "Įp_rastas"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Spausdinti laišką"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopijuoti nuorodos adresą"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Tinka:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Priskirtas"
+
+#: mail/em-format-html-display.c:597
 #, fuzzy
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
 msgstr ""
-"Šis laiškas yra pasirašytas skaitmeniniu parašu, patikrinus nustatyta, kad "
+"Šis laiškas yra pasirašytas skaitmeniniu parašu, bet neina patikrinti, ar "
 "jis autentiškas"
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Pridėti sąlygą"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Pridėti sąlygą"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Pertraukta"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+#, fuzzy
+msgid "Encrypted, weak"
+msgstr "Užšifruotas laiškas"
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "PGP užšifruoti"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+#, fuzzy
+msgid "Encrypted, strong"
+msgstr "Užšifruotas laiškas"
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Negalėjau išnagrinėti MIME laiško. Rodomas šaltinis."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Nepalaikoma schema"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Nepavyko patikrinti sertifikatų."
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Žiūrėti viduje"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Slėpti"
@@ -12031,100 +12689,73 @@ msgstr "Slėpti"
 msgid "Page %d of %d"
 msgstr "Gaunamas laiškas %d iš %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Gaunamas laiškas %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 #, fuzzy
 msgid "Malformed external-body part."
 msgstr "Blogai suformuota išorinio kūno dalis."
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Rodyklė į FTP svetainę (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Rodyklė į vietinę bylą (%s), galiojanti svetainėje „%s“"
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Rodyklė į vietinę bylą (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Rodyklė į nutolusius duomenis (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Rodyklė į nežinomus išorinius duomenis („%s“ tipo)"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-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/em-format-html.c:906 mail/em-format.c:1217
-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/em-format-html.c:930 mail/em-format.c:1190
-#, fuzzy
-msgid "No signature present"
-msgstr "HTML parašo byla:"
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Negalėjau inicializuoti GNOME"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Nepalaikoma schema"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Negalėjau išnagrinėti MIME laiško. Rodomas šaltinis."
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Perkeliami laiškai"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Nuo"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Atsakyti-kam"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Kam"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 #, fuzzy
 msgid "Mailer"
 msgstr ""
@@ -12132,92 +12763,141 @@ msgstr ""
 "Pašto programa: "
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "%s priedas"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Negalėjau išnagrinėti MIME laiško. Rodomas šaltinis."
+msgid "Session not initialised"
+msgstr "Negalėjau inicializuoti GNOME"
+
+#: mail/em-format.c:1210
+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/em-format.c:1212
+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/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Laukiama..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Skanuojama %s"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Nepavyko iškoduoti laiško."
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Nepavyko iškoduoti laiško."
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Nepavyko iškoduoti laiško."
 
-#: mail/em-popup.c:593
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Išsaugoti kaip..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 #, fuzzy
 msgid "Set as _Background"
 msgstr "Fonas:"
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Atsakyti siuntėjui"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Nuorodą atidaryti naršyklėje"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Siųsti _laišką sąrašui..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Pridėti adresų knygelę"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Atidaryti su %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "IMAP serverio atsakyme nebuvo %s informacijos"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Užsakyti"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Aplankas"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Prašom pasirinkti serverį."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Joks serveris nepasirinktas"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Kitą kartą neberodyti šios žinutės."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12226,27 +12906,27 @@ msgstr ""
 "Klaida, įkeliant filtro informaciją:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Filtrai"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Persiųstas laiškas"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "nežinomas siuntėjas"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%a, %Y-%m-%d %H:%M, %%s rašė:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12255,7 +12935,7 @@ msgstr ""
 "Negaliu gauti laiško: %s\n"
 "  %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12264,26 +12944,39 @@ msgstr ""
 "%s jau egzistuoja.\n"
 "Ar nori įrašyti vietoj jo?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Žinutė"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Išsaugoti laišką kaip..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Negalėjau sukurti laikino katalogo: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "_Adresas:"
+
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
+msgid ""
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Šis veiksmas amžinai sunaikins visus laiškus, pažymėtus ištrintais. Jei tu "
+"tęsi toliau, nebegalėsi atkurti tų laiškų.\n"
+"\n"
+"Tikrai ištrinti tuos laiškus?"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2288
 #, fuzzy
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12292,107 +12985,388 @@ msgstr ""
 "\n"
 "Tikrai ištrinti tuos laiškus?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#: mail/evolution-mail.schemas.in.in.h:1
 #, fuzzy
-msgid "Composer Preferences"
-msgstr "Kalendoriaus nuostatos"
+msgid "Automatic link recognition"
+msgstr "_Automatiškai tikrinti paštą kas"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "_Automatiškai tikrinti paštą kas"
+
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:6
 #, fuzzy
-msgid "Configure your email accounts here"
-msgstr "Sukurti ir keisti pašto sąskaitas ir kitas nuostatas"
+msgid "Default charset in which to compose messages"
+msgstr "Ištrinti šį laišką"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/evolution-mail.schemas.in.in.h:7
 #, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
+msgid "Default charset in which to compose messages."
+msgstr "Ištrinti šį laišką"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution pašto nustatymas"
+msgid "Default charset in which to display messages"
+msgstr "Ieškoti eilutės rodomo laiško tekste"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
-msgid "Evolution Mail component"
-msgstr "Evolution pašto rašyklė."
+msgid "Default charset in which to display messages."
+msgstr "Ieškoti eilutės rodomo laiško tekste"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Evolution pašto rašyklė."
+msgid "Default forward style"
+msgstr "Įprastas persiuntimo būdas yra: "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution pašto nustatymas"
+msgid "Default reply style"
+msgstr "Įprastas persiuntimo būdas yra: "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
 #, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution pašto aplanko vaizdavimo komponentas."
+msgid "Empty Trash folders on exit"
+msgstr "_Ištuštinti šiukšlių aplankus išeinant"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Evolution pašto komponento."
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "_Ištuštinti šiukšlių aplankus išeinant"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
-msgid "Mail Accounts"
+msgid "Height of the message-list pane"
+msgstr "Siųsti laišką vėliau"
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "Pašto sąskaita"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
-msgid "Mail Preferences"
-msgstr "Kalendoriaus nuostatos"
+msgid "Log filter actions"
+msgstr "_Log'inti filtro veiksmus į:"
 
-#: mail/importers/elm-importer.c:105
-msgid "Evolution is importing your old Elm mail"
-msgstr "Evolution importuoja tavo seną Elm paštą"
+#: mail/evolution-mail.schemas.in.in.h:28
+#, fuzzy
+msgid "Log filter actions to the specified log file."
+msgstr "_Log'inti filtro veiksmus į:"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
-msgid "Importing..."
-msgstr "Importuojama..."
+#: mail/evolution-mail.schemas.in.in.h:29
+#, fuzzy
+msgid "Logfile to log filter actions"
+msgstr "_Log'inti filtro veiksmus į:"
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
-msgid "Please wait"
-msgstr "Prašome palaukti"
+#: mail/evolution-mail.schemas.in.in.h:30
+#, fuzzy
+msgid "Logfile to log filter actions."
+msgstr "_Log'inti filtro veiksmus į:"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Importuojama %s kaip %s"
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
 
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Skanuojama %s"
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
 
-#: mail/importers/elm-importer.c:547
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Pašto nustatymas"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Pašto nustatymas"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
-"Evolution rado Elm pašto bylų\n"
-"Ar norėtum jas importuoti į Evolution?"
 
-#: mail/importers/elm-importer.c:568
-msgid "Elm"
-msgstr "Elm"
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr "Paklausti, kai siunčiamas HTML laiškas kontaktams, kurie jų nenori"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "Paklausti prieš siunčiant laiškus vien tik su _Bcc gavėjais"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "Įprastai siųsti laiškus _HTML formatu."
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "Įprastai siųsti laiškus _HTML formatu."
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "Rodyti laiką kaip"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "Rodyti laiką kaip"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Rodyti laišką normaliu stiliumi"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "_Peržiūros sritis"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+msgid "Sound file to play when new mail arrives."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+msgid "Spell check inline"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "Originalus kontaktas:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+msgid "The variable width font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Gijomis suskirstytas laiškų sąrašas"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Gijomis suskirstytas laiškų sąrašas"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+#, fuzzy
+msgid "Thread the message-list based on Subject"
+msgstr "Persiųstas laiškas (be temos)"
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "Pa_daryti šią sąskaitą įprastine"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "Kintamos krypties"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 #, fuzzy
@@ -12426,6 +13400,44 @@ msgstr ""
 msgid "Evolution Pine importer"
 msgstr "Evolution pašto rašyklė."
 
+#: mail/importers/elm-importer.c:105
+msgid "Evolution is importing your old Elm mail"
+msgstr "Evolution importuoja tavo seną Elm paštą"
+
+#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
+#: mail/importers/pine-importer.c:115
+msgid "Importing..."
+msgstr "Importuojama..."
+
+#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
+#: mail/importers/pine-importer.c:117
+msgid "Please wait"
+msgstr "Prašome palaukti"
+
+#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
+#: mail/importers/pine-importer.c:288
+#, c-format
+msgid "Importing %s as %s"
+msgstr "Importuojama %s kaip %s"
+
+#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
+#: mail/importers/pine-importer.c:425
+#, c-format
+msgid "Scanning %s"
+msgstr "Skanuojama %s"
+
+#: mail/importers/elm-importer.c:547
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution rado Elm pašto bylų\n"
+"Ar norėtum jas importuoti į Evolution?"
+
+#: mail/importers/elm-importer.c:568
+msgid "Elm"
+msgstr "Elm"
+
 #: mail/importers/netscape-importer.c:75
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
@@ -12467,12 +13479,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importuoja tavo senus Netscape duomenis"
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Šiukšlės"
-
 #: mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
@@ -12482,7 +13488,7 @@ msgstr "Vietinė pašto byla %s"
 msgid "Scanning directory"
 msgstr "Skanuojamas katalogas"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Pradedama importuoti"
 
@@ -12559,24 +13565,24 @@ msgid "You have not filled in all of the required information."
 msgstr "Tu neįvedei visos būtinos informacijos."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution sąskaitų tvarkyklė"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Hostas:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "_Vartotojo vardas:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Kelias:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Tu negali sukurti dviejų aplankų tuo pačiu vardu."
 
@@ -12585,35 +13591,35 @@ msgstr "Tu negali sukurti dviejų aplankų tuo pačiu vardu."
 msgid "Mail to %s"
 msgstr "Laiškai į %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Tema yra %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Laiškai nuo %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s konferencija"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Atsakytas"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Pridėti filtro taisyklę"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, fuzzy, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12625,146 +13631,31 @@ msgstr ""
 "    '%s'\n"
 "Ir buvo atnaujinti."
 
-#: mail/mail-component.c:194
-#, fuzzy
-msgid "Connecting..."
-msgstr "Jungiamasi prie serverio..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Šiame aplanke negali būti laiškų."
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Naujas pašto laiškas"
 
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Negalėjau pervadinti aplanko: %s"
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "_Pašto laiškas"
 
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Negalėjau sukurti laikino katalogo: %s"
-
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Negalėjau sukurti laikino katalogo: %s"
-
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Negalėjau uždaryti laikino aplanko:  %s"
+#: mail/mail-component.c:381
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Sukurti laišką"
 
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Pasirink aplanką, į kurį importuoti šiuos duomenis"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Pasirink aplanką, į kurį importuoti šiuos duomenis"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Sukurti naują aplanką"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Nurodyk, kur sukurti aplanką:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Negalėjau ištrinti aplanko „%s“: %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Ištrinti aplanką '%s'"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Ištrinti \"%s\""
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Pervadinti aplanką „%s“ į:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-#, fuzzy
-msgid "Rename Folder"
-msgstr "Pervadinti aplanką"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Nurodytas aplanko vardas yra negalimas: %s"
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Sąskaitos savybės"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Savybės"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "Aplanko pavadinimas:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Rodyti"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Atidaryti naujame lange"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Perkelti"
-
-#: mail/mail-component.c:2087
-#, fuzzy
-msgid "_New Folder..."
-msgstr "_Naujas aplankas"
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "Pe_rvadinti"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Savybės..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Asmenybė"
 
@@ -12831,11 +13722,11 @@ msgstr ""
 "vieną Evolution pašto sąskaitą. Prašom įvesti šios sąskaitos pavadinimą "
 "žemiau esančiame laukelyje. Šis pavadinimas bus naudojamas tik vaizdavimui."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Tikrinama paslauga"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Jungiamasi prie serverio..."
 
@@ -12924,28 +13815,37 @@ msgid "C_olors"
 msgstr "_Uždaryti"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Gaunamo pašto serveris"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Tikrinama, ar yra naujų laiškų"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Spalva vėluojamoms užduotims"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Sukurti laišką"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Konfigūravimas"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -12961,316 +13861,321 @@ msgstr ""
 "\n"
 "Paspausk „Baigti“, kad išsaugotum nuostatas."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "Įp_rastas"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Įp_rastas"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Įprasta koduotė: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Gaunamas paštas"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Visad_a pasirašyti siunčiamus laiškus, kai naudojama ši sąskaita"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Negaliu atidaryti laiško"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Baigta"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "_Juodraščių aplankas:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "Įju_ngti"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Pašto sąskaita"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email _address:"
 msgstr "El. pašto adresas:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "_Ištuštinti šiukšlių aplankus išeinant"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "Kontaktų _sąrašas"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Evolution sąskaitų padėjėjas"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Įvykdyti veiksmus"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "baigiasi su"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "Parinktys"
+
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Font Properties"
 msgstr "Sąskaitos savybės"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Persiųsti laiškai"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Paryškinti citatas su"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Viduje"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Išsaugoti ir uždaryti"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Loading Images"
 msgstr "Įkelt_i paveikslėlius"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Pašto nustatymas"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Pašto dėžutės vieta"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Composer"
 msgstr "Laiško antraštė"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Message Display"
 msgstr "_Laiško rodymas"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Fonts"
 msgstr "Laiškas turi savyje"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Pašto nustatymas"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Nebūtina informacija"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_zacija:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Pasirink spalvą"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Paklausti prieš siunčiant laiškus vien tik su _Bcc gavėjais"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Spausdinti pažymėtus kontaktus"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Quote original message"
 msgstr "Negaliu atidaryti laiško"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Cituojant"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "Prisi_minti šį slaptažodį"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Atsakyti-kam:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Pašto gavimas"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Gavimo nuostatos"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Prisiminti šį slaptažodį"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Būtina informacija"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Įp_rastas"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Saugumas"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Pašto siuntimas"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Išsiųstų _laiškų aplankas:"
 
-#: mail/mail-config.glade.h:108
+#: 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:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Ser_veris reikalauja autentikacijos"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Serverio nustatymas"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Serverio _tipas:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Konfigūracijos duombazė nerasta"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Stiliaus vardas:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Standartinė Unix mbox"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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:121
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
@@ -13279,12 +14184,16 @@ msgstr ""
 "Pasirink pavadinimą, kuriuo norėtum vadinti šiuos serverius. Pavyzdžiui, "
 "„Namai“ ar „Darbas“."
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Kintamos krypties"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -13295,194 +14204,203 @@ msgstr ""
 "\n"
 "Spausk „Pirmyn“, kad pradėtum."
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_HTML parašas:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "Vis_ada įkelti paveikslėlius iš tinklo"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 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:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "_Autentikacijos tipas: "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Autentikacijos tipas: "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "_Automatiškai tikrinti paštą kas"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Automatiškai tikrinti paštą kas"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Patvirtinti aplankų išvalymą"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML parašas:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Defaults"
 msgstr "Įp_rastas"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Enable"
 msgstr "Įjungti"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Persiųsti kaip"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Pilnas vardas:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML laiškuose"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Identity"
 msgstr "Asmenybė"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Birželis"
+
+#: mail/mail-config.glade.h:156
 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:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Pa_daryti šią sąskaitą įprastine"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Pažymėti laiškus skaitytais po"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Vardas:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "_Niekada neįkelti paveikslėlių iš tinklo"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 #, 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:159
+#: mail/mail-config.glade.h:165
 #, 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:160
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Pašto gavimas"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Atsakyti visiems"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Script:"
 msgstr "_Saugumas"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Ištrinti..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Pašto siuntimas"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Rodyti laiką kaip"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Signatures"
 msgstr "_HTML parašas:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Standard Font:"
 msgstr "San Marinas"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Terminal Font:"
 msgstr "Originalus kontaktas:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Naudoti s_augią jungtį (SSL)"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "aprašymas"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Skanuojama %s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13491,7 +14409,7 @@ msgstr ""
 "Klaida „%s“ metu:\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13500,7 +14418,7 @@ msgstr ""
 "Klaida vykdant veiksmą:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Dirbama"
 
@@ -13512,119 +14430,119 @@ msgstr "Filtruojamas aplankas"
 msgid "Fetching Mail"
 msgstr "Gaunamas paštas"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nepavyko įrašyti laiškų į laikiną bylą %s: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Nepavyko įrašyti laiškų į laikiną bylą %s: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Siunčiamas „%s“"
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Siunčiamas laiškas %d iš %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Nesėkmė ties laišku %d iš %d"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Užbaigta."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Laiškas išsaugomas į aplanką"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Laiškai perkeliami į %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Laiškai kopijuojami į %s"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanuojami aplankas, esantys „%s“"
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Persiųsti laiškai"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Atidaromas aplankas %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "Atidaroma saugykla %s"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Trinamas aplankas %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Įrašomas aplankas '%s'"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Atnaujinamas aplankas"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Išvalomas aplankas"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Importuojama %s kaip %s"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 #, fuzzy
 msgid "Local Folders"
 msgstr "Ypatingi aplankai"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Gaunamas laiškas %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Gaunami %d laiškai"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Išsaugomi %d laiškai"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13633,7 +14551,7 @@ msgstr ""
 "Negaliu sukurti išvesties bylos: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13642,11 +14560,11 @@ msgstr ""
 "Klaida išsaugant laiškus į: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Išsaugomas priedas"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13655,21 +14573,25 @@ msgstr ""
 "Negaliu sukurti išvesties bylos: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Negalėjau įrašyti duomenų: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Atsijungiama nuo %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Vėl jungiamasi prie %s"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Skirti raidžių dydį"
@@ -13686,60 +14608,75 @@ msgstr "Rasti:"
 msgid "Search"
 msgstr "Paieška"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Pridėti sąlygą"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Išimtys"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Šaltinio informacija"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Nutraukiama..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Serveris: %s, tipas: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Kelias: %s, tipas: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Tipas: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Siunčiamas ir gaunamas paštas"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Nutraukti visus"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Atnaujinama..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Laukiama..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Vartotojas nutraukė veiksmą."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Įvesk %s slaptažodį"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Įvesk slaptažodį"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "_Prisiminti šį slaptažodį"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "Prisiminti šį slaptažodį iki šios sesijos galo"
@@ -13781,26 +14718,31 @@ msgstr "_HTML parašas:"
 msgid "Name:"
 msgstr "Vardas:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Persiųstas laiškas - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Persiųstas laiškas"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Atidaromas aplankas %s"
+
+#: mail/mail-vfolder.c:87
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Kuriamas aplankas %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Atnaujinami vAplankai pagal uri: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13813,89 +14755,89 @@ msgstr ""
 "    '%s'\n"
 "Ir buvo atnaujinti."
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "vAplankai"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 #, fuzzy
 msgid "vFolders"
 msgstr "Aplankai"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Keisti vAplanką"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Bandoma keisti neegzistuojantį vAplanką '%s'."
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Naujas vAplankas"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Nematytas"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Matytas"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Atsakytas"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Keletas nematytų laiškų"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Keletas laiškų"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Žemiausias"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Žemesnis"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Aukštesnis"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Aukščiausias"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Šiandien %H:%M"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Vakar %H:%M"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %H:%M"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Generuojamas laiškų sąrašas"
 
@@ -13956,11 +14898,11 @@ msgstr "Persiųsti"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Atsakyti"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Atsakyti visiems"
 
@@ -14017,44 +14959,140 @@ msgstr "_Užsakyti"
 msgid "_Unsubscribe"
 msgstr "_Atsisakyti"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, fuzzy, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Evolution apvalkalas."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+#, fuzzy
+msgid "Folder Settings"
+msgstr "Nuostatos"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "389"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Pervadinti šią trumpių grupę"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Perjungti, ar rodyti aplankų juostą"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Paslėpti trumpių juostą"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "_Svarbumas:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "_Svarbumas:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Pašto nustatymo sąsaja"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
 msgstr ""
-"Negalėjau ištrinti aplanko:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 #, fuzzy
-msgid "Add a Folder"
-msgstr "Pridėti vAplanko taisyklę"
+msgid "Path to the default contacts folder"
+msgstr "Atidaromas aplankas %s"
 
-#: shell/e-local-storage.c:179
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
-msgid "Drafts"
-msgstr "Juodraštis"
+msgid "Path to the default mail folder"
+msgstr "Atidaromas aplankas %s"
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Gauti laiškai"
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Atidaromas aplankas %s"
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Siunčiami laiškai"
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:182
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
 #, fuzzy
-msgid "Sent"
-msgstr "Matytas"
+msgid "Physical URI to the default tasks folder"
+msgstr "Atidaromas aplankas %s"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Perjungti, ar rodyti aplankų juostą"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Perjungti, ar rodyti trumpių juostą"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "El. paštas"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Negalėjau tvarkingai atnaujinti bylų"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -14065,7 +15103,7 @@ msgstr ""
 "%s\n"
 "Klaida: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -14074,7 +15112,7 @@ msgstr ""
 "Įvyko klaida kopijuojant bylas į\n"
 "'%s'."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -14085,7 +15123,7 @@ msgstr ""
 "Prašau, perkelk jį, kad galėčiau įdiegti\n"
 "Evolution vartotojo bylas."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -14192,10 +15230,11 @@ msgstr ""
 "Negalėjau pervadinti aplanko:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+msgid "The specified folder name is not valid: %s"
+msgstr "Nurodytas aplanko vardas yra negalimas: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -14219,21 +15258,16 @@ msgstr ""
 "Negaliu sukurti nurodyto aplanko:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-#, fuzzy
-msgid "Create New Folder"
-msgstr "Sukurti _naują aplanką..."
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Bevardis)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 #, fuzzy
 msgid "Choose the type of importer to run:"
 msgstr "Pasirink, kurį importerį paleisti"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -14247,12 +15281,12 @@ msgstr ""
 "Gali pasirinkti „Automatiškas“ jei tu nežinai, ir Evolution bandys "
 "susigaudyti pati."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 #, fuzzy
 msgid "Please select the information that you would like to import:"
 msgstr "Prašom pasirinkti informaciją, kurią norėtum importuoti"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -14260,7 +15294,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14269,23 +15303,23 @@ msgstr ""
 "Importuojama %s\n"
 "Importuojamas elementas %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 #, fuzzy
 msgid "Select importer"
 msgstr "Pasirink aplanką"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "Nėra tokios bylos %s"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -14294,11 +15328,11 @@ msgstr ""
 "Nėra importerio, kuris galėtų suprasti\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Importuojama"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -14307,17 +15341,17 @@ msgstr ""
 "Importuojama %s.\n"
 "Pradedama %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Klaida pradedant %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Klaida įkeliant %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14326,35 +15360,35 @@ msgstr ""
 "Importuojama %s\n"
 "Importuojamas elementas 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Automatiškas"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Bylos vardas:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Pasirink bylą"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Bylos tipas:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Importuoti duomenis ir nuostatas iš kitų programų"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Importuoti vieną bylą"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -14362,46 +15396,28 @@ msgstr ""
 "Prašome palaukti...\n"
 "Ieškoma esamų nustatymų"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Paleidžiami inteligentiški importeriai"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "Nuo %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Pasirink aplanką, į kurį importuoti šiuos duomenis"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Importuoti"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Uždaromos jungtys..."
 
-#: shell/e-shell-offline-sync.c:163
-#, fuzzy, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr "Sinchronizuojamas '%s'"
-
-#: shell/e-shell-offline-sync.c:232
-#, fuzzy
-msgid "Syncing Folder"
-msgstr "Sinchronizuojamas aplankas"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, fuzzy, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Sinchronizuojamas '%s'"
-
 #: shell/e-shell-settings-dialog.c:346
 #, fuzzy
 msgid "Evolution Settings"
@@ -14442,7 +15458,7 @@ msgstr ""
 "Negaliu sukurti nurodyto aplanko:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14451,17 +15467,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Asistento"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Nauja"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Nenurodytas aplanko vardas."
@@ -14523,65 +15533,52 @@ 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:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 #, fuzzy
 msgid "_Work Online"
 msgstr "Dirbti atsijungus"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "_Dirbti atsijungus"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Dirbti atsijungus"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Joks aplankas nerodomas)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Jokio)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 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:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution dabar yra atsijungimo procese."
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution dabar yra atsijungusi.  Paspausk šį mygtuką, kad dirbtum "
 "prisijungus."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Blogi argumentai"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Negaliu užsiregistruoti OAF"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Konfigūracijos duombazė nerasta"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Bendroji klaida"
 
@@ -14702,74 +15699,18 @@ msgstr "Iš_trinti"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Pašalinti šią trumpę iš trumpių juostos"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Klaida išsaugant trumpes."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Gauti laiškai"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Trumpės"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Nėra klaidų"
-
-#: 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:575
-msgid "The specified folder type is not valid"
-msgstr "Nurodytas aplanko tipas yra blogas"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "I/O klaida"
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr "Neužtenka vietos aplankui sukurti"
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr "Aplankas nėra tuščias"
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "Nurodytas aplankas nerastas"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "Funkcija neįgyvendinta šioje saugykloje"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "Veiksmas nepalaikomas"
-
-#: 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:593
-msgid "The specified folder cannot be modified or removed"
-msgstr "Nurodytas aplankas negali būti pakeistas ar ištrintas"
-
-#: 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:597
-msgid "Cannot create a folder with that name"
-msgstr "Negaliu sukurti aplanko su tokiu vardu"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr ""
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr ""
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14780,6 +15721,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% užbaigta)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Nauja"
+
+#: shell/evolution-folder-selector-button.c:128
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "Atidaryti su %s..."
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14817,77 +15769,6 @@ msgstr ""
 "Klaida iš aktyvavimo sistemos yra:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "CORBA klaida"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Pertraukta"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Blogas argumentas"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Jau turi savininką"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Nėra savininko"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Nerastas"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Nepalaikomas tipas"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Nepalaikoma schema"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Nepalaikomas veiksmas"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Vidinė klaida"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Egzistuoja"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "Blogas URI"
-
-#: shell/evolution-shell-component.c:1215
-#, fuzzy
-msgid "Has subfolders"
-msgstr "Nėra tokio aplanko %s"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Nebeliko vietos"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "Senesnysis savininkas numirė"
-
-#: shell/evolution-test-component.c:63
-#, fuzzy
-msgid "Test type"
-msgstr "Bylos tipas:"
-
-#: shell/evolution-test-component.c:703
-#, fuzzy
-msgid "Evolution Test Component"
-msgstr "Evolution pašto rašyklė."
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "Active Connections"
@@ -14921,11 +15802,6 @@ msgstr "_Paštas"
 msgid "_Tasks:"
 msgstr "Užduotys"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-#, fuzzy
-msgid "Folder _name:"
-msgstr "Aplanko pavadinimas:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 #, fuzzy
 msgid "Folder _type:"
@@ -14986,25 +15862,6 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Evolution apvalkalas."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-#, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Testinio komponento gamykla."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-#, fuzzy
-msgid "Folder Settings"
-msgstr "Nuostatos"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Spausk „Import“, kad pradėtum importuoti bylą į Evolution."
@@ -15043,7 +15900,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Importeriai"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Importuoti"
 
@@ -15059,16 +15916,16 @@ msgstr "Kitą kartą nebeklausti"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution gali importuoti duomenis iš žemiau nurodytų bylų:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Evolution baigia darbą..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -15105,7 +15962,7 @@ msgstr ""
 "Mes tikimės, kad tau patiks mūsų sunkaus darbo vaisiai, ir\n"
 "laukiame tavo prisidėjimo!\n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -15113,70 +15970,109 @@ msgstr ""
 "Ačiū\n"
 "Ximian Evolution komanda\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Kitą kartą nebeklausti"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Negalėjau prieiti prie Ximian Evolution apvalkalo."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Negalėjau inicializuoti Ximian Evolution apvalkalo: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Pradedama importuoti"
 
-#: shell/main.c:532
+#: shell/main.c:530
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Paleidžiami inteligentiški importeriai"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Siųsti visų komponentų derinimo išvestį į bylą."
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Pasirink aplanką"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "Parašo byla:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "Pažanga"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Išraiška"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "El. pašto adresas:"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr "Parašo byla:"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -15229,91 +16125,376 @@ msgid "Backup All"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "Parašo byla:"
+
+#: smime/gui/smime-ui.glade.h:15
+msgid "Certificate Authority Trust"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "Parašo byla:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Bendras vardas"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "Kontaktų _sąrašas"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "K_eisti"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 #, fuzzy
 msgid "Email Recipient Certificate"
 msgstr "Nenurodyti jokie gavėjai"
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Nepavyko patikrinti sertifikatų."
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Išraiška"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Organizacija"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Organizacija"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Rodyti"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "Nepavyko patikrinti sertifikatų."
+
+#: smime/gui/smime-ui.glade.h:42
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Importuoti"
+msgid "Certificate already exists"
+msgstr "Kortelės ID jau egzistuoja"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%Y-%m-%d"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "mėnesis"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "mėnesis"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "mėnesis"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "mėnesis"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr ", "
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "Š"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "Gerai"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "Š"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "Parašo byla:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "Parašo byla:"
+
+#: smime/lib/e-cert.c:618
+msgid "Certificate Authority Key Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "I"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+#, fuzzy
+msgid "Subject Public Key Info"
+msgstr ""
+"\n"
+"Viešas raktas: "
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Tema yra %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Negaliu apdoroti kaupo aplanko"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+msgid "SSL Certificate Authority"
+msgstr ""
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Nepavyko patikrinti sertifikatų."
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Nuostatos"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Nėra informacijos"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "priedas"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "Parašo byla:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Kroatija"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "Kroatija"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Išraiška"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s (%d)"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Parašo byla:"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "Įterpt_i"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Tema yra %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Parašo byla:"
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "PKCS12 File Password"
+msgstr "Išsaugoti slaptažodį"
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Įvesk %s slaptažodį"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "Kontaktų _sąrašas"
 
 #: tools/evolution-launch-composer.c:324
 #, fuzzy
@@ -15368,7 +16549,7 @@ msgstr "Kopijuoti pažymėjimą"
 msgid "Copy to Folder..."
 msgstr "Kopijuoti į aplanką..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Iškirpti pažymėjimą"
 
@@ -15385,7 +16566,7 @@ msgstr "Siųsti ko_ntaktą kitam..."
 msgid "Move to Folder..."
 msgstr "Perkelti į aplanką..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Įdėti iš krepšio"
 
@@ -15393,8 +16574,8 @@ msgstr "Įdėti iš krepšio"
 msgid "Previews the contacts to be printed"
 msgstr "Peržiūrėti kontaktus prieš spausdinant"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Spa_udinio peržiūra"
@@ -15440,13 +16621,13 @@ msgstr "Sustabdyti įkėlimą"
 msgid "View the current contact"
 msgstr "esamas laikas"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "_Veiksmai"
 
@@ -15476,145 +16657,114 @@ msgid "_Send Message to Contact..."
 msgstr "Siųsti _laišką kontaktui..."
 
 #: ui/evolution-calendar.xml.h:3
-#, fuzzy
-msgid "Create a new all-day event"
-msgstr "Sukurti naują įvykį"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Sukurti naują įvykį"
-
-#: ui/evolution-calendar.xml.h:5
 msgid "Create a new calendar"
 msgstr "Sukurti naują kalendorių"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Sukurti naują užduotį"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Sukurti naują užduotį"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Diena"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 #, fuzzy
 msgid "Delete All Occurrences"
 msgstr "Ištrinti _visus pasitaikymus"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Ištrinti įvykį"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "Ištrinti šį _pasitaikymą"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "Ištrinti šį _pasitaikymą"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Eiti į"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Eiti atgal"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Eiti pirmyn"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Eiti į _datą"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Eiti į nurodytą datą"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Eiti į šiandieną"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "List"
 msgstr "sąrašas"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Mėnesis"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Naujas į_vykis"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Naujoji Kaledonija"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Susitikimas"
-
-#: ui/evolution-calendar.xml.h:27
-msgid "New _Task"
-msgstr "Nauja _užduotis"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Peržiūrėti kalendorių prieš spausdinant"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Spausdinti šį kalendorių"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Skelbti Laisvumo/Užimtumo informaciją šiam kalendoriui"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Šaltiniai"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Aplankas, kuriame saugomi įvykiai ir susitikimai"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Rodyti detales"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Rodyti vieną dieną"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Rodyti vieną mėnesį"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Rodyti vieną savaitę"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Rodyti darbo savaitę"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Savaitė"
 
@@ -15680,7 +16830,7 @@ msgstr "Išsaugoti šį elementą į diską"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Byla"
 
@@ -15909,7 +17059,7 @@ msgstr "Pažymėti _visus skaitytais"
 msgid "Mark all visible messages as read"
 msgstr "Visus matomus laiškus pažymėti perskaitytais"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Paste message(s) from the clipboard"
 msgstr "Įdėti laišką iš krepšio"
@@ -15966,16 +17116,6 @@ msgstr "_Invertuoti pažymėjimą"
 msgid "_Threaded Message List"
 msgstr "_Gijomis suskirstytas laiškų sąrašas"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Uždaryti šį langą"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "_Uždaryti"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Addressbook"
@@ -16138,277 +17278,302 @@ msgstr "Persiųsti pasirinktą laišką prisegtą kaip priedas"
 msgid "Increase the text size"
 msgstr "Padidinti teksto dydį"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Įkelt_i paveikslėlius"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Padaryti _svarbiu"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Pažymėti _neskaitytu"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Padaryti n_esvarbiu"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark the selected message(s) as having been read"
 msgstr "Pasirinktus laiškus pažymėti lyg jie buvo perskaityti"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark the selected message(s) as important"
 msgstr "Pasirinktus laiškus pažymėti svarbiais"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Pasirinktus laiškus pažymėti nesvarbiais"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Pasirinktus laiškus pažymėti lyg jie nebuvo perskaityti"
+
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Pasirinktus laiškus pažymėti lyg jie nebuvo perskaityti"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Pasirinktus laiškus pažymėti nesvarbiais"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Pasirinktus laiškus pažymėti ištrynimui"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Perkelti"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
 msgid "Move selected message(s) to another folder"
 msgstr "Perkelti pažymėtus laiškus į kitą aplanką"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Kitas"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Next _Important Message"
 msgstr "Kitą svarbų laišką"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Next _Thread"
 msgstr "Kitą giją"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "Next _Unread Message"
 msgstr "Kitą neskaitytą laišką"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Nerastas"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Atidaryti pasirinktą laišką naujame lange"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Atidaryti pasirinktą laišką rašyklės lange siuntimui iš naujo"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Originalus _dydis"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "P_revious Unread Message"
 msgstr "Praeitą neskaitytą laišką"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Atsakyti"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "Patikrinti, ar yra naujų laiškų visuose aplankuose"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Praeitą svarbų laišką"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Peržiūrėti laišką prieš spausdinant"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Praeitas"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Spausdinti šį laišką"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Persiųsti pasirinktą laišką kažkam"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Atstatyti teksto originalų dydį"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "I_eškoti laiške..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "_Mažesnis"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Išsaugoti laišką į tekstinę bylą"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Ieškoti eilutės rodomo laiško tekste"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "Set up the page settings for your current printer"
 msgstr "Nustatyti puslapio parinktis tavo esamam spausdintuvui"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "_Rodyti laiško šaltinį"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Rodyti pilnas _antraštes"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Ieškoti eilutės rodomo laiško tekste"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Rodyti laišką normaliu stiliumi"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Rodyti laišką su visomis pašto antraštėmis"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Rodyti neapdorotą laiško šaltinį"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "Teksto _dydis"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Sugrąžinti pažymėtus laiškus"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "vAplankas pagal _Konferenciją..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "vAplankas pagal Siu_ntėją..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "vAplankas pagal _Gavėjus..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "vAplankas pagal _Temą..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 #, fuzzy
 msgid "_Attached"
 msgstr "Prisegti"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "_Kopijuoti į aplanką"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "_Sukurti filtrą iš laiško"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "P_ersiųsti laišką"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 #, fuzzy
 msgid "_Go To"
 msgstr "Eiti į"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 #, fuzzy
 msgid "_Inline"
 msgstr "Viduje"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "_Didesnis"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "_Laiško rodymas"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Perkelti į aplanką"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 #, fuzzy
 msgid "_Next Message"
 msgstr "Kitą laišką"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "_Normalus rodymas"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "_Atidaryti laišką"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Praeitą laišką"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 #, fuzzy
 msgid "_Quoted"
 msgstr "Cituojant"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 #, fuzzy
 msgid "_Resend..."
 msgstr "Pe_rvadinti..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "Įran_kiai"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "S_ugrąžinti"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Uždaryti šį langą"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "_Uždaryti"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Prisegti"
@@ -16697,12 +17862,13 @@ msgid "Change Evolution's settings"
 msgstr "Evolution"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "I_šeiti"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Sukurti naują užduotį"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "Evolution _Langas"
+msgid "E_xit"
+msgstr "I_šeiti"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16714,8 +17880,8 @@ msgstr "Importuoti duomenis iš kitų programų"
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "Evolution _Langas"
+msgid "Open a new window"
+msgstr "Atidaryti naujame lange"
 
 #: ui/evolution.xml.h:11
 #, fuzzy
@@ -16723,54 +17889,68 @@ msgid "Pi_lot Settings..."
 msgstr "_Pilot nuostatos..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Siųsti / Gauti"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "Išsiųsti laukiantį paštą ir parsiųsti naują paštą"
+
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Pašto nustatymas"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Rodyti informaciją apie Ximian Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Išsiųsti klaidos pranešimą"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "Iš_siųsti klaidos pranešimą"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Pranešti apie klaidą, naudojant Bug Buddy"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Perjungti"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Perjungti, ar dirbama atsijungus."
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "_Apie Ximian Evolution..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "_Pagalba"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "_Importuoti..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Naujas"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Siųsti / Gauti"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "Ieškoti"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Spausdinti apžvalgą"
@@ -16908,12 +18088,12 @@ msgstr "Apibrėžti vaizdus"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "PATKPŠS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%Y %B"
 
@@ -17051,7 +18231,7 @@ msgstr "_Ieškoti"
 msgid "_Find Now"
 msgstr "Ieškoti"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 #, fuzzy
 msgid "_Clear"
 msgstr "Išvalyti"
@@ -17069,24 +18249,265 @@ msgstr ""
 msgid "Text"
 msgstr "Bandyti"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Išvalyti"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Ieškoti"
 
+#~ msgid "Account Name"
+#~ msgstr "Sąskaitos vardas"
+
+#~ msgid "Server Name"
+#~ msgstr "Serverio vardas"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Nutraukti vykdomą pašto operaciją"
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "Nurodytas tipas šioje saugykloje nepalaikomas"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Kiti kontaktai"
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Pavardė"
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "_Adresų knygelės konfigūravimas..."
 
-#~ msgid "Family Name"
-#~ msgstr "Pavardė"
+#, fuzzy
+#~ msgid "Add LDAP Server"
+#~ msgstr "LDAP serveris"
+
+#, fuzzy
+#~ msgid "LDAP Configuration Assistant"
+#~ msgstr "Konfigūravimas"
+
+#, fuzzy
+#~ msgid "Find contact in"
+#~ msgstr "Rasti kontaktą"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Spausk čia, kad pridėtum kontaktą *"
+
+#~ msgid "Business Address"
+#~ msgstr "Darbo adresas"
+
+#~ msgid "Department"
+#~ msgstr "Departamentas"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "Laisvas-užsiėmęs URL"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Profesija"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Atidaromos užduotys iš %s"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Siųsti vistiek?"
+
+#, fuzzy
+#~ msgid "Folder _name"
+#~ msgstr "Aplanko pavadinimas:"
+
+#, fuzzy
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "Šis laiškas yra pasirašytas skaitmeniniu parašu, patikrinus nustatyta, "
+#~ "kad jis autentiškas"
+
+#, fuzzy
+#~ msgid "No signature present"
+#~ msgstr "HTML parašo byla:"
+
+#, fuzzy
+#~ msgid "Connecting..."
+#~ msgstr "Jungiamasi prie serverio..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Šiame aplanke negali būti laiškų."
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Negalėjau pervadinti aplanko: %s"
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Pasirink aplanką, į kurį importuoti šiuos duomenis"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Negalėjau ištrinti aplanko:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Add a Folder"
+#~ msgstr "Pridėti vAplanko taisyklę"
+
+#, fuzzy
+#~ msgid "Drafts"
+#~ msgstr "Juodraštis"
+
+#~ msgid "Outbox"
+#~ msgstr "Siunčiami laiškai"
+
+#, fuzzy
+#~ msgid "Sent"
+#~ msgstr "Matytas"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr "Sinchronizuojamas '%s'"
+
+#, fuzzy
+#~ msgid "Syncing Folder"
+#~ msgstr "Sinchronizuojamas aplankas"
+
+#, fuzzy
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Sinchronizuojamas '%s'"
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Joks aplankas nerodomas)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(Jokio)"
+
+#~ msgid "No error"
+#~ msgstr "Nėra klaidų"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Jau yra aplankas su tokiu pat pavadinimu"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Nurodytas aplanko tipas yra blogas"
+
+#~ msgid "I/O error"
+#~ msgstr "I/O klaida"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Neužtenka vietos aplankui sukurti"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Aplankas nėra tuščias"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Nurodytas aplankas nerastas"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Funkcija neįgyvendinta šioje saugykloje"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Veiksmas nepalaikomas"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Nurodytas tipas šioje saugykloje nepalaikomas"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Nurodytas aplankas negali būti pakeistas ar ištrintas"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "Negalima padaryti aplanko vaiku vienu iš savo palikuonių"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Negaliu sukurti aplanko su tokiu vardu"
+
+#~ msgid "CORBA error"
+#~ msgstr "CORBA klaida"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Blogas argumentas"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Jau turi savininką"
+
+#~ msgid "No owner"
+#~ msgstr "Nėra savininko"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Nepalaikomas tipas"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Nepalaikoma schema"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Nepalaikomas veiksmas"
+
+#~ msgid "Internal error"
+#~ msgstr "Vidinė klaida"
+
+#~ msgid "Exists"
+#~ msgstr "Egzistuoja"
+
+#~ msgid "Invalid URI"
+#~ msgstr "Blogas URI"
+
+#, fuzzy
+#~ msgid "Has subfolders"
+#~ msgstr "Nėra tokio aplanko %s"
+
+#~ msgid "No space left"
+#~ msgstr "Nebeliko vietos"
+
+#~ msgid "Old owner has died"
+#~ msgstr "Senesnysis savininkas numirė"
+
+#, fuzzy
+#~ msgid "Test type"
+#~ msgstr "Bylos tipas:"
+
+#, fuzzy
+#~ msgid "Evolution Test Component"
+#~ msgstr "Evolution pašto rašyklė."
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "Importuoti"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Sukurti naują įvykį"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Naujas į_vykis"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Susitikimas"
+
+#~ msgid "New _Task"
+#~ msgstr "Nauja _užduotis"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "Evolution _Langas"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "Evolution _Langas"
+
+#~ msgid "Toggle"
+#~ msgstr "Perjungti"
+
+#~ msgid "Clear"
+#~ msgstr "Išvalyti"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Nutraukti vykdomą pašto operaciją"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -17181,9 +18602,6 @@ msgstr "Ieškoti"
 #~ msgid "Evolution VCard importer"
 #~ msgstr "Evolution pašto rašyklė."
 
-#~ msgid "Loading..."
-#~ msgstr "Įkeliama..."
-
 #~ msgid "Searching..."
 #~ msgstr "Ieškoma..."
 
@@ -17239,10 +18657,6 @@ msgstr "Ieškoti"
 #~ msgstr "EBook neįkelta\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "Kortelės ID jau egzistuoja"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Veiksmas nutrauktas"
 
@@ -17372,10 +18786,6 @@ msgstr "Ieškoti"
 #~ msgstr "Automobilinis"
 
 #, fuzzy
-#~ msgid "Phone"
-#~ msgstr "Joks"
-
-#, fuzzy
 #~ msgid "Birth date"
 #~ msgstr "Gimimo data"
 
@@ -17388,10 +18798,6 @@ msgstr "Ieškoti"
 #~ msgstr "Pagrindinis"
 
 #, fuzzy
-#~ msgid "ID"
-#~ msgstr "I"
-
-#, fuzzy
 #~ msgid "Last Use"
 #~ msgstr "Įdėti"
 
@@ -17405,9 +18811,6 @@ msgstr "Ieškoti"
 #~ msgid "Folder containing contact information"
 #~ msgstr "Aplankas, kuriame laikoma kontaktų informacija"
 
-#~ msgid "LDAP Server"
-#~ msgstr "LDAP serveris"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "LDAP serveris, kuriame laikoma kontaktų informacija"
 
@@ -17419,20 +18822,6 @@ msgstr "Ieškoti"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Aplankas, kuriame laikoma kontaktų informacija"
 
-#~ msgid "_Contact"
-#~ msgstr "_Kontaktas"
-
-#, fuzzy
-#~ msgid "Create a new contact"
-#~ msgstr "Sukurti naują kontaktą"
-
-#~ msgid "New Contact List"
-#~ msgstr "Naujas kontaktų sąrašas"
-
-#, fuzzy
-#~ msgid "Create a new contact list"
-#~ msgstr "Sukurti naują kontaktų sąrašą"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "URI, kurį rodys Aplankų naršyklė"
 
@@ -17450,9 +18839,6 @@ msgstr "Ieškoti"
 #~ msgid "Is New Card"
 #~ msgstr "Nauja"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "Nėra kortelių"
 
@@ -17509,37 +18895,6 @@ msgstr "Ieškoti"
 #~ msgstr "Aplankas, kuriame yra užduotys"
 
 #, fuzzy
-#~ msgid "New appointment"
-#~ msgstr "Naujas įvykis"
-
-#, fuzzy
-#~ msgid "_Appointment"
-#~ msgstr "Įvykis"
-
-#, fuzzy
-#~ msgid "New meeting"
-#~ msgstr "Naujienų šaltinių nuostatos"
-
-#, fuzzy
-#~ msgid "M_eeting"
-#~ msgstr "Susitikimas"
-
-#, fuzzy
-#~ msgid "New task"
-#~ msgstr "Nauja užduotis"
-
-#~ msgid "_Task"
-#~ msgstr "_Užduotis"
-
-#, fuzzy
-#~ msgid "New All Day Appointment"
-#~ msgstr "Naujas įvykis"
-
-#, fuzzy
-#~ msgid "All _Day Appointment"
-#~ msgstr "Naujas į_vykis"
-
-#, fuzzy
 #~ msgid "Could not update invalid object"
 #~ msgstr "Negalėjau tvarkingai atnaujinti bylų"
 
@@ -17571,10 +18926,6 @@ msgstr "Ieškoti"
 #~ msgstr "Atidaromas kalendorius iš %s"
 
 #, fuzzy
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Atidaromas aplankas %s"
-
-#, fuzzy
 #~ msgid "Purging event %s"
 #~ msgstr "Skanuojama %s"
 
@@ -17601,10 +18952,6 @@ msgstr "Ieškoti"
 #~ "Evolution rado GnomeCard bylų.\n"
 #~ "Ar norėtum jas importuoti į Evolution?"
 
-#, fuzzy
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Pašto nustatymo sąsaja"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "Aplankas, kuriame yra laiškai"
 
@@ -17622,25 +18969,12 @@ msgstr "Ieškoti"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Virtualus šiukšlinės aplankas"
 
-#~ msgid "Properties..."
-#~ msgstr "Savybės..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Pakeisti šio aplanko savybes"
 
 #~ msgid "You have not set a mail transport method"
 #~ msgstr "Tu nenustatei pašto siuntimo metodo"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Naujas pašto laiškas"
-
-#~ msgid "_Mail Message"
-#~ msgstr "_Pašto laiškas"
-
-#, fuzzy
-#~ msgid "Compose a new mail message"
-#~ msgstr "Sukurti laišką"
-
 #, fuzzy
 #~ msgid "New Message Post"
 #~ msgstr "Kitą laišką"
@@ -18897,10 +20231,6 @@ msgstr "Ieškoti"
 #~ msgstr "Kanada"
 
 #, fuzzy
-#~ msgid "Curitiba"
-#~ msgstr "Kroatija"
-
-#, fuzzy
 #~ msgid "Custer"
 #~ msgstr "Iškirpti"
 
@@ -21085,10 +22415,6 @@ msgstr "Ieškoti"
 #~ msgstr "Samoa"
 
 #, fuzzy
-#~ msgid "Samos"
-#~ msgstr "Samoa"
-
-#, fuzzy
 #~ msgid "Samsun"
 #~ msgstr "_Sek"
 
@@ -21377,10 +22703,6 @@ msgstr "Ieškoti"
 #~ msgstr "Užbaigimo data:"
 
 #, fuzzy
-#~ msgid "Stauning"
-#~ msgstr "Nuostatos"
-
-#, fuzzy
 #~ msgid "Staverton"
 #~ msgstr "Nuostatos"
 
@@ -21681,10 +23003,6 @@ msgstr "Ieškoti"
 #~ msgstr "Jungtiniai Arabų Emyratai"
 
 #, fuzzy
-#~ msgid "Unst"
-#~ msgstr "Nematytas"
-
-#, fuzzy
 #~ msgid "Uruapan"
 #~ msgstr "Japonija"
 
@@ -21749,10 +23067,6 @@ msgstr "Ieškoti"
 #~ msgstr "Unikodas"
 
 #, fuzzy
-#~ msgid "Vermont"
-#~ msgstr "mėnesis"
-
-#, fuzzy
 #~ msgid "Vernal"
 #~ msgstr "Esmė"
 
@@ -22022,10 +23336,6 @@ msgstr "Ieškoti"
 #~ msgstr ", "
 
 #, fuzzy
-#~ msgid " C"
-#~ msgstr ", "
-
-#, fuzzy
 #~ msgid "knots"
 #~ msgstr "mazgai"
 
@@ -22283,19 +23593,6 @@ msgstr "Ieškoti"
 #~ msgid "Remove a folder added with \"Open Other User's Folder\""
 #~ msgstr "Sukurti _naują aplanką..."
 
-#~ msgid "Send / Receive"
-#~ msgstr "Siųsti / Gauti"
-
-#, fuzzy
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Išsiųsti laukiantį paštą ir parsiųsti naują paštą"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Perjungti, ar rodyti aplankų juostą"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Perjungti, ar rodyti trumpių juostą"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Rodyti parinktą aplanką"
 
@@ -22325,9 +23622,6 @@ msgstr "Ieškoti"
 #~ msgid "_Rename..."
 #~ msgstr "Pe_rvadinti..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Siųsti / Gauti"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "_Trumpių juosta"
 
@@ -22379,10 +23673,6 @@ msgstr "Ieškoti"
 #~ msgstr "Kalendoriaus nuostatos"
 
 #, fuzzy
-#~ msgid "Automatically _detect links"
-#~ msgstr "_Automatiškai tikrinti paštą kas"
-
-#, fuzzy
 #~ msgid "Emacs"
 #~ msgstr "Rytų"
 
@@ -22483,18 +23773,10 @@ msgstr "Ieškoti"
 #~ msgstr "Evolution adresų knygelės komponento gamykla."
 
 #, fuzzy
-#~ msgid "380"
-#~ msgstr "389"
-
-#, fuzzy
 #~ msgid "<- _Remove"
 #~ msgstr " _Pašalinti"
 
 #, fuzzy
-#~ msgid "<< Fewer Options"
-#~ msgstr "Parinktys"
-
-#, fuzzy
 #~ msgid "DN Customization"
 #~ msgstr "Prisitaikyti"
 
@@ -23097,9 +24379,6 @@ msgstr "Ieškoti"
 #~ msgid "News Servers"
 #~ msgstr "Serveriai"
 
-#~ msgid "Source Information"
-#~ msgstr "Šaltinio informacija"
-
 #~ msgid "newswindow1"
 #~ msgstr "newswindow1"
 
@@ -23123,9 +24402,6 @@ msgstr "Ieškoti"
 #~ msgid "You may only import to local folders"
 #~ msgstr "Tu gali importuoti tiktai į lokalius aplankus"
 
-#~ msgid "_Contact List"
-#~ msgstr "Kontaktų _sąrašas"
-
 #~ msgid "Inline Text _File..."
 #~ msgstr "_Tekstinę bylą..."
 
@@ -23141,17 +24417,10 @@ msgstr "Ieškoti"
 #~ msgid "Send _later"
 #~ msgstr "Siųsti vė_liau"
 
-#~ msgid "Send the message later"
-#~ msgstr "Siųsti laišką vėliau"
-
 #~ msgid "_Pilot Settings..."
 #~ msgstr "_Pilot nuostatos..."
 
 #, fuzzy
-#~ msgid "Addressbook Settings"
-#~ msgstr "Adresų knygelės šaltinis"
-
-#, fuzzy
 #~ msgid "Configuration control for the Evolution Addressbook."
 #~ msgstr "Evolution adresų knygelės komponento gamykla."
 
@@ -23465,13 +24734,6 @@ msgstr "Ieškoti"
 #~ "\n"
 #~ "Unikali eilutė: "
 
-#~ msgid ""
-#~ "\n"
-#~ "Public Key: "
-#~ msgstr ""
-#~ "\n"
-#~ "Viešas raktas: "
-
 #~ msgid "Waiting for connection to LDAP server..."
 #~ msgstr "Laukiama prisijungimo prie LDAP serverio..."
 
@@ -23519,9 +24781,6 @@ msgstr "Ieškoti"
 #~ msgid "Republic Of Moldova"
 #~ msgstr "Moldovos respublika"
 
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "Kurti naujus įvykius su įprasta _užuomina"
-
 #~ msgid "First day of wee_k:"
 #~ msgstr "Pirma sa_vaitės diena:"
 
@@ -23637,9 +24896,6 @@ msgstr "Ieškoti"
 #~ msgid "Composer"
 #~ msgstr "Rašyklė"
 
-#~ msgid "Default Forward style is: "
-#~ msgstr "Įprastas persiuntimo būdas yra: "
-
 #~ msgid "Edit..."
 #~ msgstr "Taisyti..."
 
@@ -23649,15 +24905,9 @@ msgstr "Ieškoti"
 #~ msgid "_Email Address:"
 #~ msgstr "_El. pašto adresas:"
 
-#~ msgid "_Log filter actions to:"
-#~ msgstr "_Log'inti filtro veiksmus į:"
-
 #~ msgid "_Organization:"
 #~ msgstr "_Organizacija:"
 
-#~ msgid "_Send mail in HTML format by default."
-#~ msgstr "Įprastai siųsti laiškus _HTML formatu."
-
 #~ msgid "_Server Type: "
 #~ msgstr "_Serverio tipas:"
 
@@ -23824,9 +25074,6 @@ msgstr "Ieškoti"
 #~ msgid "Notification about your task"
 #~ msgstr "Pranešimas apie tavo užduotį"
 
-#~ msgid "Encrypted message"
-#~ msgstr "Užšifruotas laiškas"
-
 #~ msgid "Click icon to decrypt."
 #~ msgstr "Paspausk ant ikonos, kad iššifruotum."
 
@@ -23952,9 +25199,6 @@ msgstr "Ieškoti"
 #~ msgid "Customize toolbars"
 #~ msgstr "Prisitaikyti įrankines"
 
-#~ msgid "_Company:"
-#~ msgstr "_Kompanija:"
-
 #~ msgid "As _Minicards"
 #~ msgstr "Rodyti _mažas korteles"
 
@@ -24078,9 +25322,6 @@ msgstr "Ieškoti"
 #~ msgid "Renaming old folder and opening"
 #~ msgstr "Pervadinamas senas aplankas ir atidaromas"
 
-#~ msgid "Forwarded message (no subject)"
-#~ msgstr "Persiųstas laiškas (be temos)"
-
 #~ msgid "Print the selected message"
 #~ msgstr "Spausdinti parinktą laišką"
 
@@ -24232,9 +25473,6 @@ msgstr "Ieškoti"
 #~ msgid "Required"
 #~ msgstr "Reikalingas"
 
-#~ msgid "Save password"
-#~ msgstr "Išsaugoti slaptažodį"
-
 #~ msgid "Transport Authentication"
 #~ msgstr "Siuntimo autentikacija"
 
@@ -24262,9 +25500,6 @@ msgstr "Ieškoti"
 #~ msgid "Enter the subject of the mail"
 #~ msgstr "Įvesk laiško temą"
 
-#~ msgid "Incoming Mail Server"
-#~ msgstr "Gaunamo pašto serveris"
-
 #~ msgid "Outgoing Mail Server"
 #~ msgstr "Siunčiamo pašto serveris"
 
diff --git a/po/lv.po b/po/lv.po
index 17d8e064bf..3e56d12c62 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution for latvian\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-02-03 23:02+0200\n"
 "Last-Translator: Pēteris Krišjānis <peteris.krisjanis@os.lv>\n"
 "Language-Team: Latvian <lv@li.org>\n"
@@ -29,51 +29,191 @@ msgstr "Nevarēju ielādēt %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Nevarēju nolasīt Pilot adrešu aplikācijas bloku"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Autoaizpildes mapes"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "_Sertifikāta ID:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Šeit konfigurējiet jūsu epasta kontus"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Kontakti"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Rediģēt adrešu grāmatau"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Ražotne adrešu grāmatas adrešu izniršanai"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution adrešu grāmatas minikaršu skatītājs"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution adrešu grāmatas minikaršu skatītājs"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolution adrešu grāmatas minikaršu skatītājs"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution adrešu grāmatas minikaršu skatītājs"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution pasta izpildkopsavilkuma komponente."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Adrešu grāmata"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Rekvizīti..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Dzēst"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "_Pārsaukt"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Jauns kontakts:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Kontakts"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "Izveidot jaunu kontaktu"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Jauns kontaktu saraksts"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "_Kontaktu saraksts"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "Izveidot jaunu kontaktu sarakstu"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Personīgi"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Darbs"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "LDAP serveris"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Nevar izveidot direktoriju %s: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "Nespēju savienoties ar LDAP serveri"
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "Nespēju autentificēties ar LDAP serveri"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "Nevarēju izpildīt pieprasījumu uz saknes DSE"
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "Serveris atbildeja ar neatbalstītām meklēšanas bāzēm"
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Šis serveris neatbalsta LDAPv3 shēmas informāciju"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "Kļūda saņemot shēmas informāciju"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr "Serveris atbildēja ar nepareizu shēmas informāciju"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Konta nosaukums"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Servera nosaukums"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP nav ticis aktivizēts šajā Evolution būvējumā"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Citi kontakti"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -81,7 +221,7 @@ msgstr ""
 "Mēs nespējām atvērt šo adrešu grāmatu. Lūdzu pārbaudiet\n"
 "vai šis ceļš eksistē un vai jums ir pieejas atļauja ceļa mērķim."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -91,7 +231,7 @@ msgstr ""
 "ka esat ievadijuši nepareizu URI, vai arī LDAP serveris\n"
 "ir nesasniedzams."
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -103,7 +243,7 @@ msgstr ""
 "jums ir jākompilē programma no CVS avota pēc OpenLDAP\n"
 "programmatūras iegūšanas no saites zemāk.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -117,44 +257,43 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Nevaru atvērt adrešu gramatu"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "Izmantoju LDAP serveri anonīmi"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "Neizdevās autentificēties.\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sIevadiet %s paroli (lietotājs %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "Vārds sākas ar"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "Epasts sākas ar"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Kategorija ir"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Jebkuršs lauks satur"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Paplašināti..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -166,7 +305,7 @@ msgstr ""
 "Lūdzu padariet jūsu meklējumu precīzāku vai arī paliliniet rezultāta limitu\n"
 "direktorijas servera preferencēs šai adrešu grāmatai."
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -178,95 +317,41 @@ msgstr ""
 "vai arī palieliniet laika limitu direktorijas servera preferencēs\n"
 "šajai adrešu grāmatai."
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Šīs adrešu grāmatas aizmugure nespēja parsēt šo pieprasījumu."
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Šīs adrešu grāmatas aizmugure negribēja izpildīt pieprasījumu."
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "Šis pieprasījums netika izpildīts veiksmīgi."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Jebkura kategorija"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "URI, ko kalendārs parādīs"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "_Sertifikāta ID:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "Šeit konfigurējiet pieeju LDAP direktoriju serveriem"
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Kontakti"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "Direktoriju serveri"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Rediģēt adrešu grāmatau"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Evolution adrešu grāmatas vārda izvēles saskarne."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Ražotne adrešu grāmatas adrešu izniršanai"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution adrešu grāmatas minikaršu skatītājs"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution adrešu grāmatas minikaršu skatītājs"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Evolution adrešu grāmatas minikaršu skatītājs"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution adrešu grāmatas minikaršu skatītājs"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution pasta izpildkopsavilkuma komponente."
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -289,6 +374,7 @@ msgstr "  Pa_rādīt atbalstītās bāzes"
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -323,8 +409,8 @@ msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Add LDAP Server"
-msgstr "LDAP serveris"
+msgid "Addressbook Creation Assistant"
+msgstr "Adrešu grāmatas uzstādījumi"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -340,9 +426,9 @@ msgid "Anonymously"
 msgstr "Anonīmi"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -353,49 +439,50 @@ msgstr ""
 "Lūdzu klikšķiniet uz \"Beigt\" pogas, lai saglabātu jūsu tikko ievadītos "
 "uzstādījumus."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "Savienojos"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "Atšķiramais _vārds:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Edit LDAP Server"
 msgstr "LDAP serveris"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address:"
 msgstr "Epasta _adrese:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution lietos šo DN, lai autentificētu jūs ar serveri"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr "Evolution lietos šo epasta adresi,lai autentificētu jūs ar serveri"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "Beigt"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Galvenais"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "LDAP konfigurācijas asistents"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "Grupa"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Nekad"
 
@@ -424,8 +511,8 @@ msgid "S_earch scope: "
 msgstr "M_eklēšanas mērogs:"
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Meklēšana"
 
@@ -484,28 +571,32 @@ msgstr ""
 "meklējumiem, un konaktu izveidošanai un rediģēšanai."
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 "Parādāmā nosaukuma norādīšana ir pēdējais pieprasītais solis LDAP servera "
 "konfigurēšanā."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "Solis 1: Servera informācija"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "Solis 2: Savienojamies ar serveri"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "Solis 1: Servera informācija"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "Solis 3: Meklēšana direktorijā"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Solis 2: Savienojamies ar serveri"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "Solis 4: Parādīt vārdu"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Solis 3: Meklēšana direktorijā"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -517,18 +608,6 @@ msgstr "Atbalstītās meklēšanas bāzes"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"Pirmais solis, lai nokonfigurētu savienojumu ar LDAP serveri, ir norādīt tā "
-"nosaukumu, un jūsu pieteikšanās\n"
-"informāciju. Lūdzu vaicājiet jūsu sistēmu administrātoram ja jūs nēsat "
-"pārliecināti par jūsu informāciju."
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -540,7 +619,7 @@ msgstr ""
 "sistēmu\n"
 "administrātoram, vai jums ir vajadzība mainīt šīs opcijas."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -551,7 +630,7 @@ msgstr ""
 "tiks uzsākti. \n"
 "Ja jūs atstāsiet šo tukšu, meklējumi sāksies no direktorijas koka saknes."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -566,15 +645,14 @@ msgstr ""
 "Meklēšanas mērogs \"one\" iekļaus ierakstus tikai vienu līmeni zemāk par "
 "jūsu bāzi.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
 #, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "Šis asistents palīdzēs jums izmantot tiešsaistes direktoriju servisus,\n"
 "izmantojot LDAP (Lightweight Directory Access Protocol) serverus. \n"
@@ -583,14 +661,14 @@ msgstr ""
 "par serveri. Lūdzu sazinieties ar jūsu sistēmu administrātoru ja jums \n"
 "ir nepieciešama palīdzība, meklējot šo informāciju."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "Šis ir pilnais LDAP servera nosaukums. Piemēram, \"ldap.manakompanija.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -600,7 +678,7 @@ msgstr ""
 "pārlieku \n"
 "lielu, tiks bremzēta jūsu adrešu grāmatas darbība."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -610,7 +688,7 @@ msgstr ""
 "ka uzstādot to uz \"Epasta adrese\", tai ir nepieciešama anonīma pieeja jūsu "
 "LDAP serverī."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -619,6 +697,15 @@ msgstr ""
 "Šis ir servera nosaukums, kas parādīsies jūsu Evolution mapju sarakstā.\n"
 "Tas ir tikai attēlošanas pēc."
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Šis ir servera nosaukums, kas parādīsies jūsu Evolution mapju sarakstā.\n"
+"Tas ir tikai attēlošanas pēc."
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -647,21 +734,34 @@ msgid "Using email address"
 msgstr "Izmantoju epasta adresi"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Kad iespējams"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+"Pirmais solis, lai nokonfigurētu savienojumu ar LDAP serveri, ir norādīt tā "
+"nosaukumu, un jūsu pieteikšanās\n"
+"informāciju. Lūdzu vaicājiet jūsu sistēmu administrātoram ja jūs nēsat "
+"pārliecināti par jūsu informāciju."
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "_Attēlošanas nosaukums:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "_Lejupielādes limits:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -669,54 +769,53 @@ msgstr "_Lejupielādes limits:"
 msgid "_Edit"
 msgstr "R_ediģēt"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "_Pieteikšanās metode:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "_Porta numurs:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "_Meklēšanas bāze:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "_Servera nosaukums:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "_Taimouts (minūtes):"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "kartes"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr "searching-tab"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Nosaukums"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution adrešu grāmatas vārda izvēles saskarne."
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Izņemt visu"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Izņemt"
@@ -745,24 +844,21 @@ msgstr "Pievienot kontaktiem"
 msgid "Unnamed Contact"
 msgstr "Nenosaukts kontakts"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Nosaukums"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Avots"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Izvēlieties kontaktus no adrešu grāmatas"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "Meklēt kontaktus"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution adrešu grāmatas vārda izvēles saskarne."
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Sameklēt"
@@ -842,7 +938,8 @@ msgid "D_epartment:"
 msgstr "D_epartaments:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detaļas"
 
@@ -913,12 +1010,12 @@ msgid "_Categories..."
 msgstr "Ka_tegorijas..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Dzēst"
@@ -2058,7 +2155,7 @@ msgid "Esq."
 msgstr "Esk."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Pilns vārds"
 
@@ -2154,11 +2251,27 @@ msgstr "Kontaktu saraksta redaktors"
 msgid "Save List as VCard"
 msgstr "Saglabāt Sarakstu kā VKarti"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Izmainīt Kontaktu:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Konfliktējošais Kontakts:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Atrasts kontakta dublikāts"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Izmainītā epasta adrese vai vārds šim kontaktam jau\n"
+"eksistē šajā mapē. Vai jūs to vēlaties pievienot jebkurā gadījumā?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Jauns kontakts:"
@@ -2175,22 +2288,6 @@ msgstr ""
 "Vārds vai epasta adrese šim kontaktam jau eksistē\n"
 "šajā mapē. Vai jūs vēlaties pievienot jebkurā gadījumā?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Izmainīt Kontaktu:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Konfliktējošais Kontakts:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"Izmainītā epasta adrese vai vārds šim kontaktam jau\n"
-"eksistē šajā mapē. Vai jūs to vēlaties pievienot jebkurā gadījumā?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2291,9 +2388,9 @@ msgstr "Pārsūtīt kontaktu"
 msgid "Send Message to Contact"
 msgstr "Sūtīt vēstuli kontaktam"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Drukāt"
@@ -2315,9 +2412,12 @@ msgstr "Pārvietot uz mapi..."
 msgid "Cut"
 msgstr "Izgriezt"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopēt"
 
@@ -2326,16 +2426,8 @@ msgstr "Kopēt"
 msgid "Paste"
 msgstr "Ievietot"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Dzēst"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "Pašreizējais skats"
 
@@ -2352,166 +2444,170 @@ msgstr ""
 "izmantot"
 
 #: 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:2
 msgid "Assistant"
 msgstr "Asistents"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant Phone"
 msgstr "Asistenta telefons"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Address"
-msgstr "Darījumu adrese"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Fakss darījumiem"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Darījumu telefons"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Darījumu telefons 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Atzvanīšanas telefons"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Automašīnas telefons"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategorijas"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Kompānijas telefons"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Departaments"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "Epasts"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "Epasts 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "Epasts 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Uzvārds"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Saglabāt kā"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "Brīvs-aizņemts URL"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Mājas adrese"
+#, fuzzy
+msgid "Given Name"
+msgstr "Uzvārds"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Mājas fakss"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Mājas telefons"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Mājas telefons 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Ponkē"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Jordāna"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Menedžeris"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobilais telefons"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Iesauka"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Piezīme"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Birojs"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organizācija"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Cita adrese"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Cits fakss"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Cits telefons"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Peidžers"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Primārais telefons"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Profesija"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Loma"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Dzīvesbiedrs"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Telekss"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Amats"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Unsta"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Web lapaspuse"
 
@@ -2613,11 +2709,19 @@ msgstr "Locekļi"
 msgid "Job Title"
 msgstr "_Darba nosaukums:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Mājas adrese"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Mājas adrese"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Cita adrese"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2630,113 +2734,110 @@ msgstr "Mājas fakss"
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Veiksmīgi"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Nezināma kļūda"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Repozitorijs nesaistes režīmā"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Atļauja liegta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Karte nav atrasta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Kartes ID jau eksistē"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Protokols nav atbalstīts"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Atsaukts"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "Autentifikācija neizdevusies"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "Pieprasīta autentifikācija"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS nav pieejams"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "Adrešu grāmata neeksistē"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Cita kļūda"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Vai jūs vēlaties saglabāt izmaiņas?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 #, fuzzy
 msgid "_Discard"
 msgstr "Dinarda"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Kļūda pievienojot sarakstu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Kļūda pievienojot karti"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Kļūda mainot sarakstu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Kļūda mainot karti"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Kļūda izņemot sarakstu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Kļūda izņemot karti"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2745,7 +2846,7 @@ msgstr ""
 "%d karšu atvēršana atvērs %d jaunus logus.\n"
 "Vai jūs tiešām vēlaties attēlot visas no šim kartēm?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2754,49 +2855,49 @@ msgstr ""
 "%s jau eksistē\n"
 "Vai tu vēlies to pārrakstīt?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "Pārrakstīt"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, fuzzy, c-format
 msgid "Error saving %s: %s"
 msgstr "Kļūda saglabājot failu: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "saraksts"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Pārvietot karti uz"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kopēt karti uz"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Pārvietot kartes uz"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kopēt kartes uz"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Vairākas VKartes"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "%s VKarte"
@@ -2992,7 +3093,7 @@ msgstr "Robežas"
 msgid "Number of columns:"
 msgstr "Kolonu skaits:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Opcijas"
 
@@ -3179,18 +3280,18 @@ msgstr "Nenosaukts saraksts"
 msgid "Split Multi-Day Events:"
 msgstr "Sadalīt vairāku dienu notikumus:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Nevarēju sāknēt wombat serveri"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Nevarēju sāknēt wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nevarēju nolasīt Pilot kalendāra aplikācijas bloku"
 
@@ -3198,24 +3299,90 @@ msgstr "Nevarēju nolasīt Pilot kalendāra aplikācijas bloku"
 msgid "Default Priority:"
 msgstr "Noklusētā prioritāte:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nevar nolasīt Pilota ToDo aplikācijas bloku"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Kalendārs un uzdevumi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Kalendārs"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Šeit konfigurējiet jūsu laika zonu, kalendāru un uzdevumu sarakstu"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Kalendārs un uzdevumi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution kalendāra iTip/iMip skatītājs"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution kalendāra iTip/iMip skatītājs"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution ziņu redaktors"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution ziņu redaktors"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolution kalendāra kopsavilkuma komponente."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolution Kopsavilkuma komponente."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Uzdevumi"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Ražotne trauksmes notifikācijas servisam"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Sākums:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Beigas:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Evolution trauksme"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Trauksme %s"
@@ -3290,44 +3457,173 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Neprasīt vairāk man par šo programmu."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Ražotne trauksmes notifikācijas servisam"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Nevarēju inicializēt Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Nespēju inicializēt gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Nevarēju izveidot trauksmes notifikācijas servisa ražotni"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "nepareizs laiks"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "iKalendāra kļūda"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Krāsas šodienas uzdevumiem"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Krāsas šodienas uzdevumiem"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "Parādīt tikšanos b_eigu laikus nedēļas un mēneša skatos"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Parāda kalendāru, kāds tas tiks drukāts"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#, fuzzy
+msgid "Units of default reminder"
+msgstr "Veidot jaunus tikšanos ierakstus ar noklusēto at_gādinātāju"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "Pr_asīt apstiprinājumu, kad dzēš priekšmetus"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "Pr_asīt apstiprinājumu, kad dzēš priekšmetus"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Dzēst izpildītos uzdevumus"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Parādīt nedēļas _numurus datuma navigātorā"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Kopsavilkums satur"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Apraksts satur"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Komentāri satur"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Neatbilstoši"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3339,81 +3635,111 @@ msgstr ""
 "\n"
 "Tiešām izdzēst šos uzdevumus?"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "atgriež mazāk kā"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "dienas"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Drukāt šo kalendāru"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Jaunkaledonija"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "Jauna tikšanās"
+
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "_Tikšanās"
+
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Ievietot jaunu ierakstu par tikšanos"
+
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "Jauna sanāksme"
+
+#: calendar/gui/calendar-component.c:640
 #, fuzzy
-msgid "Rename"
-msgstr "_Pārsaukt"
+msgid "M_eeting"
+msgstr "Sanāksme"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:641
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Izveidot jaunu sanāksmes pieprasījumu"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Personīgi"
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Jauna tikšanās visu dienu"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Darbs"
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr "Visas _dienas tikšanās"
+
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Ievietot jaunu ierakstu par tikšanos"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3536,7 +3862,7 @@ msgstr "Sūtīt"
 msgid "With these arguments:"
 msgstr "Ar šiem argumentiem:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr ""
 
@@ -3552,6 +3878,10 @@ msgstr "stundas"
 msgid "minutes"
 msgstr "minūtes"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3585,8 +3915,8 @@ msgstr "Sūtīt epastu"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Kopsavilkums:"
 
@@ -3615,7 +3945,7 @@ msgstr "tikšanās beigas"
 msgid "hour(s)"
 msgstr "stunda(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minūte(s)"
 
@@ -3669,7 +3999,7 @@ msgstr "Dienas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Piekdiena"
 
@@ -3683,7 +4013,7 @@ msgstr "Minūtes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Pirmdiena"
 
@@ -3693,7 +4023,7 @@ msgstr "_Sv"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Sesdiena"
 
@@ -3707,7 +4037,7 @@ 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:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Svēdiena"
 
@@ -3725,7 +4055,7 @@ msgstr "Uzdevumu saraksts"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Ceturdiena"
 
@@ -3743,7 +4073,7 @@ msgstr "Laika formāts:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Otradiena"
 
@@ -3753,12 +4083,12 @@ msgstr "N_edēļa sākas:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Trešdiena"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Darba nedēļa"
 
@@ -3795,7 +4125,7 @@ msgid "_Fri"
 msgstr "_Piek"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Galvenais"
 
@@ -3835,7 +4165,7 @@ msgstr "_Tre"
 msgid "before every appointment"
 msgstr "pirms katras tikšanās"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
@@ -3843,11 +4173,11 @@ msgstr ""
 "Notikums, kuru jūs vēlaties dzēst, ir sanāksme, vai jūs vēlaties izsūtīt "
 "atsaukumus?"
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Vai jūs esat pārliecināts, ka vēlaties atsaukt un izdzēst šo sanāksmi?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
@@ -3855,11 +4185,11 @@ msgstr ""
 "Uzdevums, ko jūs vēlaties dzēst, ir norīkots, vai jūs vēlaties izsūtīt "
 "atsaukumu?"
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Vai jūs esat pārliecināts, ka vēlaties atsaukt un izdzēst šo uzdevumu?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -3867,54 +4197,54 @@ msgstr ""
 "Žurnāla ieraksts, ko jūs vēlaties dzēst, ir publicēts, vai jūs vēlaties "
 "izsūtīt atsaukumu?"
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 "Vai jūs esat pārliecināts, ka vēlaties atsaukt un izdzēst šo žurnāla "
 "ierakstu?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Šis notikums ir izdzēsts."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Šis uzdevums ir izdzēsts."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Šis žurnāla ieraksts ir izdzēsts."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Jūs esat veicis izmaiņas. Aizmirst šīs izmaiņas un aizvērt redaktoru?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Jūs neesat veicis nekādas izmaiņas, aizvērt redaktoru?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Notikums tika izmainīts."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Uzdevums tika izmainīts."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Žurnāla ieraksts tika izmainīts."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Jūs esat veicat izmaiņas. Aizmirst šīs izmaiņas un atjaunināt redaktoru?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Jūs neesat veicis izmaiņas, atjaunināt redaktoru?"
@@ -3924,175 +4254,180 @@ msgstr "%s  Jūs neesat veicis izmaiņas, atjaunināt redaktoru?"
 msgid "Validation error: %s"
 msgstr "Validācijas kļūda: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " uz "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Izpildīts "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Izpildīts"
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Līdz "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Līdz"
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "Nevarēju atjaunināt objektu"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Rediģēt tikšanos"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tikšanās - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Uzdevums - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Žurnāla ieraksts - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Nav kopsavilkuma"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Saglabāt kā..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 #, fuzzy
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Izmaiņas, izdarītas šajā priekšmetā, varētu tikt atceltas, ja atjauninājums "
 "atnāk caur epastu"
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Nevar dabūt pašreizējo versiju!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Izvēlieties gala mērķa direktoriju, lai importētu šos datus"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst šo tikšanos '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 "Vai jūs esat pārliecināts, ka vēlaties dzēst informāciju par šo nenosaukto "
 "tikšanos?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst šo uzdevumu '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst šo nenosaukto uzdevumu?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst šo žurnāla ierakstu '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 "Vai jūs esat pārliecināts, ka vēlaties dzēst šo nenosaukto žurnāla ierakstu?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr ""
 "Vai jūs esat pārliecināts, ka vēlaties dzēst %d ierakstus par tikšanos?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst %d uzdevumus?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Vai jūs esat pārliecināts, ka vēlaties izdzēst %d žurnāla ierakstus?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 #, fuzzy
 msgid "The item could not be deleted due to a corba error"
 msgstr "Priekšmets nevar tikt nosūtīts!\n"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 #, fuzzy
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 "Apmeklētāja statuss nevar tikt atjaunināts sakarā ar nepareizo statusu!\n"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Priekšmets nevar tikt nosūtīts!\n"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Priekšmets nevar tikt nosūtīts!\n"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr ""
 "Apmeklētāja statuss nevar tikt atjaunināts sakarā ar nepareizo statusu!\n"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Priekšmets nevar tikt nosūtīts!\n"
@@ -4109,43 +4444,43 @@ msgstr "Deleģēt Uz:"
 msgid "Enter Delegate"
 msgstr "Ievadīt delegātu"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Tikšanās"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Atgādinājums"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Atkārtošanās"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Plānošana"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Sanāksme"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "Sākuma datums ir nepareizs"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "Beigu datums ir nepareizs"
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "Sākuma datums ir nepareizs"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "Beigu datums ir nepareizs"
 
@@ -4215,31 +4550,31 @@ msgid "_Start time:"
 msgstr "_Sākuma laiks:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Nekas"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "Nepieciešams organizētajs."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "Tiek pieprasīts vismaz viens apmeklētājs."
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Deleģēt uz..."
 
@@ -4280,21 +4615,15 @@ msgid "Member"
 msgstr "Loceklis"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Loma"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -4314,6 +4643,7 @@ msgid "_Invite Others..."
 msgstr "_Ielūgt citus..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4346,6 +4676,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Nevar izveidot direktoriju %s: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "Jābūt norādītam organizētājam."
@@ -4375,34 +4706,59 @@ msgstr "Kalendāra informācija"
 msgid "Calendar Name"
 msgstr "Kalendārs"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Nevar izveidot direktoriju %s: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Kalendāra informācija"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Uzdevumu saraksts"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Uzdevumu saraksts"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Uzdevumu saraksts"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Volisa un Futuna salas"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 #, fuzzy
 msgid "This and Future Instances"
 msgstr "Volisa un Futuna salas"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 #, fuzzy
 msgid "All Instances"
 msgstr "Vi_sas stacijas:"
@@ -4452,10 +4808,15 @@ msgstr "dienā"
 msgid "on the"
 msgstr "uz"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "reizes"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Datums/laiks:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "Pievieno_t"
@@ -4520,7 +4881,7 @@ msgstr "nedēļa(s)"
 msgid "year(s)"
 msgstr "gads(i)"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 #, fuzzy
 msgid ""
 "This event has been changed, but has not been saved.\n"
@@ -4531,32 +4892,32 @@ msgstr ""
 "\n"
 "Vai jūs vēlaties saglabāt jūsu izmaiņas?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 #, fuzzy
 msgid "Save Event"
 msgstr "Kalendāra notikumi"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Informācija par sanāksmi ir izveidota. Nosūtīt to?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Informācija par sanāksmi ir izmainīta. Nosūtīt atjauninātu versiju?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "Informācija par uzdevuma norīkojumu ir izveidota. Nosūtīt to?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "Informācija par uzdevumu ir izmainīta. Nosūtīt atjauninātu versiju?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Izpildīšanas datums ir nepareizs"
 
@@ -4566,43 +4927,43 @@ msgid "% _Complete"
 msgstr "% izpildīts"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Pabeigts"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Augsts"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "Progresā"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Zems"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Normāls"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Nav iesākts"
 
@@ -4611,7 +4972,7 @@ msgid "Progress"
 msgstr "Progress"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Nedefinēts"
 
@@ -4633,21 +4994,21 @@ msgstr "_Statuss:"
 msgid "_Web Page:"
 msgstr "_Web lapaspuses adrese:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Pamata"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Uzticējums"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "Izpildes datums ir nepareizs"
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4655,9 +5016,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "Konfidenciāli"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Apraksts:"
 
@@ -4762,26 +5123,21 @@ msgstr "%s iekš %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s nezināma palaidēja tipam"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Publisks"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Privāts"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Konfidenciāls"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategorijas"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4794,28 +5150,26 @@ msgid "Start Date"
 msgstr "Sākuma datums"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Kopsavilkums"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "krāsa"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Tikšanās"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Brīvs"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Aizņemts"
 
@@ -4827,7 +5181,7 @@ msgstr "Z"
 msgid "S"
 msgstr "D"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "A"
 
@@ -4835,7 +5189,7 @@ msgstr "A"
 msgid "W"
 msgstr "R"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4845,7 +5199,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4853,7 +5207,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Jā"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4861,17 +5215,17 @@ msgstr "Nē"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Nezināms"
 
@@ -4883,181 +5237,179 @@ msgstr "Periodisks"
 msgid "Assigned"
 msgstr "Asignēts"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Atjaunināt objektus"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Dzēšu izvēlētos objektus"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Atjaunināt objektus"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Jauna _tikšanās...."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Jauns visas di_enas notikums"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "Jauna sanāksme"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Jauns uzdevums"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Drukāt..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Ievietot"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Iet uz _dienu"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "_Iet uz datumu..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicēt brīvs/aizņemts informāciju"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "_Uzstādījumi..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Atvērt"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Saglabāt kā..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Kopēt"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "Plānot _sanāksmi..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "_Pārsūtīt kā iKalendāru..."
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "_Uzstādījumi..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Atvērt vēstuli"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "_Nozīmēt uzdevumu"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "_Pārsūtīt kā iKalendāru"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "A_tzīmēt kā Izpildītus"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "A_tzīmēt izvēlētos uzdevumus kā izpildītus"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "_Dzēst izvēlētos uzdevumus"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klikšķināt, lai pievienotu uzdevumu"
@@ -5071,8 +5423,8 @@ msgstr "% izpildīts"
 msgid "Alarms"
 msgstr "Trauksmes"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Izpildīts"
 
@@ -5101,18 +5453,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5131,7 +5483,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
@@ -5144,125 +5496,125 @@ msgstr "%d. %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr "Jā. (Sarežģīta atkārtošanās)"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "Katru dienu"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "Katras %d dienas"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "Katru nedēļu"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "Katras %d nedēļas"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr "Katru nedēļu "
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Katras %d nedēļas "
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " un "
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr "%s. dienā, "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s, "
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "katru mēnesi"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr "katrus %d mēnešus"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "Katru gadu"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "Katrus %d gadus"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr " kopā %d reizes"
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ", beidzoties "
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>Sākas:</b> "
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Beidzas:</b>"
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>Izpildīts:</b>"
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>Līdz:</b>"
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "iKalendāra informācija"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "iKalendāra kļūda"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Nezināma persona"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5270,321 +5622,320 @@ 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:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Nekas</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "Lokācija: "
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Statuss:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Apstiprināts"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Pagaidām akceptēt"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Noliegts"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Izvēlieties darbību:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Atjaunot"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Apstiprināt"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Pagaidām akceptēt"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Noliegt"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Nosūtīt brīvs/aizņemts informāciju"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Atjaunināt respondenta statusu"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Sūtīt pēdīgo informāciju"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Atsaukt"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ir publicējis informāciju par sanāksmi."
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Informācija par sanāksmi"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> pieprasa %s klātbūtni sanāksmē."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> pieprasa jūsu klātbūtni sanāksmē."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Sanāksmes iemesls"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> vēlas pievienot jau eksistējošai sanāksmei."
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Atjaunināta informācija par sanāksmi"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> vēlas saņemt pēdīgo informāciju par sanāksmi."
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Informācijas par sanāksmi atjaunināšanas pieprasīšana"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ir atbildējis uz sanāksmes pieprasījumu."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Atbilde par sanāksmi"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> ir atsaucis sanāksmi."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Sanāksmes atcelšana"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> ir nosūtijis nesaprotamu vēstuli."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Nepareiza vēstule par sanāksmi"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Uzdevuma informācija"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> pieprasa %s izpildīt uzdevumu."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, 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:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Uzdevuma priekšlikums"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, 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:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Uzdevuma atjaunināšana"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, 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:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Uzdevuma atjaunināšanas pieprasījums"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, 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:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Uzdevuma atbilde"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> ir atcēlis uzdevumu."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Uzdevuma atsaukums"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Slikts uzdevuma ziņojums"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, 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:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Brīvs/aizņemts informācija"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, 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:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Brīvs/aizņemts pieprasījums"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, 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:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Brīvs/aizņemts atbilde"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Slikta Brīvs/aizņemts ziņa"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr "Ziņa, izskatās, ir nepareizi noformēta"
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "Ziņa satur tikai neatbalstītus pieprasījumus."
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Piesaistne nesatur atļautu kalendāra ziņu"
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr "Piesaistnei nav skatāmu kalendāra priekšmetu"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalendāra fails nevarēja tikt atjaunināts!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Atjaunināšana izpildīta\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Apmeklētāja statuss nevar tikt atjaunināts, tāpēc ka priekšmets vairāk "
 "neeksistē"
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekts ir nepareizs un nevar tikt atjaunināts\n"
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Šī atbilde nav no pašreizējā apmeklētāja. Pievienot kā apmeklētāju?"
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 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:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr "Ir kļūda CORBA sistēmā\n"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr "Objektu nevarēja atrast\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Jums nav pareizo atļauju, lai atjauninātu kalendāru\n"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Apmeklētāja status atjaunināts\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "Apmeklētāja status nevar tikt atjaunināts!\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Izņemšana pabeigta"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Priekšmets nosūtīts!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Priekšmets nevar tikt nosūtīts!\n"
 
@@ -5744,7 +6095,7 @@ msgstr "%a %m/%d/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
@@ -5808,49 +6159,44 @@ msgstr "Sanāksmes _sākuma laiks:"
 msgid "Meeting _end time:"
 msgstr "Sanāksmes _beigu laiks:"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "Sākum_a datums:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "_Datuma laikā:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "_Prioritāte:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Lapa"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Atvērt uzdevumus uz %s"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nevar ielādēt uzdevumus uz `%s'"
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metode lai ielādētu `%s' nav atbalstīta"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Jums nav atļaujas, lai atvērtu mapi iekš '%s'"
 
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5859,48 +6205,39 @@ msgstr ""
 "Kļūda %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "Izpildam uzdevumus..."
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "Dzēšam izvēlētos objektus..."
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "Iztīru"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Uzdevumi"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Kalendārs"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nevar atvērt mapi uz `%s'"
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Pieprasītā metode, lai atvērtu `%s' nav atbalstīta"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Pievienoju trauksmes priekš %s"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5912,7 +6249,7 @@ msgstr ""
 " ir avarējusi. Jums būs jāparstartē Evolution, ja jūs vēlaties to atkal "
 "izmantot"
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5924,64 +6261,11 @@ msgstr ""
 " ir avarējusi. Jums būs jāparstartē Evolution, ja jūs vēlaties to atkal "
 "izmantot"
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Turīna"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalendārs un uzdevumi"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Kalendārs"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Šeit konfigurējiet jūsu laika zonu, kalendāru un uzdevumu sarakstu"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Kalendārs un uzdevumi"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution kalendāra iTip/iMip skatītājs"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Evolution kalendāra iTip/iMip skatītājs"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution ziņu redaktors"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Evolution ziņu redaktors"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolution kalendāra kopsavilkuma komponente."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolution Kopsavilkuma komponente."
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aprīlis"
@@ -6038,296 +6322,332 @@ msgstr "Oktobris"
 msgid "September"
 msgstr "Septembris"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Jābūt norādītam organizētājam."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Vismaz viens apmeklētajs ir vajadzīgs"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Notikuma informācija"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Uzdevuma Informācija"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Žurnāla informācija"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Brīvs/Aizņemts informācija"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Kalendāra informācija"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Atjaunināt"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Atsvaidzināt"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "Pretpiedāvājums"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Brīvs/Aizņemts informācija (%s uz %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "iKalendāra informācija"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Jums jābūt notikuma apmeklētājam."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Sv"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Pr"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Ot"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Tr"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Ct"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Pk"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Sd"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Izvēlēta diena (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Izvēlētā nedēļa (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Izvēlētais mēnesis (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Izvēlētais gads (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Uzdevums"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritāte: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procenti Izpidildīti: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorijas: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Kontakti:"
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Drukāšanas Pirmsapskats"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Drukāt Priekšmetu"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Drukāšanas Uzstādijumi"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Pārdēvēt šo saīsinājumu"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Uzdevumu saraksts"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Jauns uzdevums"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Uzdevums"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Ievietot jaunu uzdevumu"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "Parādāmās uzdevumu mapes URI"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6339,11 +6659,11 @@ msgstr ""
 "\n"
 "Tiešām izdzēst šos uzdevumus?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Neprasiet man vēlreiz."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "Drukāt uzdevumus"
 
@@ -6375,15 +6695,15 @@ msgstr "Kalendāra ziņojums"
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "Atgādinājums!!"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "Kalendāra notikumi"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6391,7 +6711,7 @@ msgstr ""
 "Evolution ir atradis Gnome Kalendāra failus.\n"
 "Vai jūs vēlaties, lai tie tiktu importēti Evolution?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Gnome kalendārs"
 
@@ -7924,28 +8244,28 @@ msgstr "Klusais/Wallis"
 msgid "Pacific/Yap"
 msgstr "Klusais/Yap"
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "Šis šifrs neatbalsta parakstīšanu"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "Šis šifrs neatbalsta pārbaudīšanu"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Šis šifrs neatbalsta kodēšanu"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Šis šifrs neatbalsta dekodēšanu"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 #, fuzzy
 msgid "You may not import keys with this cipher"
 msgstr "Šis šifrs neatbalsta dekodēšanu"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 #, fuzzy
 msgid "You may not export keys with this cipher"
 msgstr "Šis šifrs neatbalsta dekodēšanu"
@@ -7998,86 +8318,86 @@ msgstr "Sagatavojam mapi '%s' nesaistei"
 msgid "You must be working online to complete this operation"
 msgstr "Jums ir jāstrādā tiešsaistē lai izpildītu šo operāciju"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Neizdevās izveidot kanālu %s: %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Neizdevās izveidot bērna procesu '%s': %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Nevarēju nolasīt sviecienu no %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Sinhronizējam mapes"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Kļūda parsējot filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Kļūda palaižot filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Nespēju atvērt spoles mapi"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Nespēj procesēt spoles mapi"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Dabūjam vēstuli %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Nevar atvērt vēstuli"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Problēma ar vēstuli %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "SInhronizējam mapi"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Dabūjam vēstuli %d no %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Kļūda pie vēstules %d no %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Neizdevās saņemt vēstuli"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr "Nepareizi argumenti uz (system-flag)"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr "Nepareizi argrumenti uz (user-flag)"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Kļūda sāknējot filtra meklēšanu: %s: %s"
@@ -8109,35 +8429,35 @@ msgstr "(match-all) pieprasa vienu būla rezultātu"
 msgid "Performing query on unknown header: %s"
 msgstr "Izpildu pieprasījumu uz nezināmas galvenes: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Neatbalstīta operācija: pievienot vēstuli: priekš %s"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Neatbalstīta operācija: meklēšana pēc izteiksmes: priekš %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Neatbalstīta operācija: meklēšana pēc uids: priekš %s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Pārvietojam vēstules"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr "Kopēju vēstules"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Saņemu %d vēstuli(es)"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8148,15 +8468,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr "Neizdevās noparsēt gpg userid padomu."
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr "Neizdevās noparsēt gpg paroļfrāzes pieprasījumu."
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8165,30 +8485,30 @@ msgstr ""
 "Jums nepieciešama atslēgfrāze, lai atslēgtu atslēgu\n"
 "lietotājam: \"%s\""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Atsaukts."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Neizdevās atslēgt slepeno atslēgu: dotas 3 sliktas paroļfrāzes"
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Negaidīta atbilde no GnuPG: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr "Nav piegādāti dati"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Neizdevās kodēt: Nav norādīti atļauti adresāti."
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8199,50 +8519,63 @@ msgstr ""
 "\n"
 "%.*s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Neizdevās GPG %s vēstuli: %s\n"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Nevarēju ierakstīt datus: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Neizdevās palaist gpg: %s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr "Neizdevās palaist gpg."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "Šī ir digitāli parakstītā vēstules daļa"
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr ""
+"Nevaru pārbaudīt vēstules parakstu: nevarēju izveidot pagaidu failu: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Nevaru pārbaudīt vēstules parakstu: nevarēju izveidot pagaidu failu: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nevarēju ierakstīt datus: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Šī ir digitāli parakstītā vēstules daļa"
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Indeksa ķermenis satur"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Nespēju saņemt vēstuli no redaktora"
@@ -8342,15 +8675,15 @@ msgstr "Kļūda rakstot pasta pagaidu failu: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Kļūda kopējot pasta pagaidu failu: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Neizdevās atkodēt MIME daļu: protokola kļūda"
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "Neizdevās atkodēt MIME daļu: nepareiza struktūra"
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "parsēšanas kļūda"
 
@@ -8663,12 +8996,12 @@ msgstr "Virtuālās mapes epasta piegādātājs"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Pasta lasīšanai kā citas mapju kopas pieprasījumu"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Nav pieejams piegādātajs protokolam '%s'"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8677,71 +9010,82 @@ msgstr ""
 "Nevarēja izveidot direktoriju %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Lūdzu ievadiet jūsu %s paroles frāzi %s"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Nedefinēts"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Rediģēt parakstu"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Rediģēt parakstu"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Ķēdē pašparakstīts sertifikāts"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "Neuzticams sertifikāts"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Saglabāt parakstu"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Parsēšanas kļūda"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Serveris: %s, Tips: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Nevaru dabūt mapi: Nepareiza operācija šajā glabātuvē"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nevaru izveidot mapi: Nepareiza operācija šajā glabātuvē"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Atkritummape"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "Jūnijs"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "Neizdodas dabūt izsniedzēja sertifikātu"
@@ -8948,7 +9292,7 @@ msgid ""
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Nevarēja noparsēt URL `%s'"
@@ -8967,22 +9311,22 @@ msgstr "Nav tādas vēstules %s iekš %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Nevar kopēt vai pārvietot vēstules virtuālajā mapē"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nevar izdzēst mapi: %s: Nepareiza operācija"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nevar izdzēst mapi: %s: Nav tādas mapes"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nevar pārsaukt mapi: %s: Nepareiza operācija"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nevar pārsaukt mapi: %s: Nav tādas mapes"
@@ -9062,7 +9406,7 @@ msgstr "Nespēju saņemt vēstuli: %s"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9076,7 +9420,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Nav tādas vēstules"
@@ -9114,54 +9458,71 @@ msgid "Failed to cache %s: %s"
 msgstr "Neizdevās keišot %s: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Savienojamies ar serveri..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Nespēju savienoties ar LDAP serveri"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr ""
+"\n"
+"Komentāri: "
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Pārbaudam jauno pastu"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 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:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Mapes"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Parādīt tikai parakstītās mapes"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "Pārrakstīt servera piedāvātos mapju nosaukumlaukumus"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Vārdalauks"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Attiecināt filtrus uz jaunām vēstulēm INBOX šajā serverī"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Automātiski parbaudīt jauno pastu"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Lai lasītu un glabātu pastu uz IMAP serveriem."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Parole"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Šī opcija savienos ar IMAP serveri lietojot parasta teksta paroli."
@@ -9412,7 +9773,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Nevarēju pārsaukt mapi %s par %s: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nevarēju pārsaukt '%s': %s"
@@ -9527,29 +9888,29 @@ msgstr "Meklēju jaunās vēstules"
 msgid "Storing folder"
 msgstr "Glabāju mapi"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Nevaru izveidot mapes slēgu uz %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Nevaru atvērt pastkasti: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "Pasta pievienošana atsaukta"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nevar pievienot vēstuli mbox failam: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9558,11 +9919,11 @@ msgstr ""
 "Nevar dabūt vēstuli: %s no mapes %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Šī mape izskatās, ka ir neatgriezeniski sabojāta."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Vēstules konstrukcija neveiksmīga: Sabojāta pastkaste?"
 
@@ -9630,12 +9991,17 @@ msgstr "Nevar izveidot direktoriju %s: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "Nevaru dabūt mapi: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "Kartes ID jau eksistē"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Nevarēju pārsaukt mapi %s par %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Norādītais mapes nosaukums nav pareizs: %s"
@@ -9679,7 +10045,7 @@ msgstr "Nevarēju aizvērt avota mapi %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Nevarēju aizvērt pagaidu mapi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nevarēju pārsaukt mapi: %s"
@@ -9960,7 +10326,7 @@ msgstr "Dzēst pēc %s dienas(ām)"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -10049,7 +10415,7 @@ msgid "No such folder `%s'."
 msgstr "Nav tādas mapes `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10101,7 +10467,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Pasta nosūtīšana ar sendmail programmu"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10270,7 +10636,7 @@ msgstr "SMTP pasta nosūtīšana caur  %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Nevar nosūtīt adresi: sūtītāja adrese nav pareiza."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Sūtam vēstuli"
 
@@ -10391,7 +10757,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "piesaistne"
 
@@ -10436,14 +10802,14 @@ msgstr "MIME tips:"
 msgid "Suggest automatic display of attachment"
 msgstr "Ieteikt automātisku piesaistnes attēlošanu"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Jums vajag konfigurēt identitāti,\n"
 "pirms jūs varēsiet sacerēt vēstuli."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Uz adrešu grāmatu"
 
@@ -10454,45 +10820,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Atbildēt Kam:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "No:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Subjekts:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Kam:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Ievadiet vēstules adresātus"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Ievadiet adreses kuras saņems vēstules kopiju"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10503,14 +10869,19 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Publicēts uz:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr "Publicējuma mērķis"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Piesaistīt failu vēstulei"
+
 #: composer/e-msg-composer-select-file.c:119
 #, fuzzy
 msgid "Attach file(s)"
@@ -10547,21 +10918,21 @@ msgstr "Fails eksistē, pārrakstīt?"
 msgid "Error saving file: %s"
 msgstr "Kļūda saglabājot failu: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Kļūda ielādējot failu: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Kļūda atverot failu: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Nespēju saņemt vēstuli no redaktora"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10570,7 +10941,7 @@ msgstr ""
 "Nevar meklēt failā: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10579,7 +10950,7 @@ msgstr ""
 "Nevar samazināt failu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10588,7 +10959,7 @@ msgstr ""
 "Nevar meklēt failā: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10597,7 +10968,7 @@ msgstr ""
 "Kļūda automātiski glabājot vēstuli: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10605,7 +10976,7 @@ msgstr ""
 "Ximian Evolution ir atradis nesaglabātus failus no iepriekšējās sesijas.\n"
 "Vai jūs gribētu tos atjaunot?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10616,28 +10987,28 @@ msgstr ""
 "\n"
 "Vai jūs vēlaties saglabāt izmaiņas?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Brīdinājums: Mainīta vēstule"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Atvērt failu"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "Paraksts:"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "Autoģenerēts"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Uzrakstīt vēstuli"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10645,7 +11016,7 @@ msgstr ""
 "Nevarēju izveidot sacerētāja logu:\n"
 "Neizdevās aktivizēt adrešu izvēlētāja kontroli."
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10657,7 +11028,7 @@ msgstr ""
 "Lūdzu pārliecinieties, ka jums ir uzstādītas gtkhtml\n"
 "un libgtkhtml pareizās versijas.\n"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10665,7 +11036,7 @@ msgstr ""
 "Nevarēju izveidot sacerētāja logu:\n"
 "Nespēju aktivizēt HTML redaktora komponenti."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10673,11 +11044,13 @@ msgstr ""
 "<b>(Sacerētājs satur neteksta vēstules ķermeni, kas nevar tikt rediģēts.)<b>"
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Evolution programkopa"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10926,13 +11299,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11059,7 +11432,7 @@ msgstr "Tad"
 msgid "You must specify a folder."
 msgstr "Jums ir jānorāda mape.\n"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Izvēlēties mapi"
@@ -11073,24 +11446,24 @@ msgstr ""
 "Kļūda neregulārajā izteiksmē '%s':\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Svarīgs"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "Darāmais"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Vēlāk"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Tests"
 
@@ -11190,7 +11563,7 @@ msgstr "atpakaļ"
 msgid "months"
 msgstr "mēneši"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "sekundes"
 
@@ -11287,7 +11660,7 @@ msgstr "Izteiksme"
 msgid "Follow Up"
 msgstr "Sekojums"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "Iezīme"
 
@@ -11357,112 +11730,118 @@ msgid "Source Account"
 msgstr "Avota konts"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Smidzināšana"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Specifiska galvene"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Apturēt procesēšanu"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Subjekts"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "Noņemt statusu"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "satur"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "nesatur"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "nebeidzas ar"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "neeksistē"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "does not return"
 msgstr "neatgriežas"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "neskan kā"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "nesākas ar"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "beidzas ar"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "eksistē"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr "ir karogots"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr "ir pēc"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "is before"
 msgstr "ir pirms"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "ir lielāks par"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "ir mazāks par"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr "nav karogots"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "nav"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "ir"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr "atgriež lielāku kā"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr "atgriež mazāk kā"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr "atgriež"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "skan kā"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "sākas ar"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, fuzzy, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Noteikuma nosaukums '%s' nav unikāls, izvēlieties citu"
@@ -11488,20 +11867,88 @@ msgstr "Noteikuma nosaukums:"
 msgid "Score Rules"
 msgstr "Rezultāta noteikumi"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Jums jānosauc šī vmape."
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 #, fuzzy
 msgid "You need to to specify at least one folder as a source."
 msgstr "Jums jānorāda vismaz viena mape kā avots."
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 #, fuzzy
 msgid "VFolder source"
 msgstr "vMapes avoti"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Sacerētāja preferences"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Šeit konfigurējiet pasta preferences, ieskaitot drošību un vēstuļu attēlošanu"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Šeit konfigurējiet pareizrakstības pārbaudi, parakstus un vēstuļu sacerētājam"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Šeit konfigurējiet jūsu epasta kontus"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Evolution pasta sacerētājs."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Evolution pasta sacerētājs."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution pasta mapes attēlošanas komponents."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolution pasta izpildkopsavilkuma komponente."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Pasts"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Pasta konti"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "Pasta Preferences"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Vai jūs esat pārliecināts, ka vēlaties izdzēst šo kontu?"
@@ -11543,7 +11990,7 @@ msgid "Protocol"
 msgstr "Protokols"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr "Bezvārda"
 
@@ -11571,20 +12018,17 @@ msgstr "Pievienot skripta parakstu"
 msgid "Signature(s)"
 msgstr "_Paraksti"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "Jūs sūtat HTML formatētu vēstuli. Lūdzu pārliecinieties, vai\n"
 "sekojoši adresāti vēlas un spēj saņemt HTML pastu:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Sūtīt jebkurā gadījumā?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11592,7 +12036,7 @@ msgstr ""
 "Šai vēstulei nav virsraksta.\n"
 "Patiešām nosūtīt?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11600,11 +12044,11 @@ msgstr ""
 "Tā kā kontaktu saraksts, uz kuru jūs sūtiet, ir konfigurēts slēpt saraksta "
 "adreses, šī vēstule saturēs tikai bcc adresātus."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Šī vēstule satur tikai Bcc adresātus."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11614,11 +12058,11 @@ msgstr ""
 "Apparently-To (Acīmredzot uz) galveni.\n"
 "Sūtīt jebkurā gadījumā?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Jums jānorāda adresāti, lai nosūtītu šo vēstuli."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11630,189 +12074,403 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Izveidot _virtuālo mapi no meklējuma..."
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "Pasts"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<klikšķiniet šeit, lai izvēlētos mapi>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" iekš \"%s\""
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Izveidot jaunu mapi"
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Norādīt, kur lai izveidotu mapi:"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
-msgid "Folder _name"
+msgid "Folder _name:"
 msgstr "Mapes nosaukums:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Nevar izveidot pagaidu direktoriju: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Nevar izveidot pagaidu direktoriju: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Nevarēju izveidot pagaidu failu '%s': %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Nevarēju aizvērt pagaidu mapi: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Ielādēju..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Izvēlieties mapi"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Izveidot jaunu mapi"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Nevarēju izdzēst mapi `%s': %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Patiešām izdzēst mapi \"%s\"?"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Dzēst \"%s\""
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Pārdēvēt \"%s\" mapi par:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+#, fuzzy
+msgid "Rename Folder"
+msgstr "Pārdēvēt mapi"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Fontu rekvizīti"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Rekvizīti"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "_Mapes nosaukums:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Skatīt"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Atvērt jaunā logā"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Pārvietot"
+
+#: mail/em-folder-tree.c:1500
+#, fuzzy
+msgid "_New Folder..."
+msgstr "_Jauna mape"
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "_Pārsaukt"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "_Rekvizīti..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "R_ediģēt kā jaunu ziņojumu..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "_Drukāt"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Atbildēt sūtītājam"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Atbildēt uz _sarakstu"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Atbildēt _visiem"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "_Pārsūtīt"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr "S_ekojums..."
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr "Ka_rodziņš pabeigts"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "Notīrī_t karodziņu"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "A_tzīmēt kā lasītu"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "Atzīmēt kā _nelasītu"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Atzīmēt kā _svarīgu"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "Atzīmēt kā ne_svarīgu"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Atzīmēt kā _nelasītu"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Atzīmēt kā _svarīgu"
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "_Atdzēst"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "Pār_vietot uz mapi..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kopēt uz mapi..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "Pievienot sūtītāju adrešu _grāmatai"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "A_ttiecināt filtrus"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "_Izveidot noteikumu no vēstules"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "VMape ar subjektu"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "VMape ar sūtītāju"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "Vmape a_r adresātiem"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "VMape ar adresātu sarakstu"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "VMape ar sūtītāju"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Filtrs uz subjektu"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Filtrs uz sūtītāju"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Filtrs uz saņēmējiem"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Filtrs uz adresātu sarakstu"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filtrs uz sūtītāju"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Noklusētais"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Drukāt vēstuli"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopēt saites lokāciju"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Atbilstumi:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Asignēts"
+
+#: mail/em-format-html-display.c:597
+#, fuzzy
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr ""
+"Šī vēstule ir digitāli parakstīta, bet nevar tikt pārbaudīta, vai ir "
+"autnetiska."
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Rediģēt parakstu"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Rediģēt parakstu"
+
+#: mail/em-format-html-display.c:599
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr ""
-"Šī vēstule ir digitāli parakstīta. Klikšķiniet uz slēdzenes ikonu, lai "
-"uzzinātu vairāk."
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Pārtraukts"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "PGP kodējums"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Nevarēju noparsēt MIME vēstuli. Attēloju kā avotu."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Neatbalstīta shēma"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Neizdodas pārbaudīt lapas parakstu"
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Skatīt iekļauti"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Slēpt"
@@ -11822,186 +12480,208 @@ msgstr "Slēpt"
 msgid "Page %d of %d"
 msgstr "%d. lapa no %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Saņemu vēstuli %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Sliktformēta ārējā ķermeņa daļa."
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Norāde uz FTP saiti (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Norāde uz lokālu failu (%s) atļautu saitē \"%s\""
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Norāde uz lokālu failu (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Norāde uz attālinātiem datiem (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Norāde uz nezināmiem ārējiem datiem (\"%s\" tips)"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-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/em-format-html.c:906 mail/em-format.c:1217
-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/em-format-html.c:930 mail/em-format.c:1190
-#, fuzzy
-msgid "No signature present"
-msgstr "Slēpt paraksta padomu"
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Nevarēju inicializēt GNOME"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Neatbalstīta shēma"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nevarēju noparsēt MIME vēstuli. Attēloju kā avotu."
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Pārvietojam vēstules"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "No"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Atbildēt-Uz"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Kam"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "Pastnieks"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datums"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "%s piesaistne"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Nevarēju noparsēt MIME vēstuli. Attēloju kā avotu."
+msgid "Session not initialised"
+msgstr "Nevarēju inicializēt GNOME"
+
+#: mail/em-format.c:1210
+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/em-format.c:1212
+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/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Gaidu..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Ehotestējam %s"
 
-#: mail/em-popup.c:593
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Neizdevās keišot %s: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Neizdevās izveidot kanālu %s: %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Neizdevās izveidot kanālu %s: %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Saglabāt kā..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Atbildēt sūtītājam"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Kopēt saiti pārlūkprogrammā"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Sūtīt _vēstuli uz saraksti..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Pievienot adrešu grāmatu"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Atvērt ar %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "Šis serveris neatbalsta LDAPv3 shēmas informāciju"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Pierakstīties"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Mape"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Lūdzu izvēlieties serveri."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Nav izvēlēts serveris"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Nerādīt šo ziņu vēlreiz."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12010,27 +12690,27 @@ msgstr ""
 "Kļūda ielādējot filtra informāciju:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Pārsūtīta vēstule"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "nezināms nosūtītājs"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%Y-%m-%d at %H:%M, %%s rakstīja:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12039,7 +12719,7 @@ msgstr ""
 "Nevar dabūt vēstuli: %s\n"
 "  %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12048,26 +12728,39 @@ msgstr ""
 "Fails '%s' jau eksistē.\n"
 "Pārrakstīt to?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Vēstule"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Saglabāt vēstuli kā..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Nevar izveidot pagaidu direktoriju: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "_Adrese:"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
+msgid ""
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Šī operācija izdzēsīs visas vēstules, kas atzīmētas kā dzēstas. Ja jūs "
+"turpināsiet, jūs nevarēsiet atjaunot šīs vēstules.\n"
+"\n"
+"Patiešām izdzēst šīs vēstules?"
+
+#: mail/em-utils.c:2288
 #, fuzzy
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12076,105 +12769,390 @@ msgstr ""
 "\n"
 "Patiešām izdzēst šīs vēstules?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Sacerētāja preferences"
+#: mail/evolution-mail.schemas.in.in.h:1
+#, fuzzy
+msgid "Automatic link recognition"
+msgstr "Automātiski _noteikt saites"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "Automātiski _noteikt saites"
+
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
 msgstr ""
-"Šeit konfigurējiet pasta preferences, ieskaitot drošību un vēstuļu attēlošanu"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
 msgstr ""
-"Šeit konfigurējiet pareizrakstības pārbaudi, parakstus un vēstuļu sacerētājam"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Šeit konfigurējiet jūsu epasta kontus"
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/evolution-mail.schemas.in.in.h:6
 #, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
+msgid "Default charset in which to compose messages"
+msgstr "Vēstules noklusētais subjekts."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:7
 #, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
+msgid "Default charset in which to compose messages."
+msgstr "Vēstules noklusētais subjekts."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
-msgid "Evolution Mail component"
-msgstr "Evolution pasta sacerētājs."
+msgid "Default charset in which to display messages"
+msgstr "Meklēt tekstu attēlotajā vēstules ķermenī"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Evolution pasta sacerētājs."
+msgid "Default charset in which to display messages."
+msgstr "Meklēt tekstu attēlotajā vēstules ķermenī"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
+msgid "Default forward style"
+msgstr "Noklusētais pārsūtīšanas stils ir:"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution pasta mapes attēlošanas komponents."
+msgid "Default reply style"
+msgstr "Noklusētais pārsūtīšanas stils ir:"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Evolution pasta izpildkopsavilkuma komponente."
+msgid "Empty Trash folders on exit"
+msgstr "Iztukšot _atkritumu mapes pie iziešanas"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Iztukšot _atkritumu mapes pie iziešanas"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+#, fuzzy
+msgid "Height of the message-list pane"
+msgstr "Sūtīt šo vēstuli vēlāk"
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "Pasta konti"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "Pasta Preferences"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
 
-#: mail/importers/elm-importer.c:105
-msgid "Evolution is importing your old Elm mail"
-msgstr "Evolution importē jūsu veco Eim pastu"
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
-msgid "Importing..."
-msgstr "Importēju..."
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
-msgid "Please wait"
-msgstr "Lūdzu uzgaidiet"
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Importējam %s kā %s"
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
 
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Skanējam %s"
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "_Reģistrēt filtra darbības:"
 
-#: mail/importers/elm-importer.c:547
+#: mail/evolution-mail.schemas.in.in.h:28
+#, fuzzy
+msgid "Log filter actions to the specified log file."
+msgstr "_Reģistrēt filtra darbības:"
+
+#: mail/evolution-mail.schemas.in.in.h:29
+#, fuzzy
+msgid "Logfile to log filter actions"
+msgstr "_Reģistrēt filtra darbības:"
+
+#: mail/evolution-mail.schemas.in.in.h:30
+#, fuzzy
+msgid "Logfile to log filter actions."
+msgstr "_Reģistrēt filtra darbības:"
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Ziņošana par jaunu pastu"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Ziņošana par jaunu pastu"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
-"Evolution ir atradis Elm pasta failus\n"
-"Vai jūs vēlaties, lai tie tiktu importēti Evolution?"
 
-#: mail/importers/elm-importer.c:568
-msgid "Elm"
-msgstr "Eim"
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr "_Norādīt, kad sūta HTML vēstules kontaktiem, kuri to nevēlas"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "Norādīt, kad sūta vēstules tikai ar norādītiem _bcc adresātiem"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "_Sūtīt pastu HTML formātā pēc noklusējuma."
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "_Sūtīt pastu HTML formātā pēc noklusējuma."
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "_Rādīt kustīgos attēlus"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "_Rādīt kustīgos attēlus"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Parādīt vēstuli normālā stilā"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "_Apskata lauks"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "_Spēlēt skaņas failu, kad tiek saņemts jauns pasts"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "_Pareizrakstības pārbaude"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "Oriģinālais kontakts:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "Izvēlieties HTML mainīga platuma fontu drukāšanai"
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Sasaistīts vēstuļu saraksts"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Sasaistīts vēstuļu saraksts"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "_Padarīt šo par manu noklusēto kontu"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "_Mainīgs platums:"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 #, fuzzy
@@ -12208,6 +13186,44 @@ msgstr ""
 msgid "Evolution Pine importer"
 msgstr "Evolution pasta sacerētājs."
 
+#: mail/importers/elm-importer.c:105
+msgid "Evolution is importing your old Elm mail"
+msgstr "Evolution importē jūsu veco Eim pastu"
+
+#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
+#: mail/importers/pine-importer.c:115
+msgid "Importing..."
+msgstr "Importēju..."
+
+#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
+#: mail/importers/pine-importer.c:117
+msgid "Please wait"
+msgstr "Lūdzu uzgaidiet"
+
+#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
+#: mail/importers/pine-importer.c:288
+#, c-format
+msgid "Importing %s as %s"
+msgstr "Importējam %s kā %s"
+
+#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
+#: mail/importers/pine-importer.c:425
+#, c-format
+msgid "Scanning %s"
+msgstr "Skanējam %s"
+
+#: mail/importers/elm-importer.c:547
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution ir atradis Elm pasta failus\n"
+"Vai jūs vēlaties, lai tie tiktu importēti Evolution?"
+
+#: mail/importers/elm-importer.c:568
+msgid "Elm"
+msgstr "Eim"
+
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -12269,12 +13285,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importē jūsu vecos Netscape datus"
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Atkritummape"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Skanēju pasta filtrus"
@@ -12283,7 +13293,7 @@ msgstr "Skanēju pasta filtrus"
 msgid "Scanning directory"
 msgstr "Skanējam direktoriju"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Sākam importu"
 
@@ -12358,23 +13368,23 @@ msgid "You have not filled in all of the required information."
 msgstr "Jūs neesat aizpildijis visu pieprasīto informāciju."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution kontu redaktors"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Hosts:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "_Lietotājvārds:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Ceļš:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Jūs nevarat izveidot divus kontus ar vienādiem nosaukumiem."
 
@@ -12383,35 +13393,35 @@ msgstr "Jūs nevarat izveidot divus kontus ar vienādiem nosaukumiem."
 msgid "Mail to %s"
 msgstr "Pasts uz %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Subjekts ir %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Pasts no %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s pasta sarakste"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Atbildēts uz"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Pievienot filtra noteikumus"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "Sekojoši filtru noteikumi:\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12422,145 +13432,30 @@ msgstr ""
 "    '%s'\n"
 "Un tiek atjaunota."
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "Savienojos..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Šī mape nevar saturēt ziņojumus."
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Jauna pasta vēstule"
 
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Nevar atvērt koplietošanas mapi: `%s'."
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "_Pasta vēstule"
 
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Nevar izveidot pagaidu direktoriju: %s"
-
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Nevarēju izveidot pagaidu failu '%s': %s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "Sacerēt jaunu pasta vēstuli"
 
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Nevarēju aizvērt pagaidu mapi: %s"
-
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Izvēlieties gala mērķa direktoriju, lai importētu šos datus"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Izvēlieties gala mērķa direktoriju, lai importētu šos datus"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Izveidot jaunu mapi"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Norādīt, kur lai izveidotu mapi:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Nevarēju izdzēst mapi `%s': %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Patiešām izdzēst mapi \"%s\"?"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Dzēst \"%s\""
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Pārdēvēt \"%s\" mapi par:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-#, fuzzy
-msgid "Rename Folder"
-msgstr "Pārdēvēt mapi"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Norādītais mapes nosaukums nav pareizs: %s"
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Fontu rekvizīti"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Rekvizīti"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "_Mapes nosaukums:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Skatīt"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Atvērt jaunā logā"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Pārvietot"
-
-#: mail/mail-component.c:2087
-#, fuzzy
-msgid "_New Folder..."
-msgstr "_Jauna mape"
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "_Pārsaukt"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Rekvizīti..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Identitāte"
 
@@ -12624,11 +13519,11 @@ msgstr ""
 "kontu. Lūdzu ievadiet konta nosaukumu laukumā zemāk. Šis nosaukums tiks "
 "izmantots tikai attēlošanas nolūkos."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Pārbaudam servisu"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Savienojamies ar serveri..."
 
@@ -12710,26 +13605,35 @@ msgid "C_olors"
 msgstr "_Krāsas"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Pārbaudīt jauno pastu"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "Pārbaudīt pareizrakstību kāmēr es _rakstu"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Pārbaudīt jauno pastu"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "Krāsa _kļūdainajiem vārdiem:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Sacerēt vēstules"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Konfigurācija"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -12746,274 +13650,279 @@ msgstr ""
 "\n"
 "Klikšķināt \"Beigt\" lai saglabātu jūsu uzstādījumus."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "Nokl_usētais"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Noklusētā uzvedība"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "Noklusētais rakstzīmju ko_dējums:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Pasta dzēšana"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Vienmēr parakstīt izejošās vēstules, kad izmanto šo kontu"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "Necitēt oriģinālo vēstuli"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Neparakstīt _sanāksmju pieprasījumus (savietojamībai ar Outlook)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Izdarīts"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "_Melnrakstu mape:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "A_ktivizēt"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "Epasta konti"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "Epasta _adrese:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "Iztukšot _atkritumu mapes pie iziešanas"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Sertifikāta ID:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontu asistents"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Izpildīt komandu..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "Fiksē_ts -platums:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "<< Mazāk opcijas"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "Fontu rekvizīti"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "Formatēt vēstules _HTML"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "Izcelt _citātus ar"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Iekļaut"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Iezīmes un krāsas"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Ielādēju attēlus"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Pasta konfigurācija"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Pasta kastes atrašanās vieta"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Vēstuļu sacerētājs"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Vēstules attēlošana"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Fonts"
 msgstr "Vēstule satur"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Ziņošana par jaunu pastu"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Piezīme: jums nepieprasīs ievadīt paroli līdz jūs savienosieties pirmo reizi"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Optionāla informācija"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "Or_ganizācija:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Atslēgas ID:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Izvēlies krāsu"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Norādīt, kad sūta vēstules tikai ar norādītiem _bcc adresātiem"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Drukātie fonti"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "Citēt oriģinālo vēstuli"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Citēts"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "Atc_erēties šo paroli"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "At_bildēt-Uz:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Saņemu epastu"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "Saņemšanas _opcijas"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "Atcerēties šo _paroli"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Pieprasītā informācija"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "Atjaunot noklusējumus"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "_Drošība"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "Drošais MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr "Izvēlieties HTML fiksēta platuma fontu"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr "Izvēlieties HTML fiksēta platuma fontu drukāšanai"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr "Izvēlieties HTML mainīga platuma fontu"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr "Izvēlieties HTML mainīga platuma fontu drukāšanai"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Sūtu epastu"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Nosūtīto _ziņu mape:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Nosūtītās un melnraksta vēstules"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Ser_veris pieprasa autentikāciju"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Servera konfigurācija"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Servera _tips: "
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Ķēdē pašparakstīts sertifikāts"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "Norādiet _faila nosaukumu:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "_Pareizrakstības pārbaude"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Standarta Unix mbox"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13023,7 +13932,7 @@ msgstr ""
 "paraksts. Nosaukums, kuru norādīsiet, tiks\n"
 "izmantots tikai attēlošanas nolūkos."
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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 "
@@ -13033,7 +13942,7 @@ msgstr ""
 "Valodu saraksts šeit parāda tikai tās valodas, kurām jums ir uzstādīta "
 "vārdnīca."
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13041,11 +13950,15 @@ msgstr ""
 "Ievadiet nosaukumu, kādu jūs gribētu piešķirt šim kontam.\n"
 "Piemēram: \"Darbs\" vai \"Personīgi\""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "_Mainīgs platums:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -13056,172 +13969,181 @@ msgstr ""
 "\n"
 "Klikšķiniet \"Nākošais\" lai sāktu."
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "_Pievienot parakstu"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "_Vienmēr ielādēt attēlus no tīkla"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Vienmēr parakstīt izejošās vēstules, kad izmanto šo kontu"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "_Autentifikācijas tips:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "_Autentifikācijas tips:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "_Automātiski parbaudīt jauno pastu"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "_Automātiski ievietot smaidiņu attēlus"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "_Pīkstēt, kad ir saņemts jauns pasts"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "_Apstiprināt, iztīrot mapi"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "_Noklusētais paraksts:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "_Noklusētie"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "Neziņojiet _man, kad ierodas jauns pasts"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "_Aktivizēt"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "_Pārsūtīšanas stils:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "_Pilns vārds:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "_HTML pasts"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "_Identitāte"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Jūnijs"
+
+#: mail/mail-config.glade.h:156
 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:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "_Padarīt šo par manu noklusēto kontu"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "_Atzīmēt vēstules kā lasītas pēc"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Vārds:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "_Nekad neielādēt attēlus no tīkla"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "_Spēlēt skaņas failu, kad tiek saņemts jauns pasts"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 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:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Norādīt, kad sūta vēstules ar tukšu subjekta rindu"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "_Saņemot pastu"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "_Atbildes stils:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "_Atjaunot noklusējumus"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Skripts:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Dzēst..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "_Sūtot pastu"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "_Rādīt kustīgos attēlus"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Paraksti"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Standard Font:"
 msgstr "Sand Point"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Terminal Font:"
 msgstr "Oriģinālais kontakts:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "_Lietot drošu savienojumu (SSL):"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "apraksts"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr "Ehotestējam %s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13230,7 +14152,7 @@ msgstr ""
 "Kļūda kamēr '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13239,7 +14161,7 @@ msgstr ""
 "Kļūda izpildot operāciju:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Strādāju"
 
@@ -13251,118 +14173,118 @@ msgstr "Filtrējam mapi"
 msgid "Fetching Mail"
 msgstr "Pasta saņemšana"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Neizdevās saglabāt pastu pagaidu failā %s: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Neizdevās saglabāt pastu pagaidu failā %s: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sūtu \"%s\""
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sūtam %d. vēstuli no %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Kļūda pie %d vēstules no %d"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Izpildīts."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Saglabāju vēstuli mapē"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Pārvietoju vēstules uz %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopēju vēstules uz %s"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanēju mapes \"%s\""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Pārsūtītās vēstules"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Atveru mapi %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "Atveru glabātuvi %s"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Izņemu mapi %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Glabāju mapi '%s'"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Atjauninu mapi"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Iztīru mapi"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Importējam %s kā %s"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Lokālās mapes"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Saņemu vēstuli %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Saņemu %d vēstuli(es)"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Saglabāju %d vēstuli(es)"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13371,7 +14293,7 @@ msgstr ""
 "Nevaru izveidot izejas failu: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13380,11 +14302,11 @@ msgstr ""
 "Kļūda glabājot vēstules uz: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Saglabājam piesaistni"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13393,21 +14315,25 @@ msgstr ""
 "Nevaru izveidot izejas failu: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nevarēju ierakstīt datus: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Atvienojos no %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Pārvienojos ar %s"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Reģistrjūtīgs"
@@ -13424,60 +14350,75 @@ msgstr "Meklēt:"
 msgid "Search"
 msgstr "Meklēšana"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Rediģēt parakstu"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Izņēmumi"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Avota informācija"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Atsaucu..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Serveris: %s, Tips: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Ceļš: %s, Tips: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Tips: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Sūtīt un saņemt pastu"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Atcelt Visu"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Atjauninu..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Gaidu..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Lietotājs atsauca operāciju."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Ievadiet %s paroli"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Ievadiet paroli"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "_Atcerēties šo paroli"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Atcerēties šo paroli uz visu atlikušo sesijas laiku"
 
@@ -13516,26 +14457,31 @@ msgstr "Ievadiet nosaukumu šim parakstam."
 msgid "Name:"
 msgstr "Nosaukums:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Pārsūtītā vēstule - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Pārsūtīta vēstule"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Atveru mapi %s"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Uzstādu vmapi: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Atjauninu vmapes priekš uri: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13548,88 +14494,88 @@ msgstr ""
 "    '%s'\n"
 "Un tagad tiek atjauninātas."
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "vMapes"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "vMapes"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Rediģēt vMapi"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Mēģinājums rediģēt vmapi '%s', kur īstenībā neeksistē"
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Jauna vMape"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Neredzēta"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Redzēta"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Atbildēta"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Vairākas neredzētas vēstules"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Vairākas vēstules"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Zemākais"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Zemāk"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Augstāk"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Augstākais"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Šodien %l:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Vakardien %I:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Izveidoju vēstuļu sarakstu"
 
@@ -13685,11 +14631,11 @@ msgstr "Pārsūtīt"
 msgid "No Response Necessary"
 msgstr "Nav nepieciešama atbilde (No Response Necessary)"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Atbildēt"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Atbildēt Visiem"
 
@@ -13744,41 +14690,140 @@ msgstr "_Parakstīties"
 msgid "_Unsubscribe"
 msgstr "_Atrakstīties"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr "Konfigurēt speciālo mapju un nesaistes mapes uzvedību šeit"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Evolution čaula."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Mapes uzstādījumi"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "380"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Pārdēvēt saīsinājumu grupu"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Norādīt, vai tiek rādīta mapes josla"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Paslēpt saīsinājumjoslu"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Noklusētā prioritāte:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Noklusētā prioritāte:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Pasta konfigurēšanas saskarne"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+#, fuzzy
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "Atzīmēt piesaistni, lai tā tiktu rādīta iekļauti pēc noklusējuma."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
 msgstr ""
-"Nevar pārsūtīt mapi:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Pievienot mapi"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Melnraksti"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Iesūtne"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "Atveru noklusēto uzdevumu mapi"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Atveru noklusēto uzdevumu mapi"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Atveru noklusēto uzdevumu mapi"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Izsūtne"
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Nosūtītās"
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Atveru noklusēto uzdevumu mapi"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Norādīt, vai tiek rādīta mapes josla"
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Norādīt, vai tiek rādīta saīsinājumu josla"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "Epasts"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Nevar korekti atjaunināt failus"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13789,7 +14834,7 @@ msgstr ""
 "%s\n"
 "Kļūda: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13798,7 +14843,7 @@ msgstr ""
 "Kļūda kopējot failus uz\n"
 "`%s'."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13809,7 +14854,7 @@ msgstr ""
 "Lūdzu pārvietojiet to, lai atļautu Evolution\n"
 "instalēt lietotāja failus."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13909,10 +14954,11 @@ msgstr ""
 "Nevaru pārsaukt mapi:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+msgid "The specified folder name is not valid: %s"
+msgstr "Norādītais mapes nosaukums nav pareizs: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -13936,19 +14982,15 @@ msgstr ""
 "Nevar izveidot norādīto mapi:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Izveidot jaunu mapi"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Nenosaukts)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Izvēlieties importētāja tipu:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13962,11 +15004,11 @@ msgstr ""
 "Jūs varat izvēlēties \"Automātiski\", ja jūs precīzi nezināt faila tipu. "
 "Evolution mēģinās tad to noteikt jūsu vietā."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Lūdzu izvēlieties informāciju, ko jūs vēlētos importēt:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13974,7 +15016,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13983,21 +15025,21 @@ msgstr ""
 "Improtējam %s\n"
 "Importējām priekšmetu %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "Izvēlēties mapi"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "Fails %s neeksistē"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Evolution kļūda "
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -14006,11 +15048,11 @@ msgstr ""
 "Nav importētāja, kurš spētu tikt galā ar\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Importējam"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -14019,17 +15061,17 @@ msgstr ""
 "Importējam %s.\n"
 "Sākam %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Kļūda sāknējot %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Kļūda ielādējot %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14038,35 +15080,35 @@ msgstr ""
 "Importējam %s\n"
 "Importējam priekšmetu 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Automātisks"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Faila nosaukums:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Izvēlieties failu"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Faila tips:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Importēt datus un uzstādijumus no vecākām programmām"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Importēt vienu failu"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -14074,47 +15116,28 @@ msgstr ""
 "Lūdzu uzgaidiet...\n"
 "Meklējam eksistējošus uzstādijumus"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Startēju inteliģentos importētājus"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "No %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Izvēlieties gala mērķa direktoriju, lai importētu šos datus"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Importēt"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Aizvērt savienojumus..."
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Kļūda sinhronizējot \"%s\":\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "Sinhronizējam mapi"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Sinhronizējam \"%s\" (%d no %d) ..."
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Evolution Uzstādījumi"
@@ -14150,7 +15173,7 @@ msgstr "Nevar atvērt koplietošanas mapi: `%s'."
 msgid "Cannot find the specified shared folder."
 msgstr "Nevar atrast norādīto koplietošanas mapi."
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14159,17 +15182,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Asistents"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Jauna"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Nav norādīts mapes nosaukums."
@@ -14230,64 +15247,51 @@ 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:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "_Strādāt tiešsaistē"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "_Strādāt nesaistē"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Strādāt nesaistē"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Nav atēlota mape)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Nekas)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution pašreiz ir tiešaistē. Klikšķiniet pogu lai strādātu "
 "nesaistē."
 
-#: shell/e-shell-view.c:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution ieiet nesaistes režīmā."
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution pašreiz ir nesaistes režīmā. Klikšķiniet uz šīs pogas, lai "
 "strādātu tiešsaistē."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Nepareizi argrumenti"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Nevar reģistrēties uz OAF"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Konfigurāciju datubāze nav atrasta"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Vispārēja kļūda"
 
@@ -14405,74 +15409,18 @@ msgstr "_Izņemt"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Izņemt šo saīsinājumu no saīsinājumu joslas"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Kļūda glabājot saīsinājumus."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Iesūtne"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Saīsinājumi"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Nav kļūdas"
-
-#: 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:575
-msgid "The specified folder type is not valid"
-msgstr "Norādītais mapes tips nav pareizs"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "I/O kļūda"
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr "Nav pietiekami vietas, lai izveidotu mapi"
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr "Mape nav tukša"
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "Norādītā mape netika atrasta"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "Funkcija nav implementēta šajā glabātuvē"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "Operācija nav atbalstīta"
-
-#: 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: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:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr ""
-
-#: shell/e-storage.c:597
-msgid "Cannot create a folder with that name"
-msgstr "Nevaru izveidot mapi ar šādu nosaukumu"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Šī operācija nevar tikt izpildīta nesaistes režīmā"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Izvēles rūtiņa"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14483,6 +15431,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% izpildīts)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Jauna"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "\"%s\" iekš \"%s\""
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14520,75 +15479,6 @@ msgstr ""
 "Kļūda no aktivizēšanas sistēmas ir:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "COBRA kļūda"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Pārtraukts"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Nepareizs arguments"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Jau ir īpašnieks"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Nav īpašnieka"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Nav atrasts"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Neatbalstīts tips"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Neatbalstīta shēma"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Neatbalstīta operācija"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Iekšēja kļūda"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Izejam"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "Nepareizs URI"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Ir apakšmapes"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Nav brīvas vietas"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "Vecais īpašnieks ir 'miris'"
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Testa tips"
-
-#: shell/evolution-test-component.c:703
-#, fuzzy
-msgid "Evolution Test Component"
-msgstr "Evolution Kopsavilkuma komponente."
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "Active Connections"
@@ -14619,11 +15509,6 @@ msgstr "_Pasts:"
 msgid "_Tasks:"
 msgstr "_Uzdevumi:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-#, fuzzy
-msgid "Folder _name:"
-msgstr "Mapes nosaukums:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 #, fuzzy
 msgid "Folder _type:"
@@ -14689,24 +15574,6 @@ msgstr ""
 "\n"
 "Klikšķināt \"Beigt\" pogu, lai saglabātu uzstādijumus. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "Konfigurēt speciālo mapju un nesaistes mapes uzvedību šeit"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Evolution čaula."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-#, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Mapes uzstādījumi"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Klikšķināt \"Importēt\" lai sāktu faila importēšanu Evolution. "
@@ -14745,7 +15612,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Importeri"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Importēt"
 
@@ -14761,16 +15628,16 @@ msgstr "Neprasiet man vēlreiz"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution var importēt datus no sekojošiem failiem:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Evolution tagad iziet ..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14805,7 +15672,7 @@ msgstr ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -14813,36 +15680,48 @@ msgstr ""
 "Paldies\n"
 "Ximian Evolution Komanda\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr "Nesakiet man vēlreiz"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Nevar atvērt Ximian Evolution čaulu."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nevaru inicializēt Ximian Evolution čaulu: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Startēt nesaistes režīmā"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Startēt tiešsaistes režīmā"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Sūtīt visu atkļudošanas informāciju no visiem komponentiem uz failu."
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14851,31 +15730,60 @@ msgstr ""
 "%s: --online un --offline nevar tikt lietoti kopā.\n"
 "  Izmantojiet %s --help, lai iegūtu vairāk informācijas.\n"
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Izvēlēties mapi"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Sertifikāta ID:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "Progress"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Izteiksme"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Epasta adrese:"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"Sertifikāta der. laiks iztecējis: %s\n"
+"Izsniedzējs: %s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14933,91 +15841,379 @@ msgid "Backup All"
 msgstr "Blackpool"
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "_Sertifikāta ID:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Neuzticams sertifikāts"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "_Sertifikāta ID:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Parastais vārds"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "_Sertifikāta ID:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "R_ediģēt"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Neizdevās pārbaudīt sertifikātus."
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Izteiksme"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Organizācija"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Organizācija"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Skatīt"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "_Sertifikāta ID:"
+
+#: smime/gui/smime-ui.glade.h:42
+#, fuzzy
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr "Nepareiza sertifikāta autoritāte (SA)"
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "_Sertifikāta ID:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Importēt"
+msgid "Certificate already exists"
+msgstr "Kartes ID jau eksistē"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%m/%d/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Vermonta"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Vermiliona"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Vermiliona"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Vermiliona"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "Z"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "OK"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "Z"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "_Sertifikāta ID:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "_Sertifikāta ID:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "Neuzticams sertifikāts"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "I"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+#, fuzzy
+msgid "Subject Public Key Info"
+msgstr ""
+"\n"
+"Publiskā atslēga: "
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Subjekts ir %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Nespēj procesēt spoles mapi"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "Nepareiza sertifikāta autoritāte (SA)"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Nepareiza sertifikāta autoritāte (SA)"
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Nav Informācijas"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "piesaistne"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "_Sertifikāta ID:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Curitiba"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "Ziemeļkarolīna"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Izteiksme"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s iekš %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Sertifikāta paraksta neizdošanās"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "_Ievietot"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Subjekts ir %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Sertifikāta paraksta neizdošanās"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Ievadiet %s paroli"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "_Sertifikāta ID:"
 
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
@@ -15068,7 +16264,7 @@ msgstr "Kopēt izvēlējumu"
 msgid "Copy to Folder..."
 msgstr "Kopēt uz mapi..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Izņemt izvēlējumu"
 
@@ -15084,7 +16280,7 @@ msgstr "Pārvietot kontaktus uz citu mapi..."
 msgid "Move to Folder..."
 msgstr "Pārvietot uz mapi..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Ievietot starpliktuves saturu"
 
@@ -15092,8 +16288,8 @@ msgstr "Ievietot starpliktuves saturu"
 msgid "Previews the contacts to be printed"
 msgstr "Apskatīt drukājamos kontaktus"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Drukāšanas _pirmsapskats"
@@ -15138,13 +16334,13 @@ msgstr "Apturēt Ielādi"
 msgid "View the current contact"
 msgstr "Parādīt pašreizējo kontaktu"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "_Darbības"
 
@@ -15174,145 +16370,114 @@ msgstr "_Sūtīt vēstuli kontaktam..."
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "Izveidot ierakstu par jaunu visas dienas tikšanos"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Ievietot jaunu ierakstu par tikšanos"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "Izveidot jaunu mapi"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Izveidot jaunu sanāksmes pieprasījumu"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Ievietot jaunu uzdevumu"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Diena"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 #, fuzzy
 msgid "Delete All Occurrences"
 msgstr "reizes"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Dzēst šo tikšanos"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "Dzēst šo priekšmetu"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "Dzēst šo mapi"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Iet Uz "
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Iet atpakaļ"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Iet uz priekšu"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Iet uz _Datumu"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Iet uz norādīto datumu"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Iet uz šodienu"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "List"
 msgstr "Lista"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Mēnesis"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Jauna _tikšanās"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Jaunkaledonija"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Jauna sanāksme"
-
-#: ui/evolution-calendar.xml.h:27
-msgid "New _Task"
-msgstr "Jauns uzdevums"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Parāda kalendāru, kāds tas tiks drukāts"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Drukāt šo kalendāru"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publicēt Brīvs/Aizņemts informāciju šim kalendāram"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Bourges"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Publiska mape, kas satur tikšanos un notikumu ierakstus"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Parādīt detaļas"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Parādīt vienu dienu"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Parādīt vienu mēnesi"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Parādīt vienu nedēļu"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Parādīt darba nedēļu"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Nedēļa"
 
@@ -15377,7 +16542,7 @@ msgstr "Saglabāt šo priekšmetu uz diska"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Fails"
 
@@ -15598,7 +16763,7 @@ msgstr "Atzīmēt _visas kā lasītas"
 msgid "Mark all visible messages as read"
 msgstr "Atzīmēt visas redzamās vēstules kā lasītas"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "Izlikt vēstuli(es) no starpliktuves"
 
@@ -15656,16 +16821,6 @@ msgstr "_Invertēt izvēlējumu"
 msgid "_Threaded Message List"
 msgstr "_Sasaistīts Vēstuļu saraksts"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Aizvērt šo logu"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "_Aizvērt"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "Pievienot sūtītāju a_drešu grāmatai"
@@ -15823,257 +16978,282 @@ msgstr "Pārsūtīt izvēlēto vēstuli kādam kā piesaistni"
 msgid "Increase the text size"
 msgstr "Palielināt teksta izmēru"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "_Ielādēt attēlus"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Iezīmēt kā svarīgas"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Atzīmēt kā _neizlasītas"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Iezīmēt _kā nesvarīgas"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "Atzīmēt izvēlētās vēstules kā lasītas"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "Atzīmēt izvēlētās vēstules kā svarīgas"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Atzīmēt izvēlētās vēstules kā nesvarīgas"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Atzīmēt izvēlētās vēstules kā nelasītas"
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Atzīmēt izvēlētās vēstules kā nelasītas"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Atzīmēt izvēlētās vēstules kā nesvarīgas"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Atzīmēt izvēlētās vēstules dzēšanai"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Pārvietot"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "Pārvietot izvēlētās vēstules uz citu mapi"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Nākošā"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "Nākošā _svarīgā vēstule"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "Nākošais _pavediens"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "Nākošā _neizlasītā vēstule"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Nav atrasts"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Atvērt izvēlēto vēstuli jaunā logā"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Atvērt norādīto vēstuli sacerētājā, lai to pārsūtītu"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Oriģinālais I_zmērs"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "Iep_riekšējā neizlasītā vēstule"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Publicēt atbildi"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr "Publicēt atbildi uz vēstuli publiskajā mapē"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "I_epriekšējā svarīgā vēstule"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Apskatīt vēstuli pirms drukāšanas"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Iepriekšējā"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Drukāt šo vēstuli"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "Pāra_dresēt"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Pāradresēt izvēlēto vēstuli kādam"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Atsaukt tekstu oriģinālajā izmērā"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "M_eklēt vēstuli..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "_Mazāks"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Saglabāt vēstuli kā teksta failu"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Meklēt tekstu attēlotajā vēstules ķermenī"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr "Uzstādīt lapas uzstādijumus jūsu pašreizējam printerim"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Parādīt epasta _avotu"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Parādīt _pilnas galvenes"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Meklēt tekstu attēlotajā vēstules ķermenī"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Parādīt vēstuli normālā stilā"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Parādīt vēstuli ar visiem epasta galvenēm"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Parādīt vēstules pamata epasta avotu "
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "Teksta _izmērs"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Atdzēst izvēlētās vēstules"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "VMape uz pasta _saraksti..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "VMape uz sū_tītāju..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "VMape uz saņē_mējiem..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "VMape pēc _subjekta..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "_Piesaistīt"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "_Kopēt uz mapi"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "_Izveidot filtru no vēstules"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "_Pārsūtīt vēstuli"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "_Ej uz "
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "_Iekļaut"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "_Lielāks"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "_Vēstules attēlošana"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Pārvietot uz mapi"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "_Nākošā vēstule"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "_Normāla attēlošana"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "_Atvērt vēstuli"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "_Iepriekšējā vēstule"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "_Citēts"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "_Pārsūtīt..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "_Rīki"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "_Atdzēst"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Aizvērt šo logu"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "_Aizvērt"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Piesaistīt"
@@ -16352,12 +17532,13 @@ msgid "Change Evolution's settings"
 msgstr "Izmainīt Evolution uzstādījumus"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "I_ziet"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Izveidot jaunu sanāksmes pieprasījumu"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "Evolution _logs"
+msgid "E_xit"
+msgstr "I_ziet"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16369,61 +17550,74 @@ msgstr "Importēt datus no citām programmām"
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "Evolution _logs"
+msgid "Open a new window"
+msgstr "Atvērt jaunā logā"
 
 #: ui/evolution.xml.h:11
 msgid "Pi_lot Settings..."
 msgstr "Pi_lot Uzstādījumi..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Sūtīt / Saņemt"
+
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr "Sūtīt sarindotos priekšmetus un saņemt jaunus priekšmetus"
+
+#: ui/evolution.xml.h:14
 msgid "Set up Pilot configuration"
 msgstr "Uzstādīt Pilot konfigurāciju"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Parādīt informāciju par Ximian Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Nosūtīt Kļūdu Ziņojumu"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "Nosūtīt _Kļūdu Ziņojumu"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Nosūtīt kļūdu ziņojumu, izmantojot Bug Buddy"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Norādīt"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Norādīt, vai mēs strādājam nesaistes režīmā."
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _VUJ"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "_Par Ximian Evolution..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "_Palīdzība"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "I_mportēt..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Jauns"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Sūtīt / Saņemt"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "_Meklēt Tagad"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Drukāt kopsavilkumu"
@@ -16556,12 +17750,12 @@ msgstr "_Definēt skatus"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -16694,7 +17888,7 @@ msgstr "_Meklēt"
 msgid "_Find Now"
 msgstr "_Meklēt Tagad"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "_Tīrs"
 
@@ -16711,24 +17905,265 @@ msgstr ""
 msgid "Text"
 msgstr "Tests"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Tīrs"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Meklēt tagad"
 
+#~ msgid "Account Name"
+#~ msgstr "Konta nosaukums"
+
+#~ msgid "Server Name"
+#~ msgstr "Servera nosaukums"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "LDAP nav ticis aktivizēts šajā Evolution būvējumā"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Citi kontakti"
+
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "Šeit konfigurējiet pieeju LDAP direktoriju serveriem"
+
+#~ msgid "Directory Servers"
+#~ msgstr "Direktoriju serveri"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Atcelt pašreizējo pasta operāciju"
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Evolution adrešu grāmatas vārda izvēles saskarne."
+
+#, fuzzy
+#~ msgid "Add LDAP Server"
+#~ msgstr "LDAP serveris"
+
+#~ msgid "LDAP Configuration Assistant"
+#~ msgstr "LDAP konfigurācijas asistents"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Solis 4: Parādīt vārdu"
+
+#~ msgid "Find contact in"
+#~ msgstr "Meklēt kontaktus"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Klikšķini šeit, lai pievienotu kontaktu *"
+
+#~ msgid "Business Address"
+#~ msgstr "Darījumu adrese"
+
+#~ msgid "Department"
+#~ msgstr "Departaments"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "Brīvs-aizņemts URL"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Profesija"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Atvērt uzdevumus uz %s"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Sūtīt jebkurā gadījumā?"
+
+#, fuzzy
+#~ msgid "Folder _name"
+#~ msgstr "Mapes nosaukums:"
+
+#~ 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."
+
+#, fuzzy
+#~ msgid "No signature present"
+#~ msgstr "Slēpt paraksta padomu"
+
+#~ msgid "Connecting..."
+#~ msgstr "Savienojos..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Šī mape nevar saturēt ziņojumus."
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Nevar atvērt koplietošanas mapi: `%s'."
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Izvēlieties gala mērķa direktoriju, lai importētu šos datus"
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nevar pārsūtīt mapi:\n"
+#~ "%s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "Pievienot mapi"
+
+#~ msgid "Drafts"
+#~ msgstr "Melnraksti"
+
+#~ msgid "Outbox"
+#~ msgstr "Izsūtne"
+
+#~ msgid "Sent"
+#~ msgstr "Nosūtītās"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kļūda sinhronizējot \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "Sinhronizējam mapi"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Sinhronizējam \"%s\" (%d no %d) ..."
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Nav atēlota mape)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(Nekas)"
+
+#~ msgid "No error"
+#~ msgstr "Nav kļūdas"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Mape ar šadu nosaukumu jau eksistē"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Norādītais mapes tips nav pareizs"
+
+#~ msgid "I/O error"
+#~ msgstr "I/O kļūda"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Nav pietiekami vietas, lai izveidotu mapi"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Mape nav tukša"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Norādītā mape netika atrasta"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Funkcija nav implementēta šajā glabātuvē"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Operācija nav atbalstīta"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Norādītais tips nav atbalstīts šajā glabātuvē"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Norādītā mape nevar tikt mainīta vai izņemta"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Nevaru izveidot mapi ar šādu nosaukumu"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Šī operācija nevar tikt izpildīta nesaistes režīmā"
+
+#~ msgid "Checkbox"
+#~ msgstr "Izvēles rūtiņa"
+
+#~ msgid "CORBA error"
+#~ msgstr "COBRA kļūda"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Nepareizs arguments"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Jau ir īpašnieks"
+
+#~ msgid "No owner"
+#~ msgstr "Nav īpašnieka"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Neatbalstīts tips"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Neatbalstīta shēma"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Neatbalstīta operācija"
+
+#~ msgid "Internal error"
+#~ msgstr "Iekšēja kļūda"
+
+#~ msgid "Exists"
+#~ msgstr "Izejam"
+
+#~ msgid "Invalid URI"
+#~ msgstr "Nepareizs URI"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Ir apakšmapes"
+
+#~ msgid "No space left"
+#~ msgstr "Nav brīvas vietas"
+
+#~ msgid "Old owner has died"
+#~ msgstr "Vecais īpašnieks ir 'miris'"
+
+#~ msgid "Test type"
+#~ msgstr "Testa tips"
+
+#, fuzzy
+#~ msgid "Evolution Test Component"
+#~ msgstr "Evolution Kopsavilkuma komponente."
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Uzvārds"
+#~ msgid "import"
+#~ msgstr "Importēt"
 
-#~ msgid "Family Name"
-#~ msgstr "Uzvārds"
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Izveidot ierakstu par jaunu visas dienas tikšanos"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Jauna _tikšanās"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Jauna sanāksme"
+
+#~ msgid "New _Task"
+#~ msgstr "Jauns uzdevums"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "Evolution _logs"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "Evolution _logs"
+
+#~ msgid "Toggle"
+#~ msgstr "Norādīt"
+
+#~ msgid "Clear"
+#~ msgstr "Tīrs"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Atcelt pašreizējo pasta operāciju"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -16823,9 +18258,6 @@ msgstr "Meklēt tagad"
 #~ msgid "Evolution VCard importer"
 #~ msgstr "Evolution pasta sacerētājs."
 
-#~ msgid "Loading..."
-#~ msgstr "Ielādēju..."
-
 #~ msgid "Searching..."
 #~ msgstr "Meklēju..."
 
@@ -16879,10 +18311,6 @@ msgstr "Meklēt tagad"
 #~ msgstr "EGrāmata (EBook) nav ielādēta\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "Kartes ID jau eksistē"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Operācija atsaukta"
 
@@ -17097,10 +18525,6 @@ msgstr "Meklēt tagad"
 #~ msgstr "%x"
 
 #, fuzzy
-#~ msgid "Phone"
-#~ msgstr "Ponkē"
-
-#, fuzzy
 #~ msgid "Birth date"
 #~ msgstr "Dzimšanas datums"
 
@@ -17113,10 +18537,6 @@ msgstr "Meklēt tagad"
 #~ msgstr "Amritsar"
 
 #, fuzzy
-#~ msgid "ID"
-#~ msgstr "I"
-
-#, fuzzy
 #~ msgid "Last Use"
 #~ msgstr "Ievietot"
 
@@ -17130,9 +18550,6 @@ msgstr "Meklēt tagad"
 #~ msgid "Folder containing contact information"
 #~ msgstr "Mape, kas satur informāciju par kontaktiem"
 
-#~ msgid "LDAP Server"
-#~ msgstr "LDAP serveris"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "LDAP serveris, kas satur informāciju par kontaktiem"
 
@@ -17142,18 +18559,6 @@ msgstr "Meklēt tagad"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Publiskā mape, kas satur informāciju par kontaktiem"
 
-#~ msgid "_Contact"
-#~ msgstr "_Kontakts"
-
-#~ msgid "Create a new contact"
-#~ msgstr "Izveidot jaunu kontaktu"
-
-#~ msgid "New Contact List"
-#~ msgstr "Jauns kontaktu saraksts"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "Izveidot jaunu kontaktu sarakstu"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "URI, ko mapju aplūks attēlos"
 
@@ -17171,9 +18576,6 @@ msgstr "Meklēt tagad"
 #~ msgid "Is New Card"
 #~ msgstr " Jauns "
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "Nav karšu"
 
@@ -17220,31 +18622,6 @@ msgstr "Meklēt tagad"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "Publiskā mape, kas satur uzdevumu priekšmetus"
 
-#~ msgid "New appointment"
-#~ msgstr "Jauna tikšanās"
-
-#~ msgid "_Appointment"
-#~ msgstr "_Tikšanās"
-
-#~ msgid "New meeting"
-#~ msgstr "Jauna sanāksme"
-
-#, fuzzy
-#~ msgid "M_eeting"
-#~ msgstr "Sanāksme"
-
-#~ msgid "New task"
-#~ msgstr "Jauns uzdevums"
-
-#~ msgid "_Task"
-#~ msgstr "_Uzdevums"
-
-#~ msgid "New All Day Appointment"
-#~ msgstr "Jauna tikšanās visu dienu"
-
-#~ msgid "All _Day Appointment"
-#~ msgstr "Visas _dienas tikšanās"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "Nevarēju atjaunināt nepareizu objektu"
 
@@ -17290,9 +18667,6 @@ msgstr "Meklēt tagad"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "Atvērt kalendāru uz %s"
 
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Atveru noklusēto uzdevumu mapi"
-
 #~ msgid "Evaluation of the search expression did not yield a boolean value"
 #~ msgstr "Meklēšanas izteiksmes pārbaude nedeva būla vērtību"
 
@@ -17330,10 +18704,6 @@ msgstr "Meklēt tagad"
 #~ "Evolution ir atradusi GnomeCard failus.\n"
 #~ "Vai jūs vēlaties, lai tie tiktu importēti Evolution? "
 
-#, fuzzy
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Pasta konfigurēšanas saskarne"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "Mape, kura satur pastu"
 
@@ -17349,9 +18719,6 @@ msgstr "Meklēt tagad"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Virtuālā atkritumu mape"
 
-#~ msgid "Properties..."
-#~ msgstr "Rekvizīti..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Izmainīt šīs mapes rekvizītus"
 
@@ -17362,15 +18729,6 @@ msgstr "Meklēt tagad"
 #~ msgstr ""
 #~ "Jums ir nenosūtītas vēstules, vai jūs vēlaties iziet jebkurā gadījumā?"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Jauna pasta vēstule"
-
-#~ msgid "_Mail Message"
-#~ msgstr "_Pasta vēstule"
-
-#~ msgid "Compose a new mail message"
-#~ msgstr "Sacerēt jaunu pasta vēstuli"
-
 #~ msgid "New Message Post"
 #~ msgstr "Jauna vēstules publicēšana"
 
@@ -19183,9 +20541,6 @@ msgstr "Meklēt tagad"
 #~ msgid "Cumberland"
 #~ msgstr "Cumberland"
 
-#~ msgid "Curitiba"
-#~ msgstr "Curitiba"
-
 #~ msgid "Curitiba Apt"
 #~ msgstr "Curitiba Apt"
 
@@ -22177,9 +23532,6 @@ msgstr "Meklēt tagad"
 #~ msgid "North Bend"
 #~ msgstr "North Bend"
 
-#~ msgid "North Carolina"
-#~ msgstr "Ziemeļkarolīna"
-
 #~ msgid "North Conway"
 #~ msgstr "North Conway"
 
@@ -23791,9 +25143,6 @@ msgstr "Meklēt tagad"
 #~ msgid "State College"
 #~ msgstr "State College"
 
-#~ msgid "Stauning"
-#~ msgstr "Stauning"
-
 #~ msgid "Staunton"
 #~ msgstr "Staunton"
 
@@ -24382,9 +25731,6 @@ msgstr "Meklēt tagad"
 #~ msgid "United Arab Emirates "
 #~ msgstr "Apvienotie Arābu Erimāti"
 
-#~ msgid "Unst"
-#~ msgstr "Unsta"
-
 #~ msgid "Upington"
 #~ msgstr "Upington"
 
@@ -24493,12 +25839,6 @@ msgstr "Meklēt tagad"
 #~ msgid "Veracruz"
 #~ msgstr "Veracruz"
 
-#~ msgid "Vermillion"
-#~ msgstr "Vermiliona"
-
-#~ msgid "Vermont"
-#~ msgstr "Vermonta"
-
 #~ msgid "Vernal"
 #~ msgstr "Vernala"
 
@@ -25031,9 +26371,6 @@ msgstr "Meklēt tagad"
 #~ msgid " F"
 #~ msgstr " F"
 
-#~ msgid " C"
-#~ msgstr " C"
-
 #~ msgid "knots"
 #~ msgstr "pēdas"
 
@@ -25652,9 +26989,6 @@ msgstr "Meklēt tagad"
 #~ msgid "Freezing haze"
 #~ msgstr "Saldējoša dūmaka"
 
-#~ msgid "Spray"
-#~ msgstr "Smidzināšana"
-
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Gaidāma smidzināšana"
 
@@ -26024,18 +27358,6 @@ msgstr "Meklēt tagad"
 #~ msgid "Remove a folder added with \"Open Other User's Folder\""
 #~ msgstr "Izdzēst mapi pievienotu ar \"Atvērt cita lietotāja mapi\""
 
-#~ msgid "Send / Receive"
-#~ msgstr "Sūtīt / Saņemt"
-
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Sūtīt sarindotos priekšmetus un saņemt jaunus priekšmetus"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Norādīt, vai tiek rādīta mapes josla"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Norādīt, vai tiek rādīta saīsinājumu josla"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Parādīt izvēlēto mapi"
 
@@ -26063,9 +27385,6 @@ msgstr "Meklēt tagad"
 #~ msgid "_Rename..."
 #~ msgstr "Pā_rsaukt..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Sūtīt / Saņemt"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "Ī_sinājumikonu josla"
 
@@ -26116,9 +27435,6 @@ msgstr "Meklēt tagad"
 #~ msgid "Font Preferences"
 #~ msgstr "Fontu preferences"
 
-#~ msgid "Automatically _detect links"
-#~ msgstr "Automātiski _noteikt saites"
-
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 
@@ -26226,18 +27542,12 @@ msgstr "Meklēt tagad"
 #~ msgid "1234"
 #~ msgstr "1234"
 
-#~ msgid "380"
-#~ msgstr "380"
-
 #~ msgid "666"
 #~ msgstr "666"
 
 #~ msgid "<- _Remove"
 #~ msgstr "<- _Izņemt"
 
-#~ msgid "<< Fewer Options"
-#~ msgstr "<< Mazāk opcijas"
-
 #~ msgid "Add (or Edit) Attribute Mappings"
 #~ msgstr "Pievienot (vai rediģēt) atribūtu atbilstības"
 
@@ -26770,9 +28080,6 @@ msgstr "Meklēt tagad"
 #~ msgid "Send _later"
 #~ msgstr "Sūtīt _vēlāk"
 
-#~ msgid "Send the message later"
-#~ msgstr "Sūtīt šo vēstuli vēlāk"
-
 #~ msgid "HTML"
 #~ msgstr "HTML"
 
@@ -27047,9 +28354,6 @@ msgstr "Meklēt tagad"
 #~ msgid "News Servers"
 #~ msgstr "Ziņu serveri"
 
-#~ msgid "Source Information"
-#~ msgstr "Avota informācija"
-
 #~ msgid "newswindow1"
 #~ msgstr "zinulogs1"
 
@@ -27072,18 +28376,12 @@ msgstr "Meklēt tagad"
 #~ msgid "You may only import to local folders"
 #~ msgstr "Jūs varat tikai importēt uz lokālajām mapēm"
 
-#~ msgid "_Contact List"
-#~ msgstr "_Kontaktu saraksts"
-
 #~ msgid "Inline Text _File..."
 #~ msgstr "Iekļaut Teksta _Failu..."
 
 #~ msgid "_Pilot Settings..."
 #~ msgstr "_Pilot uzstādījumi..."
 
-#~ msgid "Addressbook Settings"
-#~ msgstr "Adrešu grāmatas uzstādījumi"
-
 #~ msgid "Could not query for schema information"
 #~ msgstr "Nevarēju pieprasīt informāciju par shēmu"
 
@@ -27414,25 +28712,11 @@ msgstr "Meklēt tagad"
 
 #~ msgid ""
 #~ "\n"
-#~ "Comment: "
-#~ msgstr ""
-#~ "\n"
-#~ "Komentāri: "
-
-#~ msgid ""
-#~ "\n"
 #~ "Unique String: "
 #~ msgstr ""
 #~ "\n"
 #~ "Unikālā Virkne: "
 
-#~ msgid ""
-#~ "\n"
-#~ "Public Key: "
-#~ msgstr ""
-#~ "\n"
-#~ "Publiskā atslēga: "
-
 #~ msgid "Waiting for connection to LDAP server..."
 #~ msgstr "Gaidu savienojumu ar LDAP serveri..."
 
@@ -27505,9 +28789,6 @@ msgstr "Meklēt tagad"
 #~ msgid "Republic Of Moldova"
 #~ msgstr "Moldovas Republika"
 
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "Veidot jaunus tikšanos ierakstus ar noklusēto at_gādinātāju"
-
 #~ msgid "First day of wee_k:"
 #~ msgstr "Pirmā diena _nedēļā:"
 
@@ -27633,9 +28914,6 @@ msgstr "Meklēt tagad"
 #~ msgid "Composer"
 #~ msgstr "Komponētājs"
 
-#~ msgid "Default Forward style is: "
-#~ msgstr "Noklusētais pārsūtīšanas stils ir:"
-
 #~ msgid "Edit..."
 #~ msgstr "Rediģēt..."
 
@@ -27651,15 +28929,9 @@ msgstr "Meklēt tagad"
 #~ msgid "_Email Address:"
 #~ msgstr "_Epasta adrese:"
 
-#~ msgid "_Log filter actions to:"
-#~ msgstr "_Reģistrēt filtra darbības:"
-
 #~ msgid "_Organization:"
 #~ msgstr "_Oranizācija:"
 
-#~ msgid "_Send mail in HTML format by default."
-#~ msgstr "_Sūtīt pastu HTML formātā pēc noklusējuma."
-
 #~ msgid "_Server Type: "
 #~ msgstr "_Servera Tips:"
 
diff --git a/po/ms.po b/po/ms.po
index 36b9742c0d..4b31d59492 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-11-19 11:10+0800\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-11-17 11:40+0800\n"
 "Last-Translator: Mimos Open Source Development Group <ismas@mimos.my>\n"
 "Language-Team: Projek Gabai <gabai-penyumbang@lists.sf.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
@@ -30,176 +30,181 @@ msgid "Could not read pilot's Address application block"
 msgstr "Tidak dapat membaca blok aplikasi Alamat rintis"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Folder Autocompletion"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Certificates"
 msgstr "Sijil"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "Buat konfigurasi capaian ke pelayan direktori LDAP di sini"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Buat konfigurasi akaun e-mel anda di sini"
 
 #. Fix me *
 #. can not get name, should be a bug of e-book.Anyway, should set a default name.
 #.
 #. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
 msgid "Contacts"
 msgstr "Kenalan"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "Pelayan Direktori"
-
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 msgid "Evolution Addressbook"
 msgstr "Buku Alamat Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Kawalan Konfigurasi LDAP Buku Alamat Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook address pop-up"
 msgstr "Pop-up alamat Buku Alamat Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook address viewer"
 msgstr "Pelihat alamat Buku Alamat Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook card viewer"
 msgstr "Pelihat kad Buku Alamat Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Addressbook component"
 msgstr "Komponen Buku Alamat Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Addressbook folder viewer"
 msgstr "Pelihat folder Buku Alamat Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution S/Mime Certificate Management Control"
 msgstr "Kawalan Pengurusan Sijil S/Mime Evolution"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Kawalan konfigurasi seting folder Evolution"
+
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Manager your S/Mime certificates here"
 msgstr "Urus sijil S/Mime anda di sini"
 
-#: addressbook/gui/component/addressbook-component.c:125
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "New Addressbook"
 msgstr "Buku Alamat"
 
-#: addressbook/gui/component/addressbook-component.c:126
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Ciri-ciri..."
+
+#: addressbook/gui/component/addressbook-component.c:147
 #: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:342 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 msgid "Delete"
 msgstr "Hapus"
 
-#: addressbook/gui/component/addressbook-component.c:127
-#: calendar/gui/calendar-component.c:343
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
 #, fuzzy
 msgid "Rename"
 msgstr "_Namakan semula"
 
-#: addressbook/gui/component/addressbook-component.c:185
+#: addressbook/gui/component/addressbook-component.c:217
 #, fuzzy
 msgid "New Contact"
 msgstr "Kenalan Baru:"
 
-#: addressbook/gui/component/addressbook-component.c:186
+#: addressbook/gui/component/addressbook-component.c:218
 msgid "_Contact"
 msgstr "_Kenalan"
 
-#: addressbook/gui/component/addressbook-component.c:187
+#: addressbook/gui/component/addressbook-component.c:219
 msgid "Create a new contact"
 msgstr "Wujudkan kenalan baru"
 
-#: addressbook/gui/component/addressbook-component.c:192
+#: addressbook/gui/component/addressbook-component.c:224
 msgid "New Contact List"
 msgstr "Senarai Kenalan Baru"
 
-#: addressbook/gui/component/addressbook-component.c:193
+#: addressbook/gui/component/addressbook-component.c:225
 #, fuzzy
 msgid "Contact _List"
 msgstr "Senarai Kenalan Baru"
 
-#: addressbook/gui/component/addressbook-component.c:194
+#: addressbook/gui/component/addressbook-component.c:226
 msgid "Create a new contact list"
 msgstr "Wujudkan senarai kenalan baru"
 
-#: addressbook/gui/component/addressbook-component.c:336
-#: calendar/gui/calendar-component.c:639
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
 msgid "On This Computer"
 msgstr "Atas Komputer Ini"
 
 #. orange
-#: addressbook/gui/component/addressbook-component.c:346
-#: calendar/gui/calendar-component.c:647 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
 #: shell/e-config-upgrade.c:1456
 msgid "Personal"
 msgstr "Peribadi"
 
 #. red
-#: addressbook/gui/component/addressbook-component.c:353
-#: calendar/gui/calendar-component.c:654 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
 #: shell/e-config-upgrade.c:1455
 msgid "Work"
 msgstr "Kerja"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "Pelayan LDAP"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Tidak dapat mewujudkan direktori untuk kalendar baru"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "Gagal disambungkan ke pelayan LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "Gagal disahkan dengan pelayan LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "Tidak dapat membuat pertanyaan pada Asas DSE"
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "Pelayan memberikan maklum balas dengan tiada asas carian sokongan"
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Pelayan ini tidak menyokong maklumat skema LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "Ralat ketika mendapatkan semula maklumat skema"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr "Pelayan tidak memberikan maklum balas dengan maklumat skema yang sah"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Nama Akaun"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Nama Pelayan"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP tidak dibolehkan dalam binaan Evolution ini"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Kenalan Lain"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -207,7 +212,7 @@ msgstr ""
 "Kami tidak dapat membuka buku alamat ini.  Sila semak ada\n"
 "laluan atau tidak dan adakah anda diberi kebenaran untuk mencapainya."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -217,7 +222,7 @@ msgstr ""
 "sama ada anda telah memasukkan URI yang tidak betul, atau pelayan LDAP\n"
 "tidak dapat dijangkau."
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -230,7 +235,7 @@ msgstr ""
 "anda mestilah kompilkan atur cara dari sumber CVS setelah\n"
 "mendapatkan semula OpenLDAP dari pautan di bawah.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -244,44 +249,43 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Tidak dapat membuka buku alamat"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "Mencapai Pelayan LDAP tanpa nama"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "Gagal disahkan.\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sMasukkan kata laluan bagi %s (pengguna %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "Nama bermula dengan"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "E-mel bermula dengan"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Kategorinya ialah"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Sebarang medan mengandungi"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Lanjutan..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -294,7 +298,7 @@ msgstr ""
 "Sila jadikan carian anda lebih khusus atau tingkatkan had hasil dalam\n"
 "keutamaan pelayan direktori bagi buku alamat ini."
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -306,29 +310,44 @@ msgstr ""
 "lebih khusus atau tingkatkan had masa dalam keutamaan pelayan\n"
 "direktori bagi buku alamat ini."
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "Bahagian belakang buku alamat ini tidak dapat menghuraikan pertanyaan ini."
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Bahagian belakang buku alamat ini enggan membuat pertanyaan ini."
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "Pertanyaan ini tidak dapat disiapkan dengan jayanya."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Sebarang Kategori"
 
-#: addressbook/gui/component/addressbook.c:1102
-msgid "URI of the contacts that the control will display"
+#: addressbook/gui/component/addressbook.c:1063
+#, fuzzy
+msgid "UID of the contacts source that the view will display"
 msgstr "URI bagi kenalan yang akan dipaparkan oleh kawalan"
 
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
+msgstr ""
+
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
@@ -349,6 +368,7 @@ msgstr "  T_unjukkan Asas Sokongan"
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -382,8 +402,9 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "Tambahkan Pelayan LDAP"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "Pembantu Konfigurasi LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -399,9 +420,9 @@ msgid "Anonymously"
 msgstr "Tanpa nama"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -412,50 +433,51 @@ msgstr ""
 "Sila klik butang \"Selesai\" untuk menyimpan seting yang anda masukkan di "
 "sini."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "Disambungkan"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "Nama_ berbeza:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr "Edit Pelayan LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
 msgstr "Alamat e-mel:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 "Evolution akan mengggunakan DN ini untuk mengesahkan anda dengan pelayan"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution akan menggunakan alamat e-mel ini untuk mengesahkan anda dengan "
 "pelayan"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "Selesai"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Am"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "Pembantu Konfigurasi LDAP"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "Kumpulan"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Tidak Pernah"
 
@@ -484,7 +506,7 @@ msgid "S_earch scope: "
 msgstr "Skop C_arian: "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
 #: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Sedang mencari"
@@ -546,28 +568,32 @@ msgstr ""
 "LDAP, dan bagi mewujudkan dan mengedit kenalan. "
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 "Menetapkan nama paparan ialah langkah terakhir yang diperlukan dalam membuat "
 "konfigurasi pelayan LDAP."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "Langkah 1: Maklumat Pelayan"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "Langkah 2: Sambungkan ke Pelayan"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "Langkah 1: Maklumat Pelayan"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "Langkah 3: Mencari dalam Direktori"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Langkah 2: Sambungkan ke Pelayan"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "Langkah 4: Paparkan Nama"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Langkah 3: Mencari dalam Direktori"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -579,18 +605,6 @@ msgstr "Asas Carian Sokongan"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"Langkah pertama dalam membuat konfigurasi pelayan LDAP adalah memberikan "
-"namanya, dan maklumat log masuk\n"
-"anda. Sila tanya pentadbir sistem anda jika anda tidak pasti tentang "
-"maklumat ini."
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -603,7 +617,7 @@ msgstr ""
 "sama ada anda\n"
 "perlu mengubah opsyen ini atau tidak."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -614,7 +628,7 @@ msgstr ""
 "bermula. Jika anda membiarkannya kosong, carian akan bermula pada akar "
 "pepohon direktori."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -629,14 +643,14 @@ msgstr ""
 "Skop carian bagi \"satu\" akan hanya merangkumi entri satu tahap di bawah "
 "asas anda.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
+#, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "Pembantu ini akan membantu anda mencapai khidmat direktori dalam talian\n"
 "dengan menggunakan pelayan LDAP (Lightweight Directory Access Protocol). \n"
@@ -645,14 +659,14 @@ msgstr ""
 "hubungi pentadbir sistem anda jika anda memerlukan bantuan untuk mendapatkan "
 "maklumat ini."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "Ini nama penuh pelayan ldap anda. Contohnya, \"ldap.syarikatsaya.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -662,7 +676,7 @@ msgstr ""
 "sehingga \n"
 "terlalu besar akan melambatkan buku alamat anda."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -672,7 +686,7 @@ msgstr ""
 "perhatian bahawa mengesetkannya kepada \"Alamat E-mel\" memerlukan capaian "
 "tanpa nama kepada pelayan ldap anda."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -682,6 +696,16 @@ msgstr ""
 "anda.\n"
 "Ia untuk tujuan paparan sahaja. "
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Ini nama bagi pelayan ini yang akan tertera pada senarai folder Evolution "
+"anda.\n"
+"Ia untuk tujuan paparan sahaja. "
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -710,20 +734,33 @@ msgid "Using email address"
 msgstr "Menggunakan alamat e-mel"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Pada bila-bila masa yang mungkin"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+"Langkah pertama dalam membuat konfigurasi pelayan LDAP adalah memberikan "
+"namanya, dan maklumat log masuk\n"
+"anda. Sila tanya pentadbir sistem anda jika anda tidak pasti tentang "
+"maklumat ini."
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "_Paparkan nama:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "_Had muat turun:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -732,39 +769,39 @@ msgstr "_Had muat turun:"
 msgid "_Edit"
 msgstr "_Edit"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "_Kaedah log masuk:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "_Nombor port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "_Asas carian:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "_Nama pelayan:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "_Tamat masa (minit):"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "kad"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr "tab sambung"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr "tab am"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr "tab cari"
 
@@ -777,7 +814,7 @@ msgid "Remove All"
 msgstr "Keluarkan Semua"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Keluarkan"
@@ -815,14 +852,10 @@ msgstr "Nama"
 msgid "Source"
 msgstr "Sumber"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Pilih Kenalan daripada Buku Alamat"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "Cari kenalan dalam"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Cari"
@@ -898,7 +931,8 @@ msgid "D_epartment:"
 msgstr "J_abatan:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:18
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Perincian"
 
@@ -965,12 +999,13 @@ msgid "_Categories..."
 msgstr "_Kategori..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:695
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:36
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:108 ui/evolution-tasks.xml.h:18
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
+#: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Hapus"
 
@@ -2091,7 +2126,7 @@ msgid "Esq."
 msgstr "Esq."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Nama Penuh"
 
@@ -2317,9 +2352,9 @@ msgstr "Sampaikan kepada Kenalan"
 msgid "Send Message to Contact"
 msgstr "Hantar Mesej kepada Kenalan"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:76
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Cetak"
@@ -2341,9 +2376,12 @@ msgstr "Alihkan ke folder..."
 msgid "Cut"
 msgstr "Potong"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Salin"
 
@@ -2353,7 +2391,7 @@ msgid "Paste"
 msgstr "Tampal"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "Pandangan Semasa"
 
@@ -2370,166 +2408,169 @@ msgstr ""
 "semula"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "* Click here to add a contact *"
-msgstr "* Klik di sini untuk menambahkan kenalan *"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Pembantu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant Phone"
 msgstr "Telefon Pembantu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Address"
-msgstr "Alamat Perniagaan"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Faks Perniagaan"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Telefon Perniagaan"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Telefon Perniagaan 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Telefon Panggil Balik"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Telefon Kereta"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategori"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Telefon Syarikat"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Jabatan"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "E-mel"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "E-mel 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "E-mel 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Nama Keluarga"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Failkan Sebagai"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "URL Bebas-sibuk"
+msgid "Given Name"
+msgstr "Nama Diberi"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Alamat Rumah"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Faks Rumah"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Telefon Rumah"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Telefon Rumah 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Jordan"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Pengurus"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Telefon Bimbit"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Nama ringkas"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Pejabat"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisasi"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Alamat Lain"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Faks Lain"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Telefon Lain"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Pengelui"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Telefon Utama"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Profesion"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Peranan"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Pasangan"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Gelaran"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Unst"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Laman Web"
 
@@ -2619,10 +2660,18 @@ msgstr "Senaraikan Ahli"
 msgid "Job Title"
 msgstr "Gelaran Jawatan"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Alamat Rumah"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 msgid "Work Address"
 msgstr "Alamat Tempat Kerja"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Alamat Lain"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 msgid "Home page"
@@ -2633,107 +2682,104 @@ msgstr "Laman web"
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Berjaya"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:995
-#: shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Ralat tak diketahui"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Repositori luar talian"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Kebenaran dinafikan"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Contact not found"
 msgstr "Kenalan tidak dijumpai"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Contact ID already exists"
 msgstr "ID Kenalan telah wujud"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Protokol tidak disokong"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Batal"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "Pengesahan Gagal"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "Pengesahan Diperlukan"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS tidak Ada"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "Buku Alamat tidak wujud"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Ralat lain"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Adakah anda ingin menyimpan perubahan?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr "_Buang"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Ralat ketika menambahkan senarai"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Error adding contact"
 msgstr "Ralat ketika menambahkan kenalan"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Ralat ketika mengubahsuaikan senarai"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying contact"
 msgstr "Ralat ketika mengubah suai kenalan"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Ralat ketika mengeluarkan senarai"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 msgid "Error removing contact"
 msgstr "Ralat ketika mengeluarkan kenalan"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2742,7 +2788,7 @@ msgstr ""
 "Membuka %d kenalan akan turut membuka %d tetingkap baru.\n"
 "Adakah anda benar-benar ingin memaparkan semua kenalan ini?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2751,45 +2797,45 @@ msgstr ""
 "%s telah wujud\n"
 "Adakah anda ingin menulis gantinya?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "Tulis ganti"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Ralat ketika menyimpan %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "senarai"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 msgid "Move contact to"
 msgstr "Alihkan kenalan ke"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 msgid "Copy contact to"
 msgstr "Salin kenalan ke"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 msgid "Move contacts to"
 msgstr "Alihkan kenalan ke"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 msgid "Copy contacts to"
 msgstr "Salin kenalan ke"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "VCard Berganda"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard bagi %s"
@@ -2979,7 +3025,7 @@ msgstr "Jidar"
 msgid "Number of columns:"
 msgstr "Bilangan lajur:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Opsyen"
 
@@ -3231,9 +3277,9 @@ msgid "Evolution's Tasks component"
 msgstr "Komponen ujian Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1084 calendar/gui/print.c:1797
-#: calendar/gui/tasks-control.c:488
-#: calendar/importers/icalendar-importer.c:711
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
 #: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
 msgid "Tasks"
 msgstr "Tugas"
@@ -3242,19 +3288,19 @@ msgstr "Tugas"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Khidmat pemberitahuan penggera Kalendar Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Bermula:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Berakhir:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Penggera Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Penggera pada %s"
@@ -3333,15 +3379,15 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Jangan tanya saya lagi tentang atur cara ini."
 
-#: calendar/gui/alarm-notify/notify-main.c:154
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Tidak dapat memulakan Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:157
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Tidak dapat memulakan gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:166
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Tidak dapat mewujudkan penggera, maklumkan kilang khidmat"
 
@@ -3349,19 +3395,152 @@ msgstr "Tidak dapat mewujudkan penggera, maklumkan kilang khidmat"
 msgid "invalid time"
 msgstr "masa tak sah"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "Ralat iCalendar"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Warna bagi tugas yang genap tempoh hari ini"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Warna bagi tugas yang genap tempoh hari ini"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "_Tunjukkan masa akhir temu janji dalam pandangan minggu dan bulan"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Pralihat kalendar yang akan dicetak"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "_Minta pengesahan apabila menghapuskan item"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "_Minta pengesahan apabila menghapuskan item"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Hapuskan tugas yang siap"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Tunjukkan bilangan _minggu dalam pemandu arah tarikh"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Ringkasan mengandungi"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Huraian mengandungi"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Ulasan mengandungi"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1134
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Tidak padan"
 
@@ -3384,90 +3563,99 @@ msgstr "Singkirkan peristiwa yang lebih lama dari"
 msgid "days"
 msgstr "hari"
 
-#: calendar/gui/calendar-commands.c:479
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:482 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:484 calendar/gui/calendar-commands.c:489
-#: calendar/gui/calendar-commands.c:491
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:508 calendar/gui/calendar-commands.c:514
-#: calendar/gui/calendar-commands.c:520 calendar/gui/calendar-commands.c:522
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:512
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:281
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:321
+#: calendar/gui/calendar-component.c:408
 #, fuzzy
 msgid "Rename this calendar to"
 msgstr "Cetak kalendar ini"
 
-#: calendar/gui/calendar-component.c:341
+#: calendar/gui/calendar-component.c:428
 msgid "New Calendar"
 msgstr "Kalendar Baru"
 
-#: calendar/gui/calendar-component.c:524
+#: calendar/gui/calendar-component.c:632
 msgid "New appointment"
 msgstr "Temu janji baru"
 
-#: calendar/gui/calendar-component.c:525
+#: calendar/gui/calendar-component.c:633
 msgid "_Appointment"
 msgstr "_Temu janji"
 
-#: calendar/gui/calendar-component.c:526
+#: calendar/gui/calendar-component.c:634
 msgid "Create a new appointment"
 msgstr "Wujudkan temu janji baru"
 
-#: calendar/gui/calendar-component.c:531
+#: calendar/gui/calendar-component.c:639
 msgid "New meeting"
 msgstr "Mesyuarat baru"
 
-#: calendar/gui/calendar-component.c:532
+#: calendar/gui/calendar-component.c:640
 msgid "M_eeting"
 msgstr "M_esyuarat"
 
-#: calendar/gui/calendar-component.c:533
+#: calendar/gui/calendar-component.c:641
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Wujudkan mesyuarat baru"
 
-#: calendar/gui/calendar-component.c:538
+#: calendar/gui/calendar-component.c:646
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Temu Janji Baru Sepanjang Hari"
 
-#: calendar/gui/calendar-component.c:539
+#: calendar/gui/calendar-component.c:647
 msgid "All _Day Appointment"
 msgstr "Temu Janji _Sepanjang Hari"
 
-#: calendar/gui/calendar-component.c:540
+#: calendar/gui/calendar-component.c:648
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Wujudkan temu janji baru"
 
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
+
 #. create the remote source group
-#: calendar/gui/calendar-component.c:663
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3583,7 +3771,7 @@ msgstr "Hantar Kepada:"
 msgid "With these arguments:"
 msgstr "Dengan argumen ini:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:46
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -3599,6 +3787,10 @@ msgstr "jam"
 msgid "minutes"
 msgstr "minit"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3631,7 +3823,7 @@ msgstr "Hantar E-mel"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
 #: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Ringkasan:"
@@ -3661,7 +3853,7 @@ msgstr "temu janji berakhir"
 msgid "hour(s)"
 msgstr "jam"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minit"
 
@@ -3715,7 +3907,7 @@ msgstr "Hari"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Jumaat"
 
@@ -3729,7 +3921,7 @@ msgstr "Minit"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Isnin"
 
@@ -3739,7 +3931,7 @@ msgstr "A_had"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Sabtu"
 
@@ -3753,7 +3945,7 @@ msgstr "Tunjukkan bilangan _minggu dalam pemandu arah tarikh"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Ahad"
 
@@ -3771,7 +3963,7 @@ msgstr "Senarai Tugas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Khamis"
 
@@ -3789,7 +3981,7 @@ msgstr "Format masa:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Selasa"
 
@@ -3799,7 +3991,7 @@ msgstr "M_inggu bermula:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Rabu"
 
@@ -3841,7 +4033,7 @@ msgid "_Fri"
 msgstr "_Jumaat"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Am"
 
@@ -3881,7 +4073,7 @@ msgstr "_Rabu"
 msgid "before every appointment"
 msgstr "sebelum setiap temu janji"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
@@ -3889,11 +4081,11 @@ msgstr ""
 "Peristiwa yang sedang dihapuskan ialah mesyuarat, adakah anda ingin "
 "menghantar notis pembatalan?"
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Adakah anda pasti ingin membatalkan dan menghapuskan mesyuarat ini?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
@@ -3901,11 +4093,11 @@ msgstr ""
 "Tugas yang sedang dihapuskan diumpukkan, adakah anda ingin menghantar notis "
 "pembatalan?"
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Adakah anda pasti ingin membatalkan dan menghapuskan tugas ini?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -3913,54 +4105,54 @@ msgstr ""
 "Entri jurnal yang sedang dihapuskan disiarkan, adakah anda ingin menghantar "
 "notis pembatalan?"
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Adakah anda pasti ingin membatalkan dan menghapuskan entri jurnal ini?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Peristiwa ini telah dihapuskan."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Tugas ini telah dihapuskan."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Entri jurnal ini telah dihapuskan"
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Anda telah membuat perubahan. Abaikan perubahan tersebut dan tutup "
 "editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Anda tidak membuat sebarang perubahan, tutup editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Peristiwa ini telah diubah."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Tugas ini telah diubah."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Entri jurnal ini telah diubah."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Anda telah membuat perubahan. Abaikan perubahan tersebut dan kemas kini "
 "editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Anda tidak membuat sebarang perubahan, kemas kini editor?"
@@ -3970,162 +4162,167 @@ msgstr "%s  Anda tidak membuat sebarang perubahan, kemas kini editor?"
 msgid "Validation error: %s"
 msgstr "Ralat pengesahan: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " kepada "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr "(Siap "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Siap "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Genap Tempoh "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Genap Tempoh"
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "Tidak dapat mengemas kini objek"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Edit Temu Janji"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Temu janji - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Tugas - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entri jurnal - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Tiada ringkasan"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Simpan sebagai..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Perubahan yang dibuat pada item ini boleh dibuang jika kemas kini dilakukan"
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Tidak dapat memperoleh versi semasa!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Pilih destinasi untuk folder ini disalin"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Adakah anda pasti ingin menghapuskan temu janji `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Adakah anda pasti ingin menghapuskan temu janji tak berjudul ini?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Adakah anda pasti ingin menghapuskan tugas `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Adakah anda pasti ingin menghapuskan tugas tak berjudul ini?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Adakah anda pasti ingin menghapuskan entri jurnal `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Adakah anda pasti ingin menghapuskan entri jurnal tak berjudul ini?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Adakah anda pasti ingin menghapuskan %d temu janji?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Adakah anda pasti ingin menghapuskan %d tugas?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Adakah anda pasti ingin menghapuskan %d entri jurnal?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "Peristiwa tidak dapat dihapuskan disebabkan oleh ralat corba"
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "Tugas tidak boleh dihapuskan disebabkan oleh ralat corba"
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Entri jurnal tidak dapat dihapuskan disebabkan oleh ralat corba"
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Item tidak dapat dihapuskan disebabkan oleh ralat corba"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "Peristiwa tidak dapat dihapuskan kerana kebenaran dinafikan"
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "Tugas tidak dapat dihapuskan kerana kebenaran dinafikan"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Entri jurnal tidak dapat dihapuskan kerana kebenaran dinafikan"
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "Item tidak dapat dihapuskan kerana kebenaran dinafikan"
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "Peristiwa tidak dapat dihapuskan disebabkan oleh satu ralat"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr "Tugas tidak boleh dihapuskan disebabkan oleh satu ralat"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Entri jurnal tidak dapat dihapuskan disebabkan oleh satu ralat"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "Item tidak dapat dihapuskan disebabkan oleh satu ralat"
 
@@ -4141,43 +4338,43 @@ msgstr "Ditugaskan Kepada:"
 msgid "Enter Delegate"
 msgstr "Masukkan Ditugaskan"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Temu janji"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Peringatan"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Perulangan"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Penjadualan"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Mesyuarat"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "Tarikh mula adalah salah"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "Tarikh akhir adalah salah"
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "Masa mula adalah salah"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "Masa akhir adalah salah"
 
@@ -4246,31 +4443,31 @@ msgid "_Start time:"
 msgstr "_Masa mula:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:704
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
 #: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Tiada"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr "Penyusun yang dipilih tidak lagi mempunyai akaun."
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "Penyusun diperlukan."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "Sekurang-kurangnya seorang peserta diperlukan."
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Ditugaskan Kepada..."
 
@@ -4311,17 +4508,11 @@ msgid "Member"
 msgstr "Ahli"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Sila Jawab"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Peranan"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
@@ -4345,6 +4536,7 @@ msgid "_Invite Others..."
 msgstr "_Jemput Orang Lain..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "Sumber dengan nama '%s' telah wujud dalam kumpulan yang dipilih"
@@ -4376,6 +4568,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Tidak dapat mewujudkan direktori untuk kalendar baru"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 msgid "A group must be selected"
 msgstr "Satu kumpulan mesti dipilih."
 
@@ -4400,39 +4593,64 @@ msgstr "Maklumat kalendar"
 msgid "Calendar Name"
 msgstr "Nama Kalendar"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Tidak dapat mewujudkan direktori untuk kalendar baru"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "<b>Opsyen kalendar</b>"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Senarai Tugas"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Senarai Tugas"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Senarai Tugas"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 "Anda sedang mengubah suai peristiwa yang berulang, apa yang ingin anda ubah "
 "suai?"
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 "Anda sedang mengubah suai tugas yang berulang, apakah yang ingin anda ubah "
 "suai?"
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 "Anda sedang mengubah suai entri jurnal yang berulang, apakah yang ingin anda "
 "ubah suai?"
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr "Contoh Ini Sahaja"
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Contoh Ini dan Masa Depan"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr "Contoh Ini dan Masa Depan"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr "Semua Contoh"
 
@@ -4485,6 +4703,11 @@ msgstr "semasa"
 msgid "occurrences"
 msgstr "kejadian"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Tarikh/Masa:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "T_ambah"
@@ -4549,7 +4772,7 @@ msgstr "minggu"
 msgid "year(s)"
 msgstr "tahun"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
@@ -4559,31 +4782,31 @@ msgstr ""
 "\n"
 "Adakah anda ingin menyimpan perubahan yang dilakukan?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "_Buang Perubahan"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 msgid "Save Event"
 msgstr "Simpan Peristiwa"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Maklumat mesyuarat telah diwujudkan. Hantar maklumat?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Maklumat mesyuarat telah diubah. Hantar versi yang telah dikemas kini?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "Maklumat umpukan tugas telah diwujudkan. Hantar maklumat?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "Maklumat tugas telah diubah. Hantar versi yang telah dikemas kini?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Tarikh siap adalah salah"
 
@@ -4594,42 +4817,42 @@ msgstr "% _Selesai"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
-#: calendar/gui/print.c:2318
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Selesai"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:231
-#: mail/message-list.c:914
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Tinggi"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
-#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "Sedang Dijalankan"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:235
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Rendah"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:233 mail/message-list.c:913
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:217
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Tidak Dimulakan"
 
@@ -4638,7 +4861,7 @@ msgid "Progress"
 msgstr "Perkembangan"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Tidak ditentukan"
 
@@ -4658,21 +4881,21 @@ msgstr "_Status:"
 msgid "_Web Page:"
 msgstr "_Laman Web:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Asas"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Umpukan"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "Tarikh genap tempoh adalah salah"
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr "Tarikh genap tempoh adalah sebelum tarikh mula!"
 
@@ -4680,9 +4903,9 @@ msgstr "Tarikh genap tempoh adalah sebelum tarikh mula!"
 msgid "Con_fidential"
 msgstr "Su_lit"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Huraian:"
 
@@ -4787,26 +5010,21 @@ msgstr "%s semasa %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s bagi jenis cetusan yang tak diketahui"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Awam"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Persendirian"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Sulit"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategori"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Description"
@@ -4818,11 +5036,12 @@ msgid "Start Date"
 msgstr "Tarikh Mula"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1083
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Ringkasan"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "warna"
 
@@ -4830,13 +5049,12 @@ msgstr "warna"
 msgid "component"
 msgstr "komponen"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Bebas"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Sibuk"
 
@@ -4848,7 +5066,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "E"
 
@@ -4882,17 +5100,17 @@ msgstr "Tidak"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1647
-#: camel/camel-gpg-context.c:1698 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Tak diketahui"
 
@@ -4904,179 +5122,178 @@ msgstr "Berulang"
 msgid "Assigned"
 msgstr "Diumpukkan"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Mengemaskinikan objek"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Menghapuskan objek yang dipilih"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Mengemaskinikan objek"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Temu janji _Baru..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "_Peristiwa Baru Sepanjang Hari"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "Mesyuarat Baru"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Tugas Baru"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:120
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Cetak..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:118 ui/evolution-tasks.xml.h:20
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Tampal"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
 #: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Pergi ke _Hari Ini"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "_Pergi ke Tarikh..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Siarkan Maklumat Bebas/Sibuk"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:30
-msgid "_Settings..."
-msgstr "_Seting..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:670 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Buka"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:672 mail/em-popup.c:589 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:124
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Simpan Sebagai..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "P_otong"
 
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:35
-#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:105
-#: ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Salin"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "_Jadualkan Mesyuarat..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "_Sampaikan sebagai iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Hapuskan Kejadian _ini"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Hapuskan _Semua Kejadian"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "_Seting..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 msgid "Open _Web Page"
 msgstr "Buka Laman _Web"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "_Umpukkan Tugas"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "_Sampaikan sebagai iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "_Tandakan sebagai Siap"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Tandakan Tugas yang Dipilih sebagai Siap"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "_Hapuskan Tugas yang Dipilih"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klik untuk menambahkan tugas"
@@ -5090,8 +5307,8 @@ msgstr "% Siap"
 msgid "Alarms"
 msgstr "Penggera"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1172
-#: camel/camel-filter-driver.c:1267 mail/mail-send-recv.c:576
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Siap"
 
@@ -5120,18 +5337,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5150,7 +5367,7 @@ msgstr "%02i bahagian minit"
 #. 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5163,125 +5380,125 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "pagi"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "petang"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr "start_calendar_server(): %s"
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ya. (Perulangan Rumit)"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "Setiap hari"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "Setiap %d hari"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "Setiap minggu"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "Setiap %d minggu"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr "Setiap minggu pada "
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Setiap %d minggu pada "
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " dan "
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr "%s hari dalam "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s dalam "
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "setiap bulan"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr "setiap %d bulan"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "Setiap tahun"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "Setiap %d tahun"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr " sejumlah %d kali"
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ", berakhir pada "
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>Mula:</b> "
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Akhir:</b> "
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>Siap:</b> "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>Genap tempoh:</b> "
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "Maklumat iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "Ralat iCalendar"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Orang yang tak diketahui"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5289,320 +5506,319 @@ msgstr ""
 "<br>Sila kaji semula maklumat berikut, dan kemudian pilih tindakan daripada "
 "menu di bawah."
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Tiada</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "Lokasi:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:203
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Diterima"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Diterima Sementara"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Ditolak"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Pilih tindakan:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Kemas kini"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:985 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Terima"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Terima sementara"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Tolak"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Hantar Maklumat Bebas/Sibuk"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Kemas kini status responden"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Hantar Maklumat Terkini"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
 #: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Batal"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> telah menyiarkan maklumat mesyuarat."
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Maklumat Mesyuarat"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> meminta kehadiran %s di mesyuarat."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> meminta kehadiran anda di mesyuarat."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Cadangan Mesyuarat"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> ingin menambahkan pada mesyuarat yang sedia ada."
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Pengemaskinian Mesyuarat"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ingin menerima maklumat mesyuarat terkini."
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Permintaan Pengemaskinian Mesyuarat"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> telah memberikan jawapan agar mesyuarat diadakan."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Jawapan Mesyuarat"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> telah membatalkan mesyuarat."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Pembatalan Mesyuarat"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> telah menghantar mesej yang tidak dapat difahami."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Mesej Mesyuarat Salah"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> telah menyiarkan maklumat tugas."
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Maklumat Tugas"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> meminta %s untuk menjalankan tugas."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> meminta anda menjalankan tugas."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Cadangan Tugas"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> ingin menambahkan pada tugas yang sedia ada."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Pengemaskinian Tugas"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ingin menerima maklumat tugas terkini."
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Permintaan Pengemaskinian Tugas"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> telah memberikan jawapan terhadap umpukan tugas."
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Jawapan Tugas"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> telah membatalkan tugas."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Pembatalan Tugas"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Mesej Tugas Salah"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> telah menyiarkan maklumat bebas/sibuk."
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Maklumat Bebas/Sibuk"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> meminta maklumat bebas/sibuk anda."
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Permintaan Bebas/Sibuk"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> telah memberikan jawapan terhadap permintaan bebas/sibuk."
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Jawapan Bebas/Sibuk"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Mesej Bebas/Sibuk Salah"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr "Mesej tidak terbentuk dengan sempurna"
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "Mesej mengandungi permintaan yang tidak disokong sahaja."
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Lampiran tidak mengandungi mesej kalendar yang sah"
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr "Lampiran mempunyai item kalendar yang tidak dapat dilihat"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "Fail kalendar tidak dapat dikemaskinikan!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Pengemaskinian siap\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Status peserta tidak dapat dikemaskinikan kerana item tidak lagi wujud"
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objek tak sah dan tidak dapat dikemas kini\n"
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Maklum balas ini bukannya daripada peserta semasa.  Tambahkan sebagai "
 "peserta?"
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Status peserta tidak dapat dikemaskinikan kerana status tak sah!\n"
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr "Terdapat ralat pada sistem CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr "Objek tidak dapat dijumpai\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Anda tidak mendapat kebenaran sah untuk mengemaskinikan kalendar\n"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Status peserta dikemaskinikan\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "Status peserta tidak dapat dikemaskinikan!\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Pengeluaran Selesai"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Item dihantar!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Item tidak dapat dihantar!\n"
 
@@ -5762,7 +5978,7 @@ msgstr "%a %m/%d/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
@@ -5854,12 +6070,12 @@ msgstr "Tidak dapat memuatkan tugas dalam `%s"
 msgid "The method required to load `%s' is not supported"
 msgstr "Kaedah yang diperlukan untuk memuatkan `%s tidak disokong"
 
-#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1764
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Anda tidak mendapat kebenaran untuk membuka folder dalam `%s"
 
-#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1978
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5868,39 +6084,39 @@ msgstr ""
 "Ralat dalam %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:959
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "Menyiapkan tugas..."
 
-#: calendar/gui/e-tasks.c:982
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "Menghapuskan objek yang dipilih..."
 
-#: calendar/gui/e-tasks.c:1007
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "Sedang Buang"
 
-#: calendar/gui/gnome-cal.c:1603 mail/importers/netscape-importer.c:1843
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: calendar/gui/gnome-cal.c:1736
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Tidak dapat membuka folder dalam `%s'"
 
-#: calendar/gui/gnome-cal.c:1750
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Kaedah yang diperlukan untuk membuka `%s' tidak disokong"
 
-#: calendar/gui/gnome-cal.c:1807
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Menambahkan penggera bagi %s"
 
-#: calendar/gui/gnome-cal.c:1999
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5912,7 +6128,7 @@ msgstr ""
 " telah rosak. Anda perlu memulakan semula Evolution untuk menggunakannya "
 "semula"
 
-#: calendar/gui/gnome-cal.c:2007
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5924,7 +6140,7 @@ msgstr ""
 " telah rosak. Anda perlu memulakan semula Evolution untuk menggunakannya "
 "semula"
 
-#: calendar/gui/gnome-cal.c:2847
+#: calendar/gui/gnome-cal.c:2848
 msgid "Purging"
 msgstr "Menyingkir"
 
@@ -5984,296 +6200,332 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Penyusun mestilah ditetapkan."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Sekurang-kurangnya seorang peserta adalah perlu"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Maklumat peristiwa"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Maklumat tugas"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Maklumat jurnal"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Maklumat Bebas/Sibuk"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Maklumat kalendar"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Dikemaskinikan"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Muat semula"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "Cadangan balas"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Maklumat Bebas/Sibuk (%s hingga %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "Maklumat iCalendar"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Anda mestilah peserta peristiwa itu."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Ahad"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Isnin"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Selasa"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Rabu"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Khamis"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Jumaat"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Sabtu"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Hari yang dipilih (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Minggu yang dipilih (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Bulan yang dipilih (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Tahun yang dipilih (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Tugas"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Keutamaan: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Peratus Siap: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategori: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Kenalan: "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:565 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Pralihat Cetakan"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Item Cetakan"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Persediaan Cetakan"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Cetak kalendar ini"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Senarai Tugas"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Tugas baru"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Tugas"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Wujudkan tugas baru"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "URI bagi folder tugas akan memaparkan"
 
-#: calendar/gui/tasks-control.c:449
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6285,11 +6537,11 @@ msgstr ""
 "\n"
 "Anda pasti ingin memadamkan tugas ini?"
 
-#: calendar/gui/tasks-control.c:452
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Jangan tanya saya lagi."
 
-#: calendar/gui/tasks-control.c:594
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "Cetak Tugas"
 
@@ -6317,15 +6569,15 @@ msgstr "Fail iCalendar (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "Fail vCalendar (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:464
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "Peringatan!!"
 
-#: calendar/importers/icalendar-importer.c:704
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "Peristiwa Kalendar"
 
-#: calendar/importers/icalendar-importer.c:729
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6333,7 +6585,7 @@ msgstr ""
 "Evolution telah menjumpai fail Kalendar Gnome.\n"
 "Adakah anda ingin mengimportnya ke dalam Evolution?"
 
-#: calendar/importers/icalendar-importer.c:736
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Kalendar Gnome"
 
@@ -7945,63 +8197,63 @@ msgstr "Anda mestilah berada dalam talian untuk melengkapkan pengendalian ini"
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Gagal mewujudkan saluran bagi '%s': %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:553
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Gagal mewujudkan proses anak '%s': %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Aliran mesej tak sah diterima daripada %s: %s"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:948
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Menyegerakkan folder"
 
-#: camel/camel-filter-driver.c:1037 camel/camel-filter-driver.c:1410
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Ralat ketika menghuraikan penapis : %s: %s"
 
-#: camel/camel-filter-driver.c:1046 camel/camel-filter-driver.c:1416
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Ralat ketika melaksanakan penapis :%s: %s"
 
-#: camel/camel-filter-driver.c:1113
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Tidak dapat membuka folder spul"
 
-#: camel/camel-filter-driver.c:1122
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Tidak dapat memproses folder spul"
 
-#: camel/camel-filter-driver.c:1137
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Mendapatkan mesej %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1141
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Tidak dapat membuka mesej"
 
-#: camel/camel-filter-driver.c:1142 camel/camel-filter-driver.c:1154
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Gagal pada mesej %d"
 
-#: camel/camel-filter-driver.c:1168 camel/camel-filter-driver.c:1262
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Menyegerakkan folder"
 
-#: camel/camel-filter-driver.c:1229
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Mendapatkan mesej %d daripada %d"
 
-#: camel/camel-filter-driver.c:1244
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Gagal pada mesej %d daripada %d"
@@ -8018,7 +8270,7 @@ msgstr "Argumen tak sah pada (bendera sistem)"
 msgid "Invalid arguments to (user-tag)"
 msgstr "Argumen tak sah pada (tag pengguna)"
 
-#: camel/camel-filter-search.c:676 camel/camel-filter-search.c:684
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Ralat ketika melaksanakan carian penapis: %s: %s"
@@ -8050,34 +8302,34 @@ msgstr "(padan dengan semua) memerlukan hasil bool tunggal"
 msgid "Performing query on unknown header: %s"
 msgstr "Membuat pertanyaan pada pengepala yang tak diketahui:  %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Pengendalian tidak disokong: tambahkan mesej: bagi %s"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Pengendalian tidak disokong: cari mengikut ungkapan: bagi %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Pengendalian tidak disokong: cari mengikut uids: bagi %s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Mengalihkan mesej"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr "Menyalin mesej"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 msgid "Filtering new message(s)"
 msgstr "Menapis mesej baru"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8088,15 +8340,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr "Gagal menghuraikan petunjuk id pengguna gpg."
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr "Gagal menghuraikan permintaan ungkapan laluan gpg."
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8105,30 +8357,30 @@ msgstr ""
 "Anda memerlukan ungkapan laluan untuk membuka kunci bagi\n"
 "pengguna:  \"%s\""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1410 camel/camel-gpg-context.c:1490
-#: camel/camel-gpg-context.c:1597 mail/mail-send-recv.c:572
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Batal."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Gagal membuka kunci rahsia: 3 ungkapan laluan yang rosak diberikan."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Maklum balas yang tidak dijangkakan daripada GnuPG: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr "Tiada data diberikan"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Gagal untuk menyulitkan: Penerima sah tidak ditetapkan."
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8139,64 +8391,65 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Gagal untuk GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:406
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Tidak dapat menulis data: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1646
-#: camel/camel-gpg-context.c:1697
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Gagal melaksanakan gpg: %s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1402
-#: camel/camel-gpg-context.c:1483 camel/camel-gpg-context.c:1506
-#: camel/camel-gpg-context.c:1590 camel/camel-gpg-context.c:1614
-#: camel/camel-gpg-context.c:1668 camel/camel-gpg-context.c:1719
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr "Gagal melaksanakan gpg."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "Ini ialah bahagian mesej yang ditandatangani secara digital"
 
-#: camel/camel-gpg-context.c:1369 camel/camel-gpg-context.c:1378
-#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:709
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
 #, fuzzy
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 "Tidak dapat mengesah betul tandatangan mesej: tidak dapat mewujudkan fail "
 "sementara: %s"
 
-#: camel/camel-gpg-context.c:1385
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Tidak dapat mengesah betul tandatangan mesej: tidak dapat mewujudkan fail "
 "sementara: %s"
 
-#: camel/camel-gpg-context.c:1466
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Tidak dapat menulis data: %s"
 
-#: camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1531
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Ini ialah bahagian mesej yang ditandatangani secara digital"
 
-#: camel/camel-gpg-context.c:1621 camel/camel-smime-context.c:963
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Kandungan badan indeks"
 
-#: camel/camel-gpg-context.c:1625
+#: camel/camel-gpg-context.c:1632
 msgid "Unable to parse message content"
 msgstr "Tidak dapat menghuraikan kandungan mesej"
 
@@ -8303,7 +8556,7 @@ msgstr "Gagal menyahsulitkan bahagian MIME: ralat protokol"
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "Gagal menyahsulitkan bahagian MIME: struktur tak sah"
 
-#: camel/camel-multipart-signed.c:691
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "ralat hurai"
 
@@ -8633,12 +8886,12 @@ msgstr "Penyedia e-mel folder maya"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Untuk membaca mel sebagai pertanyaan bagi set folder yang lain"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Tidak ada penyedia bagi protokol `%s'"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8705,6 +8958,17 @@ msgstr "Tidak dapat memperoleh folder: pengendalian tak sah pada simpanan ini"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Tidak dapat mewujudkan folder: pengendalian tak sah pada simpanan ini"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Sampah"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "Jun"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "Tidak dapat memperoleh sijil pengeluar"
@@ -9079,53 +9343,68 @@ msgid "Failed to cache %s: %s"
 msgstr "Gagal untuk cache %s: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Sedang disambungkan ke pelayan..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Gagal disambungkan ke pelayan LDAP"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "Syarikat"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Menyemak mel baru"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Check for new messages in all folders"
 msgstr "Menyemak mesej baru dalam semua folder"
 
-#: camel/providers/imap/camel-imap-provider.c:48
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Folder"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Tunjukkan folder yang dilanggan sahaja"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "Menolak ruang nama folder yang disediakan oleh pelayan"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Ruang nama"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Gunakan penapis bagi mesej baru dalam INBOX dalam pelayan ini"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 msgid "Automatically synchronize remote mail locally"
 msgstr "Secara automatik segerakkan mel jauh secara setempat"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Untuk membaca dan menyimpan mel dalam pelayan IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Kata laluan"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9650,7 +9929,7 @@ msgstr "Tidak dapat menutup folder sumber %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Tidak dapat menutup folder sementara: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Tidak dapat menamakan semula folder: %s"
@@ -9933,7 +10212,7 @@ msgstr "Hapuskan selepas %s hari"
 msgid "Disable support for all POP3 extensions"
 msgstr "Melumpuhkan sokongan untuk semua sambungan POP3"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -10024,7 +10303,7 @@ msgid "No such folder `%s'."
 msgstr "Folder tersebut tidak ada `%s'"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Hantar mel"
 
@@ -10079,7 +10358,7 @@ msgstr "hantarkan mel"
 msgid "Mail delivery via the sendmail program"
 msgstr "Penyerahan mel melalui atur cara hantar mel"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10370,7 +10649,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "lampiran"
 
@@ -10414,11 +10693,11 @@ msgstr "Jenis MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Cadangkan paparan automatik bagi lampiran"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 msgid "You need to configure an account before you can compose mail."
 msgstr "Anda perlu mengkonfigurasikan akaun sebelum anda boleh menggubah mel."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Klik di sini bagi buku alamat"
 
@@ -10429,45 +10708,45 @@ msgstr "Klik di sini bagi buku alamat"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Balas Kepada:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Daripada:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Tajuk:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Kepada:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Masukkan penerima mesej"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Salinan kepada (Sk):"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Masukkan alamat yang akan menerima salinan mesej"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Salinan tersembunyi (St):"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10478,14 +10757,19 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Kirimkan Kepada:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr "Destinasi Pengiriman"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Lampirkan fail ke mesej"
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Lampirkan fail"
@@ -10520,21 +10804,21 @@ msgstr "Fail wujud, tulis ganti?"
 msgid "Error saving file: %s"
 msgstr "Ralat ketika menyimpan fail: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Ralat ketika memuatkan fail: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Ralat ketika mencapai fail: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Tidak boleh mendapatkan semula mesej daripada editor"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10543,7 +10827,7 @@ msgstr ""
 "Tidak dapat menjangkau fail: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10552,7 +10836,7 @@ msgstr ""
 "Tidak dapat memangkas fail: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10561,7 +10845,7 @@ msgstr ""
 "Tidak dapat menyalin penghurai fail: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10570,7 +10854,7 @@ msgstr ""
 "Ralat ketika menyimpan mesej secara automatik: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10579,7 +10863,7 @@ msgstr ""
 "sebelumnya.\n"
 "Adakah anda ingin cuba memulihkannya?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10590,28 +10874,28 @@ msgstr ""
 "\n"
 "Adakah anda ingin menyimpan perubahan yang telah dibuat?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Amaran: Mesej yang Diubah Suai"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Buka fail"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "Tandatangan:"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "Autogenerated"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Gubah mesej"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10619,7 +10903,7 @@ msgstr ""
 "Tidak dapat mewujudkan tetingkap penggubah:\n"
 "Tidak dapat mengaktifkan kawalan pemilih alamat."
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10631,7 +10915,7 @@ msgstr ""
 "Sila pastikan versi gtkhtml dan libgtkhtml\n"
 "yang betul dipasang.\n"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10639,7 +10923,7 @@ msgstr ""
 "Tidak dapat mewujudkan tetingkap penggubah:\n"
 "Tidak dapat mengaktifkan komponen editor HTML."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10647,11 +10931,13 @@ msgstr ""
 "<b>(Penggubah mengandungi badan mesej bukan teks yang tidak boleh diedit.)<b>"
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Set perisian kumpulan Evolution"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10907,13 +11193,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11046,19 +11332,19 @@ msgstr ""
 "Ralat dalam ungkapan biasa '%s':\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Penting"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "Perkara yang Perlu Dibuat"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Selepas itu"
@@ -11163,7 +11449,7 @@ msgstr "yang lalu"
 msgid "months"
 msgstr "bulan"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "saat"
 
@@ -11260,7 +11546,7 @@ msgstr "Ungkapan"
 msgid "Follow Up"
 msgstr "Susulan"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:703
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "Label"
 
@@ -11342,8 +11628,9 @@ msgstr "Pengepala yang khusus"
 msgid "Stop Processing"
 msgstr "Hentikan Memproses"
 
-#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1462 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Tajuk"
 
@@ -11440,7 +11727,7 @@ msgid "starts with"
 msgstr "bermula dengan"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:918
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Tajuk peraturan '%s' tidak unik, pilih yang lain."
@@ -11526,7 +11813,7 @@ msgstr "Pemandang folder Mel Evolution"
 msgid "Evolution Mail preferences control"
 msgstr "Kawalan keutamaan Mel Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:773
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
 #: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
 #: mail/importers/pine-importer.c:572
 msgid "Mail"
@@ -11536,7 +11823,7 @@ msgstr "Mel"
 msgid "Mail Accounts"
 msgstr "Akaun Mel"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
 msgid "Mail Preferences"
 msgstr "Keutamaan Mel"
 
@@ -11581,7 +11868,7 @@ msgid "Protocol"
 msgstr "Protokol"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr "Tanpa nama"
 
@@ -11605,20 +11892,17 @@ msgstr "Tambahkan tandatangan skrip"
 msgid "Signature(s)"
 msgstr "Tandatangan"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "Anda menghantar mesej berformat HTML. Sila pastikan bahawa\n"
 "penerima berikut mahu dan boleh menerima mel HTML:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Tetap hantarkan?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11626,7 +11910,7 @@ msgstr ""
 "Mesej ini tidak mempunyai tajuk.\n"
 "Anda pasti ingin menghantarnya?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11634,11 +11918,11 @@ msgstr ""
 "Memandangkan senarai kenalan yang anda hantar dikonfigurasikan untuk "
 "menyembunyikan alamat senarai, mesej ini akan hanya mengandungi penerima St."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Mesej ini hanya mengandungi penerima St."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11648,11 +11932,11 @@ msgstr ""
 "pengepala Jelas Kepada.\n"
 "Tetap hantarkan?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Anda mestilah menetapkan penerima untuk menghantar mesej ini."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11669,167 +11953,285 @@ msgstr "Wujudkan _Folder Maya Daripada Carian..."
 msgid "<click here to select a folder>"
 msgstr "<klik di sini untuk memilih folder>"
 
-#: mail/em-folder-selector.c:234
-msgid "Folder _name"
-msgstr "Nama _folder"
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Wujudkan Folder Baru"
 
-#: mail/em-folder-view.c:589 mail/em-folder-view.c:603
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Tetapkan di mana folder akan diwujudkan:"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
+msgstr "Nama _folder:"
+
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Tidak dapat mewujudkan direktori sementara: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Tidak dapat mewujudkan stor mbox sementara: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Tidak dapat mewujudkan folder mbox sementara: %s"
+
+#: mail/em-folder-tree-model.c:592
+#, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Tidak dapat menyalin mesej ke folder mbox sementara: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Sedang memuatkan..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Pilih folder"
 
+#: mail/em-folder-tree.c:1091
+msgid "Create folder"
+msgstr "Wujudkan folder"
+
+#: mail/em-folder-tree.c:1179
+#, c-format
+msgid "Could not delete folder: %s"
+msgstr "Tidak dapat menghapuskan folder: %s"
+
+#: mail/em-folder-tree.c:1200
+#, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr ""
+"Anda pasti ingin menghapuskan folder \"%s\" dan semua subfolder dalamnya?"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Hapuskan \"%s\""
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Namakan semula folder \"%s\" kepada:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+msgid "Rename Folder"
+msgstr "Namakan semula Folder"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr "Folder bernama \"%s\" telah wujud. Sila gunakan nama yang lain."
+
+#: mail/em-folder-tree.c:1370
+msgid "Folder properties"
+msgstr "Ciri-ciri Folder"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Ciri-ciri"
+
+#: mail/em-folder-tree.c:1384
+msgid "Folder Name"
+msgstr "Nama Folder"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Lihat"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Buka dalam Tetingkap _Baru"
+
+#: mail/em-folder-tree.c:1497
+msgid "_Move"
+msgstr "_Alih"
+
+#: mail/em-folder-tree.c:1500
+msgid "_New Folder..."
+msgstr "_Folder Baru..."
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "_Namakan semula"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "_Ciri-ciri..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:671 mail/em-popup.c:588
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "_Edit sebagai Mesej Baru..."
 
-#: mail/em-folder-view.c:673
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "_Cetak"
 
-#: mail/em-folder-view.c:676 ui/evolution-mail-message.xml.h:122
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Balas kepada Penghantar"
 
-#: mail/em-folder-view.c:677 mail/em-popup.c:649
-#: ui/evolution-mail-message.xml.h:84
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Balas kepada _Senarai"
 
-#: mail/em-folder-view.c:678 mail/em-popup.c:650
-#: ui/evolution-mail-message.xml.h:83
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Balas kepada _Semua"
 
-#: mail/em-folder-view.c:679 mail/em-popup.c:652
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "_Sampaikan"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr "Susu_lan..."
 
-#: mail/em-folder-view.c:683
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr "Bendera Siap Ditunjukkan"
 
-#: mail/em-folder-view.c:684
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "Ko_songkan Bendera"
 
-#: mail/em-folder-view.c:687 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Tanda_kan sebagai Telah Dibaca"
 
-#: mail/em-folder-view.c:688
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "Tandakan sebagai _Belum Dibaca"
 
-#: mail/em-folder-view.c:689
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Tandakan sebagai _Penting"
 
-#: mail/em-folder-view.c:690
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "_Tandakan sebagai Tidak Penting"
 
-#: mail/em-folder-view.c:691 ui/evolution-mail-message.xml.h:51
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Tandakan sebagai _Belum Dibaca"
 
-#: mail/em-folder-view.c:692 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Tandakan sebagai _Penting"
 
-#: mail/em-folder-view.c:696
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "Batalkan hapus"
 
-#: mail/em-folder-view.c:699
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "Alih_kan ke Folder..."
 
-#: mail/em-folder-view.c:700 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Salin ke Folder..."
 
-#: mail/em-folder-view.c:708
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "Tambahkan Penghantar ke Buku_Alamat"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "Gunak_an Penapis"
 
-#: mail/em-folder-view.c:714
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "Wujud_kan Peraturan Daripada Mesej"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "VFolder bagi _Tajuk"
 
-#: mail/em-folder-view.c:716
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "VFolder bagi Pen_ghantar"
 
-#: mail/em-folder-view.c:717
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "VFolder bagi _Penerima"
 
-#: mail/em-folder-view.c:718
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "VFolder bagi Senarai _Mel"
 
-#: mail/em-folder-view.c:720
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "VFolder bagi Pen_ghantar"
 
-#: mail/em-folder-view.c:724
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Penapis bagi Ta_juk"
 
-#: mail/em-folder-view.c:725
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Penapis bagi Peng_hantar"
 
-#: mail/em-folder-view.c:726
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Penapis bagi Pe_nerima"
 
-#: mail/em-folder-view.c:727
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Penapis bagi _Senarai Mel"
 
-#: mail/em-folder-view.c:729
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Penapis bagi Peng_hantar"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1507 mail/em-folder-view.c:1545
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Piawai"
 
-#: mail/em-folder-view.c:1579
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Cetak Mesej"
 
-#: mail/em-folder-view.c:1820
+#: mail/em-folder-view.c:1825
 msgid "_Copy Link Location"
 msgstr "_Salin Lokasi Pautan"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, c-format
 msgid "Matches: %d"
 msgstr "Padanan: %d"
 
-#: mail/em-format-html-display.c:570
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Diumpukkan"
+
+#: mail/em-format-html-display.c:597
 #, fuzzy
 msgid ""
 "This message is not signed.  There is no guarantee the sender of the message "
@@ -11837,19 +12239,33 @@ msgid ""
 msgstr ""
 "Mesej ini ditandatangani secara digital dan tidak dapat dibuktikan sah."
 
-#: mail/em-format-html-display.c:571
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Tandatangan buruk"
+
+#: mail/em-format-html-display.c:598
 msgid ""
 "This message is signed and is valid, the sender of this message is very "
 "likely who they claim to be."
 msgstr ""
 
-#: mail/em-format-html-display.c:572
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Tandatangan buruk"
+
+#: mail/em-format-html-display.c:599
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:573
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
 #, fuzzy
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
@@ -11858,42 +12274,65 @@ msgstr ""
 "Token_input mengandungi tandatangan tak sah, atau tandatangan yang tidak "
 "dapat disah betul."
 
-#: mail/em-format-html-display.c:579
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Disampuk"
+
+#: mail/em-format-html-display.c:606
 msgid ""
 "This message is not encrypted.  It's content may be viewed in transit across "
 "The Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:580
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+#, fuzzy
+msgid "Encrypted, weak"
+msgstr "Kandungan badan indeks"
+
+#: mail/em-format-html-display.c:607
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:581
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "Penyulitan PGP"
+
+#: mail/em-format-html-display.c:608
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 
-#: mail/em-format-html-display.c:582
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+#, fuzzy
+msgid "Encrypted, strong"
+msgstr "Kandungan badan indeks"
+
+#: mail/em-format-html-display.c:609
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:703 mail/em-format-html.c:591
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Tidak dapat menghuraikan mesej S/MIME. Ralat tak diketahui."
 
-#: mail/em-format-html-display.c:826
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr ""
-"Mesej ini ditandatangani secara digital. Klik ikon kunci untuk keterangan "
-"lanjut."
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+msgid "Unsupported signature format"
+msgstr "Format tandatangan yang tidak disokong"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Tidak dapat mengesah betul tandatangan dedaun"
 
 #: mail/em-format-html-display.c:917
 msgid "_View Inline"
@@ -11908,102 +12347,85 @@ msgstr "_Sembunyikan"
 msgid "Page %d of %d"
 msgstr "Halaman %d daripada %d"
 
-#: mail/em-format-html.c:454 mail/em-format-html.c:456
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Mendapatkan semula %s"
 
-#: mail/em-format-html.c:803
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Bahagian badan luaran tidak sempurna."
 
-#: mail/em-format-html.c:833
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Penuding ke tapak FTP (%s)"
 
-#: mail/em-format-html.c:844
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Penuding ke fail setempat (%s) sah di tapak \"%s\""
 
-#: mail/em-format-html.c:846
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Penuding ke fail setempat (%s)"
 
-#: mail/em-format-html.c:867
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Penuding ke data jauh (%s)"
 
-#: mail/em-format-html.c:878
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Penuding ke data luaran yang tak diketahui (jenis \"%s\")"
 
-#: mail/em-format-html.c:1000 mail/em-format.c:1215
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-"Mesej ini ditandatangani secara digital dan tidak dapat dibuktikan sah."
-
-#: mail/em-format-html.c:1001 mail/em-format.c:1213
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Mesej ini ditandatangani secara digital dan didapati sah."
-
-#: mail/em-format-html.c:1023 mail/em-format.c:1188
-msgid "Session not initialised"
-msgstr "Sesi tidak dapat dimulakan"
-
-#: mail/em-format-html.c:1034 mail/em-format.c:1199
-msgid "Unsupported signature format"
-msgstr "Format tandatangan yang tidak disokong"
-
-#: mail/em-format-html.c:1083
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Tidak dapat menghuraikan mesej MIME. Dipaparkan sebagai sumber."
 
-#: mail/em-format-html.c:1172
+#: mail/em-format-html.c:1141
 msgid "Formatting message"
 msgstr "Memformat mesej"
 
-#: mail/em-format-html.c:1447 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Daripada"
 
-#: mail/em-format-html.c:1449 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Balas Kepada"
 
-#: mail/em-format-html.c:1451 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Kepada"
 
-#: mail/em-format-html.c:1453 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Sk"
 
-#: mail/em-format-html.c:1455 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "St"
 
-#: mail/em-format-html.c:1474
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "Pengemel"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1501
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1504
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1515 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Tarikh"
@@ -12013,61 +12435,111 @@ msgstr "Tarikh"
 msgid "%s attachment"
 msgstr "lampiran %s"
 
-#: mail/em-popup.c:598
+#: mail/em-format.c:1185
+msgid "Session not initialised"
+msgstr "Sesi tidak dapat dimulakan"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Mesej ini ditandatangani secara digital dan didapati sah."
+
+#: mail/em-format.c:1212
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"Mesej ini ditandatangani secara digital dan tidak dapat dibuktikan sah."
+
+#: mail/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Sedang menunggu..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "%s berdenting"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Gagal untuk cache %s: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Gagal mewujudkan saluran bagi '%s': %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Gagal menyelesaikan hos `%s': %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Simpan Sebagai..."
 
-#: mail/em-popup.c:646
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr "Set sebagai _Latar belakang"
 
-#: mail/em-popup.c:648
+#: mail/em-popup.c:649
 msgid "_Reply to sender"
 msgstr "_Balas kepada penghantar"
 
-#: mail/em-popup.c:685
+#: mail/em-popup.c:697
 msgid "_Open Link in Browser"
 msgstr "_Buka Pautan dalam Pelayar"
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:698
 msgid "Se_nd message to..."
 msgstr "Ha_ntar mesej ke..."
 
-#: mail/em-popup.c:687
+#: mail/em-popup.c:699
 msgid "_Add to Addressbook"
 msgstr "_Tambah ke Buku Alamat"
 
-#: mail/em-popup.c:793
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Buka dalam %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "Stor ini tidak menyokong langganan, atau ia tidak diaktifkan."
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 msgid "Subscribed"
 msgstr "Dilanggan"
 
-#: mail/em-subscribe-editor.c:612
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Folder"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Sila pilih pelayan."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Pelayan tidak dipilih"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Jangan tunjukkan mesej ini lagi."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12076,25 +12548,25 @@ msgstr ""
 "Ralat ketika memuatkan maklumat penapis:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Penapis"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mesej Yang Disampaikan --------"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "penghantar tak diketahui"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Pada %a, %Y-%m-%d di %H:%M %%+05d, %%s menulis:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12103,7 +12575,7 @@ msgstr ""
 "Tidak dapat menyimpan dalam `%s'\n"
 " %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12112,23 +12584,39 @@ msgstr ""
 "`%s' telah wujud.\n"
 "Tulis gantinya?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 msgid "message"
 msgstr "mesej"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 msgid "Save Message..."
 msgstr "Simpan Mesej..."
 
-#: mail/em-utils.c:1893
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Tidak dapat mewujudkan direktori sementara: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Alamat"
+
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
+msgid ""
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Pengendalian ini akan memadamkan secara kekal semua mesej yang ditandakan "
+"sebagai\n"
+"dihapuskan. Jika anda meneruskannya, anda tidak akan dapat memulihkan mesej "
+"ini.\n"
+"\n"
+"Anda pasti ingin menghapuskan mesej ini?"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2288
+#, fuzzy
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12139,6 +12627,388 @@ msgstr ""
 "\n"
 "Anda pasti ingin menghapuskan mesej ini?"
 
+#: mail/evolution-mail.schemas.in.in.h:1
+#, fuzzy
+msgid "Automatic link recognition"
+msgstr "_Kesan pautan secara automatik"
+
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "_Kesan pautan secara automatik"
+
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
+msgid "Default charset in which to compose messages"
+msgstr "Tajuk piawai bagi mesej."
+
+#: mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
+msgid "Default charset in which to compose messages."
+msgstr "Tajuk piawai bagi mesej."
+
+#: mail/evolution-mail.schemas.in.in.h:8
+#, fuzzy
+msgid "Default charset in which to display messages"
+msgstr "Cari teks dalam badan mesej yang dipaparkan"
+
+#: mail/evolution-mail.schemas.in.in.h:9
+#, fuzzy
+msgid "Default charset in which to display messages."
+msgstr "Cari teks dalam badan mesej yang dipaparkan"
+
+#: mail/evolution-mail.schemas.in.in.h:10
+#, fuzzy
+msgid "Default forward style"
+msgstr "_Gaya untuk menyampaikan:"
+
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default reply style"
+msgstr "_Gaya Balasan:"
+
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Empty Trash folders on exit"
+msgstr "Kosongkan _folder sampah apabila keluar"
+
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Kosongkan _folder sampah apabila keluar"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
+msgstr "Akaun Mel"
+
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "Melaksanakan tindakan"
+
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Pemberitahuan Mel Baru"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Pemberitahuan Mel Baru"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+"_Penggesa apabila menghantar mesej HTML kepada kenalan yang tidak mahukannya"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "Penggesa apabila menghantar mesej dengan hanya penerima St ditentukan"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "Hantar Mel HTML?"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "Hantar Mel HTML?"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "_Tunjukkan imej animasi"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "_Tunjukkan imej animasi"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Tunjukkan mesej dalam gaya normal"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "_Pralihat Anak Tetingkap"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "_Mainkan fail bunyi apabila ada mel baru"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "Semak _Ejaan"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "_Fon Terminal:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "Pilih fon lebar pemboleh ubah HTML untuk pencetakan"
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Senarai Mesej yang Disambungkan"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Senarai Mesej yang Disambungkan"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "_Jadikan ini akaun piawai saya"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "L_ebar Pemboleh ubah:"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr "Pengimport Elm Evolution"
@@ -12267,10 +13137,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution sedang mengimport data Netscape lama anda"
 
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1119
-msgid "Trash"
-msgstr "Sampah"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Mengimbas penapis mel"
@@ -12279,7 +13145,7 @@ msgstr "Mengimbas penapis mel"
 msgid "Scanning directory"
 msgstr "Mengimbas direktori"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Memulakan import"
 
@@ -12354,19 +13220,19 @@ msgid "You have not filled in all of the required information."
 msgstr "Anda tidak mengisi semua maklumat yang diperlukan."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Editor Akaun Evolution"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Hos:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "Nama_pengguna:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Laluan:"
 
@@ -12379,35 +13245,35 @@ msgstr "Anda tidak boleh mewujudkan dua akaun dengan nama yang sama."
 msgid "Mail to %s"
 msgstr "Mel ke %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Tajuk adalah %s "
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Mel dari %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s senarai mel"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Jawapan kepada"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Tambahkan Peraturan Penapis"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "Peraturan penapis berikut:\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12418,30 +13284,30 @@ msgstr ""
 "    '%s'\n"
 "Dan telah dikemaskinikan."
 
-#: mail/mail-component.c:211
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr "Atas komputer ini"
 
-#: mail/mail-component.c:362
+#: mail/mail-component.c:379
 msgid "New Mail Message"
 msgstr "Mesej Mel Baru"
 
-#: mail/mail-component.c:363
+#: mail/mail-component.c:380
 msgid "_Mail Message"
 msgstr "_Mesej Mel"
 
-#: mail/mail-component.c:364
+#: mail/mail-component.c:381
 msgid "Compose a new mail message"
 msgstr "Gubah mesej mel baru"
 
-#: mail/mail-component.c:445
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Pengenalan"
 
@@ -12501,11 +13367,11 @@ msgstr ""
 "ini dalam ruang di bawah. Nama ini akan digunakan untuk tujuan paparan "
 "sahaja."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Menyemak Khidmat"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Sedang disambungkan ke pelayan..."
 
@@ -12589,26 +13455,35 @@ msgid "C_olors"
 msgstr "W_arna"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Menyemak Mel Baru"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "Semak ejaan sambil saya _menaip"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Menyemak Mel Baru"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "Warna bagi _kata yang salah eja:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Menggubah Mesej"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Konfigurasi"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12624,133 +13499,138 @@ msgstr ""
 "\n"
 "Klik \"Guna\" untuk menyimpan seting anda."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "Pia_wai"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Peri laku Piawai"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "Pengekodan aksara _piawai:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Menghapuskan Mel"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Sentiasa tandatangan mesej keluar apabila menggunakan akaun ini"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "Jangan petik mesej asal"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Jangan tandatangani _permintaan mesyuarat (bagi keserasian Outlook)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Selesai"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "Folder _draf:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "Bo_lehkan"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "Akaun E-mel"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "Alamat _e-mel:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "Kosongkan _folder sampah apabila keluar"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "Sijil Kenalan"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Pembantu Akaun Evolution"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Laksanakan Arahan..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "Le_bar -tetap:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "Penapis"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "Ciri-ciri Fon"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "Formatkan mesej dalam _HTML"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "Tonjolkan _petikan dengan"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Dalam Talian"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Label dan Warna"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Memuatkan Imej"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Konfigurasi Mel"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Lokasi peti mel"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Penggubah Mesej"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Paparan Mesej"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 msgid "Message Fonts"
 msgstr "Fon Mesej"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Pemberitahuan Mel Baru"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -12758,140 +13638,140 @@ msgstr ""
 "Nota: anda tidak akan digesa untuk memberikan kata laluan sehinggalah anda "
 "disambungkan buat pertama kali"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Maklumat Opsyenal"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "Or_ganisasi:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _ID Kekunci:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Pilih warna"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Penggesa apabila menghantar mesej dengan hanya penerima St ditentukan"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Kebersendirian Agak Baik (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Fon Tercetak"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Dirmel Qmail "
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "Petik mesej asal"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Dipetik"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "I_ngat kata laluan ini"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "Jawapan Kepada:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Menerima E-mel"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "Menerima _Opsyen"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "Ingat kata laluan _ini"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Maklumat yang Diminta"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "Simpan semula Piawai"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "K_eselamatan"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME Terjamin (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr "Pilih fon lebar tetap HTML"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr "Pilih fon lebar tetap HTML untuk pencetakan"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr "Pilih fon lebar pemboleh ubah HTML"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr "Pilih fon lebar pemboleh ubah HTML untuk pencetakan"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Menghantar E-mel"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Folder _mesej Dihantar:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Mesej Dihantar dan Didraf"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Pe_layan memerlukan pengesahan"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Konfigurasi Pelayan"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Jenis _Pelayan:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Sijil tandatangan tidak dijumpai"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "Tetapkan _nama fail:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "Semak _Ejaan"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Peti mel Unix piawai"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12901,7 +13781,7 @@ msgstr ""
 "anda. Nama yang anda tetapkan akan digunakan\n"
 "untuk tujuan paparan sahaja. "
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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 "
@@ -12911,7 +13791,7 @@ msgstr ""
 "semakan ejaan. Senarai bahasa di sini hanya menunjukkan bahasa yang terdapat "
 "dalam kamus yang telah dimasukkan."
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12919,11 +13799,15 @@ msgstr ""
 "Taip nama yang ingin anda gunakan bagi akaun ini.\n"
 "Contohnya: \"Kerja\" or \"Peribadi\""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "L_ebar Pemboleh ubah:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12933,161 +13817,170 @@ msgstr ""
 "\n"
 "Klik \"Sampaikan\" untuk bermula. "
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "_Tambahkan Tandatangan"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "_Sentiasa muatkan imej daripada internet"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Sentiasa tandatangan mesej keluar apabila menggunakan akaun ini"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "_Jenis Pengesahan:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "_Jenis Pengesahan:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr "_Secara automatik semak mel baru setiap"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "_Secara automatik sisipkan imej smiley"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "_Bunyi bip apabila ada mesej baru"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "_Sahkan apabila membuang folder"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "_Tandatangan piawai:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "_Piawai"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Jangan beritahu saya apabila ada mel baru"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "_Bolehkan"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "_Gaya untuk menyampaikan:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "_Nama penuh:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "_Mel HTML"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "_Pengenalan"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Jun"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "_Muatkan imej jika penghantar ada dalam buku alamat"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "_Jadikan ini akaun piawai saya"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "_Tandakan mesej sebagai telah dibaca selepas"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Nama:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "_Jangan muatkan imej daripada internet"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "_Mainkan fail bunyi apabila ada mel baru"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "_Penggesa apabila menghantar mesej HTML kepada kenalan yang tidak mahukannya"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Penggesa tapabila menghantar mesej tanpa tajuk"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "_Menerima Mel"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "_Gaya Balasan:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "_Simpan semula piawai"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Skrip:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "_Hapuskan..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "_Menghantar Mel"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "_Tunjukkan imej animasi"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Tandatangan"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr "_Fon Piawai:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr "_Fon Terminal:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "_Gunakan sambungan terjamin (SSL):"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr "_Gunakan fon yang sama seperti aplikasi lain"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "huraian"
 
@@ -13096,7 +13989,7 @@ msgstr "huraian"
 msgid "Pinging %s"
 msgstr "%s berdenting"
 
-#: mail/mail-mt.c:256
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13105,7 +13998,7 @@ msgstr ""
 "Ralat semasa '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:259
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13114,7 +14007,7 @@ msgstr ""
 "Ralat semasa melakukan pengendalian:\n"
 "%s"
 
-#: mail/mail-mt.c:910
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Berfungsi"
 
@@ -13183,11 +14076,6 @@ msgstr "Menyalin mesej ke %s"
 msgid "Scanning folders in \"%s\""
 msgstr "Mengimbas folder dalam \"%s\""
 
-#: mail/mail-ops.c:1125
-#, fuzzy
-msgid "Junk"
-msgstr "Jun"
-
 #: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Mesej yang disampaikan"
@@ -13229,22 +14117,22 @@ msgstr "Mengosongkan tong sampah dalam '%s'"
 msgid "Local Folders"
 msgstr "Folder Setempat"
 
-#: mail/mail-ops.c:1758
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Mendapatkan semula mesej %s"
 
-#: mail/mail-ops.c:1830
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Mendapatkan semula %d mesej"
 
-#: mail/mail-ops.c:1914
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Menyimpan %d mesej"
 
-#: mail/mail-ops.c:1962
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13253,7 +14141,7 @@ msgstr ""
 "Tidak dapat mewujudkan fail output: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1990
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13262,11 +14150,11 @@ msgstr ""
 "Ralat ketika menyimpan mesej ke: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2061
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Menyimpan lampiran"
 
-#: mail/mail-ops.c:2078
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13275,22 +14163,22 @@ msgstr ""
 "Tidak dapat mewujudkan fail output: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2108
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Tidak dapat menulis data: %s"
 
-#: mail/mail-ops.c:2256
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Terputus daripada %s"
 
-#: mail/mail-ops.c:2256
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Disambungkan semula ke %s"
 
-#: mail/mail-ops.c:2358
+#: mail/mail-ops.c:2366
 msgid "Changing junk status"
 msgstr ""
 
@@ -13310,6 +14198,21 @@ msgstr "Cari:"
 msgid "Search"
 msgstr "Cari"
 
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Edit tandatangan"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Pengecualian"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Maklumat Akaun"
+
 #: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Sedang membatalkan..."
@@ -13345,24 +14248,24 @@ msgstr "Sedang mengemaskinikan..."
 msgid "Waiting..."
 msgstr "Sedang menunggu..."
 
-#: mail/mail-session.c:231
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Pengguna membatalkan pengendalian."
 
-#: mail/mail-session.c:264
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Masukkan Kata Laluan bagi %s"
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Masukkan Kata Laluan"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "_Ingat kata laluan ini"
 
-#: mail/mail-session.c:290
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Ingat kata laluan ini bagi sesi seterusnya"
 
@@ -13410,17 +14313,22 @@ msgstr "Mesej yang disampaikan - %s"
 msgid "Forwarded message"
 msgstr "Mesej yang disampaikan"
 
-#: mail/mail-vfolder.c:90
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Membuka folder %s"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Menyediakan vfolder: %s"
 
-#: mail/mail-vfolder.c:208
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Mengemaskinikan vfolder bagi uri: %s"
 
-#: mail/mail-vfolder.c:466
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13433,88 +14341,88 @@ msgstr ""
 "    '%s'\n"
 "Dan telah dikemaskinikan."
 
-#: mail/mail-vfolder.c:777
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "VFolder"
 
-#: mail/mail-vfolder.c:836
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "vFolder"
 
-#: mail/mail-vfolder.c:875
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Edit vFolder"
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Cuba mengedit vFolder '%s' yang tidak wujud."
 
-#: mail/mail-vfolder.c:967
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "VFolder Baru"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Belum dilihat"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Dilihat"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Dijawab"
 
-#: mail/message-list.c:905
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Pelbagai Mesej yang Belum Dilihat"
 
-#: mail/message-list.c:906
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Pelbagai Mesej"
 
-#: mail/message-list.c:910
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Paling rendah"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Lebih rendah"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Lebih tinggi"
 
-#: mail/message-list.c:916
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr " Paling tinggi"
 
-#: mail/message-list.c:1233
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1240
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Hari ini %l:%M %p"
 
-#: mail/message-list.c:1249
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Semalam %l:%M %p"
 
-#: mail/message-list.c:1261
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1271
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3073
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Menjana senarai mesej"
 
@@ -13570,11 +14478,11 @@ msgstr "Sampaikan"
 msgid "No Response Necessary"
 msgstr "Maklum Balas Tidak Perlu"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:81
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Balas"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:82
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Balas kepada Semua"
 
@@ -13634,22 +14542,125 @@ msgstr "Buat konfigurasi folder khas dan peri laku folder luar talian di sini"
 msgid "Evolution Shell"
 msgstr "Cangkerang Evolution"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Kawalan konfigurasi seting folder Evolution"
-
 #: shell/GNOME_Evolution_Shell.server.in.in.h:4
 msgid "Folder Settings"
 msgstr "Seting Folder"
 
-#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" dalam \"%s\""
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "80%"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Namakan semula kumpulan jalan pintas ini"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Toggle sama ada ingin menunjukkan bar folder atau tidak"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Sembunyikan bar jalan pintas"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Keutamaan Piawai:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Keutamaan Piawai:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Antara muka konfigurasi Mel Evolution"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+#, fuzzy
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "Tandakan lampiran yang akan ditunjukkan dalam talian secara piawai."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
+msgid ""
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "Membuka folder tugas piawai"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Membuka folder tugas piawai"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Membuka folder tugas piawai"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Tambahkan Folder"
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Membuka folder tugas piawai"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Toggle sama ada ingin menunjukkan bar folder atau tidak"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Toggle sama ada ingin menunjukkan bar jalan pintas atau tidak"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "E-mel"
 
 #: shell/e-setup.c:144
 msgid "Could not update files correctly"
@@ -13775,11 +14786,6 @@ msgstr ""
 msgid "Really delete folder \"%s\"?"
 msgstr "Anda pasti ingin menghapuskan folder \"%s\"?"
 
-#: shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Hapuskan \"%s\""
-
 #: shell/e-shell-folder-commands.c:489
 #, c-format
 msgid ""
@@ -13789,26 +14795,12 @@ msgstr ""
 "Tidak dapat menamakan semula folder:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Namakan semula folder \"%s\" kepada:"
-
-#: shell/e-shell-folder-commands.c:541
-msgid "Rename Folder"
-msgstr "Namakan semula Folder"
-
 #: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Nama folder yang ditetapkan tak sah: %s"
 
-#: shell/e-shell-folder-commands.c:554
-#, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr "Folder bernama \"%s\" telah wujud. Sila gunakan nama yang lain."
-
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
 msgstr "Folder yang dipilih bukannya milik pengguna yang lain"
@@ -13831,19 +14823,15 @@ msgstr ""
 "Tidak dapat mewujudkan folder yang ditetapkan:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Wujudkan Folder Baru"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Tak Berjudul)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Pilih jenis pengimport yang akan dijalankan:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13857,11 +14845,11 @@ msgstr ""
 "Anda boleh pilih \"Automatik\" jika anda tidak tahu, dan Evolution akan cuba "
 "menyelesaikannya."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Sila pilih maklumat yang ingin anda import:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13873,7 +14861,7 @@ msgstr ""
 "yang dapat diimport apabila dijumpai. Jika anda mahu mencuba\n"
 "lagi, sila klik butang \"Kembali\".\n"
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13882,21 +14870,21 @@ msgstr ""
 "Mengimport %s\n"
 "Mengimport item %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "Pilih pengimport"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "Fail %s tidak wujud"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Ralat Evolution"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -13905,11 +14893,11 @@ msgstr ""
 "Tidak ada pengimport yang boleh mengendalikan\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Mengimport"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -13918,17 +14906,17 @@ msgstr ""
 "Mengimport %s.\n"
 "Memulakan %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Ralat ketika memulakan %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Ralat ketika memuatkan %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13937,31 +14925,31 @@ msgstr ""
 "Mengimport %s\n"
 "Mengimport item 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Automatik"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 msgid "_Filename:"
 msgstr "_Namafail:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Pilih fail"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 msgid "File _type:"
 msgstr "_Jenis fail:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 msgid "Import data and settings from _older programs"
 msgstr "Import data dan seting daripada program _lama"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 msgid "Import a _single file"
 msgstr "Import fail _tunggal"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -13969,46 +14957,27 @@ msgstr ""
 "Sila tunggu...\n"
 "Sedang mengimbas persediaan sedia ada"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Memulakan Pengimport Cerdas"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "Daripada %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Pilih folder destinasi untuk mengimport data ini"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 msgid "_Import"
 msgstr "_Import"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Sedang menutup sambungan..."
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Ralat ketika menyegerakkan \"%s\":\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "Menyegerakkan Folder"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Sedang menyegerakkan \"%s\" (%d daripada %d)..."
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Seting Evolution"
@@ -14043,7 +15012,7 @@ msgstr "Tidak dapat membuka folder kongsi: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Tidak dapat mencari folder kongsi yang ditetapkan."
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14057,7 +15026,7 @@ msgstr ""
 "\n"
 "Adakah anda mahu berhenti menggunakan Pembantu ini sekarang?"
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 msgid "Quit Assistant"
 msgstr "Keluar dari Pembantu"
 
@@ -14132,19 +15101,37 @@ msgstr "_Bekerja Luar Talian"
 msgid "Work Offline"
 msgstr "Bekerja Luar Talian"
 
-#: shell/e-shell.c:987
+#: shell/e-shell-window.c:324
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution dalam talian sekarang.  Klik butang ini untuk bekerja luar "
+"talian."
+
+#: shell/e-shell-window.c:331
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Ximian Evolution adalah dalam proses menjadi luar talian."
+
+#: shell/e-shell-window.c:337
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution luar talian sekarang.  Klik butang ini untuk bekerja dalam "
+"talian."
+
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Argumen tak sah"
 
-#: shell/e-shell.c:989
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Tidak dapat mendaftarkan dalam OAF"
 
-#: shell/e-shell.c:991
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Pangkalan Data Konfigurasi tidak dijumpai"
 
-#: shell/e-shell.c:993
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Ralat generik"
 
@@ -14248,10 +15235,6 @@ msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Buka folder yang dipautkan ke jalan pintas ini dalam tetingkap baru"
 
 #: shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "_Namakan semula"
-
-#: shell/e-shortcuts-view.c:427
 msgid "Rename this shortcut"
 msgstr "Namakan semula jalan pintas ini"
 
@@ -14285,6 +15268,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% siap)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Baru"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "\"%s\" dalam \"%s\""
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14322,66 +15316,6 @@ msgstr ""
 "Ralat daripada sistem pengaktifan ialah:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "Ralat CORBA"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Disampuk"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Argumen tak sah"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Sudah mempunyai pemilik"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Tiada pemilik"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Tidak dijumpai"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Jenis yang tidak disokong"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Skema yang tidak disokong"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Pengendalian yang tidak disokong"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Ralat dalaman"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Wujud"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "URI tak sah"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Mempunyai subfolder"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Tiada lagi ruang"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "Pemilik lama telah meninggal dunia"
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr "Sambungan Aktif"
@@ -14410,18 +15344,10 @@ msgstr "_Mel:"
 msgid "_Tasks:"
 msgstr "_Tugas:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr "Nama _folder:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder _type:"
 msgstr "Jenis _folder:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Tetapkan di mana folder akan diwujudkan:"
-
 #: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "Buka Folder Pengguna Lain"
@@ -14518,7 +15444,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Pengimport"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:27
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Import"
 
@@ -14534,7 +15460,7 @@ msgstr "Jangan tanya saya lagi"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution boleh mengimport data daripada fail berikut:"
 
-#: shell/main.c:114 shell/main.c:557
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -14610,27 +15536,27 @@ msgstr "Tidak dapat mencapai cangkerang Ximian Evolution."
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Tidak dapat memulakan cangkerang Ximian Evolution: %s"
 
-#: shell/main.c:524
+#: shell/main.c:526
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:526
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Mulakan dalam mod luar talian"
 
-#: shell/main.c:528
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Mulakan dalam mod dalam talian"
 
-#: shell/main.c:531
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr "Tamatkan semua komponen Evolution secara paksa"
 
-#: shell/main.c:534
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Hantarkan output penyahpijatan bagi semua komponen ke fail."
 
-#: shell/main.c:561
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14639,32 +15565,56 @@ msgstr ""
 "%s: --dalam talian dan --luar talian tidak dapat digunakan bersama.\n"
 "  Gunakan %s --bantuan untuk keterangan lanjut.\n"
 
-#: smime/gui/certificate-manager.c:134 smime/gui/certificate-manager.c:275
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Pilih pengimport"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 msgid "Certificate Name"
 msgstr "Nama Sijil"
 
-#: smime/gui/certificate-manager.c:140 smime/gui/certificate-manager.c:287
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 msgid "Purposes"
 msgstr "Tujuan"
 
-#: smime/gui/certificate-manager.c:146 smime/gui/smime-ui.glade.h:35
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr "Nombor Siri"
 
-#: smime/gui/certificate-manager.c:152
+#: smime/gui/certificate-manager.c:174
 msgid "Expires"
 msgstr "Tamat tempoh"
 
-#: smime/gui/certificate-manager.c:196 smime/gui/certificate-manager.c:330
-#, fuzzy
-msgid "Select a cert to import..."
-msgstr "Pilih pengimport"
-
-#: smime/gui/certificate-manager.c:281
+#: smime/gui/certificate-manager.c:323
 msgid "E-Mail Address"
 msgstr "Alamat E-mel"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"Sijil tamat tempoh: %s\n"
+"Pengeluar: %s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<Not Part of Certificate>"
@@ -14719,125 +15669,364 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
 #, fuzzy
 msgid "Certificate"
 msgstr "Sijil"
 
 #: smime/gui/smime-ui.glade.h:15
 #, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Sijil tak dipercayai"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
 msgid "Certificate details"
 msgstr "Sijil"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:17
 msgid "Common Name (CN)"
 msgstr "Nama Biasa (CN)"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:18
 msgid "Contact Certificates"
 msgstr "Sijil Kenalan"
 
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:21
 #, no-c-format
 msgid "Do you want to trust \"%s\" for the following purposes?"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:21
+#: smime/gui/smime-ui.glade.h:22
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:23
 msgid "Edit"
 msgstr "Edit"
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "E-mel Sijil Penerima"
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:25
 msgid "Email Signer Certificate"
 msgstr "E-mel Sijil Penandatangan"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:26
 msgid "Expires On"
 msgstr "Tamat Tempoh Pada"
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr "Dikeluarkan Pada"
 
-#: smime/gui/smime-ui.glade.h:29
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr "Cap jari MD5"
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:31
 msgid "Organization (O)"
 msgstr "Organisasi (O)"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:32
 msgid "Organizational Unit (OU)"
 msgstr "Unit Organisasi (OU)"
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr "Cap jari SHA1"
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr "Sijil Pelanggan SSL"
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr "Sijil Pelayan SSL"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/gui/smime-ui.glade.h:37
 msgid "Trust this CA to identify email users."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:37
+#: smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify software developers."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:38
+#: smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify web sites."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:39
+#: smime/gui/smime-ui.glade.h:40
 msgid "View"
 msgstr "Lihat"
 
-#: smime/gui/smime-ui.glade.h:40
+#: smime/gui/smime-ui.glade.h:41
 #, fuzzy
 msgid "View Certificate"
 msgstr "Sijil"
 
-#: smime/gui/smime-ui.glade.h:41
+#: smime/gui/smime-ui.glade.h:42
 #, fuzzy
 msgid "You have been asked to trust a new Certificate Authority (CA)."
 msgstr "Kuasa Sijil Tak Sah (CA)"
 
-#: smime/gui/smime-ui.glade.h:42
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Anda mempunyai sijil daripada organisasi ini yang mengecam anda:"
 
-#: smime/gui/smime-ui.glade.h:43
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr "Anda mempunyai sijil pada fail yang mengecam kesahihan sijil ini:"
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr "Anda mempunyai sijil pada fail yang mengecam orang-orang ini:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
 msgstr "Sijil Anda"
 
-#: smime/lib/e-cert-db.c:443
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "ID Kenalan telah wujud"
 
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%m/%d/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Vermont"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "OK"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "Nama Sijil"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "Nama Sijil"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "Sijil tak dipercayai"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "ID"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Tajuk adalah %s "
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Tidak dapat memproses folder spul"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "Kuasa Sijil Tak Sah (CA)"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Kuasa Sijil Tak Sah (CA)"
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Tiada Maklumat"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "lampiran"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "Nama Sijil"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Curitiba"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "Carolina Utara"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Ungkapan"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s semasa %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Kegagalan tandatangan sijil"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "Dikeluarkan Pada"
+
+#: smime/lib/e-cert.c:1097
+#, fuzzy
+msgid "Issuer Unique ID"
+msgstr "ID Unik"
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "ID Unik"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Kegagalan tandatangan sijil"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Masukkan Kata Laluan bagi %s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "Sijil Anda"
+
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
 msgstr "Lampiran yang akan ditambahkan."
@@ -14912,7 +16101,7 @@ msgid "Previews the contacts to be printed"
 msgstr "Pralihat kenalan yang akan dicetak"
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:77
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Pralihat Ce_takan"
@@ -14961,7 +16150,7 @@ msgstr "Lihat kenalan semasa"
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: 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:103
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
@@ -15370,7 +16559,7 @@ msgstr "Tandakan Semua sebagai _Dibaca"
 msgid "Mark all visible messages as read"
 msgstr "Tandakan semua mesej yang dapat dilihat sebagai telah dibaca"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "Tampal mesej daripada papan keratan"
 
@@ -15422,10 +16611,6 @@ msgstr "_Folder"
 msgid "_Invert Selection"
 msgstr "_Songsangkan Pemilihan"
 
-#: ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Ciri-ciri..."
-
 #: ui/evolution-mail-list.xml.h:28
 msgid "_Threaded Message List"
 msgstr "_Senarai Mesej yang Disambungkan"
@@ -15586,261 +16771,266 @@ msgstr "Sampaikan mesej yang dipilih kepada seseorang sebagai lampiran"
 msgid "Increase the text size"
 msgstr "Tambahkan saiz teks"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Muatkan _Imej"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Tandakan sebagai P_enting"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Tandakan sebagai B_elum Dibaca"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Tandakan sebagai Tida_k Penting"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "Tandakan mesej yang dipilih sebagai telah dibaca"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "Tandakan mesej yang dipilih sebagai penting"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:56
 #, fuzzy
 msgid "Mark the selected message(s) as junk"
 msgstr "Tandakan mesej yang dipilih sebagai tidak penting"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:57
 #, fuzzy
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Tandakan mesej yang dipilih sebagai belum dibaca"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Tandakan mesej yang dipilih sebagai belum dibaca"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Tandakan mesej yang dipilih sebagai tidak penting"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Tandakan mesej yang dipilih untuk dihapuskan"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Alihkan"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "Alihkan mesej yang dipilih ke folder lain"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Seterusnya"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "Mesej _Penting Seterusnya"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "Bebenang _Seterusnya"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "Mesej _Belum Dibaca Seterusnya"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Tidak dijumpai"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Buka mesej yang dipilih dalam tetingkap baru"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Buka mesej yang dipilih dalam penggubah untuk menghantarnya semula"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Saiz As_al"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "Mesej Belum Dibaca Sebelumnya"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:73
 msgid "Post a Repl_y"
 msgstr "Kirimkan Balas_an"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr "Kirimkan balasan bagi mesej dalam Folder Awam"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "Mesej Penting Se_belumnya"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Pralihat mesej yang akan dicetak"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Sebelumnya"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Cetak mesej ini"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "Hantar _semula"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Hantar semula (lantun) mesej yang dipilih kepada seseorang"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Set semula teks kepada saiznya yang asal"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "S_earch in Message..."
 msgstr "C_ari dalam Mesej..."
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "L_ebih kecil"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Simpan mesej sebagai fail teks"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Cari teks dalam badan mesej yang dipaparkan"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr "Sediakan seting halaman bagi pencetak semasa anda"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Tunjukkan Sumber _E-mel"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Tunjukkan Pengepala _Penuh"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Tunjukkan kursor berkelip-kelip dalam badan mesej yang dipaparkan"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Tunjukkan mesej dalam gaya normal"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Tunjukkan mesej dengan semua pengepala e-mel"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Tunjukkan sumber e-mel mentah bagi mesej"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "Saiz Te_ks"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Batalkan hapus mesej yang dipilih"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "VFolder bagi Senarai _Mel..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "VFolder bagi Pe_nghantar..."
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "VFolder bagi _Penerima..."
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "VFolder bagi _Tajuk"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "_Dilampirkan"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "_Salin ke Folder"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "_Wujudkan Penapis Daripada Mesej"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "_Sampaikan Mesej"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "_Pergi Ke"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "_Dalam Talian"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "_Lebih Besar"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "_Paparan Mesej"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Alihkan ke Folder"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "_Mesej Seterusnya"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "_Paparan Normal"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "_Buka Mesej"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "_Mesej Sebelumnya"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "_Disebut"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "_Hantar semula..."
 
-#: ui/evolution-mail-message.xml.h:125 ui/evolution.xml.h:31
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "_Alatan"
 
-#: ui/evolution-mail-message.xml.h:126
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "_Batalkan hapus"
 
@@ -15854,11 +17044,6 @@ msgstr "Tutup tetingkap ini"
 msgid "_Close"
 msgstr "_Tutup"
 
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
-msgid "_View"
-msgstr "_Lihat"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Lampirkan"
@@ -16432,10 +17617,6 @@ msgstr "Ukranian"
 msgid "Visual"
 msgstr "Tampak"
 
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Baru"
-
 #: widgets/misc/e-charset-picker.c:168
 #, c-format
 msgid "Unknown character set: %s"
@@ -16507,6 +17688,125 @@ msgstr "Teks"
 msgid "Find _Now"
 msgstr "Cari Sekarang"
 
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "Buat konfigurasi capaian ke pelayan direktori LDAP di sini"
+
+#~ msgid "Directory Servers"
+#~ msgstr "Pelayan Direktori"
+
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Kawalan Konfigurasi LDAP Buku Alamat Evolution"
+
+#~ msgid "Account Name"
+#~ msgstr "Nama Akaun"
+
+#~ msgid "Server Name"
+#~ msgstr "Nama Pelayan"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "LDAP tidak dibolehkan dalam binaan Evolution ini"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Kenalan Lain"
+
+#~ msgid "Add LDAP Server"
+#~ msgstr "Tambahkan Pelayan LDAP"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Langkah 4: Paparkan Nama"
+
+#~ msgid "Find contact in"
+#~ msgstr "Cari kenalan dalam"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Klik di sini untuk menambahkan kenalan *"
+
+#~ msgid "Business Address"
+#~ msgstr "Alamat Perniagaan"
+
+#~ msgid "Department"
+#~ msgstr "Jabatan"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "URL Bebas-sibuk"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Profesion"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Tetap hantarkan?"
+
+#~ msgid "Folder _name"
+#~ msgstr "Nama _folder"
+
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "Mesej ini ditandatangani secara digital. Klik ikon kunci untuk keterangan "
+#~ "lanjut."
+
+#~ msgid "Add a Folder"
+#~ msgstr "Tambahkan Folder"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ralat ketika menyegerakkan \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "Menyegerakkan Folder"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Sedang menyegerakkan \"%s\" (%d daripada %d)..."
+
+#~ msgid "CORBA error"
+#~ msgstr "Ralat CORBA"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Argumen tak sah"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Sudah mempunyai pemilik"
+
+#~ msgid "No owner"
+#~ msgstr "Tiada pemilik"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Jenis yang tidak disokong"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Skema yang tidak disokong"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Pengendalian yang tidak disokong"
+
+#~ msgid "Internal error"
+#~ msgstr "Ralat dalaman"
+
+#~ msgid "Exists"
+#~ msgstr "Wujud"
+
+#~ msgid "Invalid URI"
+#~ msgstr "URI tak sah"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Mempunyai subfolder"
+
+#~ msgid "No space left"
+#~ msgstr "Tiada lagi ruang"
+
+#~ msgid "Old owner has died"
+#~ msgstr "Pemilik lama telah meninggal dunia"
+
 #~ msgid "e_book_add_contact called on book before e_book_load_uri"
 #~ msgstr "e_book_add_contact dipanggil dalam buku sebelum e_book_load_uri"
 
@@ -16594,15 +17894,6 @@ msgstr "Cari Sekarang"
 #~ msgid "e_book_load_uri: Could not create EBookListener"
 #~ msgstr "e_book_load_uri: Tidak dapat mewujudkan PendengarEBook"
 
-#~ msgid "Unique ID"
-#~ msgstr "ID Unik"
-
-#~ msgid "Given Name"
-#~ msgstr "Nama Diberi"
-
-#~ msgid "Family Name"
-#~ msgstr "Nama Keluarga"
-
 #~ msgid "Address List"
 #~ msgstr "Senarai Alamat"
 
@@ -16696,9 +17987,6 @@ msgstr "Cari Sekarang"
 #~ msgid "VCard (.vcf, .gcrd)"
 #~ msgstr "VCard (.vcf, .gcrd)"
 
-#~ msgid "Loading..."
-#~ msgstr "Sedang memuatkan..."
-
 #~ msgid "Searching..."
 #~ msgstr "Sedang mencari..."
 
@@ -16869,15 +18157,6 @@ msgstr "Cari Sekarang"
 #~ msgid "Could not open source folder: %s"
 #~ msgstr "Tidak dapat membuka folder sumber: %s"
 
-#~ msgid "Could not create temporary mbox store: %s"
-#~ msgstr "Tidak dapat mewujudkan stor mbox sementara: %s"
-
-#~ msgid "Could not create temporary mbox folder: %s"
-#~ msgstr "Tidak dapat mewujudkan folder mbox sementara: %s"
-
-#~ msgid "Could not copy messages to temporary mbox folder: %s"
-#~ msgstr "Tidak dapat menyalin mesej ke folder mbox sementara: %s"
-
 #~ msgid ""
 #~ "Some of your mail settings seem corrupt, please check that everything is "
 #~ "in order."
@@ -16885,40 +18164,12 @@ msgstr "Cari Sekarang"
 #~ "Beberapa seting mel anda tampaknya rosak, sila semak untuk memastikan "
 #~ "semuanya dalam keadaan baik."
 
-#~ msgid "Select destination to copy folder into"
-#~ msgstr "Pilih destinasi untuk folder ini disalin"
-
 #~ msgid "Select destination to move folder into"
 #~ msgstr "Pilih destinasi untuk folder ini dialih"
 
-#~ msgid "Create folder"
-#~ msgstr "Wujudkan folder"
-
-#~ msgid "Could not delete folder: %s"
-#~ msgstr "Tidak dapat menghapuskan folder: %s"
-
-#~ msgid "Really delete folder \"%s\" and all of its subfolders?"
-#~ msgstr ""
-#~ "Anda pasti ingin menghapuskan folder \"%s\" dan semua subfolder dalamnya?"
-
 #~ msgid "A folder named \"%s\" already exists.  Please use a different name."
 #~ msgstr "Folder bernama \"%s\" telah wujud. Sila gunakan nama yang lain."
 
-#~ msgid "Folder properties"
-#~ msgstr "Ciri-ciri Folder"
-
-#~ msgid "Properties"
-#~ msgstr "Ciri-ciri"
-
-#~ msgid "Folder Name"
-#~ msgstr "Nama Folder"
-
-#~ msgid "_Move"
-#~ msgstr "_Alih"
-
-#~ msgid "_New Folder..."
-#~ msgstr "_Folder Baru..."
-
 #~ msgid "Alwa_ys sign outgoing messages when using this account"
 #~ msgstr "Sentia_sa tandatangan mesej keluar apabila menggunakan akaun ini"
 
@@ -16956,23 +18207,6 @@ msgstr "Cari Sekarang"
 #~ msgid "(None)"
 #~ msgstr "(Tiada)"
 
-#~ msgid ""
-#~ "Ximian Evolution is currently online.  Click on this button to work "
-#~ "offline."
-#~ msgstr ""
-#~ "Ximian Evolution dalam talian sekarang.  Klik butang ini untuk bekerja "
-#~ "luar talian."
-
-#~ msgid "Ximian Evolution is in the process of going offline."
-#~ msgstr "Ximian Evolution adalah dalam proses menjadi luar talian."
-
-#~ msgid ""
-#~ "Ximian Evolution is currently offline.  Click on this button to work "
-#~ "online."
-#~ msgstr ""
-#~ "Ximian Evolution luar talian sekarang.  Klik butang ini untuk bekerja "
-#~ "dalam talian."
-
 #~ msgid "A folder with the same name already exists"
 #~ msgstr "Folder dengan nama yang sama telah wujud"
 
@@ -17027,9 +18261,6 @@ msgstr "Cari Sekarang"
 #~ msgid "Create a new all-day event"
 #~ msgstr "Wujudkan perisitiwa baru sepanjang hari"
 
-#~ msgid "Create a new task"
-#~ msgstr "Wujudkan tugas baru"
-
 #~ msgid "New _Appointment"
 #~ msgstr "Temu Janji _Baru"
 
@@ -17072,9 +18303,6 @@ msgstr "Cari Sekarang"
 #~ msgid "Callback"
 #~ msgstr "Panggil balik"
 
-#~ msgid "Company"
-#~ msgstr "Syarikat"
-
 #~ msgid "Comp"
 #~ msgstr "Syarikat"
 
@@ -17141,9 +18369,6 @@ msgstr "Cari Sekarang"
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
 #~ msgid "Birth date"
 #~ msgstr "Tarikh lahir"
 
@@ -17156,9 +18381,6 @@ msgstr "Cari Sekarang"
 #~ msgid "Arbitrary"
 #~ msgstr "Sebarangan"
 
-#~ msgid "ID"
-#~ msgstr "ID"
-
 #~ msgid "Last Use"
 #~ msgstr "Kali Terakhir Guna"
 
@@ -17171,9 +18393,6 @@ msgstr "Cari Sekarang"
 #~ msgid "Folder containing contact information"
 #~ msgstr "Folder mengandungi maklumat kenalan"
 
-#~ msgid "LDAP Server"
-#~ msgstr "Pelayan LDAP"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "Pelayan LDAP mengandungi maklumat kenalan"
 
@@ -17198,9 +18417,6 @@ msgstr "Cari Sekarang"
 #~ msgid "Is New Card"
 #~ msgstr "Ialah Kad Baru"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "Tiada kad"
 
@@ -17250,12 +18466,6 @@ msgstr "Cari Sekarang"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "Folder awam mengandungi item yang perlu dibuat"
 
-#~ msgid "New task"
-#~ msgstr "Tugas baru"
-
-#~ msgid "_Task"
-#~ msgstr "_Tugas"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "Tidak dapat mengemaskinikan objek tak sah"
 
@@ -17286,9 +18496,6 @@ msgstr "Cari Sekarang"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "Membuka kalendar pada %s"
 
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Membuka folder tugas piawai"
-
 #, fuzzy
 #~ msgid "Purging event %s"
 #~ msgstr "%s berdenting"
@@ -17330,9 +18537,6 @@ msgstr "Cari Sekarang"
 #~ "Evolution telah menjumpai fail GnomeCard.\n"
 #~ "Adakah anda ingin mengimportnya ke dalam Evolution?"
 
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Antara muka konfigurasi Mel Evolution"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "Folder yang mengandungi mel"
 
@@ -17348,9 +18552,6 @@ msgstr "Cari Sekarang"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Folder Sampah Maya"
 
-#~ msgid "Properties..."
-#~ msgstr "Ciri-ciri..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Ubah ciri-ciri folder ini"
 
@@ -19204,9 +20405,6 @@ msgstr "Cari Sekarang"
 #~ msgid "Cumberland"
 #~ msgstr "Cumberland"
 
-#~ msgid "Curitiba"
-#~ msgstr "Curitiba"
-
 #~ msgid "Curitiba Apt"
 #~ msgstr "Curitiba Apt"
 
@@ -22198,9 +23396,6 @@ msgstr "Cari Sekarang"
 #~ msgid "North Bend"
 #~ msgstr "North Bend"
 
-#~ msgid "North Carolina"
-#~ msgstr "Carolina Utara"
-
 #~ msgid "North Conway"
 #~ msgstr "Conway Utara"
 
@@ -23812,9 +25007,6 @@ msgstr "Cari Sekarang"
 #~ msgid "State College"
 #~ msgstr "State College"
 
-#~ msgid "Stauning"
-#~ msgstr "Stauning"
-
 #~ msgid "Staunton"
 #~ msgstr "Staunton"
 
@@ -24406,9 +25598,6 @@ msgstr "Cari Sekarang"
 #~ msgid "United Arab Emirates "
 #~ msgstr "Emiriyah Arab Bersatu"
 
-#~ msgid "Unst"
-#~ msgstr "Unst"
-
 #~ msgid "Upington"
 #~ msgstr "Upington"
 
@@ -24517,12 +25706,6 @@ msgstr "Cari Sekarang"
 #~ msgid "Veracruz"
 #~ msgstr "Veracruz"
 
-#~ msgid "Vermillion"
-#~ msgstr "Vermillion"
-
-#~ msgid "Vermont"
-#~ msgstr "Vermont"
-
 #~ msgid "Vernal"
 #~ msgstr "Vernal"
 
@@ -25054,9 +26237,6 @@ msgstr "Cari Sekarang"
 #~ msgid " F"
 #~ msgstr " F"
 
-#~ msgid " C"
-#~ msgstr " C"
-
 #~ msgid "knots"
 #~ msgstr "simpulan"
 
@@ -26047,12 +27227,6 @@ msgstr "Cari Sekarang"
 #~ msgstr ""
 #~ "Keluarkan folder yang ditambahkan dengan \"Buka Folder Pengguna Lain\""
 
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Toggle sama ada ingin menunjukkan bar folder atau tidak"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Toggle sama ada ingin menunjukkan bar jalan pintas atau tidak"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Lihat folder yang dipilih"
 
@@ -26167,9 +27341,6 @@ msgstr "Cari Sekarang"
 #~ msgid "Font Preferences"
 #~ msgstr "Keutamaan Fon"
 
-#~ msgid "Automatically _detect links"
-#~ msgstr "_Kesan pautan secara automatik"
-
 #~ msgid "Emacs"
 #~ msgstr "Akaun e-mel"
 
diff --git a/po/nl.po b/po/nl.po
index 0988f329fe..f093b8131d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-06-15 14:37+0100\n"
 "Last-Translator: Vincent van Adrighem <V.vanAdrighem@dirck.mine.nu>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -39,51 +39,184 @@ msgstr "Kon %s niet laden: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Kon de adresgegevens niet uit de pilot lezen"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Auto-afmaakmappen"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "_Certificaat-ID:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Hier kunt u uw e-mail accounts instellen"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Adresboek"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
+msgstr "Evolution adresboek"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution adresboek adrespopup"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution adresboek adresweergave"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution adresboek kaartweergave"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook component"
+msgstr "Evolution adresboekcomponent"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution adresboek mapweergave"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution e-mail voorkeuren"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution configuratie voor mapinstellingen"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Adresboek"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Eigenschappen..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Verwijderen"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "_Hernoemen"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Nieuw contact:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "C_ontact"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "Nieuw contact maken"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Nieuwe contactenlijst"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "Nieuwe contactenlijst"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "Maak een nieuwe contactenlijst"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Persoonlijk"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Werk"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "LDAP server"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Kon directory %s niet maken: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "Kan geen verbinding krijgen met LDAP server"
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "Fout bij het aanmelden bij de LDAP server"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "Kan geen query uitvoeren op de Root DSE"
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "De server antwoordde zonder ondersteunde zoekbasis"
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Deze server ondersteunt geen LDAPv3 schema informatie"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "Fout bij het laden van schema informatie"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr "Het antwoord van de server bevatte geen geldige schema informatie"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Accountnaam"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Servernaam"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP wordt niet ondersteund in deze versie van Evolution"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Andere adresboeken"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -91,7 +224,7 @@ msgstr ""
 "Kan het adresboek niet openen.  Controleer of het pad bestaat\n"
 "en of u het mag benaderen."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -101,7 +234,7 @@ msgstr ""
 "u een ongeldige URI heeft opgegeven of dat de LDAP server\n"
 "onbereikbaar is."
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -113,7 +246,7 @@ msgstr ""
 "moet u het programma vanuit de CVS sources meecompileren\n"
 "nadat u OpenLDAP van onderstaande link heeft opgehaald.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -127,44 +260,43 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Kan het adresboek niet openen"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "Anonieme verbinding met LDAP server wordt opgezet"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "Fout bij het aanmelden.\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sVoer uw wachtwoord in voor %s (gebruiker %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "Naam begint met"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "E-mail begint met"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Categorie is"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Een veld bevat"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Uitgebreid..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -175,7 +307,7 @@ msgstr ""
 "worden. Probeer uw opdracht specifieker te maken of verhoog\n"
 "de limiet voor resultaten in de voorkeuren van het adresboek."
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -186,88 +318,41 @@ msgstr ""
 "Wees specifieker bij uw zoekopdracht of verhoog de limiet\n"
 "bij de instellingen van de adresboekserver."
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Het backend van dit adresboek kon uw opdracht niet verwerken."
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Het backend van dit adresboek weigerde uw zoekopdracht te verwerken."
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "De zoekopdracht is niet succesvol beeïndigd"
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Elke categorie"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "De URI die de kalender zal tonen"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "_Certificaat-ID:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "Hier kunt u de toegang tot LDAP servers instellen"
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Adresboek"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "Adresboekservers"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolution adresboek"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Evolution adresboek LDAP-configuratie"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution adresboek adrespopup"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution adresboek adresweergave"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution adresboek kaartweergave"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr "Evolution adresboekcomponent"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution adresboek mapweergave"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution e-mail voorkeuren"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -290,6 +375,7 @@ msgstr "Ondersteunde bases _weergeven"
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -323,8 +409,9 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "LDAP server toevoegen"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "LDAP configuratie assistent"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -340,9 +427,9 @@ msgid "Anonymously"
 msgstr "Anoniem"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -352,48 +439,49 @@ msgstr ""
 "\n"
 "Klik op de \"Finish\" knop om de zojuist gemaakte instellingen op te slaan."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "Bezig met verbinden"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "Unieke _naam:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr "LDAP server bewerken"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
 msgstr "E-mail adres:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution zal deze DN gebruiken om u te identificeren bij de server"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution zal dit e-mailadres gebruiken om u te identificeren bij de server"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "Klaar"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Algemeen"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "LDAP configuratie assistent"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "Groep"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Nooit"
 
@@ -421,8 +509,8 @@ msgid "S_earch scope: "
 msgstr "Zoek_gebied: "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Zoeken"
 
@@ -478,29 +566,33 @@ msgstr ""
 "wijzigingsinstellingen voor contacten veranderen ."
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 "Het geven van een schermnaam is de laatste stap die nodig is om de LDAP "
 "server\n"
 "te configureren."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "Stap 1: Server informatie"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "Stap 2: Verbinden met server"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "Stap 1: Server informatie"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "Stap 3: Doorzoeken van de directory"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Stap 2: Verbinden met server"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "Stap 4: Schermnaam"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Stap 3: Doorzoeken van de directory"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -512,19 +604,6 @@ msgstr "Ondersteunde zoekbases"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"De eerste stap in het configureren van een LDAP server is het opgeven van de "
-"servernaam\n"
-"en inlog informatie. Vraag de systeembeheerder om hulp als u niet zeker bent "
-"over\n"
-"deze informatie."
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -535,7 +614,7 @@ msgstr ""
 "en hoe lang de zoekopdracht mag duren. Vraag aan de systeembeheerder als u\n"
 "deze opties wilt veranderen."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -547,7 +626,7 @@ msgstr ""
 "beginnen. Als u hier niets invult, zal de zoekopdracht aan het begin van de "
 "boom starten."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -561,14 +640,14 @@ msgstr ""
 "Een zoekdiepte van \"sub\" zal alle takken onder uw zoekbasis afzoeken. Een\n"
 "zoekdiepte van \"één\" zal slechts één niveau dieper dan uw zoekbasis gaan.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
+#, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "Deze assistent zal u helpen bij het raadplegen van een online adresboek\n"
 "met behulp van LDAP-servers.\n"
@@ -577,7 +656,7 @@ msgstr ""
 "de server. Neem contact op met de systeembeheerder als u hulp nodig heeft "
 "bij het vinden van deze informatie."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -585,7 +664,7 @@ msgstr ""
 "Dit is de volledige naam van uw LDAP-server. Bijvoorbeeld \"ldap.mijnbedrijf."
 "nl\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -594,7 +673,7 @@ msgstr ""
 "Dit is het maximum aantal kaarten wat zal worden opgehaald. Als u het \n"
 "te hoog zet wordt dit adresboek erg langzaam."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -603,7 +682,7 @@ msgstr ""
 "Dit is de methode die evolution zal gebruiken om u aan te melden. Als het op "
 "\"E-mailadres\" wordt gezet, is anonieme toegang tot de ldap server vereist."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -612,6 +691,15 @@ msgstr ""
 "Deze naam wordt gebruikt om deze server in uw mappenlijst weer te geven.\n"
 "De naam is alleen voor weergave-doeleinden."
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Deze naam wordt gebruikt om deze server in uw mappenlijst weer te geven.\n"
+"De naam is alleen voor weergave-doeleinden."
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -640,21 +728,35 @@ msgid "Using email address"
 msgstr "E-mail adres wordt gebruikt"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Indien mogelijk"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+"De eerste stap in het configureren van een LDAP server is het opgeven van de "
+"servernaam\n"
+"en inlog informatie. Vraag de systeembeheerder om hulp als u niet zeker bent "
+"over\n"
+"deze informatie."
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "_Weergave naam:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "_Downloadlimiet:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -662,54 +764,52 @@ msgstr "_Downloadlimiet:"
 msgid "_Edit"
 msgstr "Be_werken"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "In_logmethode:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "_Poortnummer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "Zoek_basis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "_Servernaam:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "_Timeout (minuten):"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "kaarten"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr "Algemeen-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr "Zoeken-tab"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Naam"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution adresboek naamselectie-interface"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Alle verwijderen"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Verwijderen"
@@ -736,23 +836,21 @@ msgstr "Toevoegen aan contacten"
 msgid "Unnamed Contact"
 msgstr "Ander contact"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Naam"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Bron"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Selecteer contacten uit het adresboek"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "Vind contact in"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution adresboek naamselectie-interface"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Zoek"
@@ -829,7 +927,8 @@ msgid "D_epartment:"
 msgstr "Afd_eling:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Details"
 
@@ -897,12 +996,12 @@ msgid "_Categories..."
 msgstr "_Categorieën..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Verwijderen"
@@ -2027,7 +2126,7 @@ msgid "Esq."
 msgstr "Dhr."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Volledige naam"
 
@@ -2120,11 +2219,27 @@ msgstr "Contactenlijst bewerken"
 msgid "Save List as VCard"
 msgstr "Lijst opslaan als VCard"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Veranderd contact:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Conflicterend contact:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Duplicaatcontact gevonden"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"De veranderde naam of e-mailadres van dit contact bestaat reeds\n"
+"in deze map. Wilt u het toch toevoegen?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Nieuw contact:"
@@ -2141,22 +2256,6 @@ msgstr ""
 "De naam of het e-mailadres van dit contact bestaat reeds\n"
 "in deze map. Wilt u het toch toevoegen?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Veranderd contact:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Conflicterend contact:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"De veranderde naam of e-mailadres van dit contact bestaat reeds\n"
-"in deze map. Wilt u het toch toevoegen?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2255,9 +2354,9 @@ msgstr "Contact doorsturen"
 msgid "Send Message to Contact"
 msgstr "Stuur bericht aan contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Afdrukken"
@@ -2279,9 +2378,12 @@ msgstr "Verplaatsen naar map..."
 msgid "Cut"
 msgstr "Knippen"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopiëren"
 
@@ -2290,16 +2392,8 @@ msgstr "Kopiëren"
 msgid "Paste"
 msgstr "Plakken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Verwijderen"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "Huidige weergave"
 
@@ -2316,166 +2410,170 @@ msgstr ""
 "gebruiken."
 
 #: 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:2
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Bedrijfsfax"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Bedrijfstelefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Bedrijf Telefoon-2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "TerugbelTelefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Autotelefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Categorieën"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Bedrijfstelefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Afdeling"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "E-mail 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "E-mail 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Achternaam"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Opslaan als"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "Vrij/Bezet URL"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Thuis adres"
+#, fuzzy
+msgid "Given Name"
+msgstr "Veldnaam"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Fax thuis"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Thuis telefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Thuis telefoon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Tel."
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Jordanië"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Manager"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobiele telefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Bijnaam"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Opmerkingen"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Kantoor"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisatie"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Ander adres"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Andere Fax"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Andere telefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Pieper"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Eerste telefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Beroep"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Rol"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Echtgeno(o)t(e)"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Functie"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Unst"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Website"
 
@@ -2568,11 +2666,19 @@ msgstr "Leden"
 msgid "Job Title"
 msgstr "_Functie:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Thuis adres"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Thuis adres"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Ander adres"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2585,112 +2691,109 @@ msgstr "Fax thuis"
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Succes"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Opslagplaats offline"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Operatie niet toegestaan"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Kaart niet gevonden"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Kaart-ID bestaat reeds"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Protocol niet ondersteund"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Geannuleerd"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "Aanmelding mislukt"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "Aanmelding is vereist"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS is niet beschikbaar"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "Adresboek bestaat niet"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Onbekende fout"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Wilt u de wijzingen opslaan?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr "_Verwerpen"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Fout bij toevoegen lijst"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Fout bij toevoegen kaart"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Fout bij aanpassen ljist"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Fout bij aanpassen van kaart"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Fout bij verwijderen lijst"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Fout bij verwijderen kaart"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2699,7 +2802,7 @@ msgstr ""
 "Bij het openen van %d kaarten worden %d nieuwe vensters geopend.\n"
 "Wilt u deze kaarten werkelijk allemaal openen?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2708,49 +2811,49 @@ msgstr ""
 "%s bestaat reeds.\n"
 "Wilt u het overschrijven?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "Overschrijven"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Fout bij opslaan %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "lijst"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Verplaats kaart naar"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kopieer kaart naar"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Verplaats kaarten naar"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kopieer kaarten naar"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Meerdere Vkaarten"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "Vkaart voor %s"
@@ -2945,7 +3048,7 @@ msgstr "Marges"
 msgid "Number of columns:"
 msgstr "Aantal kolommen:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Opties"
 
@@ -3132,18 +3235,18 @@ msgstr "Lijst van onbenoemden"
 msgid "Split Multi-Day Events:"
 msgstr "Meerdaagse gebeurtenissen splitsen:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Kon wombat server niet starten"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Kon wombat niet starten"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kon kalendergegevens niet uit de pilot lezen"
 
@@ -3151,24 +3254,83 @@ msgstr "Kon kalendergegevens niet uit de pilot lezen"
 msgid "Default Priority:"
 msgstr "Standaard prioriteit:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kon actielijstgegevens niet uit de pilot lezen"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Kalender en Taken"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configureer uw tijdzone, kalender en taaklijst hier "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution kalender en taken"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution kalenderconfiguratie"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution kalender planingsberichtenweergave"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Evolution kalenderweergave"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution kalender- / taakbeheer"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Evolution taakbeheer"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolution kalender en taken-component"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolution tescomponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Taken"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution kalender alarmweergave"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Bezig met starten:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Einde:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Evolution alarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm op %s"
@@ -3243,43 +3405,172 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Dit bericht niet meer weergeven voor dit programma."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution kalender alarmweergave"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Kon bonobo niet initialiseren"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Kon Gnome-vfs niet initialiseren"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Creëeren van de alarmnotificatie-dienst is mislukt:"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "ongeldige tijd"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "iCalendar Fout"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Kleur voor taken voor vandaag"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Kleur voor taken voor vandaag"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "Eindtijden van afspraken tonen in week- en maandweergave"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Geeft een afdrukvoorbeeld van de kalender"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "Vr_aag om bevestiging bij het wissen van items"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "Vr_aag om bevestiging bij het wissen van items"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Verwijder de voltooide taken"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Week_nummers tonen in datum navigator"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Samenvatting bevat"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Omschrijving bevat"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Commentaar bevat"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Niet passend"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3291,81 +3582,110 @@ msgstr ""
 "\n"
 "De taken echt verwijderen?"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "geeft kleiner dan"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "dagen"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Druk deze Kalender af"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Nieuw Caledonië"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "Nieuwe afspraak"
+
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "_Afspraak"
+
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Maak een nieuwe afspraak"
+
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "Nieuwe vergadering"
+
+#: calendar/gui/calendar-component.c:640
+msgid "M_eeting"
+msgstr "Ver_gadering"
+
+#: calendar/gui/calendar-component.c:641
 #, fuzzy
-msgid "Rename"
-msgstr "_Hernoemen"
+msgid "Create a new meeting request"
+msgstr "Maak een nieuw bijeenkomstverzoek"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Nieuwe dag-omvattende afspraak"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Persoonlijk"
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr "_Dag-omvattende afspraak"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Werk"
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Maak een nieuwe afspraak"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3482,7 +3802,7 @@ msgstr "Aan:"
 msgid "With these arguments:"
 msgstr "Met deze parameters:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -3498,6 +3818,10 @@ msgstr "uren"
 msgid "minutes"
 msgstr "minuten"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3530,8 +3854,8 @@ msgstr "Verstuur een e-mail"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Samenvatting:"
 
@@ -3560,7 +3884,7 @@ msgstr "einde van afspraak"
 msgid "hour(s)"
 msgstr "u(u)r(en)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minuten"
 
@@ -3614,7 +3938,7 @@ msgstr "Dagen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Vrijdag"
 
@@ -3628,7 +3952,7 @@ msgstr "Minuten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Maandag"
 
@@ -3638,7 +3962,7 @@ msgstr "Z_on"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Zaterdag"
 
@@ -3652,7 +3976,7 @@ msgstr "Week_nummers tonen in datum navigator"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Zondag"
 
@@ -3670,7 +3994,7 @@ msgstr "Takenlijst"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Donderdag"
 
@@ -3688,7 +4012,7 @@ msgstr "Tijdsformaat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Dinsdag"
 
@@ -3698,12 +4022,12 @@ msgstr "W_eek begint:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Woensdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Werkweek"
 
@@ -3740,7 +4064,7 @@ msgid "_Fri"
 msgstr "_Vrij"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Algemeen"
 
@@ -3780,7 +4104,7 @@ msgstr "_Woe"
 msgid "before every appointment"
 msgstr "voor het begin van elke afspraak"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
@@ -3788,11 +4112,11 @@ msgstr ""
 "De gebeurtenis geselecteerd voor verwijdering is een bijeenkomst; wilt u een "
 "afmeldingsbericht sturen? "
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Weet u zeker dat u deze vergadering wilt annuleren en verwijderen?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
@@ -3800,11 +4124,11 @@ msgstr ""
 "De taak geselecteerd voor verwijdering is reeds toegewezen; wilt u een "
 "afmeldingsbericht sturen?"
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Weet u zeker dat u deze taak wilt annuleren en verwijderen?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -3812,53 +4136,53 @@ msgstr ""
 "De dagboek ingang geselecteerd voor verwijdering is gepubliceerd; wilt u een "
 "afmeldingsbericht sturen? "
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Weet u zeker dat u dit dagboek item wilt annuleren en verwijderen?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Deze gebeurtenis is verwijderd."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Deze taak is verwijderd."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Dit dagboekitem is verwijderd."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s U heeft veranderingen gemaakt. Deze veranderingen negeren en de editor "
 "sluiten?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s U heeft niets veranderd. Editor sluiten?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Deze gebeurtenis is veranderd."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Deze taak is veranderd"
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Dit dagboekitem is veranderd"
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s U heeft iets veranderd. Deze veranderingen vergeten en de editor sluiten?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s U heeft niet veranderd, de editor verversen?"
@@ -3868,168 +4192,173 @@ msgstr "%s U heeft niet veranderd, de editor verversen?"
 msgid "Validation error: %s"
 msgstr "Verificatiefout: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " tot "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Voltooid"
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Voltooid"
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Verloopt "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Verloopdatum "
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "Kon object niet vernieuwen"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Afspraak Bewerken"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Afspraak - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Taak - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagboekelement - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Geen samenvatting"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Opslaan als..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "De gemaakte veranderingen aan dit item worden verworpen indien een "
 "bijwerking via e-mail arriveerd"
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Ophalen huidige versie mislukt!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Selecteer een doelmap voor deze belangrijke data"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Weet u zeker dat u afspraak `%s' wilt verwijderen?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Weet u zeker dat u deze naamloze afspraak wilt verwijderen?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Weet u zeker dat u de taak `%s' wilt verwijderen?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Weet u zeker dat u deze naamloze taak wilt verwijderen?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Weet u zeker dat u dagboek entry `%s' wilt verwijderen?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Weet u zeker dat u dit naamloze dagboekelement wilt verwijderen?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Weet u zeker dat u %d afspraken wilt verwijderen?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Weet u zeker dat u de %d taken wilt verwijderen?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Weet u zeker dat u %d dagboek ingangen wilt verwijderen?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "De gebeurtenis kon niet verwijderd worden door een CORBA-fout."
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "De taak kon niet verwijderd worden door een CORBA-fout"
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "De dagboekingang kon niet verwijderd worden door een CORBA-fout"
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Dit item kon niet verwijderd worden door een CORBA-probleem"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 "De gebeurtenis kon niet verwijderd worden omdat u geen recht hiertoe heeft"
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "De taak kon niet verwijderd worden omdat u de toegang is geweigerd"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 "De dagboekingang kon niet verwijderd worden omdat u geen recht hiertoe heeft"
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "Het item kon niet verwijderd worden omdat u hier geen recht toe heeft"
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "De gebeurtenis kon niet verwijderd worden door een CORBA-fout."
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "De taak kon niet verwijderd worden door een CORBA-fout"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "De dagboekingang kon niet verwijderd worden door een CORBA-fout"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Dit item kon niet verwijderd worden door een CORBA-probleem"
@@ -4046,43 +4375,43 @@ msgstr "Overdragen aan:"
 msgid "Enter Delegate"
 msgstr "Gemachtigde invoeren"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Afspraak"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Herinnering"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Herhaling"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Bijeenkomstplannen"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Vergadering"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "Begindatum is ongeldig"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "Einddatum is fout"
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "Begintijd is ongeldig"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "Eindtijd is fout"
 
@@ -4152,31 +4481,31 @@ msgid "_Start time:"
 msgstr "_Begintijd:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Geen"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr "De geselecteerde organisator heeft geen account meer."
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "Er moet een organisator ingesteld worden."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "Er is minstens één aanwezige nodig."
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Overdragen aan..."
 
@@ -4217,21 +4546,15 @@ msgid "Member"
 msgstr "Lid"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Rol"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -4251,6 +4574,7 @@ msgid "_Invite Others..."
 msgstr "Anderen uit_nodigen..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4283,6 +4607,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Kon directory %s niet maken: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "Er moet een organisator ingesteld worden."
@@ -4312,39 +4637,64 @@ msgstr "Kalenderinformatie"
 msgid "Calendar Name"
 msgstr "Kalender"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Kon directory %s niet maken: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Kalenderinformatie"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Takenlijst"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Takenlijst"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Takenlijst"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 "U bent een gebeurtenis aan het bewerken die meerdere keren voorkomt. Wat "
 "wilt u aanpassen?"
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 "U bent een taak aan het bewerken die meerdere keren voorkomt. Wat wilt u "
 "aanpassen?"
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 "U bent een dagboekingang aan het bewerken die meerdere keren voorkomt. Wat "
 "wilt u aanpassen?"
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr "Alleen deze keer"
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Deze keer en komende keren"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr "Deze keer en komende keren"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr "Alle keren"
 
@@ -4392,10 +4742,15 @@ msgstr "dag"
 msgid "on the"
 msgstr "op de"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "gebeurtenissen"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Datum/Tijd"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "_Toevoegen"
@@ -4460,7 +4815,7 @@ msgstr "we(e)k(en)"
 msgid "year(s)"
 msgstr "ja(a)r(en)"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
@@ -4470,31 +4825,31 @@ msgstr ""
 "\n"
 "Wilt u de wijzingen opslaan?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "Veranderingen verwerpen"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 msgid "Save Event"
 msgstr "Gebeurtenis opslaan"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "De vergaderingsgegevens zijn gamaakt. Verzenden?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "De vergaderingsgegevens zijn veranderd. De actuele versie verzenden?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "De taakopdracht informatie is gemaakt. Verzenden?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "De taakgegevens zijn veranderd. De actuele versie verzenden?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Voltooiingsdatum is ongeldig"
 
@@ -4504,43 +4859,43 @@ msgid "% _Complete"
 msgstr "% Voltooid:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Voltooid"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Hoog"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "In behandeling"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Laag"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Normaal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Niet gestart"
 
@@ -4549,7 +4904,7 @@ msgid "Progress"
 msgstr "Voortgang"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Ongedefinieerd"
 
@@ -4572,21 +4927,21 @@ msgstr "_Status:"
 msgid "_Web Page:"
 msgstr "Homepage:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Basis"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Opdracht"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "Voltooiingsdatum is incorrect"
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4594,9 +4949,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "Vertrouwelijk"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Omschrijving:"
 
@@ -4701,26 +5056,21 @@ msgstr "%s bij %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s voor een onbekend triggertype"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Openbaar"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Privé"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Vertrouwelijk"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Categorieën"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4733,28 +5083,26 @@ msgid "Start Date"
 msgstr "Begindatum"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Samenvatting"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "kleur"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Afspraak"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Vrij"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Bezig"
 
@@ -4766,7 +5114,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "E"
 
@@ -4774,7 +5122,7 @@ msgstr "E"
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4784,7 +5132,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4792,7 +5140,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4800,17 +5148,17 @@ msgstr "Nee"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Onbekend"
 
@@ -4822,181 +5170,179 @@ msgstr "Herhalend"
 msgid "Assigned"
 msgstr "Toegewezen"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Objecten worden ververst"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Geselecteerde objecten verwijderen"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Objecten worden ververst"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Nieuwe _Afspraak..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Gebeurtenis voor de hele dag"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "Nieuwe bijeenkomst"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Nieuwe taak"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "Af_drukken..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Plakken"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Ga Naar _Vandaag"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "_Ga Naar Datum..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Publiceer Beschikbaarheidsinformatie"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "_Instellingen..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Openen"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Opslaan als..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Kopiëren"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "_Bijeenkomst Plannen..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "_Doorsturen als iKalender"
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Verwijder deze Gebeurtenis"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Verwijder alle Gebeurtenissen"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "_Instellingen..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "Bericht _openen"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "Taak _toewijzen"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "Doorsturen als i_Kalendar"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "Markeren als Voltooid"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Geselecteerde taken als voltooid markeren"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "_Verwijder de Geselecteerde Taken"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klik hier om een taak toe te voegen"
@@ -5010,8 +5356,8 @@ msgstr "% Voltooid:"
 msgid "Alarms"
 msgstr "Alarmen"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Voltooid"
 
@@ -5040,18 +5386,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d-%m-%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d-%m-%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5070,7 +5416,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5083,125 +5429,125 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja. (complexe herhaling)"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "Elke dag"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "Elke %d dagen"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "Elke week"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "Elke %d weken"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr "Elke week op"
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Elke %d weken op"
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " en "
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr "De %s dag van "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr "De %s %s van "
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "elke maand"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr "elke %d maanden"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "Elk jaar"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "Elke %d jaar"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr "een totaal van %d keer"
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ", eindigend op "
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>Begint:</b> "
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Eindigt: <b>"
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>Voltooid:</b>"
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>Voltooid:</b>"
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "iCalendar Informatie"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "iCalendar Fout"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Een onbekende persoon"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5209,322 +5555,321 @@ msgstr ""
 "<br> Bekijk de volgende informatie en kies daarna een actie uit het menu "
 "hieronder."
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Geen</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "Lokatie: "
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Geaccepteerd"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Voorlopig Geaccepteerd"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Geweigerd"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Kies een actie:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Verversen"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Accepteren"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Voorlopig accepteren"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Weigeren"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Verstuur Vrij/Bezet Informatie"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Ververs antwoordstatus"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Verstuur Laatste Informatie"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> heeft bijeenkomstgegevens beschikbaar gemaakt."
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Bijeenkomst Informatie"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> verzoekt %s om bij de bijeenkomst aanwezig te zijn."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Vergadering Voorstel"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Vergadering Update"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "VergaderingsUpdate Verzoek"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, 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:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Bijeenkomst Antwoord"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> heeft een bijeenkomst geannuleerd."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Bijeenkomst Annulering"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, 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:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Fout Bijeenkomstbericht"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> heeft taakgegevens beschikbaar gemaakt."
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Taak Informatie"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> verzoekt %s om een taak uit te voeren."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, 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:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Taak Voorstel"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, 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:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Taak Update"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, 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:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Taak Update Verzoek"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, 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:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Taak Antwoord"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> heeft een taak geannuleerd."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Taak Annulering"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Fout Taakbericht"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, 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:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Vrij/Bezet Informatie"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, 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:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Vrij/Bezet Verzoek"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, 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:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Vrij/Bezet Antwoord"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Foutief Vrij/Bezet Bericht"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 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:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "Het bericht bevat slechts niet ondersteunde aanvragen."
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr "De bijlage bevat geen geldig kalenderbericht"
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr "De bijlage heeft geen bekijkbaar kalenderobject"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "Calenderbestand kon niet bijgewerkt worden!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Update Voltooid\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 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:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Object is ongeldig en kan niet worden bijgewerkt\n"
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Dit antwoord is niet van een geregistreerd staand persoon. Toevoegen in "
 "registratie?"
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 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:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr "Er is een fout opgetreden in het CORBA-systeem\n"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr "Object kan niet worden gevonden\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "U heeft niet de juiste rechten om de kalender te vernieuwen\n"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Bezoekerstatus ververst\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "Aanwezigheidstatus kon niet worden bijgewerkt!\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Verwijderen Voltooid"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Item Verzonden!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Dit item kon niet verzonden worden!\n"
 
@@ -5684,7 +6029,7 @@ msgstr "%a %d-%m-%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d-%m-%Y"
 
@@ -5748,49 +6093,44 @@ msgstr "Aanvang _bijeenkomst:"
 msgid "Meeting _end time:"
 msgstr "_Einde bijeenkomst:"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "Be_gindatum:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "_Verloopdatum:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "_Prioriteit:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Pagina"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Bezig met openen taken op %s"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kon de taken in `%s' niet laden"
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "De methode die nodig is om `%s' te laden wordt niet ondersteund"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "U heeft niet de juiste rechten om de map '%s' te openen"
 
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5799,48 +6139,39 @@ msgstr ""
 "Fout bij %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "Bezig met afronden van taken..."
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "Geselecteerde objecten worden verwijderd..."
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "Bezig met schrappen"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Taken"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kon de map in `%s' niet openen"
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, 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"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarmen voor %s worden toegevoegd"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5851,7 +6182,7 @@ msgstr ""
 "%s\n"
 " is gecrashed. Herstart Evolution om het opnieuw te kunnen gebruiken."
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5862,58 +6193,11 @@ msgstr ""
 "%s\n"
 " is gecrashed. Herstart Evolution om het opnieuw te kunnen gebruiken."
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Turin"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalender en Taken"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Kalender"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configureer uw tijdzone, kalender en taaklijst hier "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution kalender en taken"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution kalenderconfiguratie"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution kalender planingsberichtenweergave"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution kalenderweergave"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution kalender- / taakbeheer"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution taakbeheer"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolution kalender en taken-component"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolution tescomponent"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -5970,296 +6254,332 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Er moet een organisator ingesteld worden."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Er is minstens één bezoeker nodig"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Gebeurtenis informatie"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Taak informatie"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Journaal informatie"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Vrij/Bezet informatie"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Kalenderinformatie"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Vernieuwd"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Vernieuwen"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "Tegenvoorstel"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vrij/Bezet informatie (%s tot %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "iCalendar informatie"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "U moet een bezoeker zijn van het evenement."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1e"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2e"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3e"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4e"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5e"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6e"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7e"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8e"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9e"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10e"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11e"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12e"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13e"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14e"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15e"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16e"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17e"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18e"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19e"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20e"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21e"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22e"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23e"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24ste"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25e"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26e"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27e"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28e"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29e"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30e"
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31e"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Zo"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Ma"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Di"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Wo"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Do"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Vr"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Za"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Geselecteerde dag (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Geselecteerde week (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Geselecteerde maand (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Geselecteerde jaar (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Taak"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioriteit: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procent voltooid: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorieën: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Contacten: "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Afdrukvoorbeeld"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Item afdrukken"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Printerinstellingen"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Hernoem deze snelkoppeling"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Takenlijst"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Nieuwe Taak"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Taak"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Nieuwe taak aanmaken"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "De URI van de te tonen takenmap"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6271,11 +6591,11 @@ msgstr ""
 "\n"
 "De taken echt verwijderen?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Dit bericht niet meer weergeven."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "Taken afdrukken"
 
@@ -6303,15 +6623,15 @@ msgstr "iKalender bestanden (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "vKalender bestanden(.vcf)"
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "Herinnering!!"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "Kalendergebeurtenissen"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6319,7 +6639,7 @@ msgstr ""
 "Evolution heeft Gnome kalender bestanden gevonden.\n"
 "Wilt u deze importeren in Evolution?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Gnome kalender"
 
@@ -7852,27 +8172,27 @@ msgstr "Pacific/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacific/Yap"
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "Ondertekening wordt niet ondersteund door deze sleutel"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "Het gespecificeerde type word niet ondersteund door deze sleutel"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Het gespecificeerde type word niet ondersteund door deze sleutel"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Het gespecificeerde type word niet ondersteund door deze sleutel"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr "U mag geen sleutels importeren met deze sleutel"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr "U mag geen sleutels exporteren met deze sleutel"
 
@@ -7924,86 +8244,86 @@ msgstr "Map '%s' wordt voorbereid voor offline gebruik"
 msgid "You must be working online to complete this operation"
 msgstr "U moet online werken om deze bewerking te voltooien"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Aanmaken van pijp naar '%s' mislukt: %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Starten van kindproces '%s' mislukt: %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ongeldige berichtenstroom ontvangen van %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Map wordt gesynchroniseerd"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fout bij interpreten bestand: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fout bij uitvoeren filter: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Kan de spoolmap niet openen"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Kan de spoolmap niet verwerken"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Ophalen bericht %d(%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Kan bericht niet opnemen"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Faalde bij bericht %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Map wordt gesynchroniseerd"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Bezig met ophalen van bericht %d van %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Faalde bij bericht %d van %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Ophalen bericht mislukt"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr "Ongeldige argumenten voor (systeemvlag)"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr "Ongeldige argumenten voor (gebruiker)"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fout bij uitvoeren filterzoekactie: %s: %s"
@@ -8035,35 +8355,35 @@ msgstr "(past-allen) vereist enkelvoudig booleaans resultaat"
 msgid "Performing query on unknown header: %s"
 msgstr "Bezig met zoeken naar onbekende koptekst: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Opdracht wordt niet ondersteund: bericht achteraan toevoegen: voor %s"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Opdracht wordt niet ondersteund: zoeken op expressie: voor %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Opdracht wordt niet ondersteund: zoeken op uids: voor %s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Verplaatsen van berichten"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr "Berichten worden gekopieerd"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Bezig met ophalen van %d bericht(en)"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8074,15 +8394,15 @@ msgstr ""
 "\n"
 "%s "
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr "Interpretatie van de gpg userid hint is mislukt."
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr "Fout tijdens het verwerken van de gpg wachtwoord aanvraag."
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8091,33 +8411,33 @@ msgstr ""
 "U heeft een wachtwoord nodig om de sleutel voor\n"
 "gebruiker \"%s\" te mogen gebruiken"
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Geannuleerd."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Ontgrendelen van de geheime sleutel is mislukt: 3 onjuiste wachtzinnen "
 "gegeven."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Onverwacht antwoord van GnuPG: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr "Geen data gegeven"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 "Kan dit bericht niet versleutelen: er zijn geen geldige ontvangers opgegeven."
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8128,50 +8448,63 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "GPG %s mislukt: %s\n"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Kon gegevens niet wegschrijven: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Kon gpg niet starten: %s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr "Kon gpg niet starten."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "Dit berichtdeel is digitaal ondertekend"
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr ""
+"Kan ondertekening niet verifiëren: kan geen tijdelijk bestand maken: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Kan ondertekening niet verifiëren: kan geen tijdelijk bestand maken: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Kon gegevens niet wegschrijven: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Dit berichtdeel is digitaal ondertekend"
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Berichtinoud indexeren"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Kon bericht niet van editor halen"
@@ -8272,15 +8605,15 @@ msgstr "Fout bij opslaan van tijdelijk postbusbestand: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Fout bij opslaan van tijdelijk postbusbestand: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Ontcijferen van het MIME gedeelte is mislukt: protocol fout"
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "Kan MIME-berichtdeel niet decoderen: ongeldige structuur"
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "analysefout"
 
@@ -8608,12 +8941,12 @@ msgstr "Virtuele map e-mail aanbieder"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Voor het lezen van post als een zoekopdracht op een verzameling mappen"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Geen aanbieder beschikbaar voor protocol `%s'"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8622,71 +8955,82 @@ msgstr ""
 "Kon de directory %s niet aanmaken:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Voer uw Wachtwoord in voor %s"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Ongedefinieerd"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Handtekening bewerken"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Handtekening bewerken"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Zelf-ondertekend certificaat in sleutelbos"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "Certificaat is niet te vertrouwen"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Handtekening opslaan"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Analysefout"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Server: %s, Type: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kan map niet verkrijgen: Ongeldige bewerking op deze opslag"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan map niet maken: Ongeldige bewerking op deze opslag"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Prullenbak"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "Juni"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "Kan certificaat van eigenaar niet ophalen"
@@ -8893,7 +9237,7 @@ msgstr ""
 "Certificaat herroepingslijst is verlopen op: %s\n"
 "Eigenaar: %s"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "kon URL %s niet verwerken"
@@ -8912,22 +9256,22 @@ msgstr "Dergelijk bericht %s bestaat niet in %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kan berichten niet naar een VMap verplaatsen of kopiëren"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kon map: %s niet verwijderen: Ongeldige bewerking"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kon map: %s niet verwijderen: map bestaat niet"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kon de naam van de map: %s niet wijzigen: ongeldige bewerking"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kon de naam van map: %s niet wijzigen naar: map bestaat niet"
@@ -9007,7 +9351,7 @@ msgstr "Ophalen van bericht mislukt: %s"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9021,7 +9365,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Een dergelijk bericht bestaat niet"
@@ -9059,54 +9403,69 @@ msgid "Failed to cache %s: %s"
 msgstr "Bufferen van bericht %s mislukt: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Verbinden met server..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Kan geen verbinding krijgen met LDAP server"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "Bedrijf"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Zoeken naar nieuwe e-mail"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 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:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Mappen"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Laat alleen de aangemelde mappen zien"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "Overschrijf servergegeven mappen naamruimte"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Naamruimte:"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Pas filters toe op alle nieuwe berichten in de INBOX op deze server"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Automatisch controleren op nieuwe post, iedere"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Voor het lezen en opslaan van post op IMAP servers."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9360,7 +9719,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Kon de naam van map %s niet wijzigen naar %s: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kon '%s' niet hernoemen: %s"
@@ -9475,29 +9834,29 @@ msgstr "Bezig met controleren op nieuwe berichten"
 msgid "Storing folder"
 msgstr "Map wordt opgeslagen"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kan map niet verkrijgen: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kon postbus niet openen: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "Mail toevoegen geannuleerd"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan bericht niet aan mbox-bestand toevoegen: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9506,11 +9865,11 @@ msgstr ""
 "Kan bericht %s uit folder %s niet verkrijgen\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "De map lijkt onherstelbaar beschadigd te zijn."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Opbouwen bericht mislukt: Beschadigde mailbox?"
 
@@ -9578,12 +9937,17 @@ msgstr "Kon directory %s niet maken: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "Kan map niet verkrijgen: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "Kaart-ID bestaat reeds"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Kon de naam van map %s niet wijzigen naar %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "De opgegeven mapnaam is niet geldig: %s"
@@ -9627,7 +9991,7 @@ msgstr "Kon de bronmap %s niet sluiten: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Kon de tijdelijke map niet sluiten: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kon de naam van de map niet wijzigen: %s"
@@ -9915,7 +10279,7 @@ msgstr "Verwijder na %s dag(en)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Ondersteuning voor POP3-extensies uitschakelen"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -10006,7 +10370,7 @@ msgid "No such folder `%s'."
 msgstr "Map `%s' bestaat niet."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10060,7 +10424,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Postaflevering via het sendmail programma"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10226,7 +10590,7 @@ msgstr "Postaflevering via %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan berichten niet versturen: afzender niet geldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Bericht wordt verstuurd"
 
@@ -10349,7 +10713,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "bijlage"
 
@@ -10393,14 +10757,14 @@ msgstr "MIME type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Probeer bijlage automatisch weer te geven"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "U dient een account in te stellen\n"
 "voordat u post kunt versturen."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Klik hier voor het adresboek"
 
@@ -10411,45 +10775,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Antwoordadres:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Van:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Onderwerp:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Aan:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Geef de geadresseerden"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Geef de adressen die een kopie van het bericht moeten krijgen"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10460,14 +10824,19 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Versturen naar:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr "Doel van bericht"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Voeg een bestand bij het bericht"
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Bestand(en) bijvoegen"
@@ -10503,21 +10872,21 @@ msgstr "Bestand bestaat reeds, overschrijven?"
 msgid "Error saving file: %s"
 msgstr "Fout bij opslaan bestand: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fout bij openen bestand: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fout bij benaderen bestand: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Kon bericht niet van editor halen"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10526,7 +10895,7 @@ msgstr ""
 "Niet in staat te zoeken op bestand: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10535,7 +10904,7 @@ msgstr ""
 "Niet in staat om bestand: %s af te kappen\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10544,7 +10913,7 @@ msgstr ""
 "Kan bestandsbeschrijving niet kopëren: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10553,7 +10922,7 @@ msgstr ""
 "Fout bij automatisch opslaan bericht: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10562,7 +10931,7 @@ msgstr ""
 "gevonden.\n"
 "Wilt u dat deze hersteld worden?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10573,28 +10942,28 @@ msgstr ""
 "\n"
 "Wilt u de wijzingen opslaan?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Waarschuwing: Veranderd Bericht"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Bestand openen"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "Handtekening:"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "Automatisch gegenereerd"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Stel een nieuw bericht op"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10602,7 +10971,7 @@ msgstr ""
 "Kon het venster Opstellen niet aanmaken:\n"
 "Kan adresselectie niet activeren."
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10614,7 +10983,7 @@ msgstr ""
 "Controleer alstublieft de geïnstalleerde versie  van\n"
 "gtkhtml en libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10623,7 +10992,7 @@ msgstr ""
 "Niet in staat de HTML editor component te activeren."
 
 # # Het origineel heeft <b> in plaats van </b>
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10632,11 +11001,13 @@ msgstr ""
 "worden.)</b>"
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "De Evolution werkgroep suite"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10892,13 +11263,13 @@ msgstr "%H:%M:%S%n"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11017,7 +11388,7 @@ msgstr "Dan"
 msgid "You must specify a folder."
 msgstr "U moet een map geven."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Map selecteren"
@@ -11031,24 +11402,24 @@ msgstr ""
 "Fout in reguliere expressie '%s':\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Belangrijk"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "Te doen"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Later"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Test"
 
@@ -11148,7 +11519,7 @@ msgstr "geleden"
 msgid "months"
 msgstr "maanden"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "seconden"
 
@@ -11245,7 +11616,7 @@ msgstr "Expressie"
 msgid "Follow Up"
 msgstr "Antwoord"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "Label"
 
@@ -11315,112 +11686,118 @@ msgid "Source Account"
 msgstr "Source-Account"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Buien"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Specifieke kop"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Stop met Verwerken"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "Status herstellen"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "bevat"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "bevat niet"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "eindigt niet op"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "bestaat niet"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "does not return"
 msgstr "komt niet terug"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "klinkt niet als"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "begint niet met"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "eindigt op"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "bestaat"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr "is gemarkeerd"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr "is na"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "is before"
 msgstr "is voor"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "is groter dan"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "is kleiner dan"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr "Is niet gemarkeerd"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "is niet"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "is"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr "geeft groter dan"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr "geeft kleiner dan"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr "komt terug"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "klinkt als"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "begint met"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "De naam '%s' is niet uniek. Kies een andere naam."
@@ -11445,18 +11822,80 @@ msgstr "Regelnaam"
 msgid "Score Rules"
 msgstr "Bewerk Scoreregel"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "U moet deze vfolder een naam geven."
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr "U moet minstens één map als bron opgeven."
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 msgid "VFolder source"
 msgstr "VMap-bron"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Bericht opstellen - Voorkeuren"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Hier kunt u uw e-mailvoorkeuren instellen, inclusief beveiliging en weergave."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Hier kunt u uw spellingscontrole, onderschiften en het opstellen van nieuwe "
+"berichten instellen."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Hier kunt u uw e-mail accounts instellen"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolution e-mail"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution e-mail accountconfiguratie"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Evolution e-mailcomponent"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Evolution nieuw bericht opstellen"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution configuratie voor opstellen van nieuw bericht"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution postmap-weergave"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution e-mail voorkeuren"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Post"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "E-mail accounts"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "E-mailvoorkeuren"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Weet u zeker dat u deze account wilt verwijderen?"
@@ -11498,7 +11937,7 @@ msgid "Protocol"
 msgstr "Protocol"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr "Naamloos"
 
@@ -11522,20 +11961,17 @@ msgstr "Scripthandtekening toevoegen"
 msgid "Signature(s)"
 msgstr "Handtekening(en)"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "U verstuurt een HTML-geformatteerd bericht. Controleer alstublieft dat\n"
 "de ontvangers HTML e-mail kunnen en willen ontvangen:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Toch versturen?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11543,7 +11979,7 @@ msgstr ""
 "Dit bericht heeft geen onderwerp.\n"
 "Weet u zeker dat u het wilt versturen?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11551,11 +11987,11 @@ msgstr ""
 "Omdat de contactenlijst waar u heen stuurt configureerd is voor verborgen "
 "adreslijsten zal dit bericht slechts Bcc dressen bevatten."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Dit bericht bevat alleen Bcc-ontvangers."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11565,12 +12001,12 @@ msgstr ""
 "toevoegen van een 'Apparently-To' kop.\n"
 "Toch versturen?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 "De geadresseerde moeten worden gespecificeerd om dit bericht te versturen."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11582,189 +12018,403 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "_VMap van zoekopdracht maken..."
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "Post"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<klik hier om een map te selecteren>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" in \"%s\""
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Nieuwe map aanmaken"
 
-#: mail/em-folder-selector.c:267
-#, fuzzy
-msgid "Folder _name"
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Specificeer waar de map gemaakt moet worden:"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
 msgstr "Map_naam:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Kon tijdelijke directory niet maken: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Kon tijdelijke directory niet maken: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Kon tijdelijke bestand '%s' niet maken: %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Kon de tijdelijke map niet sluiten: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Bezig met laden..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Map selecteren"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Maak een nieuwe map aan"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Kon map `%s' niet verwijderen: %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "De map \"%s\" echt verwijderen?"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Verwijder \"%s\""
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Hernoem de \"%s\" map naar:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+msgid "Rename Folder"
+msgstr "Map hernoemen"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Lettertype-eigenschappen"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Eigenschappen"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "_Mapnaam:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "Beel_d"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Open in Nieuw Venster"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Verplaatsen"
+
+#: mail/em-folder-tree.c:1500
+msgid "_New Folder..."
+msgstr "_Nieuwe map"
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "_Hernoemen"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "_Eigenschappen..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "B_ewerk als Nieuw Bericht..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "Af_drukken"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Afzender beantwoorden"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "_Lijst beantwoorden"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "_Iedereen beantwoorden"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "_Doorsturen"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr "Vervolg_acties..."
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr "Als voltooid markeren"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "Markering wissen"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Als gelezen mar_keren"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "Als o_ngelezen markeren"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Als belan_grijk markeren"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "Als _onbelangrijk markeren"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Als o_ngelezen markeren"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Als belan_grijk markeren"
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "_Herstellen"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "Naar map _verplaatsen..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "Naar map _kopiëren..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "Afzender aan adresboe_k toevoegen"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "Filters _toepassen"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "Regel aanmaken van bericht"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "VMap op _Onderwerp"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "VMap op afze_nder"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "VMap op _Geadresseerden"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "VMap op Mailing_Lijst"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "VMap op afze_nder"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Filter op Onderwerp"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Filter op afzen_der"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Filter op Geadresseerden"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Filter op _Mailinglijst"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filter op afzen_der"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Standaard"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Bericht afdrukken"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Verwijzing kopiëren"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Klopt:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Toegewezen"
+
+#: mail/em-format-html-display.c:597
+#, fuzzy
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
 msgstr ""
-"Dit bericht is digitaal ondertekend. Klik op het hangslotpictogram voor meer "
-"informatie."
+"Dit bericht is digitaal ondertekend, maar er kan niet worden aangetoond dat "
+"het authentiek is."
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Handtekening bewerken"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Handtekening bewerken"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+#, fuzzy
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"Het input_token bevat een ongeldige handtekening, of een handtekening die "
+"niet gecontroleerd kon worden."
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Onderbroken"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "Versleutelen met PGP"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Kon MIME bericht niet verwerken. Onbewerkte weergave."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Niet ondersteund schema"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Kan ondertekening niet verifiëren"
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "In bericht weergeven"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Verbergen"
@@ -11774,185 +12424,208 @@ msgstr "Verbergen"
 msgid "Page %d of %d"
 msgstr "Pagina %d van %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Bezig met ophalen bericht %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Misvormd extern-berichtgedeelte"
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Verwijzing naar FTP site (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Verwijzing naar lokaal bestand (%s) geldig bij site \"%s\""
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Verwijzing naar lokaal bestand (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Verwijzing naar externe gegevens (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Verwijzing naar onbekende externe gegevens (\"%s\" type)"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-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/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Dit bericht is digitaal ondertekend en is authentiek."
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-msgid "No signature present"
-msgstr ""
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Kon bonobo niet initialiseren"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Niet ondersteund schema"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kon MIME bericht niet verwerken. Onbewerkte weergave."
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Verplaatsen van berichten"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Van"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Antwoordadres"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Aan"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "E-mailprogramma"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "%s bijlage"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Kon MIME bericht niet verwerken. Onbewerkte weergave."
+msgid "Session not initialised"
+msgstr "Kon bonobo niet initialiseren"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Dit bericht is digitaal ondertekend en is authentiek."
+
+#: mail/em-format.c:1212
+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/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Aan het Wachten ..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "%s wordt opgezocht"
 
-#: mail/em-popup.c:593
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Bufferen van bericht %s mislukt: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Aanmaken van pijp naar '%s' mislukt: %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Kon computer '%s' niet vinden: %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Opslaan als..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Afzender beantwoorden"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Verwijzing in browser openen"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "_Bericht aan lijst sturen..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Afzender aan adresboek toevoegen"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Openen in %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "Deze server ondersteunt geen LDAPv3 schema informatie"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Abonneren"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Map"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Selecteer een server"
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Geen server geselecteerd"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Dit bericht niet meer weergeven."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11961,27 +12634,27 @@ msgstr ""
 "Fout bij het laden van filterinformatie:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Filters"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Doorgestuurd Bericht"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "een onbekende afzender"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Op %a %d-%m-%Y, om %H:%M schreef %%s:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -11990,7 +12663,7 @@ msgstr ""
 "Kan niet opslaan als '%s'\n"
 "  %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -11999,25 +12672,26 @@ msgstr ""
 "%s bestaat al\n"
 "Wilt u het overschrijven?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Bericht"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Bericht opslaan als..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Kon tijdelijke directory niet maken: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Adres"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12026,61 +12700,428 @@ msgstr ""
 "\n"
 "Deze berichten echt verwijderen?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Bericht opstellen - Voorkeuren"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/em-utils.c:2288
+#, fuzzy
 msgid ""
-"Configure mail preferences, including security and message display, here"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
 msgstr ""
-"Hier kunt u uw e-mailvoorkeuren instellen, inclusief beveiliging en weergave."
+"Deze opdracht zal alle berichten die als 'gewist' gemarkeerd zijn\n"
+"permanent verwijderen, en u kunt ze niet meer herstellen\n"
+"\n"
+"Deze berichten echt verwijderen?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/evolution-mail.schemas.in.in.h:1
+msgid "Automatic link recognition"
 msgstr ""
-"Hier kunt u uw spellingscontrole, onderschiften en het opstellen van nieuwe "
-"berichten instellen."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Hier kunt u uw e-mail accounts instellen"
+#: mail/evolution-mail.schemas.in.in.h:2
+msgid "Automatic smiley recognition"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution e-mail"
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution e-mail accountconfiguratie"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution e-mailcomponent"
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution nieuw bericht opstellen"
+#: mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
+msgid "Default charset in which to compose messages"
+msgstr "Standaardonderwerp van het bericht."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution configuratie voor opstellen van nieuw bericht"
+#: mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
+msgid "Default charset in which to compose messages."
+msgstr "Standaardonderwerp van het bericht."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution postmap-weergave"
+#: mail/evolution-mail.schemas.in.in.h:8
+#, fuzzy
+msgid "Default charset in which to display messages"
+msgstr "Zoek voor tekst in de body van het weergegeven bericht"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution e-mail voorkeuren"
+#: mail/evolution-mail.schemas.in.in.h:9
+#, fuzzy
+msgid "Default charset in which to display messages."
+msgstr "Zoek voor tekst in de body van het weergegeven bericht"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/evolution-mail.schemas.in.in.h:10
+#, fuzzy
+msgid "Default forward style"
+msgstr "_Doorstuurstijl:"
+
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default reply style"
+msgstr "_Antwoordstijl:"
+
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Empty Trash folders on exit"
+msgstr "_Prullenbakken legen bij afsluiten"
+
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "_Prullenbakken legen bij afsluiten"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "E-mail accounts"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "E-mailvoorkeuren"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "Acties uitvoeren"
+
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Nieuwe Mail Notificatie"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Nieuwe Mail Notificatie"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+"_Waarschuwen wanneer HTML berichten verstuurd worden naar contacten die dat "
+"niet willen"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr ""
+"Waarschuwen wanneer berichten worden verstuurd met alleen _Bcc-ontvangers"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "HTLM e-mail versturen?"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "HTLM e-mail versturen?"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "Bewegende afbeeldingen _weergeven"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "Bewegende afbeeldingen _weergeven"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Laat berichten in normale stijl zien"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "Voorbeeldvenster"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "_Geluid afspelen bij binnenkomst van nieuwe e-mail"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "Spellings_controle"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "_Terminal-lettertype:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "Kies HTML lettertype met variabele breedte voor afdrukken"
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Discussies tonen"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Discussies tonen"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "_Dit instellen als standaardaccount"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "V_ariabele breedte:"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm-import"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox-import"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape mail-import"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 importeerassistent"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Pine importer"
+msgstr "Evolution pine-import"
 
 #: mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
@@ -12120,34 +13161,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm-import"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox-import"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape mail-import"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 importeerassistent"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Pine importer"
-msgstr "Evolution pine-import"
-
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -12208,12 +13221,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importeert uw oude Netscape informatie"
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Prullenbak"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Bezig met scannen van e-mailfilters"
@@ -12222,7 +13229,7 @@ msgstr "Bezig met scannen van e-mailfilters"
 msgid "Scanning directory"
 msgstr "Map wordt gescant"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Importeren wordt gestart"
 
@@ -12297,23 +13304,23 @@ msgid "You have not filled in all of the required information."
 msgstr "U heeft niet alle informatie ingevuld die nodig is."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution Accountbeheer"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "Computernaam:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "Gebruikers_naam:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Pad:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "U kunt niet meerdere accounts met dezelfde naam maken."
 
@@ -12322,35 +13329,35 @@ msgstr "U kunt niet meerdere accounts met dezelfde naam maken."
 msgid "Mail to %s"
 msgstr "Post versturen naar %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Onderwerp is %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Post ophalen van %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s mailinglijst"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Beantwoord aan"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Filterregel Toevoegen"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "De volgende regel(s):\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12361,143 +13368,30 @@ msgstr ""
 "    '%s'\n"
 "En zijn aangepast."
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "Bezig met verbinden..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Deze map kan geen berichten bevatten."
-
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Kon de gedeelde map niet openen: %s."
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Nieuw Bericht"
 
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Kon tijdelijke directory niet maken: %s"
-
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Kon tijdelijke bestand '%s' niet maken: %s"
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "Bericht"
 
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Kon de tijdelijke map niet sluiten: %s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "Een nieuwe e-mail opstellen"
 
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Selecteer een doelmap voor deze belangrijke data"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Selecteer een doelmap voor deze belangrijke data"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Maak een nieuwe map aan"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Specificeer waar de map gemaakt moet worden:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Kon map `%s' niet verwijderen: %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "De map \"%s\" echt verwijderen?"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Verwijder \"%s\""
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Hernoem de \"%s\" map naar:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-msgid "Rename Folder"
-msgstr "Map hernoemen"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "De opgegeven mapnaam is niet geldig: %s"
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Lettertype-eigenschappen"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Eigenschappen"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "_Mapnaam:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "Beel_d"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Open in Nieuw Venster"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Verplaatsen"
-
-#: mail/mail-component.c:2087
-msgid "_New Folder..."
-msgstr "_Nieuwe map"
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "_Hernoemen"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Eigenschappen..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Identiteit"
 
@@ -12559,11 +13453,11 @@ msgstr ""
 "mailaccount. Geef een naam aan dit account in de ruimte hieronder. Deze naam "
 "is alleen nodig voor de lijstweergave."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Dienst wordt gecontroleerd"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Verbinden met server..."
 
@@ -12649,26 +13543,35 @@ msgid "C_olors"
 msgstr "_Kleuren"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Controleren voor Nieuwe Berichten"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "Spelling controleren terwijl ik _tik"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Controleren voor Nieuwe Berichten"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "Kleur voor _spelfouten:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Berichten Opstellen"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Configuratie"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12683,136 +13586,141 @@ msgstr ""
 "\n"
 "Klik op \"Toepassen\" om uw instellingen op te slaan."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "Standaard"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Standaardgedrag"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "Standaard teken_codering:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Verwijderen van e-mail"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr ""
 "Uitgaande berichten _altijd ondertekenen bij het gebruik van dit account"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "Originele bericht niet citeren"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 "Aanvragen voor bijeenkomsten _niet ondertekenen (voor Outlook "
 "compatibiliteit)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Klaar"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "_Klad-map:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "Aanzetten"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "E-mail accounts"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "E-mail_adres:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "_Prullenbakken legen bij afsluiten"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Certificaat-ID:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Evolution Account Assistent"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Opdracht Uitvoeren..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "_Vaste breedte:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "Filters"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "Lettertype-eigenschappen"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "Berichten opmaken met _HTML"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "Citaten _accentueren met"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Ingebonden"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Labels en kleuren"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Afbeeldingen laden"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Postconfiguratie"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Mailbox locatie"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Berichten opstellen"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Berichtweergave"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 msgid "Message Fonts"
 msgstr "Berichtlettertype"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Nieuwe Mail Notificatie"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -12820,141 +13728,141 @@ msgstr ""
 "Opmerking: U wordt pas om uw wachtwoord gevraagd wanneer uw voor het eerst "
 "contact maakt"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Optionele Informatie"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "Or_ganisatie:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG sleutel ID:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Kies een kleur"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Waarschuwen wanneer berichten worden verstuurd met alleen _Bcc-ontvangers"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Afgedrukte lettertypes"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "Originele bericht citeren"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Geciteerd"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "Onthoud dit wachtwoord"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "Ant_woordadres:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "E-mail ontvangen"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "_Ontvangst-instellingen"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "_Wachtwoord onthouden"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Vereiste informatie"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "Standaardinstellingen herstellen"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "B_eveiliging"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "Beveiligde MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr "Kies HTML lettertype met gelijke breedte"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr "Kies HTML lettertype met gelijke breedte voor afdrukken"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr "Kies HTML lettertype met variabele breedte"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr "Kies HTML lettertype met variabele breedte voor afdrukken"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "E-mail versturen"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Verzonden _berichtenmap:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Verzonden en Klad Berichten"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Server _vereist aanmelding"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Serverconfiguratie"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Server _Type: "
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Zelf-ondertekend certificaat in sleutelbos"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "Geef _bestandsnaam:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "Spellings_controle"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Standaard Unix mailboxbestand"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12964,7 +13872,7 @@ msgstr ""
 "uw ondertekening. De naam die u hier geeft zal\n"
 "uitsluitend voor weergavedoeleinden gebruikt worden."
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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 "
@@ -12974,7 +13882,7 @@ msgstr ""
 "lijst van beschikbare talen komt overeen met de waarvoor een woordenboek "
 "geïnstalleerd is."
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12982,11 +13890,15 @@ msgstr ""
 "Geef de naam die u aan dit account wilt geven.\n"
 "Bijvoorbeeld: \"zakelijk\" of \"persoonlijk\""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "V_ariabele breedte:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12996,172 +13908,181 @@ msgstr ""
 "\n"
 "Klik op \"Volgende\" om te beginnen."
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "Handtekening _toevoegen"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "Altijd afbeeldingen ophalen va het internet"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 "Uitgaande berichten _altijd ondertekenen bij het gebruik van dit account"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "_Aanmeldingstype:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "_Aanmeldingstype:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr "_Automatisch controleren op nieuwe post, iedere"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "_Automatisch smileys invoegen"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "Piepen bij binnenkomst van nieuwe e-mail"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "Bevestigen bij het legen van een map"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "_Standaardhandtekening:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "_Standaardinstellingen"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Geen melding bij binnenkomst van nieuwe e-mail"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "_Gebruiken"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "_Doorstuurstijl:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "_Volledige Naam:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "_HTML e-mail"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "_Identiteit"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Juni"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "Afbeeldingen tonen als de afzender in het adresboek voorkomt"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "_Dit instellen als standaardaccount"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "Berichten als gelezen markeren na "
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Naam:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "_Nooit afbeeldingen van het internet ophalen"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "_Geluid afspelen bij binnenkomst van nieuwe e-mail"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "_Waarschuwen wanneer HTML berichten verstuurd worden naar contacten die dat "
 "niet willen"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Waarschuwen wanneer een bericht verstuurd wordt zonder _onderwerp"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "_Berichten ontvangen"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "_Antwoordstijl:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "_Standaardinstellingen herstellen"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Script:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Verwijderen..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "E-mail ver_sturen"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "Bewegende afbeeldingen _weergeven"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Handtekeningen"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr "Standaardlettertype"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr "_Terminal-lettertype:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "_Beveiligde verbinding (SSL) gebruiken:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr "_Hetzelfde lettertype gebruiken als de andere programma's"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "omschrijving"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr "%s wordt opgezocht"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13170,7 +14091,7 @@ msgstr ""
 "Fout tijdens '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13179,7 +14100,7 @@ msgstr ""
 "Fout tijden het uitvoeren van bewerking:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Bezig"
 
@@ -13191,118 +14112,118 @@ msgstr "Map wordt gefilterd"
 msgid "Fetching Mail"
 msgstr "Berichten aan het ontvangen"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Fout bij opslaan post in tijdelijk bestand %s: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Fout bij opslaan post in tijdelijk bestand %s: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" wordt verzonden"
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Bericht %d van %d wordt verzonden"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "faalde op bericht %d van %d"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Voltooid."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Bericht wordt opgeslagen in map"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Berichten worden verplaatst naar %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Berichten worden gekopieerd naar %s"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Bezig met scannen van mappen in \"%s\""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Doorgestuurde berichten"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Bezig met openen map %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "Bezig met openen van opslag %s"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "verwijderen map %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Bezig met opslaan map '%s'"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Map wordt ververst"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Bezig met legen map"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Prullenbak van '%s' wordt geleegd"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Lokale mappen"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Bezig met ophalen bericht %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Bezig met ophalen van %d bericht(en)"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Bezig met het opslaan van %d bericht(en)"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13311,7 +14232,7 @@ msgstr ""
 "Kon uitvoerbestand niet maken: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13320,11 +14241,11 @@ msgstr ""
 "Fout bij opslaan berichten in: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Bezig met opslaan bijlage"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13333,21 +14254,25 @@ msgstr ""
 "Kan uitvoerbestand niet maken: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kon gegevens niet wegschrijven: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbreken van %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Bezig met opnieuw verbinden met %s"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Hoofdlettergevoelig"
@@ -13365,59 +14290,74 @@ msgstr "Zoek:"
 msgid "Search"
 msgstr "_Zoeken"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Handtekening bewerken"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Uitzonderingen"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Accountinformatie"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Annuleren..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Type: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Pas: %s, Type: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "E-mail versturen & ontvangen"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 msgid "Cancel _All"
 msgstr "_Alles annuleren"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Aan het Actualiseren ..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Aan het Wachten ..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Gebruiker heeft operatie afgebroken."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Voer uw Wachtwoord in voor %s"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Voer Wachtwoord in"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "_Onthoud dit wachtwoord"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr "Dit wachtwoord onthouden tot het einde van deze sessie"
 
@@ -13456,26 +14396,31 @@ msgstr "Geef deze handtekening een naam."
 msgid "Name:"
 msgstr "Naam:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Doorgestuurd bericht - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Doorgestuurd bericht"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Bezig met openen map %s"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Bezig met aanmaken vfolder: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Actualiseren vfolders voor uri: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13488,89 +14433,89 @@ msgstr ""
 "    '%s'\n"
 "En zijn aangepast."
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "VMappen"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "vMappen"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Bewerk VMap"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 "Poging tot aanpassen van vMap '%s' gedetecteerd terwijl deze niet bestaat."
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Nieuwe VMap"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Ongelezen"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Gelezen"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Beantwoord"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Meerdere Ongelezen Berichten"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Meerdere Berichten"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Laagste"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Laag"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Hoog"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Hoogste"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Vandaag %l:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Gisteren %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Bezig met genereren van berichtenlijst"
 
@@ -13626,11 +14571,11 @@ msgstr "Doorsturen"
 msgid "No Response Necessary"
 msgstr "Geen antwoord nodig"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Beantwoorden"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Iedereen beantwoorden"
 
@@ -13682,41 +14627,139 @@ msgstr "Abonneren"
 msgid "_Unsubscribe"
 msgstr "Afmelden"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr "Hier kunt u speciale mappen en offline gedrag instellen"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Evolution shell"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Mapinstellingen"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "80%"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Hernoem deze snelkoppelingsgroep"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Toont de mappenbalk"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Verberg de snelkoppelingenbalk"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Standaard prioriteit:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Standaard prioriteit:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Evolution e-mail configuratie interface"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+#, fuzzy
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "Bijlage markeren om in het bericht zelf weergegeven te worden."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
 msgstr ""
-"Kan map niet overzetten:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Map toevoegen"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Klad"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Inbox"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Outbox"
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "Standaard takenmap wordt geopend"
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Verzonden"
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Standaard takenmap wordt geopend"
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Standaard takenmap wordt geopend"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Standaard takenmap wordt geopend"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Toont de mappenbalk"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Toont de snelkoppelingenbalk"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "E-mail"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Kon bestanden niet correct actualiseren"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13727,7 +14770,7 @@ msgstr ""
 "%s\n"
 "Fout: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13736,7 +14779,7 @@ msgstr ""
 "Er trad een fout op bij het kopieëren van bestanden naar\n"
 "`%s'."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13747,7 +14790,7 @@ msgstr ""
 "Verplaats het om de installatie van de Evolution\n"
 "bestanden af te maken."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13845,10 +14888,11 @@ msgstr ""
 "Kan map niet hernoemen:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+msgid "The specified folder name is not valid: %s"
+msgstr "De opgegeven mapnaam is niet geldig: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -13872,19 +14916,15 @@ msgstr ""
 "Kan de gespecificeerde map niet aanmaken:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Nieuwe map aanmaken"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Naamloos)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Kies welk type importeerfilter u wilt gebruiken:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13898,11 +14938,11 @@ msgstr ""
 "U kunt \"Automatisch\" kiezen als u het niet weet; Evolution probeert het "
 "dan voor u uit te zoeken."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Kies de informatie die u zou willen importeren:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13910,7 +14950,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13919,21 +14959,21 @@ msgstr ""
 "Importeren %s\n"
 "Bezig met importeren item %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "Importeerder selecteren"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "Map %s bestaat niet"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Evolution Fout"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -13942,11 +14982,11 @@ msgstr ""
 "Er is geen importeerfunctie die het volgende kan afhandelen\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Bezig met importeren"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -13955,17 +14995,17 @@ msgstr ""
 "Importeren %s.\n"
 "Beginnen %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Fout bij laden %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Fout bij laden %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13974,35 +15014,35 @@ msgstr ""
 "Importeren %s\n"
 "Bezig met importeren item 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Bestandsnaam:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Selecteer een bestand"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Bestandstype:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Informatie en instellingen importeren van oudere programma's"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Een enkel bestand importeren"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -14010,47 +15050,28 @@ msgstr ""
 "Even geduld...\n"
 "Bestaande instellingen worden nagezocht"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Intelligent Importeren wordt gestart"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "Van %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Selecteer een doelmap voor deze belangrijke data"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Importeren"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Verbindeingen ophangen...."
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Fout bij synchoniseren van \"%s\":\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "Map wordt gesynchroniseerd"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "\"%s\" wordt gesynchroniseerd (%d van %d) ..."
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Evolution instellingen"
@@ -14085,7 +15106,7 @@ msgstr "Kon de gedeelde map niet openen: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Kan de gegeven gedeelde map niet vinden."
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14094,17 +15115,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Assistent"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Nieuw"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Geen mapnaam opgegeven."
@@ -14162,63 +15177,50 @@ msgstr "Nieuwe verwijzing aanmaken"
 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:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "Werk Online"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "Offline _werken"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Werk zonder netwerk"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Geen map weergegeven)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Geen)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 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:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution is bezig offline te gaan."
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution is nu offline. Klik op deze knop om online te gaan werken."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Ongeldige argumenten"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Kan niet registreren op OAF"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Configuratiedatabase niet gevonden"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Generieke fout"
 
@@ -14331,74 +15333,18 @@ msgstr "Verwijderen"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Verwijder deze snelkoppeling van de snelkoppelingenbalk"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Fout bij opslaan van snelkoppelingen."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Inbox"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Snelkoppelingen"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Geen fout"
-
-#: 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:575
-msgid "The specified folder type is not valid"
-msgstr "Het gespecificeerde foldertype is niet geldig"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "I/O fout"
-
-#: 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:581
-msgid "The folder is not empty"
-msgstr "De map is niet leeg"
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "De opgegeven folder is niet gevonden"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "Functie niet geïmplementeerd voor deze opslag"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "Operatie niet ondersteund"
-
-#: 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:593
-msgid "The specified folder cannot be modified or removed"
-msgstr "De opgegeven folder kan niet worden veranderd of verwijderd"
-
-#: 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:597
-msgid "Cannot create a folder with that name"
-msgstr "Kan geen map met die naam maken"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Deze opdracht kan niet uitgevoerd worden in de offline stand"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Aankruisvakje"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14409,6 +15355,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% voltooid)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Nieuw"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "\"%s\" in \"%s\""
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14446,74 +15403,6 @@ msgstr ""
 "De fout van het activeringssysteem is:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "CORBA fout"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Onderbroken"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Ongeldige argument"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Heeft al een eigenaar"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Geen eigenaar"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Niet gevonden"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Niet ondersteund type"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Niet ondersteund schema"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Niet ondersteunde bewerking"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Interne fout"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Bestaat"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "Ongeldige URI"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Heeft submappen"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Geen ruimte over"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "Oude eigenaar is gestorven"
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Test type"
-
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr "Evolution tescomponent"
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr "Actieve verbindingen"
@@ -14542,10 +15431,6 @@ msgstr "_Post:"
 msgid "_Tasks:"
 msgstr "_Taken:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr "Map_naam:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder _type:"
 msgstr "Map_type:"
@@ -14608,22 +15493,6 @@ msgstr ""
 "\n"
 "Klik op \"Toepassen\" om uw instellingen op te slaan."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "Hier kunt u speciale mappen en offline gedrag instellen"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Evolution shell"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution configuratie voor mapinstellingen"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Mapinstellingen"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -14664,7 +15533,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Importeerders"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Importeren"
 
@@ -14680,16 +15549,16 @@ msgstr "Dit bericht niet meer weergeven."
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan gegevens importeren van de volgende bestanden:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Bezig met afsluiten ..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14726,7 +15595,7 @@ msgstr ""
 "ons\n"
 "harde werk en wachten in spanning op uw bijdrage!\n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -14734,36 +15603,48 @@ msgstr ""
 "Bedankt!\n"
 "Het Ximian Evolution team\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr "Dit bericht niet meer weergeven"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan geen toegang verkrijgen tot de Evolution shell."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan de Ximian Evolution-schil niet initialiseren: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Beginnen in offline stand"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Beginnen in online modus"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr "Alle onderdelen van Evolution stoppen"
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Zend de debug uitvoor van alle componenten naar een bestand"
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14772,31 +15653,60 @@ msgstr ""
 "%s: --online en --offline kan niet tegelijk worden gebruikt.\n"
 "  Gebruik %s --help voor meer informatie.\n"
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Importeerder selecteren"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Certificaat-ID:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "Voortgang"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Expressie"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "E-mailadres samenvoegen"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"Certificaat verlopen op: %s\n"
+"Eigenaar: %s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14854,91 +15764,376 @@ msgid "Backup All"
 msgstr "Blackpool"
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "_Certificaat-ID:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Certificaat is niet te vertrouwen"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "_Certificaat-ID:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Algemene naam"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "_Certificaat-ID:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "Be_werken"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Verifiëren van certificaten mislukt."
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Expressie"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Organisatie"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Organisatie"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "Beel_d"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "_Certificaat-ID:"
+
+#: smime/gui/smime-ui.glade.h:42
+#, fuzzy
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr "Ongeldige Certificaat Authoriteit (CA)"
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "_Certificaat-ID:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Importeren"
+msgid "Certificate already exists"
+msgstr "Kaart-ID bestaat reeds"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d-%m-%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Vermont"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "OK"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "_Certificaat-ID:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "_Certificaat-ID:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "Certificaat is niet te vertrouwen"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "ID"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Onderwerp is %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Kan de spoolmap niet verwerken"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "Ongeldige Certificaat Authoriteit (CA)"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Ongeldige Certificaat Authoriteit (CA)"
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Geen informatie"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "bijlage"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "_Certificaat-ID:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Curitiba"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "North Carolina"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Expressie"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s bij %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Certificaatondertekening-fout"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "_Invoegen"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Onderwerp is %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Certificaatondertekening-fout"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Voer uw Wachtwoord in voor %s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "_Certificaat-ID:"
 
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
@@ -14989,7 +16184,7 @@ msgstr "Kopieer de selectie"
 msgid "Copy to Folder..."
 msgstr "Naar map kopiëren..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Knip de selectie"
 
@@ -15005,7 +16200,7 @@ msgstr "Contact(en) verplaatsen naar een andere map..."
 msgid "Move to Folder..."
 msgstr "Naar map verplaatsen..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Plak het klembord"
 
@@ -15013,8 +16208,8 @@ msgstr "Plak het klembord"
 msgid "Previews the contacts to be printed"
 msgstr "Geeft een voorbeeld van de af te drukken contacten"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Afdruk_voorbeeld"
@@ -15059,13 +16254,13 @@ msgstr "Stop met Laden"
 msgid "View the current contact"
 msgstr "Huidige contact weergeven"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "_Acties"
 
@@ -15095,142 +16290,110 @@ msgstr "Stuur Bericht aan Contact..."
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "Maak een nieuwe dag-omvattende afspraak"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Maak een nieuwe afspraak"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "Maak een nieuwe map aan"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Maak een nieuw bijeenkomstverzoek"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Nieuwe taak aanmaken"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Dag"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Alle instanties verwijderen"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Verwijder deze afspraak"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Alleen deze verwijderen"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Alleen deze verwijderen"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Ga naar"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Ga terug in de tijd"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Ga vooruit in de tijd"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Ga Naar Datum"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Ga naar een specifieke datum"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Ga Naar Vandaag"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "Lijst"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Maand"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Nieuwe _Afspraak"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Nieuw Caledonië"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Nieuwe bijeenkomst"
-
-#: ui/evolution-calendar.xml.h:27
-#, fuzzy
-msgid "New _Task"
-msgstr "Nieuwe taak"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Geeft een afdrukvoorbeeld van de kalender"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Druk deze Kalender af"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Vrij/Bezig informatie voor deze kalender publiceren"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Bourges"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Map met afspraken en gebeurtenissen"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Details weergeven"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "één dag tonen"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "één maand tonen"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "één week tonen"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "De werkweek tonen"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Week"
 
@@ -15295,7 +16458,7 @@ msgstr "Dit item opslaan op de harde schijf"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Bestand"
 
@@ -15514,7 +16677,7 @@ msgstr "Alles als _gelezen markeren"
 msgid "Mark all visible messages as read"
 msgstr "Alle zichtbare berichten als gelezen markeren"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "Bericht(en) vanaf het klembord plakken"
 
@@ -15571,16 +16734,6 @@ msgstr "Selectie in_verteren"
 msgid "_Threaded Message List"
 msgstr "_Berichtenlijst met discussies"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Dit venster sluiten"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "_Sluiten"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "Afzender aan adresboek _toevoegen"
@@ -15739,258 +16892,283 @@ msgstr "Stuur het bericht door naar iemand als bijlage"
 msgid "Increase the text size"
 msgstr "Tekstweergave vergroten"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Toon _Afbeeldingen"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Als _belangrijk markeren"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Als o_ngelezen markeren"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Als _onbelangrijk markeren"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "Geselecteerde berichten als gelezen markeren"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "Geselecteerde berichten als belangrijk markeren"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Geselecteerde berichten als onbelangrijk markeren"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Geselecteerde berichten als ongelezen markeren"
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Geselecteerde berichten als ongelezen markeren"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Geselecteerde berichten als onbelangrijk markeren"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Geselecteerde berichten om te verwijderen markeren"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Verplaatsen"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "Geselecteerde berichten verplaatsen naar een andere map"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Volgende"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "Volgende belangrijke bericht"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "Volgende dis_cussie"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "Volgende _ongelezen bericht"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Niet gevonden"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Geselecteerde bericht openen in een nieuw venster"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 "Geselecteerde bericht openen als nieuw bericht om het opnieuw te zenden"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Originele groo_tte"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "Vo_rige ongelezen bericht"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Antwoord sturen"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr "Antwoord sturen op een bericht in een openbare map"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "Vori_ge belangrijke bericht"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Geeft een afdrukvoorbeeld van het bericht"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Vorige"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Druk dit bericht af"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "Doorsturen"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Stuur het geselecteerde bericht door naar iemand"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "De tekst zijn originele grootte geven"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "B_ericht zoeken..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "_Kleiner"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Sla bericht op als tekstbestand"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Zoek voor tekst in de body van het weergegeven bericht"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr "Pagina-instellingen configureren voor de huidige printer"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Toon broncode van _Bericht"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Toon alle _Koppen"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Zoek voor tekst in de body van het weergegeven bericht"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Laat berichten in normale stijl zien"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Laat berichten zien met alle e-mail headers"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Laat de ruwe e-mailbron van het bericht zien"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "Tekstgroo_tte"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Maak verwijderen ongedaan van de geselecteerde berichten"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "VMap op mailing_lijst..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "VMap op _afzender..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "VMap op _geadresseerden..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "VMap op _onderwerp..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "_Bijgevoegd"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "_Kopiëren naar map"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "_Filter maken van bericht"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "Bericht _doorsturen"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "_Ga naar"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "_Ingebonden"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "_Groter"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "_Berichtweergave"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Verplaatsen naar map"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "_Volgend bericht"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "_Normale weergave"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "Bericht _openen"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "Vo_rig bericht"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "Ge_citeerd"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "_Opnieuw sturen..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "_Gereedschap"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "_Herstellen"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Dit venster sluiten"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "_Sluiten"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Bijlage toevoegen"
@@ -16269,12 +17447,13 @@ msgid "Change Evolution's settings"
 msgstr "Instellingen van Evolution bewerken"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "_Afsluiten"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Maak een nieuw bijeenkomstverzoek"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "Evolution Venster"
+msgid "E_xit"
+msgstr "_Afsluiten"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16286,61 +17465,74 @@ msgstr "Importeer gegevens van andere programma's"
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "Evolution Venster"
+msgid "Open a new window"
+msgstr "Open in Nieuw Venster"
 
 #: ui/evolution.xml.h:11
 msgid "Pi_lot Settings..."
 msgstr "Pil_ot instellingen..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Versturen & ontvangen"
+
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr "Items in de wachtrij versturen en nieuwe items ophalen"
+
+#: ui/evolution.xml.h:14
 msgid "Set up Pilot configuration"
 msgstr "Pilotconfiguratie instellen"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Toon informatie over Ximian Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Bug-Report Insturen"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "_Bug Report Insturen"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Report insturen met Bug Buddy."
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Verander"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Offline werken aan- of uitschakelen."
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "_Over Ximian Evolution..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "_Hulp"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "_Importeren..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Nieuw"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Versturen & ontvangen"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "Nu _zoeken"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Samenvatting afdrukken"
@@ -16469,12 +17661,12 @@ msgstr "Weergaven definiëren..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "MDWDVZZ"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -16607,7 +17799,7 @@ msgstr "_Zoeken"
 msgid "_Find Now"
 msgstr "Nu _zoeken"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "_Wissen"
 
@@ -16623,24 +17815,259 @@ msgstr "Subitem ID"
 msgid "Text"
 msgstr "Tekst"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Wissen"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Nu zoeken"
 
+#~ msgid "Account Name"
+#~ msgstr "Accountnaam"
+
+#~ msgid "Server Name"
+#~ msgstr "Servernaam"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "LDAP wordt niet ondersteund in deze versie van Evolution"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Andere adresboeken"
+
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "Hier kunt u de toegang tot LDAP servers instellen"
+
+#~ msgid "Directory Servers"
+#~ msgstr "Adresboekservers"
+
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Evolution adresboek LDAP-configuratie"
+
+#~ msgid "Add LDAP Server"
+#~ msgstr "LDAP server toevoegen"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Stap 4: Schermnaam"
+
+#~ msgid "Find contact in"
+#~ msgstr "Vind contact in"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Klik hier om een contact toe te voegen *"
+
+#~ msgid "Business Address"
+#~ msgstr "Bedrijfs Adres"
+
+#~ msgid "Department"
+#~ msgstr "Afdeling"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "Vrij/Bezet URL"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Beroep"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Bezig met openen taken op %s"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Toch versturen?"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Stop de huidige e-mail operatie"
+#~ msgid "Folder _name"
+#~ msgstr "Map_naam:"
+
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "Dit bericht is digitaal ondertekend. Klik op het hangslotpictogram voor "
+#~ "meer informatie."
+
+#~ msgid "Connecting..."
+#~ msgstr "Bezig met verbinden..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Deze map kan geen berichten bevatten."
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Kon de gedeelde map niet openen: %s."
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Selecteer een doelmap voor deze belangrijke data"
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan map niet overzetten:\n"
+#~ "%s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "Map toevoegen"
+
+#~ msgid "Drafts"
+#~ msgstr "Klad"
+
+#~ msgid "Outbox"
+#~ msgstr "Outbox"
+
+#~ msgid "Sent"
+#~ msgstr "Verzonden"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Fout bij synchoniseren van \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "Map wordt gesynchroniseerd"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "\"%s\" wordt gesynchroniseerd (%d van %d) ..."
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Geen map weergegeven)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(Geen)"
+
+#~ msgid "No error"
+#~ msgstr "Geen fout"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Een folder met die naam bestaat reeds"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Het gespecificeerde foldertype is niet geldig"
+
+#~ msgid "I/O error"
+#~ msgstr "I/O fout"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Niet genoeg ruimte vrij om de folder te maken"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "De map is niet leeg"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "De opgegeven folder is niet gevonden"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Functie niet geïmplementeerd voor deze opslag"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Operatie niet ondersteund"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Het gespecificeerde type word niet ondersteund door deze opslag"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "De opgegeven folder kan niet worden veranderd of verwijderd"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "Kan de map niet verplaatsen naar een van zijn eigen kinderen"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Kan geen map met die naam maken"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Deze opdracht kan niet uitgevoerd worden in de offline stand"
+
+#~ msgid "Checkbox"
+#~ msgstr "Aankruisvakje"
+
+#~ msgid "CORBA error"
+#~ msgstr "CORBA fout"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Ongeldige argument"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Heeft al een eigenaar"
+
+#~ msgid "No owner"
+#~ msgstr "Geen eigenaar"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Niet ondersteund type"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Niet ondersteund schema"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Niet ondersteunde bewerking"
+
+#~ msgid "Internal error"
+#~ msgstr "Interne fout"
+
+#~ msgid "Exists"
+#~ msgstr "Bestaat"
+
+#~ msgid "Invalid URI"
+#~ msgstr "Ongeldige URI"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Heeft submappen"
+
+#~ msgid "No space left"
+#~ msgstr "Geen ruimte over"
+
+#~ msgid "Old owner has died"
+#~ msgstr "Oude eigenaar is gestorven"
+
+#~ msgid "Test type"
+#~ msgstr "Test type"
+
+#~ msgid "Evolution Test Component"
+#~ msgstr "Evolution tescomponent"
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "Importeren"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Maak een nieuwe dag-omvattende afspraak"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Nieuwe _Afspraak"
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Veldnaam"
+#~ msgid "New _Meeting"
+#~ msgstr "Nieuwe bijeenkomst"
 
-#~ msgid "Family Name"
-#~ msgstr "Achternaam"
+#, fuzzy
+#~ msgid "New _Task"
+#~ msgstr "Nieuwe taak"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "Evolution Venster"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "Evolution Venster"
+
+#~ msgid "Toggle"
+#~ msgstr "Verander"
+
+#~ msgid "Clear"
+#~ msgstr "Wissen"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Stop de huidige e-mail operatie"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -16733,9 +18160,6 @@ msgstr "Nu zoeken"
 #~ msgid "VCard (.vcf, .gcrd)"
 #~ msgstr "VCard (.vcf, .gcrd)"
 
-#~ msgid "Loading..."
-#~ msgstr "Bezig met laden..."
-
 #~ msgid "Searching..."
 #~ msgstr "Bezig met zoeken..."
 
@@ -16787,10 +18211,6 @@ msgstr "Nu zoeken"
 #~ msgstr "EBook niet geladen\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "Kaart-ID bestaat reeds"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Operatie geannuleerd"
 
@@ -16938,9 +18358,6 @@ msgstr "Nu zoeken"
 #~ msgid "Callback"
 #~ msgstr "Terugbel"
 
-#~ msgid "Company"
-#~ msgstr "Bedrijf"
-
 #~ msgid "Comp"
 #~ msgstr "Bedr"
 
@@ -17007,9 +18424,6 @@ msgstr "Nu zoeken"
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#~ msgid "Phone"
-#~ msgstr "Tel."
-
 #~ msgid "Birth date"
 #~ msgstr "Geboortedatum"
 
@@ -17022,9 +18436,6 @@ msgstr "Nu zoeken"
 #~ msgid "Arbitrary"
 #~ msgstr "Arbitrair"
 
-#~ msgid "ID"
-#~ msgstr "ID"
-
 #~ msgid "Last Use"
 #~ msgstr "Laatst gebruikt"
 
@@ -17037,9 +18448,6 @@ msgstr "Nu zoeken"
 #~ msgid "Folder containing contact information"
 #~ msgstr "Map met contactinformatie"
 
-#~ msgid "LDAP Server"
-#~ msgstr "LDAP server"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "LDAP server met contactinformatie"
 
@@ -17049,18 +18457,6 @@ msgstr "Nu zoeken"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Map met contactinformatie die publiekelijk toegankelijk is"
 
-#~ msgid "_Contact"
-#~ msgstr "C_ontact"
-
-#~ msgid "Create a new contact"
-#~ msgstr "Nieuw contact maken"
-
-#~ msgid "New Contact List"
-#~ msgstr "Nieuwe contactenlijst"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "Maak een nieuwe contactenlijst"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "De URI die de mapbladeraar zal laten zien"
 
@@ -17076,9 +18472,6 @@ msgstr "Nu zoeken"
 #~ msgid "Is New Card"
 #~ msgstr "Is nieuwe kaart"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "Geen kaarten"
 
@@ -17123,30 +18516,6 @@ msgstr "Nu zoeken"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "Map met to-do items"
 
-#~ msgid "New appointment"
-#~ msgstr "Nieuwe afspraak"
-
-#~ msgid "_Appointment"
-#~ msgstr "_Afspraak"
-
-#~ msgid "New meeting"
-#~ msgstr "Nieuwe vergadering"
-
-#~ msgid "M_eeting"
-#~ msgstr "Ver_gadering"
-
-#~ msgid "New task"
-#~ msgstr "Nieuwe Taak"
-
-#~ msgid "_Task"
-#~ msgstr "_Taak"
-
-#~ msgid "New All Day Appointment"
-#~ msgstr "Nieuwe dag-omvattende afspraak"
-
-#~ msgid "All _Day Appointment"
-#~ msgstr "_Dag-omvattende afspraak"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "Kon ongeldig object niet vernieuwen"
 
@@ -17192,9 +18561,6 @@ msgstr "Nu zoeken"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "Bezig met openen kalender op %s"
 
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Standaard takenmap wordt geopend"
-
 #~ msgid "Evaluation of the search expression did not yield a boolean value"
 #~ msgstr "Evaluation of the search expression did not yield a boolean value"
 
@@ -17237,9 +18603,6 @@ msgstr "Nu zoeken"
 #~ "Evolution heeft GnomeCard bestanden geovnden.\n"
 #~ "Wilt u deze importeren naar Evolution?"
 
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Evolution e-mail configuratie interface"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "Map die post bevat"
 
@@ -17255,9 +18618,6 @@ msgstr "Nu zoeken"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Virtuele afvalmap"
 
-#~ msgid "Properties..."
-#~ msgstr "Eigenschappen..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Verander de eigenschappen van deze map"
 
@@ -17267,15 +18627,6 @@ msgstr "Nu zoeken"
 #~ msgid "You have unsent messages, do you wish to quit anyway?"
 #~ msgstr "Er staan nog berichten in de wachtrij. Wilt u toch afsluiten?"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Nieuw Bericht"
-
-#~ msgid "_Mail Message"
-#~ msgstr "Bericht"
-
-#~ msgid "Compose a new mail message"
-#~ msgstr "Een nieuwe e-mail opstellen"
-
 #~ msgid "New Message Post"
 #~ msgstr "Nieuw bericht verstuurd"
 
@@ -19083,9 +20434,6 @@ msgstr "Nu zoeken"
 #~ msgid "Cumberland"
 #~ msgstr "Cumberland"
 
-#~ msgid "Curitiba"
-#~ msgstr "Curitiba"
-
 #~ msgid "Curitiba Apt"
 #~ msgstr "Curitiba Apt"
 
@@ -22077,9 +23425,6 @@ msgstr "Nu zoeken"
 #~ msgid "North Bend"
 #~ msgstr "North Bend"
 
-#~ msgid "North Carolina"
-#~ msgstr "North Carolina"
-
 #~ msgid "North Conway"
 #~ msgstr "North Conway"
 
@@ -23691,9 +25036,6 @@ msgstr "Nu zoeken"
 #~ msgid "State College"
 #~ msgstr "State College"
 
-#~ msgid "Stauning"
-#~ msgstr "Stauning"
-
 #~ msgid "Staunton"
 #~ msgstr "Staunton"
 
@@ -24282,9 +25624,6 @@ msgstr "Nu zoeken"
 #~ msgid "United Arab Emirates "
 #~ msgstr "Verenigde Arabische Emiraten"
 
-#~ msgid "Unst"
-#~ msgstr "Unst"
-
 #~ msgid "Upington"
 #~ msgstr "Upington"
 
@@ -24393,12 +25732,6 @@ msgstr "Nu zoeken"
 #~ msgid "Veracruz"
 #~ msgstr "Veracruz"
 
-#~ msgid "Vermillion"
-#~ msgstr "Vermillion"
-
-#~ msgid "Vermont"
-#~ msgstr "Vermont"
-
 #~ msgid "Vernal"
 #~ msgstr "Vernal"
 
@@ -24932,9 +26265,6 @@ msgstr "Nu zoeken"
 #~ msgid " F"
 #~ msgstr " F"
 
-#~ msgid " C"
-#~ msgstr " C"
-
 #~ msgid "knots"
 #~ msgstr "knopen"
 
@@ -25553,9 +26883,6 @@ msgstr "Nu zoeken"
 #~ msgid "Freezing haze"
 #~ msgstr "Ijskoude rook"
 
-#~ msgid "Spray"
-#~ msgstr "Buien"
-
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Hier en daar buien"
 
@@ -25922,18 +27249,6 @@ msgstr "Nu zoeken"
 #~ "Een map verwijderen die toegevoegd is met \"Map van andere _gebruiker "
 #~ "openen\""
 
-#~ msgid "Send / Receive"
-#~ msgstr "Versturen & ontvangen"
-
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Items in de wachtrij versturen en nieuwe items ophalen"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Toont de mappenbalk"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Toont de snelkoppelingenbalk"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Toon de geselecteerde map"
 
@@ -25961,9 +27276,6 @@ msgstr "Nu zoeken"
 #~ msgid "_Rename..."
 #~ msgstr "He_rnoemen..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Versturen & ontvangen"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "_Snelkoppelingsbalk"
 
diff --git a/po/nn.po b/po/nn.po
index 4fa87fe12d..e033ae4af8 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-10-28 11:42+0100\n"
 "Last-Translator: Åsmund Skjæveland <aasmunds@fys.uio.no>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -32,52 +32,187 @@ msgstr "Klarte ikkje å laste %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Klarte ikkje å lese addresseblokka i programmet til piloten"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Autofullføringsmapper"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "_Sertifikat-ID:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Set opp e-postkontoar"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Kontakter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
+msgstr "Evolution adressebok"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution adressebok adressedialog"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution adressebok adressevisar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution adressebok kortvisar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook component"
+msgstr "Evolution adressebok-komponent"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution adressebok mappevisar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution e-postinnstillingskontroll"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution oppsettkontroll for mappeinnstillingar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Adressebok"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Eigenskapar ..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Slett"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "_Gje nytt namn"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Ny kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "Opprett ny kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Ny kontaktliste"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "Ny kontakt_liste"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "Opprett ny kontaktliste"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+#, fuzzy
+msgid "Personal"
+msgstr "Personleg"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+#, fuzzy
+msgid "Work"
+msgstr "Arbeid"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "LDAP-tenar"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Kan ikkje laga mappa %s: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "Klarte ikkje å kople til LDAP-tenar"
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "Ikkje i stand til å autentisere mot IMAP-tenar"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "Kunne ikke utføra spørjing på Root DSE"
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "Tenaren svarte ikkje med nokon støtta basisar for søk"
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Denne tenaren stør ikkje LDAPv3 skjemainformasjon"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "Feil ved henting av skjemainformasjon"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr "Tenaren svarte ikkje med gyldig skjema-informasjon"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Kontonamn"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Tenarnamn"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP var ikkje tatt med i denne versjonen av Evolution"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Andre kontakter"
-
 # TRN. «Aksessera». Blæ.
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -85,7 +220,7 @@ msgstr ""
 "Kan ikkje opna denne adresseboka. Sjå etter at stien\n"
 "finst og at du har løyve til å aksessera han."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -95,7 +230,7 @@ msgstr ""
 "du har skrive inn ein ugyldig URI, eller at LDAP-tenaren\n"
 "ikkje kan nåast."
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -107,7 +242,7 @@ msgstr ""
 "Evolution, må du kompilera programmet frå kjeldekoden\n"
 "i CVS etter at du har henta OpenLDAP frå lenkja under.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -122,44 +257,43 @@ msgid "Unable to open addressbook"
 msgstr "Ikkje i stand å opne adresseboka"
 
 # TRN: Må finna betre ord for «aksessera». Kanskje dette duger?
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "Hentar data frå LDAP-tenar anonymt"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "Kan ikkje autentisera.\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sSkriv inn passord for %s (brukar %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "Namnet byrjar med"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "E-post byrjar med"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Kategori er"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Nokon felt inneheld"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Avansert ..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -171,7 +305,7 @@ msgstr ""
 "til å visa. Gjer søket ditt meir spesifikt eller hev\n"
 "resultatgrensa i oppsettet for katalogtenaren i denne adresseboka."
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -183,88 +317,41 @@ msgstr ""
 "auk grensa for kor lang tid eit søk kan ta i katalogtenar-innstillingane\n"
 "for denne adresseboka."
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Bakenden for denne adresseboka kunne ikkje tolka spørjinga."
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Bakenden for denne adresseboka nekta å utføra denne spørjinga."
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "Spørjinga vart ikkje fullført."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Nokon kategori"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "URI-en som kalenderen skal visa"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "_Sertifikat-ID:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "Set opp tilgang til LDAP-katalogtenar her"
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Kontakter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "Katalogtenarar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolution adressebok"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Kontroll for LDAP-konfigurasjon for Evolution adressebok"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution adressebok adressedialog"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution adressebok adressevisar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution adressebok kortvisar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr "Evolution adressebok-komponent"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution adressebok mappevisar"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution e-postinnstillingskontroll"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -287,6 +374,7 @@ msgstr "V_is støtta basar"
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -320,8 +408,9 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "Legg til LDAP-tenar"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "Konfigurasjonsassistent for LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -337,9 +426,9 @@ msgid "Anonymously"
 msgstr "Anonymt"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -350,49 +439,50 @@ msgstr ""
 "Trykk på «Fullfør»-knappen for å lagra innstillingane du har\n"
 "skrive inn her."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "Koplar til"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "Distinguished _name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr "Rediger LDAP-tenar"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
 msgstr "E-postadresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution vil bruka DN til å autentisera deg mot tenaren"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution kjem til å bruke denne e-postaddressa for å autentisere deg "
 "ovanfor tenaren"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "Ferdig"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Allment"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "Konfigurasjonsassistent for LDAP"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "Gruppe"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Aldri"
 
@@ -420,8 +510,8 @@ msgid "S_earch scope: "
 msgstr "Sø_keområde: "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Søker"
 
@@ -475,27 +565,31 @@ msgstr ""
 "for LDAP-søk, og for å oppretta og redigera kontaktar."
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 "Det siste steget i å setja opp ein LDAP-tenar er å setja eit visingsnamn."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "Steg 1: Tenarinformasjon"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "Steg 2: Koplar til tenar"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "Steg 1: Tenarinformasjon"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "Steg 3: Søker gjennom katalogen"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Steg 2: Koplar til tenar"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "Steg 4: Vis namn"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Steg 3: Søker gjennom katalogen"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -507,18 +601,6 @@ msgstr "Støtta søkebasar"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"Det fyrste steget i å setja opp ein LDAP-tenar er å skriva inn namnet på "
-"tenaren\n"
-"og informasjonen som trengst for å logga inn. Spør systemadministratoren din "
-"dersom du er usikker på kva denne informasjonen er."
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -529,7 +611,7 @@ msgstr ""
 "søka dine, og kor lang tid eit søk skal ta. Spør systemadministratoren din "
 "dersom du treng å endra desse vala."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -540,7 +622,7 @@ msgstr ""
 "starta. Dersom du let denne stå blank, vil søka byrja ved rota på "
 "katalogtreet."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -554,14 +636,14 @@ msgstr ""
 "Dersom du vel «one», vil berre oppføringane eitt nivå under søkebasen din "
 "brukast.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
+#, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "Denne assistenten hjelper deg med å få tilgang til katalogtenester\n"
 "på nettverket ved hjelp av LDAP (Lightweight Directory Access Protocol)-"
@@ -570,13 +652,13 @@ msgstr ""
 "med din systemansvarlege dersom du treng hjelp til å finna denne "
 "informasjonen."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Dette er det fulle namnet på LDAP-tenaren. T.d. «ldap.mittfirma.no»."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -586,7 +668,7 @@ msgstr ""
 "dette talet\n"
 "for høgt vil få adresseboka di til å gå sakte."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -596,7 +678,7 @@ msgstr ""
 "at å setja dette til «e-post-adresse» krev at anonym tilgang til LDAP-"
 "tenaren."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -605,6 +687,15 @@ msgstr ""
 "Dette er det namnet på tenaren som vert vist i Evolution si mappeliste.\n"
 "Det vert berre brukt til å visast på skjermen."
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Dette er det namnet på tenaren som vert vist i Evolution si mappeliste.\n"
+"Det vert berre brukt til å visast på skjermen."
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -633,21 +724,34 @@ msgid "Using email address"
 msgstr "Brukar e-post adresse"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Når det er mogleg"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+"Det fyrste steget i å setja opp ein LDAP-tenar er å skriva inn namnet på "
+"tenaren\n"
+"og informasjonen som trengst for å logga inn. Spør systemadministratoren din "
+"dersom du er usikker på kva denne informasjonen er."
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "_Vist namn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "Grense for ne_dlasting:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -655,54 +759,52 @@ msgstr "Grense for ne_dlasting:"
 msgid "_Edit"
 msgstr "R_edigér"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "Metode for å logga inn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "_Portnummer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "_Søkebase:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "_Tenarnamn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "_Tid før avbrot (minutt):"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "kort"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr "tilkopling-fane"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr "almennt-fane"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr "søke-fane"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Namn"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Grensesnitt for val av namn i Evolution adressebok"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Fjern alle"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Fjern"
@@ -729,23 +831,21 @@ msgstr "Legg til kontakter"
 msgid "Unnamed Contact"
 msgstr "Kontakt utan namn"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Namn"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Kjelde"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Vel kontaktar frå adresseboka"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "Finn kontakt i"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Grensesnitt for val av namn i Evolution adressebok"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Finn"
@@ -822,7 +922,8 @@ msgid "D_epartment:"
 msgstr "A_vdeling:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detaljar"
 
@@ -889,12 +990,12 @@ msgid "_Categories..."
 msgstr "_Kategoriar ..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Slett"
@@ -2027,7 +2128,7 @@ msgid "Esq."
 msgstr "Esq."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Fullt namn"
 
@@ -2120,11 +2221,27 @@ msgstr "Redigering av kontakter"
 msgid "Save List as VCard"
 msgstr "Lagre liste som VCard"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Endra kontakt:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Kontakt i konflikt:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Duplikatkontakt funne"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Den nye e-post-adressa eller det nye namnet til denne\n"
+"kontakten finst allereie i denne mappa. Vil du leggja han til likevel?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Ny kontakt"
@@ -2141,22 +2258,6 @@ msgstr ""
 "Namnet eller e-post-adressa til denne kontakten finst\n"
 "alt i denne mappa. Vil du leggja han til likevel?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Endra kontakt:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Kontakt i konflikt:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"Den nye e-post-adressa eller det nye namnet til denne\n"
-"kontakten finst allereie i denne mappa. Vil du leggja han til likevel?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2255,9 +2356,9 @@ msgstr "Vidaresend kontakt"
 msgid "Send Message to Contact"
 msgstr "Send melding til kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Skriv ut"
@@ -2279,9 +2380,12 @@ msgstr "Flytt til mappe ..."
 msgid "Cut"
 msgstr "Klipp ut"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopier"
 
@@ -2290,16 +2394,8 @@ msgstr "Kopier"
 msgid "Paste"
 msgstr "Lim inn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Slett"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "Aktiv vising"
 
@@ -2315,166 +2411,170 @@ msgstr ""
 "har krasja. Du må starta Evolution på nytt for å bruka han igjen."
 
 #: 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:2
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Firma-fax"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Firma-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Firma-telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Tilbakering telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Bil-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategoriar"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Firmatelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Avdeling"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "E-post 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Etternamn"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Arkiver som"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "Ledig-oppteken-URL"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Heime-adresse"
+#, fuzzy
+msgid "Given Name"
+msgstr "Feltnamn"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Heime-faks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Heime-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Heime-telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Jordan"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Sjef"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Kallenamn"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Merknad"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Kontor"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Alternativ adresse"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Alternativ faks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Alternativ telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Personsøkjar"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Primær telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Yrke"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Rolle"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Ektefelle"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Tittel"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Unst"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Nettstad"
 
@@ -2567,11 +2667,19 @@ msgstr "Medlemar"
 msgid "Job Title"
 msgstr "_Jobb-tittel:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Heime-adresse"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Heime-adresse"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Alternativ adresse"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2584,112 +2692,109 @@ msgstr "Heime-faks"
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Vellukka"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Fråkopla lager"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Nekta tilgang"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Fann ikkje kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Kort-id eksisterar allereide"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Protokollen er ikkje støtta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Avbroten"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "Autentisering feila"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "Treng autentisering"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS er ikkje tilgjengeleg"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "Adresseboka finst ikkje"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Anna feil"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Vil du lagre endringar?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr "_Forkast"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Feil ved tillegging av liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Feil ved tilleggjing av kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Feil ved endring av liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Feil ved endringa av kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Feil ved fjerning av liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Feil ved fjerning av kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2698,7 +2803,7 @@ msgstr ""
 "Å opna %d kort vil også opna %d nye vindauge på skjermen.\n"
 "Vil du verkeleg visa alle desse korta?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2707,49 +2812,49 @@ msgstr ""
 "%s eksisterar allereide\n"
 "Vil du skrive over?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "Skriv over"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Feil ved lagring av %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Flytt kort til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kopiér kort til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Flytt kort til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kopiér kort til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Fleire VKort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "VKort for %s"
@@ -2945,7 +3050,7 @@ msgstr "Margar"
 msgid "Number of columns:"
 msgstr "Tal på kolonnar:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Val"
 
@@ -3131,18 +3236,18 @@ msgstr "Liste utan namn"
 msgid "Split Multi-Day Events:"
 msgstr "Del opp hendingar som går over fleire dagar:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Klarte ikkje å starte wombat-tenar."
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Klarte ikkje å starte wombat."
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kan ikkje lesa kalender-applikasjonsblokka på kalenderen"
 
@@ -3150,24 +3255,85 @@ msgstr "Kan ikkje lesa kalender-applikasjonsblokka på kalenderen"
 msgid "Default Priority:"
 msgstr "Standard prioritet:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikkje lesa applikasjonsblokka for hugseliste i piloten"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Kalender og oppgåver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Set opp tidssone, kalender og oppgåveliste her"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution kalender og oppgåver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Oppsettkontroll for Evolution kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Evolution kalendervisar"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution kalender-/oppgåve-redigering"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Evolution oppgåvevisar"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolution kalender og oppgåver-komponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolution testkomponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Oppgåver"
+
+# TRN: Påminning om ein alarm? Rare greier.
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution Kalender alarmpåminningsteneste"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Startar:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Slutt:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Evolution alarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm på %s"
@@ -3246,45 +3412,172 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Ikkje spør om dette programmet fleire gongar."
 
-# TRN: Påminning om ein alarm? Rare greier.
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution Kalender alarmpåminningsteneste"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Kan ikkje initialisera Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Klarte ikkje å initialisere gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Kan ikkje laga factory for alarmtenesta"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "ugyldig tid"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "iCalendar-feil"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Farge for oppgåver som skal vera ferdige i dag"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Farge for oppgåver som skal vera ferdige i dag"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "_Vis sluttidspunkt for avtalar i veke- og månadsvising"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Førehandsvisar kalenderen som skal skrivast ut"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "_Be om stadfesting når oppføringar vert sletta"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "_Be om stadfesting når oppføringar vert sletta"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Slett utførte oppgåver"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Vis veke_nummer i datonavigatøren"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Samandrag inneheld"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Skildring inneheld"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Merknad inneheld"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Ikkje truffe"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -3294,82 +3587,109 @@ msgstr ""
 "tidslengda. Dersom du held fram, vil du ikkje kunna gjenoppretta desse "
 "hendingane."
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 msgid "Purge events older than"
 msgstr "Fjern hendingar eldre enn"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "dagar"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%d. %a %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%d. %a %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d. %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d. %b"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Skriv ut denne kalenderen"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Ny-Caledonia"
 
-#: calendar/gui/calendar-component.c:207
-#, fuzzy
-msgid "Rename"
-msgstr "_Gje nytt namn"
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "Ny avtale"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "A_vtale"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Lag ein ny avtale"
+
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "Nytt møte"
+
+#: calendar/gui/calendar-component.c:640
+msgid "M_eeting"
+msgstr "Møt_e"
+
+#: calendar/gui/calendar-component.c:641
 #, fuzzy
-msgid "Personal"
-msgstr "Personleg"
+msgid "Create a new meeting request"
+msgstr "Lag ein ny møteførespurnad"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
+#: calendar/gui/calendar-component.c:646
 #, fuzzy
-msgid "Work"
-msgstr "Arbeid"
+msgid "New all day appointment"
+msgstr "Ny avtale for heile dagen"
+
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr "Avtale for heile _dagen"
+
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Lag ein ny avtale"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3486,7 +3806,7 @@ msgstr "Send til:"
 msgid "With these arguments:"
 msgstr "Med desse argumenta:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -3503,6 +3823,10 @@ msgstr "timar"
 msgid "minutes"
 msgstr "minutt"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3535,8 +3859,8 @@ msgstr "Send ein e-post"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Samandrag:"
 
@@ -3565,7 +3889,7 @@ msgstr "slutt på avtale"
 msgid "hour(s)"
 msgstr "time/timar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minutt"
 
@@ -3619,7 +3943,7 @@ msgstr "Dagar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Fredag"
 
@@ -3633,7 +3957,7 @@ msgstr "Minutt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Måndag"
 
@@ -3643,7 +3967,7 @@ msgstr "Su_n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Laurdag"
 
@@ -3657,7 +3981,7 @@ msgstr "Vis veke_nummer i datonavigatøren"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Søndag"
 
@@ -3675,7 +3999,7 @@ msgstr "Oppgåveliste"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Torsdag"
 
@@ -3693,7 +4017,7 @@ msgstr "Tidsformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Tysdag"
 
@@ -3703,12 +4027,12 @@ msgstr "_Veka byrjar:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Onsdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Arbeidsveke"
 
@@ -3745,7 +4069,7 @@ msgid "_Fri"
 msgstr "_Fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Generelt"
 
@@ -3785,18 +4109,18 @@ msgstr "_Ons"
 msgid "before every appointment"
 msgstr "før kvar avtale"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 "Hendinga som vert sletta er eit møte. Vil du senda ut ei melding om avlysing?"
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Er du sikker på at du vil sletta og avlysa dette møtet?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
@@ -3804,11 +4128,11 @@ msgstr ""
 "Oppgåva som vert sletta er tildelt nokon. Vil du senda ei melding om "
 "kansellering?"
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Er du sikker på at du vil kansellera og sletta denne oppgåva?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -3816,54 +4140,54 @@ msgstr ""
 "Journaloppføringa som vert sletta er publisert. Vil du senda ei melding om "
 "kansellering?"
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 "Er du sikker på at du vil kansellera og sletta denne journaloppføringa?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Denne hendinga er sletta."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Denn oppgåva har vorte sletta."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Denne journaloppføringa er sletta."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Du har gjort endringar. Vil du forkasta desse endringane og gå ut av "
 "redigering?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Du har ikkje gjort nokon endringar. Gå ut av redigering?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Hendinga er endra."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Oppgåva er endra."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Journalopføringa er endra."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Du har gjort endringar. Forkast desse endringane og oppdater redigering?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Du har ikkje gjort nokon endringar. Oppdater redigering?"
@@ -3873,166 +4197,171 @@ msgstr "%s Du har ikkje gjort nokon endringar. Oppdater redigering?"
 msgid "Validation error: %s"
 msgstr "Valideringsfeil: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " til "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Ferdig "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Ferdig "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Ferdig"
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Ferdig"
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "Kan ikkje oppdatera objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Redigér avtale"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgåve - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppføring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Ikkje noko samandrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Lagre som ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Endringar som vert gjort i denne oppføringa kan verta forkasta dersom det "
 "kjem ei oppdatering"
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Ikkje stand til å få tak i noverande versjon!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Vel ei målmappe for importerte data"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Er du sikker på at du vil sletta avtalen «%s»?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Er du sikker på at du vil sletta denne avtalen utan tittel?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Er du sikker på at du vil sletta oppgåva «%s»?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Er du sikker på at du vil sletta denne oppgåva utan tittel?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Er du sikker på at du vil sletta journaloppføringa «%s»?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Er du sikker på at du vil sletta denne journaloppføringa utan tittel?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Er du sikker på at du vil sletta %d avtalar?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Er du sikker på at du vil sletta %d oppgåver?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Er du sikker på at du vil sletta %d journaloppføringar?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "Hendinga kan ikkje slettast på grunn av ein CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "Oppgåva kan ikkje slettast på grunn av ein CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Journaloppføringa kan ikkje slettast på grunn av ein CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Oppføringa kan ikkje slettast på grunn av ein CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "Hendinga kan ikkje slettast fordi tilgang vert nekta"
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "Oppgåva kan ikkje slettast fordi tilgang vert nekta"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Journaloppføringa kan ikkje slettast fordi tilgang vert nekta"
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "Oppføringa kan ikkje slettast fordi tilgang vert nekta"
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Hendinga kan ikkje slettast på grunn av ein CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Oppgåva kan ikkje slettast på grunn av ein CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Journaloppføringa kan ikkje slettast på grunn av ein CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Oppføringa kan ikkje slettast på grunn av ein CORBA-feil"
@@ -4049,44 +4378,44 @@ msgstr "Delegér til:"
 msgid "Enter Delegate"
 msgstr "Tast inn delegat"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Avtale"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Påminning"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Repetering"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 #, fuzzy
 msgid "Scheduling"
 msgstr "Planlegg"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Møte"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "Sluttdato er feil"
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "Starttid er feil"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "Sluttid er feil"
 
@@ -4155,31 +4484,31 @@ msgid "_Start time:"
 msgstr "_Start-tid:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr "Den valde organisatoren har ikkje konto lenger."
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "Det må vera ein organisator."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "Det må vera minst ein deltakar."
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Delegér til ..."
 
@@ -4220,21 +4549,15 @@ msgid "Member"
 msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Rolle"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -4254,6 +4577,7 @@ msgid "_Invite Others..."
 msgstr "_Inviter andre ..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4286,6 +4610,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Kan ikkje laga mappa %s: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "Det må vera ein organisator."
@@ -4315,34 +4640,59 @@ msgstr "Kalenderinformasjon"
 msgid "Calendar Name"
 msgstr "Kalender"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Kan ikkje laga mappa %s: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Kalenderinformasjon"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Oppgåveliste"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Oppgåveliste"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Oppgåveliste"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr "Du endrar ei hending som skjer fleire gongar. Kva vil du endra?"
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Du endrar ei oppgåve som skal gjerast fleire gongar. Kva vil du endra?"
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 "Du endrar ei journaloppføring som står fleire gongar. Kva vil du endra?"
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr "Berre denne instansen"
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Denne og framtidige instansar"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr "Denne og framtidige instansar"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr "Alle instansane"
 
@@ -4391,11 +4741,16 @@ msgstr "dag"
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 #, fuzzy
 msgid "occurrences"
 msgstr "gong(ar)"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Dato/tid:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "Le_gg til"
@@ -4464,7 +4819,7 @@ msgstr "veke(r)"
 msgid "year(s)"
 msgstr "år"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
@@ -4474,31 +4829,31 @@ msgstr ""
 "\n"
 "Vil du lagra endringane?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "_Forkast endringar"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 msgid "Save Event"
 msgstr "Lagra hending"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Møteinformasjonen er oppretta. Senda ut?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Møteinformasjonen er endra. Senda ein oppdatert versjon?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "Informasjonen om tildelinga av oppgåva er endra. Send ut?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "Oppgåveinformasjonen er endra. Send ein oppdatert versjon?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Dato for fullføring er feil"
 
@@ -4509,43 +4864,43 @@ msgid "% _Complete"
 msgstr "% _ferdig"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Ferdig"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Høg"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "Under arbeid"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Lav"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Vanleg"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Ikkje starta"
 
@@ -4554,7 +4909,7 @@ msgid "Progress"
 msgstr "Framgang"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Udefinert"
 
@@ -4574,21 +4929,21 @@ msgstr "_Status:"
 msgid "_Web Page:"
 msgstr "_Nettsideaddresse:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Enkel"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "Forfallsdato er feil"
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr "Forfallsdato er før startdato"
 
@@ -4596,9 +4951,9 @@ msgstr "Forfallsdato er før startdato"
 msgid "Con_fidential"
 msgstr "Kon_fidensielt"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Skildring:"
 
@@ -4703,26 +5058,21 @@ msgstr "%s %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s for ein ukjent utløysartype"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Offentleg"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Konfidensiell"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategoriar"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Description"
@@ -4734,28 +5084,26 @@ msgid "Start Date"
 msgstr "Start-dato"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Samandrag"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "farge"
 
 # TRN: «del», kanskje?
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 msgid "component"
 msgstr "komponent"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Ledig"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Oppteke"
 
@@ -4767,7 +5115,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "E"
 
@@ -4775,7 +5123,7 @@ msgstr "E"
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4785,7 +5133,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4793,7 +5141,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4801,17 +5149,17 @@ msgstr "Nei"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Ukjend"
 
@@ -4823,180 +5171,178 @@ msgstr "Repeterande"
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Oppdaterar objekt"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Slettar valde objekt"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Oppdaterar objekt"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Ny _avtale ..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Ny h_eildagshending"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "Nytt møte"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Ny oppgåve"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "S_kriv ut"
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Gå _til idag"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "_Gå til dato ..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Publiser ledig/oppteken-informasjon"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "_Innstillingar ..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Opne"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Lagre som ..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "_Set opp møte ..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "_Send vidare som iCalendar ..."
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendinga"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendingane"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "_Innstillingar ..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 msgid "Open _Web Page"
 msgstr "_Opna nettside"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "_Tildel oppgåve"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "Send _vidare som iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "_Merk som komplett"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merk valde oppgåver som ferdige"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "Slett _den valde oppgåver"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Trykk her for å leggje til ei oppgåve"
@@ -5010,8 +5356,8 @@ msgstr "prosent ferdig"
 msgid "Alarms"
 msgstr "Alarmar"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Ferdig"
 
@@ -5040,19 +5386,19 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d.%m.%Y %H.%M.%S"
 
 # TRN: %p blir null-streng her. Trur eg.
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %H.%M.%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5071,7 +5417,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d. %B"
 
@@ -5084,125 +5430,125 @@ msgstr "%d. %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "Kvar dag"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "Kvar %d. dag"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "Kvar veke"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "Kvar %d. veke"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr "Kvar veke på "
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Kvar %d. veke på "
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " og "
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr "Den %s dagen i "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr "Den %s %s i "
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "kvar månad"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr "kvar %d. månad"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "Kvart år"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "Kvart %d. år"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr " totalt %d gongar"
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ", sluttar på"
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>Byrjar:</b> "
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Sluttar:</b>"
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>Fullført:</b> "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>Skal vera ferdig:</b>"
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "iCalendar-informasjon"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "iCalendar-feil"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Ein ukjent person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5210,323 +5556,322 @@ msgstr ""
 "<br> Sjå gjennom den følgjande informasjon, og velj ei handling frå menyen "
 "under."
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "Plassering:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Akseptert"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Mellombels godteke"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Avslått"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Vel ei handling:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Oppdater"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Godta"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Godta mellombels"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Avslå"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Send ledig/oppteken-informasjon"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Opdatér status på svar"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Send nyaste informasjon"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> bar publisert møteinformasjon."
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Møteinformasjon"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> ber om at %s er til stades på eit møte."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Møteframlegg"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> ynskjer å leggje til noko til eit eksisterande møte."
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Møteoppdatering"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ber om å få den nyaste møteinformasjonen."
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Førespurnad om møteoppdatering"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> har svart på ein førespurnad om eit møte."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Møtesvar"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> har avlyst eit møte."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Møtekansellering"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> har sendt ei uforståeleg melding."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Feil i møtemelding"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> har publisert informasjon om ei oppgåve."
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Oppgåveinformasjon"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> ber om at %s utfører ei oppgåve."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> ber om at du utfører ei oppgåve."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Oppgåveframlegg"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, 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:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Oppgåveoppdatering"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ber om å få den nyaste oppgåveinformasjonen."
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Oppgåveoppdateringsforepørjing"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> har svart på ei  oppgåvetildeling."
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Oppgåvesvar"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, 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:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Oppgåvekansellering"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Ugyldig oppgåvemelding"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> har publisert ledig/oppteken-informasjon."
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Fri/ledig-informasjon"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> spør etter ledig/oppteken-informasjonen din."
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Fri/ledig forespørsel"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 "<b>%s</b> har svart på ein førespurnad etter ledig/oppteken-informasjon."
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Fri/Oppteke svar"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig ledig/oppteken-melding"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr "Meldinga ser ikkje ut til å vera rett forma"
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "Denne meldingar inneheld berre førespurnader som ikkje er støtta."
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Vedlegg inneheld ikkje ei gyldig kalendermelding."
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr "Vedlegget inneheld ingen kalendervedlegg som let seg visa."
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderfila kan ikkje oppdaterast!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Oppdateringa er ferdig\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltakarstatus kan ikkje oppdaterast, for oppføringa finst ikkje lenger."
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet er ugyldig og kan ikkje oppdaterast\n"
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Dette svaret er ikkje frå ein aktiv deltakar. Skal vedkommande leggjast til "
 "som deltakar?"
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Deltakarstatusen kan ikkje oppdaterast på grunn av ein ugyldig status!\n"
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr "Det oppstod ein feil i CORBA-systemet\n"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr "Fann ikkje objekt.\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Du har ikkje dei løyva som trengst for å oppdatera kalenderen\n"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Deltakarstatus oppdatert\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "Deltakarstatus kan ikkje oppdaterast!\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Fjerning ferdig"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Oppføring sendt!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Oppføringen kan ikkje sendast!\n"
 
@@ -5688,7 +6033,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -5752,45 +6097,40 @@ msgstr "Tida møtet _startar:"
 msgid "Meeting _end time:"
 msgstr "Møt_e slutttid:"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 msgid "Start Date:"
 msgstr "Startdato:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 msgid "Due Date:"
 msgstr "Forfallsdato:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 msgid "Priority:"
 msgstr "Prioritet:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 msgid "Web Page:"
 msgstr "Nettside:"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Opnar oppgåver på %s"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kan ikkje lasta oppgåvene i «%s»"
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden som krevst for å lasta «%s» er ikkje støtta"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Du har ikkje løyve til å opna mappa i «%s»"
 
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5799,48 +6139,39 @@ msgstr ""
 "Feil på %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "Fullfører oppgåver ..."
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "Slettar valde objekt ..."
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "Tømer"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Oppgåver"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kan ikkje opna mappa i «%s»"
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden som krevst for å opna «%s» er ikkje støtta"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Legg til alarmar for %s"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5848,7 +6179,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5856,57 +6187,10 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 msgid "Purging"
 msgstr "Tømmer"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalender og oppgåver"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Kalender"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Set opp tidssone, kalender og oppgåveliste her"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution kalender og oppgåver"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Oppsettkontroll for Evolution kalender"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution kalendervisar"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution kalender-/oppgåve-redigering"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution oppgåvevisar"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolution kalender og oppgåver-komponent"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolution testkomponent"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -5963,296 +6247,332 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Det må vera ein organisator."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Det må vera minst ein deltakar"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Informasjon om hending"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Informasjon om oppgåve"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Journalinformasjon"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Ledig/oppteken-informasjon"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Kalenderinformasjon"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "Motframlegg"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig/oppteken-informasjon (%s til %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "iCalendar-informasjon"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Du må delta på denne hendinga."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Sun"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Mån"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Tys"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Ons"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Tor"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Fre"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Lau"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Vald dag (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %d. %b"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Vald veke (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Vald månad (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Vald år (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Oppgåve"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prosent ferdig: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategoriar %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Kontaktar: "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Førehandsvising av utskrift"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Skriv ut element"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Utskriftoppsett"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Gi denne snarvegen nytt namn"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Oppgåveliste"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Ny oppgåve"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Oppgåve"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Opprett ei ny oppgåve"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "Adressa til oppgåvemappa som skal visast"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6264,11 +6584,11 @@ msgstr ""
 "\n"
 "Vil du sletta desse oppgåvene?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Ikkje spør igjen"
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "Skriv ut oppgåver"
 
@@ -6296,15 +6616,15 @@ msgstr "iCalendar-filer (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar-filer (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "Påminning!"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "Kalenderhending"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6312,7 +6632,7 @@ msgstr ""
 "Evolution har funne Gnome Calendar-filer.\n"
 "Vil du importera desse inn i Evolution?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
@@ -7866,32 +8186,32 @@ msgstr "Stillehavet/Wallis"
 msgid "Pacific/Yap"
 msgstr "Stillehavet/Yap"
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 #, fuzzy
 msgid "Signing is not supported by this cipher"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 #, fuzzy
 msgid "Verifying is not supported by this cipher"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 #, fuzzy
 msgid "Encryption is not supported by this cipher"
 msgstr "Knapp (ikkje støtta av KControl)"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 #, fuzzy
 msgid "You may not import keys with this cipher"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 #, fuzzy
 msgid "You may not export keys with this cipher"
 msgstr "Den oppgitte fila finst ikkje"
@@ -7943,91 +8263,91 @@ msgstr "Lagrar mappe «%s»"
 msgid "You must be working online to complete this operation"
 msgstr "Kan ikkje gjera LIST-operasjon ferdig"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Kan ikkje oppretta røyr til «%s»: %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Kan ikkje oppretta underprosess «%s»: %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ugyldig meldingsstraum motteken frå %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Synkroniserar mapper"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Feil under lesing av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Feil under køyring av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Kan ikkje laga 'spool'-katalog"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Hentar melding %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Kan ikkje opne melding"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Feila på melding %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Synkroniser mapper"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Hentar melding %d av %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Feila på melding %d av %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Klarte ikkje å dekode melding."
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Ugyldig(e) argument"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Ugyldig(e) argument"
 
 # TRN: Kva er eit filtersøk? Skjønar eg dette rett?
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Feil under køyring av filtersøk: %s: %s"
@@ -8059,39 +8379,39 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Flyttar melding"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 #, fuzzy
 msgid "Copying messages"
 msgstr "Melding"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 msgid "Filtering new message(s)"
 msgstr "Filtrerer nye meldingar"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8099,47 +8419,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Avbroten."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Uventa svar frå POP-tenaren: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 #, fuzzy
 msgid "No data provided"
 msgstr "Gå til side"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
 # TRN: Denne bør skrivast om.
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8151,52 +8471,65 @@ msgstr ""
 "%s"
 
 # TRN: Sjå førre.
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr ""
 "Kan ikkje bruka GPG på %s: %s\n"
 "s"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Klarte ikkje å skrive data: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Kan ikkje køyra gpg: %s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Klarte ikkje å dekode melding."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr ""
+"Kan ikkje stadfesta signaturen på meldinga: Kan ikkje laga mellombels fil: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Kan ikkje stadfesta signaturen på meldinga: Kan ikkje laga mellombels fil: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Klarte ikkje å skrive data: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Indekser innhaldet i meldingskroppane"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Kunne ikkje motta fil"
@@ -8296,15 +8629,15 @@ msgstr "Feil under skriving av mellombels meldingsfil: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Feil under kopiering av mellombels meldingsfil: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 #, fuzzy
 msgid "parse error"
 msgstr "Anna feil"
@@ -8609,12 +8942,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8623,72 +8956,83 @@ msgstr ""
 "Klarte ikkje å laga katalog %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Tast inn passord for %s"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Udefinert"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Legg til kriterium"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Legg til kriterium"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Oppsettsdatabasen ikkje funnen"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "Sertifikatet kan ikkje stolast på"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Lagre signatur"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Anna feil"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Tenar: %s, Type: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Klarar ikkje å opprette mappe: Ugyldig operasjon på dette lageret"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Papirkorg"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "Juni"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr ""
@@ -8888,7 +9232,7 @@ msgid ""
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Klarter ikkje å tolke URL frå «%s»"
@@ -8908,22 +9252,22 @@ msgstr "Inga slik melding %s i %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Berre sjekk for ny e-post."
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikkje sletta mappe: %s: Ugyldig operasjon"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikkje sletta mappa: %s: Mappa finst ikkje"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan ikkje byta namn på mappa: %s: Ugyldig operasjon"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikkje endra namn på mappa: %s: Mappa finst ikkje"
@@ -9003,7 +9347,7 @@ msgstr "Kan ikkje henta melding: %s"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9017,7 +9361,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Ingen slik melding"
@@ -9055,55 +9399,72 @@ msgid "Failed to cache %s: %s"
 msgstr "Kan ikkje leggja %s i mellomlageret: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr " Koplar til tenar ..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Klarte ikkje å kople til LDAP-tenar"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr ""
+"\n"
+"Merknad:"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Ser etter ny e-post"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Check for new messages in all folders"
 msgstr "Sjå etter ny e-post i alle mappene"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Mapper"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Vis kun abbonerte mapper"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Namnerom"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Bruk filter på nye meldingar i INBOX på denne tenaren"
 
 # TRN: Kva betyr dette?
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "Automatisk synkroniser ekstern e-post med lokal"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For lesing og lagring av e-post på IMAP-tenarar."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Passord"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9358,7 +9719,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Kan ikkje endra namnet på mappa «%s» til «%s»: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kan ikkje endra namnet på «%s»: %s"
@@ -9473,29 +9834,29 @@ msgstr "Ser etter nye meldingar"
 msgid "Storing folder"
 msgstr "Lagrar mappe"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kan ikkje låsa mappa «%s»: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kan ikkje opna postboksen: %s %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "Å leggja til ein e-post vart avbrote"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan ikkje leggja til ei melding i mbox-fila: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9504,11 +9865,11 @@ msgstr ""
 "Kan ikkje henta melding: %s frå mappa «%s»\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappa ser ut til å vera øydelagt og kan ikkje reparerast."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Bygginga av meldinga feila. Øydelagt mailbox?"
 
@@ -9575,12 +9936,17 @@ msgstr "Kan ikkje laga katalogen «%s»: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "Kan ikkje laga mappa: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "Kort-id eksisterar allereide"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Kan ikkje endra namnet på «%s» til «%s»: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 msgid "The new folder name is illegal."
 msgstr "Det nye mappenamnet er ikkje gyldig."
 
@@ -9623,7 +9989,7 @@ msgstr "Kan ikkje lukka kjeldamappa %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Kan ikkje lukka mellombels mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kan ikkje endra namnet på mappa: %s"
@@ -9911,7 +10277,7 @@ msgstr "Slett etter %s dag(ar)"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -9995,7 +10361,7 @@ msgid "No such folder `%s'."
 msgstr "Inga slik mappe «%s»."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10047,7 +10413,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10219,7 +10585,7 @@ msgstr ""
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 #, fuzzy
 msgid "Sending message"
 msgstr "Sen melding"
@@ -10344,7 +10710,7 @@ msgstr "%.1fM"
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "vedlegg"
 
@@ -10392,14 +10758,14 @@ msgstr "MIME-type:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Du må sette opp ein identitet\n"
 "før du skrive e-post."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 #, fuzzy
 msgid "Click here for the address book"
 msgstr "Legg adresse til adresseboka"
@@ -10411,46 +10777,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Frå:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 #, fuzzy
 msgid "Enter the recipients of the message"
 msgstr "Oppgi eit nytt namn på meldinga."
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10459,16 +10825,21 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 #, fuzzy
 msgid "Posting destination"
 msgstr "Ingen skildring"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Kunne ikkje lagra melding(ar)."
+
 #: composer/e-msg-composer-select-file.c:119
 #, fuzzy
 msgid "Attach file(s)"
@@ -10503,22 +10874,22 @@ msgstr "Fila eksisterar, skriv over?"
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil ved lasting av fil %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Feil under tilgang til fil: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikkje motta fil"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10527,7 +10898,7 @@ msgstr ""
 "Kan ikkje søka i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10536,7 +10907,7 @@ msgstr ""
 "Kan ikkje kutta av fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10545,7 +10916,7 @@ msgstr ""
 "Kan ikkje kopiera fildeskriptor: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10554,13 +10925,13 @@ msgstr ""
 "Feil under automatisk lagring av meldinga: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10571,35 +10942,35 @@ msgstr ""
 "\n"
 "Vil du lagra endringane?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Åtvaring: Melding er endra"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Opna fil"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 #, fuzzy
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Skriv ei melding"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10608,25 +10979,27 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr "Kan ikkje laga nytt vindauge.\n"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr "Kan ikkje laga nytt vindauge.\n"
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Gruppevareverktyet Evolution"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10875,13 +11248,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11013,7 +11386,7 @@ msgstr "Tiaren"
 msgid "You must specify a folder."
 msgstr "Stilnamn:"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Vel mappe"
@@ -11027,24 +11400,24 @@ msgstr ""
 "Feil i det regulære uttrykket «%s»:\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Viktig"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "Hugseliste"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Seinare"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Test"
 
@@ -11140,7 +11513,7 @@ msgstr "sidan"
 msgid "months"
 msgstr "månader"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "sekund"
 
@@ -11241,7 +11614,7 @@ msgstr "Uttrykk"
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "Etikett"
 
@@ -11314,115 +11687,121 @@ msgid "Source Account"
 msgstr "Avsendarkonto"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Sprut"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Spesifikk linje i hovud"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Stopp prosessering"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Emne"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "Nullstill status"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "inneheld"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "inneheld ikkje"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "sluttar ikkje med"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "finst ikkje"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 #, fuzzy
 msgid "does not return"
 msgstr "finst ikkje"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "høyres ikkje ut som"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "startar ikkje med"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "sluttar med"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "eksisterar"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr "er flagga"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 #, fuzzy
 msgid "is after"
 msgstr "var etter"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "is before"
 msgstr "var før"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "er større enn"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "er mindre enn"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr "er ikkje flagga"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "er ikkje"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "er"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr "returnerer større enn"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr "returnerer mindre enn"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr "returnerer"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "høyres ut som"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "byrjar med"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Regelnamnet «%s» er ikkje unikt. Vel eit anna namn"
@@ -11447,18 +11826,77 @@ msgstr "Regelnamn"
 msgid "Score Rules"
 msgstr "Poengreglar"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Du må gje denne mappa eit namn."
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr "Du må ha minst ei mappe som kjelde."
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 msgid "VFolder source"
 msgstr "vMappe-kjelde"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Redigerarinstillingar"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "Set opp e-postinnstillingar, inkludert tryggleik og meldingsvising"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Set opp stavekontroll, signaturar og meldingsredigeraren"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Set opp e-postkontoar"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolution e-post"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution oppsettkontroll for e-postkontoar"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Evolution e-postkomponent"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Evolution e-postredigerar"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution oppsettkontroll for e-postredigerar"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution e-post-mappevisar"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution e-postinnstillingskontroll"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "E-post"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "E-postkontoar"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "E-postinnstillingar"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker på at du vil sletta denne kontoen?"
@@ -11501,7 +11939,7 @@ msgid "Protocol"
 msgstr "Protokoll"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 #, fuzzy
 msgid "Unnamed"
 msgstr "Namnlaus"
@@ -11527,20 +11965,17 @@ msgstr "Legg till skriptsignatur"
 msgid "Signature(s)"
 msgstr "Signatur(ar)"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "Du sender ei HTML-formatert melding. Pass på at dei følgjande mottakarane\n"
 "er i stand til å lesa HTML-e-post, og faktisk vil ha slik post:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Send likevel?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11548,7 +11983,7 @@ msgstr ""
 "Meldinga har ikkje noko emne.\n"
 "Send likevel?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11556,11 +11991,11 @@ msgstr ""
 "Sidan kontaktlista du sender til, er sett opp til å gøyme addressatane, vil "
 "den sette opp alle mottakarane som Bcc."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Denne meldinga inneheld kun Bcc-mottakarar."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11570,11 +12005,11 @@ msgstr ""
 "«Apparently-To»-topptekst.\n"
 "Send likevel?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Du må spesifisere mottakarar for å sende denne meldinga."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11586,189 +12021,400 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Lag _virtuell mappe frå søk ..."
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "E-post"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<klikk her for å velje mappe>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "«%s» i «%s»"
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Lag ny mappe"
 
-#: mail/em-folder-selector.c:267
-#, fuzzy
-msgid "Folder _name"
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Oppgje kor mappa skal lagast:"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
 msgstr "Mappe_namn:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Klarte ikkje å lage mellombels katalog: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Klarte ikkje å lage mellombels katalog: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Klarte ikkje å lage mellombels katalog: %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Kan ikkje lukka mellombels mappe: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Lastar ..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Vel mappe"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Lag ei ny mappe"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Kan ikkje sletta mappa «%s»: %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Verkeleg sletta mappa «%s»?"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Slett «%s»"
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Endra namn på mappa «%s» til:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+msgid "Rename Folder"
+msgstr "Endra namn på mappa"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr "Ei mappe som har namnet «%s» finst allereie. Bruk eit anna namn."
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Eigenskapar"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Eigenskapar"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "_Mappenamn:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Visning"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Opne i eige vindauge"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Flytt"
+
+#: mail/em-folder-tree.c:1500
+#, fuzzy
+msgid "_New Folder..."
+msgstr "_Ny mappe"
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "_Gje nytt namn"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "Ei_genskapar ..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding .."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsendar"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Svar til _liste"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "_Vidaresend"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr "_Følg opp ..."
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr "_Merk som ferdig"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "_Fjern merke"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Mar_ker som lesen"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "Marker som _ulesen"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Marker som v_iktig"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "Marker som ikkje vi_ktig"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Marker som _ulesen"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Marker som v_iktig"
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "_Angra sletting"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "Flytt til _mappe ..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kopier til mappe ..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "_Legg til avsendar i adresseboka"
 
 # TRN: «Bruk» rett? Kva med «Køyr» eller «Filtrer»?
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "_Bruk filter"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "_Lag regel frå melding"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "vMappe på _emne"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "vMappe på avse_dar"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "vMappe på mottaka_r"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "vMappe på e-post_liste"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "vMappe på avse_dar"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Filtrér på _emne"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Filtrér på avsen_dar:"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Filtrer på _mottakarar"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Filtrer på _e-postliste"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filtrér på avsen_dar:"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Forvald"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopier lenkjeadresse"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Treff:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Tildelt"
+
+#: mail/em-format-html-display.c:597
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
 msgstr ""
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Legg til kriterium"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Legg til kriterium"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Avbroten"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "PGP-kryptér"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Kunne ikkje senda meldinga: %s"
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Ustøtta skjema"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Kan ikkje dekryptera sertifikatsignaturen."
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Vis innvevd"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Gøym"
@@ -11778,184 +12424,207 @@ msgstr "Gøym"
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Hentar melding %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-
-#: mail/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-msgid "No signature present"
-msgstr ""
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Kunne ikkje initiere Bonobo"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Ustøtta skjema"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Flyttar melding"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Frå"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Til"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "E-postprogram"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "%s vedlegg"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Kunne ikkje senda meldinga: %s"
+msgid "Session not initialised"
+msgstr "Kunne ikkje initiere Bonobo"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/em-format.c:1212
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
 
-#: mail/em-popup.c:593
+#: mail/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Ventar ..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Pingar %s"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Kan ikkje leggja %s i mellomlageret: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Kan ikkje oppretta røyr til «%s»: %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Klarte ikkje å slå opp verten «%s»: %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Lagre som ..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Sva_r til avsendar"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Opna ved innsetjing"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Sender ei melding til ein nettverksspelar"
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Legg til adressebok"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Opne i %s ..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "Denne tenaren stør ikkje LDAPv3 skjemainformasjon"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Abonnér"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Mappe"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Velj ein tenar"
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Ingen tenar har vorte vald"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Ikkje vis denne meldinga att"
 
 # TRN: Dårleg.
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11964,27 +12633,27 @@ msgstr ""
 "Feil ved lesing av filterinformasjon:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Vidaresendt melding"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "ein ukjend avsendar"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "På %a, %d/%m/%Y klokka %H:%M, skreiv %%s:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -11993,7 +12662,7 @@ msgstr ""
 "Klarte ikkje å lagra til «%s»\n"
 " %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12002,25 +12671,26 @@ msgstr ""
 "%s eksisterer allereide\n"
 "Vil du skriva over?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Melding"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Lagre melding som ..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Klarte ikkje å lage mellombels katalog: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Adresse"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12029,58 +12699,429 @@ msgstr ""
 "\n"
 "Vil du fjerna desse meldingane?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Redigerarinstillingar"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/em-utils.c:2288
+#, fuzzy
 msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "Set opp e-postinnstillingar, inkludert tryggleik og meldingsvising"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Dette vil fjerna for godt alle meldingane som er merka som sletta.\n"
+"Dersom du held fram, vil du ikkje kunna gjenoppretta desse meldingane.\n"
+"\n"
+"Vil du fjerna desse meldingane?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Set opp stavekontroll, signaturar og meldingsredigeraren"
+#: mail/evolution-mail.schemas.in.in.h:1
+#, fuzzy
+msgid "Automatic link recognition"
+msgstr "enkle innlegg"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Set opp e-postkontoar"
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "enkle innlegg"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution e-post"
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution oppsettkontroll for e-postkontoar"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution e-postkomponent"
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution e-postredigerar"
+#: mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
+msgid "Default charset in which to compose messages"
+msgstr "Standardemne for meldinga"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution oppsettkontroll for e-postredigerar"
+#: mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
+msgid "Default charset in which to compose messages."
+msgstr "Standardemne for meldinga"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution e-post-mappevisar"
+#: mail/evolution-mail.schemas.in.in.h:8
+#, fuzzy
+msgid "Default charset in which to display messages"
+msgstr "Skriv tittelen på ruta her."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution e-postinnstillingskontroll"
+#: mail/evolution-mail.schemas.in.in.h:9
+#, fuzzy
+msgid "Default charset in which to display messages."
+msgstr "Skriv tittelen på ruta her."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/evolution-mail.schemas.in.in.h:10
+#, fuzzy
+msgid "Default forward style"
+msgstr "Standard vidaresendingsstil er: "
+
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default reply style"
+msgstr "Standard vidaresendingsstil er: "
+
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Empty Trash folders on exit"
+msgstr "_Tøm papirkorga ved avslutting"
+
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "_Tøm papirkorga ved avslutting"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+#, fuzzy
+msgid "Height of the message-list pane"
+msgstr "Send meldinga seinare"
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "E-postkontoar"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "E-postinnstillingar"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "_Loggfør filterhandlingar til:"
+
+#: mail/evolution-mail.schemas.in.in.h:28
+#, fuzzy
+msgid "Log filter actions to the specified log file."
+msgstr "_Loggfør filterhandlingar til:"
+
+#: mail/evolution-mail.schemas.in.in.h:29
+#, fuzzy
+msgid "Logfile to log filter actions"
+msgstr "_Loggfør filterhandlingar til:"
+
+#: mail/evolution-mail.schemas.in.in.h:30
+#, fuzzy
+msgid "Logfile to log filter actions."
+msgstr "_Loggfør filterhandlingar til:"
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Påminning ved ny e-post"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Påminning ved ny e-post"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+"S_pør ved sending av HTML-meldingar til kontaktar som ikkje vil ha slike"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "Spø_r ved sending av melding som berre har mottakarar i Bcc-feltet"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "Send e-post i HTML-format?"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "Send e-post i HTML-format?"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "Vi_s animerte bilete"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "Vi_s animerte bilete"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Vis melding på normal måte"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "Førehandsvis i"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+msgid "Sound file to play when new mail arrives."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+msgid "Spell check inline"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "_Terminalskrifttype:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+msgid "The variable width font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Tråda meldingsliste"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Tråda meldingsliste"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "Gjer _denne til standardkonto"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "V_ariabel breidde:"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm-importerar"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox-importerar"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape Mail-importerar"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4-importerar"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine-importerar"
 
 #: mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
@@ -12120,34 +13161,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm-importerar"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox-importerar"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape Mail-importerar"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4-importerar"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine-importerar"
-
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -12210,12 +13223,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importerer gamle Netscape-data"
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Papirkorg"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Søker gjennom e-postfilter"
@@ -12224,7 +13231,7 @@ msgstr "Søker gjennom e-postfilter"
 msgid "Scanning directory"
 msgstr "Søker gjennom katalog"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Startar importering"
 
@@ -12299,23 +13306,23 @@ msgid "You have not filled in all of the required information."
 msgstr "Du har ikkje fyllt ut all den påkrevde informasjonen."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolutions kontohandtering"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Vert:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "Br_ukarnamn:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Sti:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikkje opprette to kontoar med det same namnet."
 
@@ -12324,35 +13331,35 @@ msgstr "Du kan ikkje opprette to kontoar med det same namnet."
 msgid "Mail to %s"
 msgstr "E-post til %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Melding frå %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, fuzzy, c-format
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Svart til"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Legg til filter-regel"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "Dei følgjande filterreglane:\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12363,144 +13370,30 @@ msgstr ""
 "    «%s»\n"
 "og har blitt oppdaterte."
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "Koplar til tenar ..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Denne mappa kan ikkje innehalda meldingar."
-
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Kan ikkje opna delt mappe: %s"
-
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Klarte ikkje å lage mellombels katalog: %s"
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Ny e-postmelding"
 
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Klarte ikkje å lage mellombels katalog: %s"
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "_E-post"
 
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Kan ikkje lukka mellombels mappe: %s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "Skriv ein e-post"
 
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Vel ei målmappe for importerte data"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Vel ei målmappe for importerte data"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Lag ei ny mappe"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Oppgje kor mappa skal lagast:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Kan ikkje sletta mappa «%s»: %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Verkeleg sletta mappa «%s»?"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Slett «%s»"
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Endra namn på mappa «%s» til:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-msgid "Rename Folder"
-msgstr "Endra namn på mappa"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Det oppgjevne mappenamnet er ikkje gyldig: %s"
-
-#: mail/mail-component.c:1860
-#, fuzzy, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr "Ei mappe som har namnet «%s» finst allereie. Bruk eit anna namn."
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Eigenskapar"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Eigenskapar"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "_Mappenamn:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Visning"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Opne i eige vindauge"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Flytt"
-
-#: mail/mail-component.c:2087
-#, fuzzy
-msgid "_New Folder..."
-msgstr "_Ny mappe"
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "_Gje nytt namn"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "Ei_genskapar ..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Identitet"
 
@@ -12550,11 +13443,11 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Sjekkar teneste"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 #, fuzzy
 msgid "Connecting to server..."
 msgstr " Koplar til tenar ..."
@@ -12642,27 +13535,36 @@ msgid "C_olors"
 msgstr "_Lukk"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Ser etter ny e-post"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Ser etter ny e-post"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "_Farge for feilstava ord:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Skriv ei melding"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Oppsett"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12672,491 +13574,509 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "_Standard"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Standardåtferd"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Standardt_eiknsett:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Hentar e-post"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Kan ikkje opne melding"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Ferdig"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "Mappe for _utkast:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "S_lå på"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email Accounts"
 msgstr "E-post inneheld"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "E-post_adresse:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "_Tøm papirkorga ved avslutting"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Sertifikat-ID:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "KDeelop-installering"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Køyr autorun.sh"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "Fast _breidd:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "&lt;&lt; Ferre val"
+
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Font Properties"
 msgstr "Eigenskapar"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "Formater meldingar med _HTML"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "_Merk sitering med"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Innvevd"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Lagre og lukk"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Lastar bilete"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Oppsett for post"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Postkaseeplassering"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Composer"
 msgstr "Melding motteken"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Message Display"
 msgstr "Meldingsvising"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Fonts"
 msgstr "Meldinga inneheld"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Påminning ved ny e-post"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Valfri informasjon"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_sasjon:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-nø_kkel-ID:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Vel ein farge"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Spø_r ved sending av melding som berre har mottakarar i Bcc-feltet"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Skrifttypar til utskrift"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Quote original message"
 msgstr "Kan ikkje opne melding"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Sitert"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "_Husk dette passordet"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "S_var-til:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Mottek e-post"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "Val for m_ottak"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "Hugs dette _passordet"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Required Information"
 msgstr "Tenarinformasjon"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Forvald"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "Tryggl_eik"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Trygg MIME"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 #, fuzzy
 msgid "Sending Email"
 msgstr "Send"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Mappe for sendte _meldingar:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Send meldingar"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Tenaren kre_v autentisering"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Tenar-oppsett"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Tenar-_type: "
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Oppsettsdatabasen ikkje funnen"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "Oppgje _filnamn:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Standard unix e-postkasse"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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:121
+#: mail/mail-config.glade.h:124
 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:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "V_ariabel breidde:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "_Autentiseringtype: "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Autentiseringtype: "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr "_Sjå etter nye meldingar kvart"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "Legg til smilefjes _automatisk"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "_Stadfest ved tøming av mappe"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "_Standard"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "_Skru på"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "_Vidaresendingsstil:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Fullt namn:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "_HTML-e-post"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "_Identitet"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Juni"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "_Last bileta dersom sendaren står i adresseboka"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "Gjer _denne til standardkonto"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "_Merk meldingar som lest etter"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "Last aldri bilete frå _nettet"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "S_pør ved sending av HTML-meldingar til kontaktar som ikkje vil ha slike"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Spør ved sending av meldingar med eit tomt emnefelt"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "_Mottak av e-post"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "Sva_rstil:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Script:"
 msgstr "_Tryggleik"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "_Slett ..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "_Sender e-post"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "Vi_s animerte bilete"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Signatures"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr "_Standard skrifttype:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr "_Terminalskrifttype:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "Br_uk sikker tilknytning (SSL)"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "skildring"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingar %s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13165,7 +14085,7 @@ msgstr ""
 "Feil ved «%s»:\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13174,7 +14094,7 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Arbeidar"
 
@@ -13187,118 +14107,118 @@ msgstr "Les mapper"
 msgid "Fetching Mail"
 msgstr "Hentar e-post"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Kan ikkje leggja til i lokal «Sendt»-mappe: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender «%s»"
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Feila på melding %d av %d"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Ferdig."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Lagrar meldingar i mappe"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flyttar meldingar til %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer meldingar til %s"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Leitar gjennom mapper i «%s»"
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Opnar mappe %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "Opnar lager %s"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjernar mappe %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappe «%s»"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Friskar opp mappe"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Tømer mappe"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tømer papirkorga i «%s»"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hentar melding %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Mottek %d melding(ar)"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Lagrar %d melding(ar)"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13307,7 +14227,7 @@ msgstr ""
 "Kan ikkje laga utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13316,11 +14236,11 @@ msgstr ""
 "Feil ved lagring av meldingar til: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Lagrar vedlegg"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13329,21 +14249,25 @@ msgstr ""
 "Kan ikkje laga utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Klarte ikkje å skrive data: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Koplar frå %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Koplar til %s på nytt"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Skil mellom store og små bokstavar"
@@ -13360,61 +14284,76 @@ msgstr "Finn:"
 msgid "Search"
 msgstr "Søk"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Legg til kriterium"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Unntak"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Kontoinformasjon"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Avbryt ..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Tenar: %s, Type: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Send og motta e-post"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Avbryt alle"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Oppdaterar ..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Ventar ..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Brukar avbraut operasjonen."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Tast inn passord for %s"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Tast inn passord"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 #, fuzzy
 msgid "_Remember this password"
 msgstr "Fjern denne oppføringa"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -13454,26 +14393,31 @@ msgstr ""
 msgid "Name:"
 msgstr "Namn:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Vidaresendt melding - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Opnar mappe %s"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Set opp vMappe: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, fuzzy, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13482,88 +14426,88 @@ msgid ""
 "And have been updated."
 msgstr " s."
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Rediger vMappe"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Prøvar å redigere ei vmappe «%s» som ikkje finnest."
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Ny vMappe"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Ulesen"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Svara"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Fleire uleste meldingar"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Fleire meldingar"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Lavast"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Senk"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Høgare"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Høgast"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "I dag, %l:%M:%p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "I går, %l:%M:%p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Opprettar meldingsliste"
 
@@ -13625,11 +14569,11 @@ msgstr "Vidaresend"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Svar til alle"
 
@@ -13686,41 +14630,139 @@ msgstr "_Abbonér"
 msgid "_Unsubscribe"
 msgstr "_Fjern abbonnment"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+"Set opp spesielle mapper og åtferd får mappene når du arbeider fråkopla her."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Evolution skal"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Mappeinnstillingar"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "380"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Byt namn på denne snarveggruppa"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+msgid "Default width of the folder bar pane"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Gøym snarveglinja"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Standard prioritet:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Standard prioritet:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Evolution grensesnitt for oppsett av e-post"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+#, fuzzy
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "Be om at vedlegget til vanleg vert vist som ein del av meldinga."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
 msgstr ""
-"Kan ikkje overføra mappe:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Legg til mappe"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Kladd"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Innboks"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Utboks"
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "Opnar standard oppgåvemappe"
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Sendt"
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Opnar standard oppgåvemappe"
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Opnar standard oppgåvemappe"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Opnar standard oppgåvemappe"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Avgjer om snarvegstolpen skal vise"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Avgjer om snarvegstolpen skal vise"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "E-post"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Kunne ikkje oppdatera filene"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13731,7 +14773,7 @@ msgstr ""
 "%s\n"
 "Feil: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13740,7 +14782,7 @@ msgstr ""
 "Ein feil oppsto under kopiering av filer til\n"
 "«%s»."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13751,7 +14793,7 @@ msgstr ""
 "Flytt henne slik at Evolution kan installera\n"
 "brukarfilene."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13849,10 +14891,11 @@ msgstr ""
 "Kan ikkje endra namn på mappa:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr "Ei mappe som har namnet «%s» finst allereie. Bruk eit anna namn."
+msgid "The specified folder name is not valid: %s"
+msgstr "Det oppgjevne mappenamnet er ikkje gyldig: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -13876,19 +14919,15 @@ msgstr ""
 "Kan ikkje laga den oppgjevne mappa:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Lag ny mappe"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Utan tittel)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Vel importerar som skal køyrast:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13902,11 +14941,11 @@ msgstr ""
 "Du kan velja «Automatisk» dersom du ikkje veit. Då vil Evolution prøva å "
 "finna ut kva slags fil det er sjølv."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Vel informasjonen du vil importere:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13918,7 +14957,7 @@ msgstr ""
 "som kan importerast vart ikkje funne. Klikk på «Tilbake»-knappen\n"
 "dersom du vil prøva igjen.\n"
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13927,21 +14966,21 @@ msgstr ""
 "Importerar %s\n"
 "Importerar element %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "Vel importerar"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "Fila %s finst ikkje"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Evolution feil"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -13950,11 +14989,11 @@ msgstr ""
 "Det er ingen importerarar som kan handsama\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Importerar"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -13963,17 +15002,17 @@ msgstr ""
 "Importerar %s.\n"
 "Startar %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Feil ved start av %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Feil ved asting av %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13982,31 +15021,31 @@ msgstr ""
 "Importerer %s\n"
 "Importerer oppføring 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 msgid "_Filename:"
 msgstr "_Filnamn:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Vel ei fil"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 msgid "File _type:"
 msgstr "Fil_type:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 msgid "Import data and settings from _older programs"
 msgstr "Importér data _og innstillingar frå eldre program"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 msgid "Import a _single file"
 msgstr "Importer ei ein_skild fil"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -14014,46 +15053,27 @@ msgstr ""
 "Vent...\n"
 "Leitar etter eksisterande oppsett"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Startar intelligent import"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "Frå %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Vel ei målmappe for importerte data"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 msgid "_Import"
 msgstr "_Importér"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Lukkar tilkoplingar ..."
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Feil ved synkronisering av «%s»:\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "Synkroniserer mapper"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Synkroniserer «%s» (%d av %d) ..."
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Evolution innstillingar"
@@ -14088,7 +15108,7 @@ msgstr "Kan ikkje opna delt mappe: %s"
 msgid "Cannot find the specified shared folder."
 msgstr "Kan ikkje finna den spesifiserte delte mappa."
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14102,16 +15122,10 @@ msgstr ""
 "\n"
 "Vil du avslutta hjelparen?"
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 msgid "Quit Assistant"
 msgstr "Avslutt hjelpar"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Ny"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Ingen mappenamn spesifisert."
@@ -14171,62 +15185,49 @@ msgstr "Lag ny snarveg"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vel mappa som snarvegen skal peika på:"
 
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "Arbeid _tilkopla"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "Arbeid _fråkopla"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Arbeid fråkopla"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Ingen mappe vist)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Ingen)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution er tilkopla. Klikk på denne knappen for å arbeida fråkopla."
 
-#: shell/e-shell-view.c:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution held på å kopla frå."
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution er fråkopla. Klikk på denne knappen for å arbeida tilkopla."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Ugyldige argument"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Kan ikkje registrera i OAF"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Oppsettsdatabasen ikkje funnen"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Generell feil"
 
@@ -14339,74 +15340,18 @@ msgstr "Fj_ern"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne snarvegen frå snarvegstolpen"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Feil ved lagring av snavegar."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Innboks"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Snarvegar"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Ingen feil"
-
-#: shell/e-storage.c:573
-msgid "A folder with the same name already exists"
-msgstr "Ei mappe med det namnet finst frå før."
-
-#: shell/e-storage.c:575
-msgid "The specified folder type is not valid"
-msgstr "Den oppgitte mappetypen er ugyldig."
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "I/U-feil"
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr "Ikkje nok plass til å oppretta mappa"
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr "Mappa er ikkje tom"
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "Den oppgitte mappa finst ikkje"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "Funksjonen er ikkje implementert i dette lageret"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "Operasjonen er ikkje støtta"
-
-#: shell/e-storage.c:591
-msgid "The specified type is not supported in this storage"
-msgstr "Den oppgjevne typen er ikkje støtta i dette lageret"
-
-#: shell/e-storage.c:593
-msgid "The specified folder cannot be modified or removed"
-msgstr "Den oppgjevne mappa kan ikkje endrast eller fjernast"
-
-#: shell/e-storage.c:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "Kan ikkje gjera ei mappe til eit barn av ein av etterkomarane sine"
-
-#: shell/e-storage.c:597
-msgid "Cannot create a folder with that name"
-msgstr "Kan ikkje laga ei mappe med det namnet"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Denne operasjonen kan ikkje utførast i fråkopla modus"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Avkryssingsboks"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14417,6 +15362,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ferdig)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Ny"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "«%s» i «%s»"
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14454,74 +15410,6 @@ msgstr ""
 "Feilen frå aktiveringssystemet er:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "CORBA-feil"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Avbroten"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Ugyldig argument"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Har allereide ein eigar"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Ingen eigar"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Ikkje funnen"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Typen er ikkje støtta"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Ustøtta skjema"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Ustøtta operasjon"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Intern feil"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Eksisterar"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "Ugyldig URI"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Har undermapper"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Ikkje noko plass att"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "Gammal eigar har døydd"
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Testtype"
-
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr "Evolution testkomponent"
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr "Aktive tilkoplingar"
@@ -14550,10 +15438,6 @@ msgstr "_E-post:"
 msgid "_Tasks:"
 msgstr "_Oppgåver:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr "Mappe_namn:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder _type:"
 msgstr "Mappe_type:"
@@ -14615,23 +15499,6 @@ msgstr ""
 "\n"
 "Trykk på «Bruk»-knappen for å lagra innstillingane dine."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-"Set opp spesielle mapper og åtferd får mappene når du arbeider fråkopla her."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Evolution skal"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution oppsettkontroll for mappeinnstillingar"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Mappeinnstillingar"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Klikk på «Importer» for å importera fila til Evolution."
@@ -14670,7 +15537,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Importerarar"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Importér"
 
@@ -14686,16 +15553,16 @@ msgstr "Ikkje spør meg igjen"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importera data frå desse filene:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Evolution avsluttar no ..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14733,7 +15600,7 @@ msgstr ""
 "Me vonar at du nyt resultata av det harde arbeidet vårt, og me ventar\n"
 "i spenning på dine bidrag.\n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -14741,36 +15608,48 @@ msgstr ""
 "Takk frå\n"
 "Ximian Evolution-utviklarane\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr "Ikkje sei ifrå igjen"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan ikkje starta Ximian Evolution-skalet: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Startar i fråkopla modus"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Startar i fråkopla modus"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr "Tving alle komponentane i Evolution til å avslutta"
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift frå alle komponentane til ei fil."
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14779,31 +15658,58 @@ msgstr ""
 "%s: «--online» og «--offline» kan ikkje brukast samstundes.\n"
 "  Bruk «%s --help» for å få meir informasjon.\n"
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Vel importerar"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Sertifikat-ID:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "Framgang"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Uttrykk"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "E-postadresse:"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr "_Sertifikat-ID:"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14861,91 +15767,378 @@ msgid "Backup All"
 msgstr "Blackpool"
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "_Sertifikat-ID:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Sertifikatet kan ikkje stolast på"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "_Sertifikat-ID:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Felles namn"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "_Sertifikat-ID:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "R_edigér"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Kan ikkje verifisera sertifikat."
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Uttrykk"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Organisasjon"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Organisasjonseining"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Visning"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "_Sertifikat-ID:"
+
+#: smime/gui/smime-ui.glade.h:42
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "_Sertifikat-ID:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Importér"
+msgid "Certificate already exists"
+msgstr "Kort-id eksisterar allereide"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Vermont"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "OK"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "_Sertifikat-ID:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "_Sertifikat-ID:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "Sertifikatet kan ikkje stolast på"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "ID"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+#, fuzzy
+msgid "Subject Public Key Info"
+msgstr ""
+"\n"
+"Offentleg nøkkel: "
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Emne er %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Kan ikkje laga 'spool'-katalog"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "Sertifikatet kan ikkje stolast på"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Kan ikkje verifisera sertifikat."
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Ingen informasjon"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "vedlegg"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "_Sertifikat-ID:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Curitiba"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "North Carolina"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Uttrykk"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Signaturfil:"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "Set _inn"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Emne er %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Signaturfil:"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Tast inn passord for %s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "_Sertifikat-ID:"
 
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
@@ -14996,7 +16189,7 @@ msgstr "Kopier utval"
 msgid "Copy to Folder..."
 msgstr "Kopier til mappe ..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Klipp ut valde område"
 
@@ -15012,7 +16205,7 @@ msgstr "Flytt kontaktar til ei anna mappe ..."
 msgid "Move to Folder..."
 msgstr "Flytt til mappe ..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Lim inn frå utklippstavla"
 
@@ -15020,8 +16213,8 @@ msgstr "Lim inn frå utklippstavla"
 msgid "Previews the contacts to be printed"
 msgstr "Førehandsvisar kontaktane som skal skrivast ut"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Førehands_vising av utskrift"
@@ -15067,13 +16260,13 @@ msgstr "Stopp lasting"
 msgid "View the current contact"
 msgstr "Vis den valde kontakten"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "H_andlingar"
 
@@ -15103,140 +16296,109 @@ msgstr "_Send melding til kontakt ..."
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "Lag ein ny avtale for heile dagen"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Lag ein ny avtale"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "Lag ei ny mappe"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Lag ein ny møteførespurnad"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Opprett ei ny oppgåve"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Dag"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Slett avtalen"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "Slett denne førekomsten?"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "Slett denne førekomsten?"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Gå til"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Gå bakover"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Gå framover"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Gå til _dato"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Gå til spesifisert dato"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Gå til i dag"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "Liste"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Månad"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Ny _avtale"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Ny-Caledonia"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Nytt møte"
-
-#: ui/evolution-calendar.xml.h:27
-msgid "New _Task"
-msgstr "Ny oppgåve"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Førehandsvisar kalenderen som skal skrivast ut"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Skriv ut denne kalenderen"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Offentleggjer ledig/oppteken-informasjon for denne kalenderen"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 msgid "Purg_e"
 msgstr "_Fjern"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 msgid "Purge old appointments and meetings"
 msgstr "Fjern gamle avtalar og møter"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 msgid "Show as list"
 msgstr "Vis som liste"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Vis ein dag"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Vis ein månad"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Vis ei veke"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Vis arbeidsveka"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Veke"
 
@@ -15300,7 +16462,7 @@ msgstr "Lagre dette elementet til disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Fil"
 
@@ -15516,7 +16678,7 @@ msgstr "Markér alle som l_esne"
 msgid "Mark all visible messages as read"
 msgstr "Markér alle synlege meldingar som lest"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "Lim inn melding(ar) frå utklippstavla"
 
@@ -15572,16 +16734,6 @@ msgstr "_Invertér val"
 msgid "_Threaded Message List"
 msgstr "_Tråda meldingsliste"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Lukk vindauge"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "L_ukk"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "_Legg til avsendar i adresseboka"
@@ -15762,273 +16914,298 @@ msgstr "Send valte meldingar vidare som MIME-oversikt?"
 msgid "Increase the text size"
 msgstr "Auk tekststorleik"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Last b_ilete"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Markér som v_iktig"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Markér som _ulesen"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Markér som _uviktig"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark the selected message(s) as having been read"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark the selected message(s) as important"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Sentrer dei valte elementa"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Send valte meldingar vidare som MIME-oversikt?"
+
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Markér valde melding for sletting"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Flytt"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
 msgid "Move selected message(s) to another folder"
 msgstr "Lagra side til ascii-fil"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Neste"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "Neste _viktige melding"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "Neste _tråd"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "Neste _ulesne melding"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Ikkje funnen"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Opne vald melding i eit eige vindauge"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Opne vald melding for sending på nytt"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Opprinneleg _storleik"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "Fo_rrige ulesne melding"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Post eit svar"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "Post eit svar til ei melding i ei offentleg mappe"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "_Forrige viktige melding"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Førehandsvis meldinga som skal skrivast ut"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Forrige"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Skriv ut denne meldinga"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Sett tilbake teksta til det opprinnelege"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "S_øk i meldingar ..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "M_indre"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Lagre melding som tekstfil"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "Search for text in the body of the displayed message"
 msgstr "Skriv tittelen på ruta her."
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "Set up the page settings for your current printer"
 msgstr "Endre sideoppsett for aktiv skrivar"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Vis e-post _kjeldekode"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Vis heile meldings_hovudet"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Skriv tittelen på ruta her."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Vis melding på normal måte"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Vis melding med alle meldingshovud"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Vis den rå kjeldekoda til meldinga"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "Tekststorle_ik"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "VFolder on Mailing _List..."
 msgstr "Fil alt i liste"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 #, fuzzy
 msgid "VFolder on Se_nder..."
 msgstr "Mappenamn:"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 #, fuzzy
 msgid "VFolder on _Recipients..."
 msgstr "Mappa finst: "
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "VFolder on _Subject..."
 msgstr "Ingen emne"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "Lagt _ved"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "_Kopiér til mappe"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "_Opprett filter frå melding"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "_Vidaresend melding"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "_Gå til"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "_Innvevd"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "_Større"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "_Meldingsvisning"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Flytt til mappe"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "_Neste melding"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "_Normal visning"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "_Opne melding"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "_Forrige melding"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "_Sitert"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 #, fuzzy
 msgid "_Resend..."
 msgstr "_Omdøyp ..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "Verk_tøy"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 #, fuzzy
 msgid "_Undelete"
 msgstr "Slett"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Lukk vindauge"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "L_ukk"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Legg ved"
@@ -16309,12 +17486,13 @@ msgid "Change Evolution's settings"
 msgstr "Endre innstillingar for Evolution"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "_Avslutt"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Lag eit nytt notat"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "Evolution _vindauge"
+msgid "E_xit"
+msgstr "_Avslutt"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16326,61 +17504,74 @@ msgstr ""
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "Evolution _vindauge"
+msgid "Open a new window"
+msgstr "Opne i eige vindauge"
 
 #: ui/evolution.xml.h:11
 msgid "Pi_lot Settings..."
 msgstr "Pi_lot-innstillingar ..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Send / Motta"
+
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr "Send køa meldingar og motta ny meldingar"
+
+#: ui/evolution.xml.h:14
 msgid "Set up Pilot configuration"
 msgstr "Oppsett for pilot"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Vis informasjon om Ximian Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Send inn feilrapport"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "Send inn _feilrapport"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Send inn ei feilmelding ved hjelp av Bug Buddy"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Byt"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "_Om Ximian Evolution ..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "_Importér ..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Ny"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Sende / Motta"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "_Finn no"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Skriv ut samandrag"
@@ -16509,12 +17700,12 @@ msgstr "Definer visningar"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -16648,7 +17839,7 @@ msgstr "_Søk"
 msgid "_Find Now"
 msgstr "_Finn no"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "_Tøm"
 
@@ -16665,24 +17856,255 @@ msgstr ""
 msgid "Text"
 msgstr "Tekst"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Tøm"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Finn no"
 
+#~ msgid "Account Name"
+#~ msgstr "Kontonamn"
+
+#~ msgid "Server Name"
+#~ msgstr "Tenarnamn"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "LDAP var ikkje tatt med i denne versjonen av Evolution"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Andre kontakter"
+
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "Set opp tilgang til LDAP-katalogtenar her"
+
+#~ msgid "Directory Servers"
+#~ msgstr "Katalogtenarar"
+
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Kontroll for LDAP-konfigurasjon for Evolution adressebok"
+
+#~ msgid "Add LDAP Server"
+#~ msgstr "Legg til LDAP-tenar"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Steg 4: Vis namn"
+
+#~ msgid "Find contact in"
+#~ msgstr "Finn kontakt i"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Trykk her for å legge til ein kontakt *"
+
+#~ msgid "Business Address"
+#~ msgstr "Firma-adresse"
+
+#~ msgid "Department"
+#~ msgstr "Avdeling"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "Ledig-oppteken-URL"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Yrke"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Opnar oppgåver på %s"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Send likevel?"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Avbryt den aktive e-post-operasjonen"
+#~ msgid "Folder _name"
+#~ msgstr "Mappe_namn:"
+
+#~ msgid "Connecting..."
+#~ msgstr "Koplar til tenar ..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Denne mappa kan ikkje innehalda meldingar."
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Feltnamn"
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Kan ikkje opna delt mappe: %s"
 
-#~ msgid "Family Name"
-#~ msgstr "Etternamn"
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Vel ei målmappe for importerte data"
+
+#, fuzzy
+#~ msgid "A folder named \"%s\" already exists.  Please use a different name."
+#~ msgstr "Ei mappe som har namnet «%s» finst allereie. Bruk eit anna namn."
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan ikkje overføra mappe:\n"
+#~ "%s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "Legg til mappe"
+
+#~ msgid "Drafts"
+#~ msgstr "Kladd"
+
+#~ msgid "Outbox"
+#~ msgstr "Utboks"
+
+#~ msgid "Sent"
+#~ msgstr "Sendt"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Feil ved synkronisering av «%s»:\n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "Synkroniserer mapper"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Synkroniserer «%s» (%d av %d) ..."
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Ingen mappe vist)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(Ingen)"
+
+#~ msgid "No error"
+#~ msgstr "Ingen feil"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Ei mappe med det namnet finst frå før."
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Den oppgitte mappetypen er ugyldig."
+
+#~ msgid "I/O error"
+#~ msgstr "I/U-feil"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Ikkje nok plass til å oppretta mappa"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Mappa er ikkje tom"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Den oppgitte mappa finst ikkje"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Funksjonen er ikkje implementert i dette lageret"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Operasjonen er ikkje støtta"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Den oppgjevne typen er ikkje støtta i dette lageret"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Den oppgjevne mappa kan ikkje endrast eller fjernast"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "Kan ikkje gjera ei mappe til eit barn av ein av etterkomarane sine"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Kan ikkje laga ei mappe med det namnet"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Denne operasjonen kan ikkje utførast i fråkopla modus"
+
+#~ msgid "Checkbox"
+#~ msgstr "Avkryssingsboks"
+
+#~ msgid "CORBA error"
+#~ msgstr "CORBA-feil"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Ugyldig argument"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Har allereide ein eigar"
+
+#~ msgid "No owner"
+#~ msgstr "Ingen eigar"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Typen er ikkje støtta"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Ustøtta skjema"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Ustøtta operasjon"
+
+#~ msgid "Internal error"
+#~ msgstr "Intern feil"
+
+#~ msgid "Exists"
+#~ msgstr "Eksisterar"
+
+#~ msgid "Invalid URI"
+#~ msgstr "Ugyldig URI"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Har undermapper"
+
+#~ msgid "No space left"
+#~ msgstr "Ikkje noko plass att"
+
+#~ msgid "Old owner has died"
+#~ msgstr "Gammal eigar har døydd"
+
+#~ msgid "Test type"
+#~ msgstr "Testtype"
+
+#~ msgid "Evolution Test Component"
+#~ msgstr "Evolution testkomponent"
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "Importér"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Lag ein ny avtale for heile dagen"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Ny _avtale"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Nytt møte"
+
+#~ msgid "New _Task"
+#~ msgstr "Ny oppgåve"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "Evolution _vindauge"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "Evolution _vindauge"
+
+#~ msgid "Toggle"
+#~ msgstr "Byt"
+
+#~ msgid "Clear"
+#~ msgstr "Tøm"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Avbryt den aktive e-post-operasjonen"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -16772,9 +18194,6 @@ msgstr "Finn no"
 #~ msgid "VCard (.vcf, .gcrd)"
 #~ msgstr "VCard (.vcf, .gcrd)"
 
-#~ msgid "Loading..."
-#~ msgstr "Lastar ..."
-
 #~ msgid "Searching..."
 #~ msgstr "Søkjer ..."
 
@@ -16827,10 +18246,6 @@ msgstr "Finn no"
 #~ msgstr "EBook vart ikkje lasta\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "Kort-id eksisterar allereide"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Operasjonen vart avbroten"
 
@@ -16916,9 +18331,6 @@ msgstr "Finn no"
 #~ msgid "Evolution Addressbook local backend"
 #~ msgstr "Evolutions addressebok minikortlesar"
 
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
 #~ msgid "Birth date"
 #~ msgstr "Fødselsdag"
 
@@ -16928,9 +18340,6 @@ msgstr "Finn no"
 #~ msgid "Arbitrary"
 #~ msgstr "Vilkårleg"
 
-#~ msgid "ID"
-#~ msgstr "ID"
-
 #~ msgid "Last Use"
 #~ msgstr "Sist brukt"
 
@@ -17027,9 +18436,6 @@ msgstr "Finn no"
 #~ msgid "Folder containing contact information"
 #~ msgstr "Mappe som inneheld kontaktinformasjon"
 
-#~ msgid "LDAP Server"
-#~ msgstr "LDAP-tenar"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "LDAP-tenar som inneheld kontaktinformasjon"
 
@@ -17039,18 +18445,6 @@ msgstr "Finn no"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Offentleg mappe som inneheld kontaktinformasjon"
 
-#~ msgid "_Contact"
-#~ msgstr "_Kontakt"
-
-#~ msgid "Create a new contact"
-#~ msgstr "Opprett ny kontakt"
-
-#~ msgid "New Contact List"
-#~ msgstr "Ny kontaktliste"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "Opprett ny kontaktliste"
-
 #~ msgid "Disable Queries"
 #~ msgstr "Slå av spørjingar"
 
@@ -17063,9 +18457,6 @@ msgstr "Finn no"
 #~ msgid "Is New Card"
 #~ msgstr "Er nytt kort"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "Ingen kort"
 
@@ -17115,30 +18506,6 @@ msgstr "Finn no"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "Offentleg mappe som inneheld huskeliste"
 
-#~ msgid "New appointment"
-#~ msgstr "Ny avtale"
-
-#~ msgid "_Appointment"
-#~ msgstr "A_vtale"
-
-#~ msgid "New meeting"
-#~ msgstr "Nytt møte"
-
-#~ msgid "M_eeting"
-#~ msgstr "Møt_e"
-
-#~ msgid "New task"
-#~ msgstr "Ny oppgåve"
-
-#~ msgid "_Task"
-#~ msgstr "_Oppgåve"
-
-#~ msgid "New All Day Appointment"
-#~ msgstr "Ny avtale for heile dagen"
-
-#~ msgid "All _Day Appointment"
-#~ msgstr "Avtale for heile _dagen"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "Kan ikkje oppdatera ugyldig objekt"
 
@@ -17169,9 +18536,6 @@ msgstr "Finn no"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "Opnar kaldender på %s"
 
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Opnar standard oppgåvemappe"
-
 #~ msgid "Purging event %s"
 #~ msgstr "Fjernar hending %s"
 
@@ -17272,9 +18636,6 @@ msgstr "Finn no"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Virtuell papirkorgmappe"
 
-#~ msgid "Properties..."
-#~ msgstr "Eigenskapar ..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Endra eigenskapane til mappa"
 
@@ -17284,15 +18645,6 @@ msgstr "Finn no"
 #~ msgid "You have unsent messages, do you wish to quit anyway?"
 #~ msgstr "Du har usendte meldingar, vil du avslutta likevel?"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Ny e-postmelding"
-
-#~ msgid "_Mail Message"
-#~ msgstr "_E-post"
-
-#~ msgid "Compose a new mail message"
-#~ msgstr "Skriv ein e-post"
-
 # TRN: «Send» betre enn «post»?
 #~ msgid "_Post Message"
 #~ msgstr "_Post meldinga"
@@ -17306,9 +18658,6 @@ msgstr "Finn no"
 #~ msgid "Getting Folder Information"
 #~ msgstr "Hentar informasjon om mapper"
 
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Evolution grensesnitt for oppsett av e-post"
-
 #~ msgid "Local folders/%s"
 #~ msgstr "Lokale mapper/%s"
 
@@ -18981,9 +20330,6 @@ msgstr "Finn no"
 #~ msgid "Cumberland"
 #~ msgstr "Cumberland"
 
-#~ msgid "Curitiba"
-#~ msgstr "Curitiba"
-
 #~ msgid "Curitiba Apt"
 #~ msgstr "Curitiba Apt"
 
@@ -21959,9 +23305,6 @@ msgstr "Finn no"
 #~ msgid "North Bend"
 #~ msgstr "North Bend"
 
-#~ msgid "North Carolina"
-#~ msgstr "North Carolina"
-
 #~ msgid "North Conway"
 #~ msgstr "North Conway"
 
@@ -23572,9 +24915,6 @@ msgstr "Finn no"
 #~ msgid "State College"
 #~ msgstr "State College"
 
-#~ msgid "Stauning"
-#~ msgstr "Stauning"
-
 #~ msgid "Staunton"
 #~ msgstr "Staunton"
 
@@ -24165,9 +25505,6 @@ msgstr "Finn no"
 #~ msgid "United Arab Emirates "
 #~ msgstr "Sameinte Arabiske Emiratar"
 
-#~ msgid "Unst"
-#~ msgstr "Unst"
-
 #~ msgid "Upington"
 #~ msgstr "Upington"
 
@@ -24277,12 +25614,6 @@ msgstr "Finn no"
 #~ msgid "Veracruz"
 #~ msgstr "Veracruz"
 
-#~ msgid "Vermillion"
-#~ msgstr "Vermillion"
-
-#~ msgid "Vermont"
-#~ msgstr "Vermont"
-
 #~ msgid "Vernal"
 #~ msgstr "Vernal"
 
@@ -24739,9 +26070,6 @@ msgstr "Finn no"
 #~ msgid " F"
 #~ msgstr " F"
 
-#~ msgid " C"
-#~ msgstr " C"
-
 #~ msgid "knots"
 #~ msgstr "knop"
 
@@ -25311,10 +26639,6 @@ msgstr "Finn no"
 #~ msgstr "Ledig storleik"
 
 #, fuzzy
-#~ msgid "Spray"
-#~ msgstr "Sprut"
-
-#, fuzzy
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Yr i området"
 
@@ -25509,9 +26833,6 @@ msgstr "Finn no"
 #~ msgid "_Show full path for folders"
 #~ msgstr "Vi_s full sti til mapper"
 
-#~ msgid "Create a new note"
-#~ msgstr "Lag eit nytt notat"
-
 #~ msgid "Cannot initialize Evolution's notes component."
 #~ msgstr "Kan ikkje starta Evolution Notat-komponenten"
 
@@ -25583,15 +26904,6 @@ msgstr "Finn no"
 #~ msgid "Remove a folder added with \"Open Other User's Folder\""
 #~ msgstr "Lag _ny mappe ..."
 
-#~ msgid "Send / Receive"
-#~ msgstr "Send / Motta"
-
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Send køa meldingar og motta ny meldingar"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Avgjer om snarvegstolpen skal vise"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Vis den valde mappa"
 
@@ -25620,9 +26932,6 @@ msgstr "Finn no"
 #~ msgid "_Rename..."
 #~ msgstr "_Omdøyp ..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Sende / Motta"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "_Snarvegstolpe"
 
@@ -25915,10 +27224,6 @@ msgstr "Finn no"
 #~ msgstr "Repetering"
 
 #, fuzzy
-#~ msgid "Automatically _detect links"
-#~ msgstr "enkle innlegg"
-
-#, fuzzy
 #~ msgid "Emacs"
 #~ msgstr "Aust"
 
@@ -26022,9 +27327,6 @@ msgstr "Finn no"
 #~ msgid "1234"
 #~ msgstr "1234"
 
-#~ msgid "380"
-#~ msgstr "380"
-
 #~ msgid "666"
 #~ msgstr "666"
 
@@ -26032,10 +27334,6 @@ msgstr "Finn no"
 #~ msgid "<- _Remove"
 #~ msgstr "Fje_rn"
 
-#, fuzzy
-#~ msgid "<< Fewer Options"
-#~ msgstr "&lt;&lt; Ferre val"
-
 #~ msgid "Attribute"
 #~ msgstr "Attributt"
 
@@ -26531,9 +27829,6 @@ msgstr "Finn no"
 #~ msgid "Send _later"
 #~ msgstr "Send _seinare"
 
-#~ msgid "Send the message later"
-#~ msgstr "Send meldinga seinare"
-
 #~ msgid "_Pilot Settings..."
 #~ msgstr "_Pilot-innstillingar"
 
@@ -26772,34 +28067,17 @@ msgstr "Finn no"
 
 #~ msgid ""
 #~ "\n"
-#~ "Comment: "
-#~ msgstr ""
-#~ "\n"
-#~ "Merknad:"
-
-#~ msgid ""
-#~ "\n"
 #~ "Unique String: "
 #~ msgstr ""
 #~ "\n"
 #~ "Unik streng:"
 
-#~ msgid ""
-#~ "\n"
-#~ "Public Key: "
-#~ msgstr ""
-#~ "\n"
-#~ "Offentleg nøkkel: "
-
 #~ msgid "Waiting for connection to LDAP server..."
 #~ msgstr "Ventar på å kople til LDAP-tenar ..."
 
 #~ msgid "New _Contact"
 #~ msgstr "Ny _kontakt"
 
-#~ msgid "New Contact _List"
-#~ msgstr "Ny kontakt_liste"
-
 #~ msgid "Advanced"
 #~ msgstr "Avansert"
 
@@ -26868,9 +28146,6 @@ msgstr "Finn no"
 #~ msgid "Composer"
 #~ msgstr "Meldingsskrivar"
 
-#~ msgid "Default Forward style is: "
-#~ msgstr "Standard vidaresendingsstil er: "
-
 #~ msgid "Display"
 #~ msgstr "Vis"
 
@@ -26883,9 +28158,6 @@ msgstr "Finn no"
 #~ msgid "Sources"
 #~ msgstr "Kjelder"
 
-#~ msgid "_Log filter actions to:"
-#~ msgstr "_Loggfør filterhandlingar til:"
-
 #~ msgid "_Organization:"
 #~ msgstr "_Organisasjon:"
 
diff --git a/po/no.po b/po/no.po
index bc82d7f27d..231c42228b 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-05-22 14:38+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -28,51 +28,184 @@ msgstr "Kunne ikke laste %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Autofullføringsmapper"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "_Sertifikat-ID:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Konfigurer e-post-kontoer her"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Kontakter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
+msgstr "Evolution adressebok"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution adressebok adressedialog"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution adressebok adressevisning"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution adressebok kortvisning"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook component"
+msgstr "Evolution adressebok-komponent"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution adressebok mappevisning"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Brukervalg-kontroll for Evolution e-post"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Konfigurasjonskontroll for mappeinnstillinger i Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Adressebok"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Egenskaper ..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Slett"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "End_re navn"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Ny kontakt:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "Opprett en ny kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Ny kontaktliste"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "Ny kontaktliste"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "Opprett en ny kontaktliste"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Personlig"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Arbeid"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "LDAP-tjener"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Kan ikke opprette katalog %s: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "Kunne ikke koble til LDAP-tjener"
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "Kunne ikke autentisere mot LDAP-tjener"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "Kunne ikke utføre spørring på Root DSE"
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "Tjeneren svarte ikke med noen støttede basis for søk"
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Denne tjeneren støtter ikke LDAPv3 schema-informasjon"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "Feil under henting av schema-informasjon"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr "Tjener svarte ikke med gyldig schema-informasjon"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Kontonavn"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Legg til skript"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP er ikke støttet i denne versjonen av Evolution"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Andre kontakter"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -80,7 +213,7 @@ msgstr ""
 "Kunne ikke åpne denne adresseboken. Vennligst sjekk at stien\n"
 "eksisterer og at du har rettigheter til å aksessere den."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -90,7 +223,7 @@ msgstr ""
 "at du har skrevet inn en ugyldig URI, eller at LDAP-tjeneren\n"
 "ikke kan nås."
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -102,7 +235,7 @@ msgstr ""
 "må du kompilere programmet fra kildekoden i CVS etter å\n"
 "ha hentet OpenLDAP fra lenken under.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -116,44 +249,43 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke åpne adresseboken"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "Aksesserer LDAP-tjener anonymt"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "Kunne ikke autentisere.\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sSkriv inn passord for %s (bruker %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "Navn begynner med"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "E-post begynner med"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Kategorien er"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Avansert..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -161,7 +293,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -169,88 +301,41 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Bakenden for denne adresseboken forsto ikke denne spørringen."
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Bakenden for denne adresseboken nektet å utføre denne spørringen."
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "Denne spørringen ble ikke fullført."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Enhver kategori"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "URIen som kalenderen skal vise"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "_Sertifikat-ID:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "Konfigurer tilgang til LDAP-katalogtjenere her"
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Kontakter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "Katalogtjenere"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolution adressebok"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Kontroll for LDAP-konfigurasjon for Evolution adressebok"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution adressebok adressedialog"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution adressebok adressevisning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution adressebok kortvisning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr "Evolution adressebok-komponent"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution adressebok mappevisning"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Brukervalg-kontroll for Evolution e-post"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -273,6 +358,7 @@ msgstr " V_is støttede baser "
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -306,8 +392,9 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "Legg til LDAP-tjener"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "Konfigurasjonsassistent for LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -323,9 +410,9 @@ msgid "Anonymously"
 msgstr "Anonym"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -336,48 +423,49 @@ msgstr ""
 "Vennligst klikk på «Fullfør»-knappen for å lagre innstillingenene du har "
 "oppgitt her."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "Tilkobling"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "Distinguished _name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr "Rediger LDAP-tjener"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
 msgstr "E-postadresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution vil bruke DN til å autentisere deg mot tjeneren"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution vil bruke denne e-post adressen til å autentisere deg mot tjeneren"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "Fullført"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Generelt"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "Konfigurasjonsassistent for LDAP"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "Gruppe"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Aldri"
 
@@ -400,8 +488,8 @@ msgid "S_earch scope: "
 msgstr "Sø_keområde: "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Søker"
 
@@ -460,28 +548,32 @@ msgstr ""
 "for LDAP-søk, og for oppretting og redigering av kontakter. "
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 "Spesifisering av visningsnavn er det siste steget i konfigurasjon av en LDAP-"
 "tjener."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "Steg 1: Tjenerinformasjon"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "Steg 2: Kobler til tjener"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "Steg 1: Tjenerinformasjon"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "Steg 3: Søker i katalogen"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Steg 2: Kobler til tjener"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "Steg 4: Vis navn"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Steg 3: Søker i katalogen"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -493,18 +585,6 @@ msgstr "Støttede søkebaser"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"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:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -517,7 +597,7 @@ msgstr ""
 "trenger\n"
 "å endre disse alternativene."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -528,7 +608,7 @@ msgstr ""
 "starte.\n"
 "Hvis du lar denne stå tom vil søk starte ved roten av katalogtreet."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 #, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
@@ -543,15 +623,14 @@ msgstr ""
 "Et søkeområde som «sub» vil ta med alle oppføringer under din søkebase.\n"
 "Et søkeområde som «one» vil kun ta med oppføringer ett nivå under basen."
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
 #, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "Denne veiviseren vil hjelpe deg å aksessere katalogtjenester på nettet\n"
 "ved bruk av LDAP-tjenere (Lightweight Directory Access Protocol).\n"
@@ -560,14 +639,14 @@ msgstr ""
 "om tjeneren. Vennligst kontakt din systemadministrator hvis du trenger\n"
 "hjelp med å finne denne informasjonen."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "Dette er fullt navn på din LDAP-tjener. For eksempel «ldap.mittfirma.no»."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -577,7 +656,7 @@ msgstr ""
 "dette tallet \n"
 "for høyt vil adresseboken bli treg."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -586,7 +665,7 @@ msgstr ""
 "Dette er metoden Evolution bruker for å autentisere deg. Merk at hvis du "
 "setter denne til «e-post-adresse» krever anonym tilgang til din LDAP-tjener."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -595,6 +674,15 @@ msgstr ""
 "Dette er navnet på denne tjeneren som vises i mappelisten i Evolution. \n"
 "Det brukes kun for visning på skjermen."
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Dette er navnet på denne tjeneren som vises i mappelisten i Evolution. \n"
+"Det brukes kun for visning på skjermen."
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -623,21 +711,34 @@ msgid "Using email address"
 msgstr "Bruker e-post adresse"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Når mulig"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in 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."
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "_Vis navn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "Grense for ne_dlasting:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -645,54 +746,52 @@ msgstr "Grense for ne_dlasting:"
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "Metode for på_logging:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "_Portnummer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "_Søkebase:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "_Tjenernavn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "_Tidsavbrudd (minutter):"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "kort"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Navn"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Grensesnitt for navnevalg i Evolution adressebok"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Fjern alle"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Fjern"
@@ -719,23 +818,21 @@ msgstr "Legg til i kontakter"
 msgid "Unnamed Contact"
 msgstr "Kontakt uten navn:"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Navn"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Kilde"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Velg kontakter fra adresseboken"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "Finn kontakt i"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Grensesnitt for navnevalg i Evolution adressebok"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Finn"
@@ -812,7 +909,8 @@ msgid "D_epartment:"
 msgstr "Avd_eling:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detaljer"
 
@@ -879,12 +977,12 @@ msgid "_Categories..."
 msgstr "_Kategorier..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Slett"
@@ -2007,7 +2105,7 @@ msgid "Esq."
 msgstr "Esq."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Fullt navn"
 
@@ -2100,11 +2198,27 @@ msgstr "Kontaktlisteredigering"
 msgid "Save List as VCard"
 msgstr "Lagre liste som VCard"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Endret kontakt:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Kontakt i konflikt:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Duplisert kontakt funnet"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Den nye e-post adressen eller navnet for denne kontakten\n"
+"eksisterer allerede i denne mappen. Vil du legge til likevel?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Ny kontakt:"
@@ -2121,22 +2235,6 @@ msgstr ""
 "Navnet eller e-post adressen for denne kontakten eksisterer allerede\n"
 "i denne mappen. Vil du legge den til likevel?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Endret kontakt:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Kontakt i konflikt:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"Den nye e-post adressen eller navnet for denne kontakten\n"
-"eksisterer allerede i denne mappen. Vil du legge til likevel?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2235,9 +2333,9 @@ msgstr "Videresend kontakt"
 msgid "Send Message to Contact"
 msgstr "Send melding til kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Skriv ut"
@@ -2259,9 +2357,12 @@ msgstr "Flytt til mappe..."
 msgid "Cut"
 msgstr "Klipp ut"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopier"
 
@@ -2270,16 +2371,8 @@ msgstr "Kopier"
 msgid "Paste"
 msgstr "Lim inn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Slett"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "Aktiv visning"
 
@@ -2292,166 +2385,170 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "* Click here to add a contact *"
-msgstr "* Klikk her for å legge til en kontakt *"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant Phone"
 msgstr "Assistents telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Address"
-msgstr "Arbeidsadresse"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Faks på arbeid"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Arbeidstelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Arbeidstelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Telefon for tilbakeringing"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Biltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategorier"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Firmatelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Avdeling"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "E-post 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Etternavn"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Lagre som"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "Ledig-/opptatt-URL"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Hjemmeadresse"
+#, fuzzy
+msgid "Given Name"
+msgstr "Feltnavn"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Faks hjemme"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Hjemmetelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Hjemmetelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Jordan"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Leder"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Kallenavn"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Kommentar"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Kontor"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Annen adresse"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Annen faks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Annen telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Personsøker"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Primær telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Yrke"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Rolle"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Ektefelle"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TTD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Tittel"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Unst"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Nettside"
 
@@ -2544,11 +2641,19 @@ msgstr "Medlemmer"
 msgid "Job Title"
 msgstr "_Jobbtittel:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Hjemmeadresse"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Hjemmeadresse"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Annen adresse"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2561,112 +2666,109 @@ msgstr "Faks hjemme"
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Suksess"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Frakoblet lager"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Kort ikke funnet"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Kort-ID eksisterer allerede"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Protokollen er ikke støttet"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Avbrutt"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "Autentisering feilet"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "Autentisering kreves"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS er ikke tilgjengelig"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "Adresseboken eksisterer ikke"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Annen feil"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Vil du lagre endringene?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr "_Forkast"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Feil under tillegg av liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Feil ved tillegg av kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Feil ved endring av liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Feil ved endring av kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Feil ved fjerning av liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Feil ved fjerning av kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2675,7 +2777,7 @@ msgstr ""
 "Åpning av %d kort vil medføre at %d nye vinduer vil\n"
 "vises på skjermen. Vil du virkelig vise alle disse kortene?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2684,49 +2786,49 @@ msgstr ""
 "%s eksisterer allerede\n"
 "Vil du overskrive den?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "Overskriv"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Feil under lagring av %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Flytt kort til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kopier kort til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Flytt kort til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kopier kort til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Flere VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
@@ -2921,7 +3023,7 @@ msgstr "Marger"
 msgid "Number of columns:"
 msgstr "Antall kolonner:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Alternativer"
 
@@ -3108,18 +3210,18 @@ msgstr "Liste uten navn"
 msgid "Split Multi-Day Events:"
 msgstr "Del opp hendelser som går over flere dager:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Kunne ikke starte wombat tjener"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Kunne ikke starte wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikke lese pilotens kalender-applikasjonsblokk"
 
@@ -3127,24 +3229,88 @@ msgstr "Kunne ikke lese pilotens kalender-applikasjonsblokk"
 msgid "Default Priority:"
 msgstr "Forvalgt prioritet:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke lese pilotens applikasjonsblokk for oppgaveliste"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Kalender og oppgaver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Konfigurer din tidssone, kalender og oppgaveliste her "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution kalender og oppgaver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Konfigurasjonskontroll for Evolution kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution kalender iTip/iMip-visning"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution kalender iTip/iMip-visning"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution kalender-komponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution nyhetsredigerer"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolution kalender- og oppgavekomponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Testkomponent for Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Oppgaver"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Factory for alarm-tjenesten"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Starter:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Slutter:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Evolution alarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm på %s"
@@ -3219,44 +3385,172 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Ikke spør meg om dette programmet igjen."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Factory for alarm-tjenesten"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initiere Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Kunne ikke initiere gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunne ikke opprette factory for alarm-tjenesten"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "ugyldig tid"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "iCalender-feil"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Farge for oppgaver som går ut i dag"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Farge for oppgaver som går ut i dag"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "Vi_s tid for avtalers slutt i ukes- og månedsvisning"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Forhåndsviser av kalenderen som skal skrives ut"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "Spør etter bekreftelse ved sletting _av oppføringer"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "Spør etter bekreftelse ved sletting _av oppføringer"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Slett fullførte oppgaver"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Vis uke_nummer i datonavigasjon"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Sammendrag inneholder"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Beskrivelse inneholder"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Kommentar inneholder"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Ingen treff"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3268,81 +3562,110 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse oppgavene?"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "returnerer mindre enn"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "dager"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Skriv ut denne kalenderen"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Ny-Caledonia"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "Ny avtale"
+
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "A_vtale"
+
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Opprett en ny avtale"
+
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "Nytt møte"
+
+#: calendar/gui/calendar-component.c:640
+msgid "M_eeting"
+msgstr "Møt_e"
+
+#: calendar/gui/calendar-component.c:641
 #, fuzzy
-msgid "Rename"
-msgstr "End_re navn"
+msgid "Create a new meeting request"
+msgstr "Dette er en møteforespørsel"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Ny avtale for hele dagen"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Personlig"
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr "Avtale for hele _dagen"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Arbeid"
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Opprett en ny avtale"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3459,7 +3782,7 @@ msgstr "Send til:"
 msgid "With these arguments:"
 msgstr "Med disse argumentene:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -3475,6 +3798,10 @@ msgstr "timer"
 msgid "minutes"
 msgstr "minutter"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3507,8 +3834,8 @@ msgstr "Send en melding"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Sammendrag:"
 
@@ -3537,7 +3864,7 @@ msgstr "slutt på avtale"
 msgid "hour(s)"
 msgstr "time(r)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minutt(er)"
 
@@ -3591,7 +3918,7 @@ msgstr "Dager"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Fredag"
 
@@ -3605,7 +3932,7 @@ msgstr "Minutter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Mandag"
 
@@ -3615,7 +3942,7 @@ msgstr "S_ø."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Lørdag"
 
@@ -3629,7 +3956,7 @@ msgstr "Vis uke_nummer i datonavigasjon"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Søndag"
 
@@ -3647,7 +3974,7 @@ msgstr "Oppgaveliste"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Torsdag"
 
@@ -3665,7 +3992,7 @@ msgstr "Tidformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Tirsdag"
 
@@ -3675,12 +4002,12 @@ msgstr "Uk_en starter:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Onsdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Arbeidsuke"
 
@@ -3717,7 +4044,7 @@ msgid "_Fri"
 msgstr "_Fr."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Generell"
 
@@ -3757,18 +4084,18 @@ msgstr "_On."
 msgid "before every appointment"
 msgstr "før hver avtale"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 "Hendelsen som slettes er et møte. Ønsker du å sende melding om kansellering?"
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Er du sikker på at du vil avlyse og slette dette møtet?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
@@ -3776,11 +4103,11 @@ msgstr ""
 "Oppgaven som slettes er tildelt. Ønsker du å sende en melding om "
 "kansellering?"
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Er du sikker på at du vil avlyse og slette denne oppgaven?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -3788,52 +4115,52 @@ msgstr ""
 "Journaloppføringen som slettes er publisert. Vil du sende en melding om "
 "avlysing?"
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Er du sikker på at du vil avlyse og slette denne journaloppføringen?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Denne hendelsen er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Denne oppgaven er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Denne journaloppføringen er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Du har gjort endringer. Forkast disse endringene og lukk redigering?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Du har ikke gjort endringer. Lukk redigering?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Denne hendelsen er endret."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Denne oppgaven er endret."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Denne journaloppføringen er endret."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Du har gjort endringer. Forkast disse endringene og oppdater redigering?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har ikke gjort endringer. Oppdater redigering?"
@@ -3843,166 +4170,171 @@ msgstr "%s  Du har ikke gjort endringer. Oppdater redigering?"
 msgid "Validation error: %s"
 msgstr "Valideringsfeil: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " til "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Fullført "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Fullført "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Ferdig "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Ferdig "
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "Kunne ikke oppdatere objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppføring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Endringer som gjøres i denne oppføringen kan bli forkastet hvis det kommer "
 "enoppdatering"
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Kan ikke hente versjonsdata!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Velg en målmappe for å importere data"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Er du sikker på at du vil slette avtalen «%s»?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Er du sikker på at du vil slette denne avtalen uten tittel?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Er du sikker på at du vil slette oppgaven «%s»?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Er du sikker på at du vil slette denne oppgaven uten tittel?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Er du sikker på at du vil slette journaloppføringen «%s»?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Er du sikker på at du vil slette denne journaloppføringen uten tittel?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Er du sikker på at du vil slette %d avtaler?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Er du sikker på at du vil slette %d oppgaver?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Er du sikker på at du vil slette %d journaloppføringer?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "Hendelsen kunne ikke slettes pga en CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "Oppgaven kunne ikke slettes pga en CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Journaloppføringen kunne ikke slette pga en CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Oppføringen kunne ikke slettes pga en CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "Hendelsen kunne ikke slettes fordi tilgang ble nektet"
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "Oppgaven kunne ikke slettes fordi tilgang nektes"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Journaloppføringen kunne ikke slettes fordi tilgang ble nektet"
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "Oppføringen kunne ikke slettes fordi tilgang ble nektet"
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Hendelsen kunne ikke slettes pga en CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Oppgaven kunne ikke slettes pga en CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Journaloppføringen kunne ikke slette pga en CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Oppføringen kunne ikke slettes pga en CORBA-feil"
@@ -4019,43 +4351,43 @@ msgstr "Deleger til:"
 msgid "Enter Delegate"
 msgstr "Skriv inn delegat"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Avtale"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Påminnelse"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Gjeninntreffelse"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Møteplanlegging"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Møte"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "Sluttdato er feil"
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "Tid for start er feil"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "Tid for slutt er feil"
 
@@ -4125,31 +4457,31 @@ msgid "_Start time:"
 msgstr "_Start-tid:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr "Valgt organisator har ingen konto lenger."
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "En organisator kreves."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "Minst en deltaker kreves."
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Deleger til..."
 
@@ -4190,21 +4522,15 @@ msgid "Member"
 msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Rolle"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -4224,6 +4550,7 @@ msgid "_Invite Others..."
 msgstr "_Inviter andre..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4256,6 +4583,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Kan ikke opprette katalog %s: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "En organisator må oppgis."
@@ -4285,33 +4613,58 @@ msgstr "Kalenderinformasjon"
 msgid "Calendar Name"
 msgstr "Kalender"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Kan ikke opprette katalog %s: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Kalenderinformasjon"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Oppgaveliste"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Oppgaveliste"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Oppgaveliste"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr "Du endrer en gjeninntreffende hendelse. Hva ønsker du å endre?"
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Du endrer en repeterende oppgave. Hva vil du endre?"
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr "Du endrer en repeterende journaloppføring. Hva vil du endre?"
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr "Kun denne instansen"
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Denne og fremtidige instanser"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr "Denne og fremtidige instanser"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr "Alle instanser"
 
@@ -4360,10 +4713,15 @@ msgstr "dag"
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "gjentakelser"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Dato/klokke:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "Le_gg til"
@@ -4428,7 +4786,7 @@ msgstr "uke(r)"
 msgid "year(s)"
 msgstr "år"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
@@ -4438,31 +4796,31 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "_Forkast endringer"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 msgid "Save Event"
 msgstr "Lagre hendelse"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Møteinformasjonen er opprettet. Send den?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Møteinformasjonen er endret. Send en oppdatert versjon?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "Informasjon om oppgavetildeling er opprettet. Send den?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "Oppgaveinformasjonen er endret. Send en oppdatert versjon?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Dato for ferdigstilling er feil"
 
@@ -4472,43 +4830,43 @@ msgid "% _Complete"
 msgstr "% ferdig"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Fullført"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Høy"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "Under arbeid"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Lav"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Ikke startet"
 
@@ -4517,7 +4875,7 @@ msgid "Progress"
 msgstr "Fremdrift"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Udefinert"
 
@@ -4539,21 +4897,21 @@ msgstr "_Status:"
 msgid "_Web Page:"
 msgstr "_Hjemmeside-adresse:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Grunnleggende"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "Ferdigdato er feil"
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4561,9 +4919,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "Ko_nfidensiell"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Beskrivelse:"
 
@@ -4668,26 +5026,21 @@ msgstr "%s ved %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s for en ukjent utløsertype"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Offentlig"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Konfidensiell"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategorier"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4700,28 +5053,26 @@ msgid "Start Date"
 msgstr "Startdato"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Sammendrag"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "farge"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Avtale"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Ledig"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Opptatt"
 
@@ -4733,7 +5084,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "Ø"
 
@@ -4741,7 +5092,7 @@ msgstr "Ø"
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4751,7 +5102,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4759,7 +5110,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4767,17 +5118,17 @@ msgstr "Nei"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Ukjent"
 
@@ -4789,181 +5140,179 @@ msgstr "Gjeninntreffer"
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Oppdaterer objekter"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Sletter valgte objekter"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Oppdaterer objekter"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Ny _avtale..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Ny avtale som varer h_ele dagen"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "Nytt møte"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Ny oppgave"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "S_kriv ut..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Gå _til i dag"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "_Gå til dato..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Publiser ledig/opptatt-informasjon"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "Inn_stillinger..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Åpne"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Lagre _som..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Kli_pp ut"
 
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "_Sett opp møte..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendelsen"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendelser"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "Inn_stillinger..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Åpne melding"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "Tildel oppg_ave"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "_Videresend som iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "_Merk som fullført"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merk valgte oppgaver som fullført"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "Sle_tt valgte oppgaver"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klikk for å legge til en oppgave"
@@ -4977,8 +5326,8 @@ msgstr "% ferdig"
 msgid "Alarms"
 msgstr "Alarmer"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Fullført"
 
@@ -5007,18 +5356,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d.%m.%Y %H.%M.%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %H.%M.%S"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5037,7 +5386,7 @@ msgstr "%02i minutters oppdeling"
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5050,125 +5399,125 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja (enkel gjeninntreffelse)"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "Hver dag"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "Hver %d dager"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "Hver uke"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "Hver %d uker"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr "Hver uke på "
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Hver %d uker på "
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " og "
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr "Den %s dagen i "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr "Den %s %s i "
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "hver måned"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr "hver %d måneder"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "Hvert år"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "Hvert %d år"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr " totalt %d ganger"
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ", slutter på "
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>Starter:</b> "
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Slutter:</b> "
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>Fullført:</b> "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>Ferdig:</b> "
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "iCalendar-informasjon"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "iCalender-feil"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "En ukjent person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5176,319 +5525,318 @@ msgstr ""
 "<br>Vennligst sjekk følgende informasjon og velg så en handling fra menyen "
 "under."
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "Plassering:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Godtatt"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Akteptert tentativt"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Avslått"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Velg en handling:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Oppdater"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Godta"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Godta tentativt"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Avslå"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Send ledig/opptatt-informasjon"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Oppdater status for respondent"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Send siste informasjon"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har publisert møteinformasjon."
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Møteinformasjon"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> forespør at %s er tilstede i et møte."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> forespør din tilstedeværelse i et møte."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Møteforslag"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> ønsker å legge til informasjon i et eksisterende møte."
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Møteoppdatering"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ønsker å motta seneste møteinformasjon."
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Forespørsel om møteoppdatering"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> har svart på en møteforespørsel."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Møtesvar"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> har avlyst et møte."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Møteavlysing"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> har sendt en uforståelig melding."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Ugyldig møtemelding"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> har publisert informasjon om en oppgave."
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Oppgaveinformasjon"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> forespør at %s utfører en oppgave."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> forespør at du utfører en oppgave."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Forespørsel om oppgave"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> ønsker å legge til informasjon i en eksisterende oppgave."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Oppgaveoppdatering"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ønsker å motta den seneste informasjon om oppgaven."
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Forespørsel om oppgaveoppdatering"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> har svart på en oppgavetildeling."
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Svar på oppgave"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> har avlyst en oppgave."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Avlysning av oppgave"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Ugyldig oppgavemelding"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> har publisert ledig/opptatt-informasjon."
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> forespør din ledig/opptatt-informasjon."
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Ledig/opptatt forespørsel"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> har svart på en forespørsel etter ledig/opptatt-informasjon."
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Ledig/opptatt svar"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig ledig/opptatt-melding"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr "Meldingen ser ikke ut til å være riktig utformet"
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "Denne meldingen inneholder forespørsler som ikke er støttet."
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Vedlegget inneholder ikke et gyldig kalender-vedlegg"
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr "Vedlegget inneholder ingen visbare kalender-vedlegg"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderfilen kunne ikke oppdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Oppdatering fullført\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltakerstatus kan ikke oppdateres fordi oppføringen ikke eksisterer lenger"
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet er ugyldig og kan ikke oppdateres\n"
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Dette svaret er ikke fra en aktiv deltaker. Legg til som deltaker?"
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Deltakerstatus kunne ikke oppdateres pga ugyldig status!\n"
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr "Det oppsto en feil i CORBA-systemet\n"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr "Objektet kunne ikke finnes\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Du har ikke rettigheter til å oppdatere kalenderen\n"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Deltakerstatus oppdatert\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "Deltakerstatus kunne ikke oppdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Fjerning fullført"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Oppføring sendt!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Oppføringen kunne ikke sendes!\n"
 
@@ -5648,7 +5996,7 @@ msgstr "%a %d.%m.%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
@@ -5712,49 +6060,44 @@ msgstr "Tid for møtets _start:"
 msgid "Meeting _end time:"
 msgstr "Tid for møtets slutt:"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "Sta_rt dato:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "Fer_dig-dato:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "_Prioritet:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Side"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Åpner oppgaver på %s"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikke laste oppgavene i «%s»"
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden som er nødvendig for å laste «%s» er ikke støttet"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Du har ikke rettigheter til å åpne mappen i «%s»"
 
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5763,48 +6106,39 @@ msgstr ""
 "Feil på «%s»:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "Fullfører oppgaver..."
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "Sletter valgte objekter..."
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "Tømmer"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Oppgaver"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunne ikke åpne mappen i «%s»"
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden som er nødvendig for å åpne «%s» er ikke støttet"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Legger til alarmer for %s"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5812,7 +6146,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5820,62 +6154,11 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Turin"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalender og oppgaver"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Kalender"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Konfigurer din tidssone, kalender og oppgaveliste her "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution kalender og oppgaver"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Konfigurasjonskontroll for Evolution kalender"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution kalender iTip/iMip-visning"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Evolution kalender iTip/iMip-visning"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution kalender-komponent"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Evolution nyhetsredigerer"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolution kalender- og oppgavekomponent"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Testkomponent for Evolution"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -5932,296 +6215,332 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "En organisator må oppgis."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Minst en deltaker kreves"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Hendelsesinformasjon"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Oppgaveinformasjon"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Journalinformasjon"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Kalenderinformasjon"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "Motforslag"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig/opptatt-informasjon (%s til %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "iCalendar-informasjon"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Du må være en deltager i hendelsen."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Sø."
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Ma."
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Ti."
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "On."
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "To."
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Fr."
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Lø."
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Valgt dag (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Valgt uke (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Valgt måned (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Valgt år (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Oppgave"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prosent fullført: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Kontakter: "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Forhåndsvisning av utskrift"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Skriv ut oppføring"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Skriveroppsett"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Endre navn på denne snarveien"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Oppgaveliste"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Ny oppgave"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Oppgave"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Opprett en ny oppgave"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "URIen til oppgavemappen skal vises"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6233,11 +6552,11 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse oppgavene?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Ikke spør meg igjen."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "Skriv ut oppgaver"
 
@@ -6265,15 +6584,15 @@ msgstr "iCalendar-filer (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar-filer (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "Påminnelse!!"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "Hendlelser i kalenderen"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6281,7 +6600,7 @@ msgstr ""
 "Evolution har funnet filer fra GNOME kalender.\n"
 "Vil du importere dem til Evolution?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "GNOME kalender"
 
@@ -7814,27 +8133,27 @@ msgstr "Stillehavet/Wallis"
 msgid "Pacific/Yap"
 msgstr "Stillahavet/Yap"
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "Signering er ikke støttet av dette cipheret"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "Verifisering er ikke støttet av dette cipheret"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Kryptering er ikke støttet av dette cipheret"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Dekryptering er ikke støttet av dette cipheret"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr "Du kan ikke importere nøkler med dette cipheret"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr "Du kan ikke eksportere nøkler med dette cipheret"
 
@@ -7886,86 +8205,86 @@ msgstr "Forbereder mappe «%s» på frakobling"
 msgid "You must be working online to complete this operation"
 msgstr "Du må arbeide tilknyttet for å fullføre denne operasjonen"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Klarte ikke å opprette rør til «%s»: %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Feil under oppretting av underprosess «%s»: %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ugyldig meldingsstrøm mottatt fra %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Synkroniserer mapper"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Feil under lesing av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Feil under kjøring av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Kunne ikke åpne spool-mappen"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Kan ikke prosessere spool-mappen"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Henter melding %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Kan ikke åpne melding"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Feilet på melding %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Synkroniserer mappe"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Henter melding %d av %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Feilet på melding %d av %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Feil under henting av melding"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr "Ugyldige argumenter til (system-flag)"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr "Ugyldige argumenter til (user-tag)"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Feil under lagring av filtersøk: %s: %s"
@@ -7997,35 +8316,35 @@ msgstr "(treff-alle) krever et enkelt bolsk resultat"
 msgid "Performing query on unknown header: %s"
 msgstr "Utfører spørring på ukjent header: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Ustøttet operasjon: legg til melding: for %s"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Ustøttet operasjon: søk etter uttrykk: etter %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Ustøttet operasjon: søk på uid: etter %s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Flytter meldinger"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr "Kopierer meldinger"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Henter %d melding(er)"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8036,15 +8355,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr "Feil under tolking av hint for gpg brukerid."
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr "Kunne ikke tolke forespørsel på gpg-passordfrase."
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8053,30 +8372,30 @@ msgstr ""
 "Du trenger et passord for å låse opp nøkkelen for\n"
 "bruker «%s»"
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Avbrutt"
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Feil ved åpning av hemmelig nøkkel: 3 ugyldige passord oppgitt."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Uventet svar fra GnuPG: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr "Ingen data gitt"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Kan ikke kryptere: Ingen gyldige mottakere spesifisert."
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8087,51 +8406,65 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Feil under bruk av GPG på %s: %s\n"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Feil ved kjøring av gpg: %s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr "Feil ved kjøring av gpg."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "Dette er en digitalt signert meldingsdel"
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr ""
+"Kunne ikke verifisere meldingens signatur: kunne ikke opprette midlertidig "
+"fil: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Kunne ikke verifisere meldingens signatur: kunne ikke opprette midlertidig "
 "fil: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Dette er en digitalt signert meldingsdel"
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Indekser meldingsinnhold"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Kunne ikke hente melding fra editor"
@@ -8230,15 +8563,15 @@ msgstr "Feil under skriving av midlertidig fil: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Feil under kopiering midlertidig meldingsfil: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Feil under dekryptering av MIME-del: protokollfeil"
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "Klarte ikke å dekryptere MIME-del: ugyldig struktur"
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "lesefeil"
 
@@ -8552,12 +8885,12 @@ msgstr "E-post-tilbyder for virtuelle mapper"
 msgid "For reading mail as a query of another set of folders"
 msgstr "For lesing av e-post som en spørring på et annet sett med mapper"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Ingen tilbyder tilgjengelig for protokoll «%s»"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8566,71 +8899,82 @@ msgstr ""
 "Kan ikke opprette katalog %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Skriv inn passord for %s"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Udefinert"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Rediger signatur"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Rediger signatur"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Selv-signert sertifikat i kjeden"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "Ikke-betrodd sertifikat"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Lagre signatur"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Lesefeil"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Tjener: %s, Type: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kan ikke finne mappe: Ugyldig operasjon på dette lageret"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan ikke opprette mappe: Ugyldig operasjon på dette lageret"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Søppel"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "Juni"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "Kan ikke finne utsteders sertifikat"
@@ -8843,7 +9187,7 @@ msgstr ""
 "Listen over sertifikater som er trukket tilbake er gått ut: %s\n"
 "Utsteder: %s"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Kunne ikke tolke URL «%s»"
@@ -8862,22 +9206,22 @@ msgstr "Ingen slik melding %s i %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kan ikke kopiere eller flytte meldinger inn i en virtuell mappe"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikke slette mappe: %s: Ingen slik mappe"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan ikke endre navn på mappe: %s: Ugyldig operasjon"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikke endre navn på mappe: %s: Ingen slik mappe"
@@ -8957,7 +9301,7 @@ msgstr "Kan ikke hente melding: %s"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -8971,7 +9315,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Ingen slik melding"
@@ -9009,54 +9353,69 @@ msgid "Failed to cache %s: %s"
 msgstr "Feil ved mellomlagring av %s: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Kobler til tjener..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Kunne ikke koble til LDAP-tjener"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "Firma"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Ser etter nye meldinger"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Check for new messages in all folders"
 msgstr "Se etter nye meldinger i alle mapper"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Mapper"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Vis kun abonnerte mapper"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "Overstyr tjeners navneområde for mapper"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Navneområde"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Bruk filtre for nye meldinger i INNBOKS på denne tjeneren"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "Sjekk etter nye meldinger _automatisk hvert"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For lesing og lagring av e-post på IMAP-tjenere."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Passord"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9309,7 +9668,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Kunne ikke endre navn på mappe %s til %s: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kunne ikke endre navn på «%s»: %s"
@@ -9424,29 +9783,29 @@ msgstr "Ser etter nye meldinger"
 msgid "Storing folder"
 msgstr "Lagrer mappe"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kan ikke opprette mappelås på: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kan ikke åpne postboks: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "Operasjon for å legge til e-post avbrutt"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan ikke legge til melding i mbox-filen: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9455,11 +9814,11 @@ msgstr ""
 "Kan ikke hente melding: %s fra mappe %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappen ser ut til å ha blitt korrupt og kan ikke repareres."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Oppbygging av melding feilet: Korrupt postboks?"
 
@@ -9527,12 +9886,17 @@ msgstr "Kan ikke opprette katalog %s: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "Finner ikke mappe: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "Kort-ID eksisterer allerede"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Kunne ikke endre navn på mappe %s til %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Spesifisert mappenavn er ikke gyldig: %s"
@@ -9576,7 +9940,7 @@ msgstr "Kunne ikke lukke kildemappe %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikke lukke midlertidig mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikke endre navn på mappe: %s"
@@ -9865,7 +10229,7 @@ msgstr "Slett etter %s dag(er)"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -9955,7 +10319,7 @@ msgid "No such folder `%s'."
 msgstr "Ingen slik mappe «%s»."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10009,7 +10373,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Levering av e-post via sendmail programmet"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10175,7 +10539,7 @@ msgstr "SMTP e-postlevering via %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende melding: senderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Sender melding"
 
@@ -10297,7 +10661,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "vedlegg"
 
@@ -10341,14 +10705,14 @@ msgstr "MIME-type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Foreslå automatisk visning av vedlegg"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Du må konfigurere en konto\n"
 "før du kan skrive meldinger."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Klikk her for å få opp adresseboken"
 
@@ -10359,45 +10723,45 @@ msgstr "Klikk her for å få opp adresseboken"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Fra:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Skriv inn adressene som skal motta en kopi av meldingen"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10408,14 +10772,19 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Post til:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr "Destinasjon for post"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Legg en fil ved meldingen"
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Legg ved fil(er)"
@@ -10450,21 +10819,21 @@ msgstr "Filen eksisterer, overskriv?"
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil under lasting av fil: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Feil under tilgang til fil: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente melding fra editor"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10473,7 +10842,7 @@ msgstr ""
 "Kunne ikke søke i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10482,7 +10851,7 @@ msgstr ""
 "Kunne ikke kutte av fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10491,7 +10860,7 @@ msgstr ""
 "Kunne ikke kopiere fildeskriptor: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10500,7 +10869,7 @@ msgstr ""
 "Feil under autolagring av av melding: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10508,7 +10877,7 @@ msgstr ""
 "Ximian Evolution har funnet ikke-lagrede filer fra en tidligere sesjon.\n"
 "Vil du prøve å gjenopprette dem?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10519,28 +10888,28 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Advarsel: Endret melding"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "Generert automatisk"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10548,7 +10917,7 @@ msgstr ""
 "Kunne ikke opprette vindu for ny melding:\n"
 "Klarte ikke å aktivere kontroll for adressevelger."
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10560,7 +10929,7 @@ msgstr ""
 "Vennligst sjekk at du har installert korrekt\n"
 "versjon av gtkhtml og libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10568,7 +10937,7 @@ msgstr ""
 "Kunne ikke opprette skrivevindu:\n"
 "Klarte ikke å aktivere HTML-redigeringskomponenten."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10577,11 +10946,13 @@ msgstr ""
 "kan redigeres.)<b>"
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Gruppevaresuiten Evolution"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10829,13 +11200,13 @@ msgstr "%H.%M.%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%H.%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H.%M"
 
@@ -10954,7 +11325,7 @@ msgstr "Så"
 msgid "You must specify a folder."
 msgstr "Du må oppgi en mappe."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Velg mappe"
@@ -10968,24 +11339,24 @@ msgstr ""
 "Feil i regulært uttrykk «%s»:\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Viktig"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "Oppgaver"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Senere"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Test"
 
@@ -11085,7 +11456,7 @@ msgstr "siden"
 msgid "months"
 msgstr "måneder"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr " sekunder"
 
@@ -11182,7 +11553,7 @@ msgstr "Uttrykk"
 msgid "Follow Up"
 msgstr "Følg opp"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "Etikett"
 
@@ -11252,112 +11623,118 @@ msgid "Source Account"
 msgstr "Kildekonto"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Yr"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Spesifikk header"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Emne"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "Nullstill status"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "inneholder"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "inneholder ikke"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "slutter ikke med"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "eksisterer ikke"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "does not return"
 msgstr "returnerer ikke"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "ligner ikke"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "starter ikke med"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "slutter med"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "eksisterer"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr "er merket"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr "er etter"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "is before"
 msgstr "er før"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "er større enn"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "er mindre enn"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr "er ikke merket"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "er ikke"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "er"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr "returnerer større enn"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr "returnerer mindre enn"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr "returnerer"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "lyder som"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "starter med"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Regelnavn «%s» er ikke unikt. Velg et annet navn."
@@ -11382,18 +11759,78 @@ msgstr "Regelnavn"
 msgid "Score Rules"
 msgstr "Poengregler"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Du må gi navn til denne vfolderen."
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr "Du må spesifisere minst en mappe som kilde."
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 msgid "VFolder source"
 msgstr "VFolder-kilde"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Brukervalg for redigering"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Konfigurer brukervalg for e-post, inkludert sikkerhet og meldingsvisning her"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Konfigurer stavekontroll, signaturer og meldingskomposisjon her"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Konfigurer e-post-kontoer her"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolution e-post"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Konfigurasjonskontroll for Evolution e-postkonti"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Evolution e-postkomponent"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Evolution e-postredigering"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Konfigurasjonskontroll for Evolution e-postredigering"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail folder viewer"
+msgstr "Komponent for mappevisning for Evolution e-post"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Brukervalg-kontroll for Evolution e-post"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Post"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "E-post-konti"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "Brukervalg for e-post"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker på at du vil slette denne kontoen?"
@@ -11435,7 +11872,7 @@ msgid "Protocol"
 msgstr "Protokoll"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr "Uten navn"
 
@@ -11459,20 +11896,17 @@ msgstr "Legg til skriptsignatur"
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "Du sender en melding i HMTL-format. Sjekk at følgende mottakere\n"
 "kan og vil motta e-post som HTML:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Send likevel?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11480,7 +11914,7 @@ msgstr ""
 "Denne meldingen har ikke emne.\n"
 "Send likevel?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11488,11 +11922,11 @@ msgstr ""
 "Siden kontaktlisten du sender til er konfigurert til å skjule listens "
 "adresser vil denne meldingen kun inneholde Bcc mottakere."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Denne meldingen inneholder kun Bcc mottakere."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11502,11 +11936,11 @@ msgstr ""
 "«Apparently-To»-header.\n"
 "Send likevel?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Du må spesifisere mottakere for å kunne sende denne meldingen."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11518,188 +11952,398 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Lag _virtuell mappe fra søk..."
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "Post"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<klikk her for å velge en mappe>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "«%s» i «%s»"
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Opprett ny mappe"
 
-#: mail/em-folder-selector.c:267
-#, fuzzy
-msgid "Folder _name"
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Spesifiser hvor mappen skal opprettes:"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
 msgstr "Mappe_navn:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Kunne ikke opprette midlertidig katalog: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Kunne ikke opprette midlertidig katalog: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Kunne ikke opprette midlertidig fil «%s»: %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Kunne ikke lukke midlertidig mappe: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Laster..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Velg mappe"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Opprett en ny mappe"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Kunne ikke slette mappe «%s»: %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Vild du virkelig slette mappe «%s»?"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Slett «%s»"
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Endre navn på mappe «%s» til:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+msgid "Rename Folder"
+msgstr "Endre navn på mappe"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Egenskaper for skrift"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Egenskaper"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "_Mappenavn:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Vis"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Åpne i nytt vindu"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Flytt"
+
+#: mail/em-folder-tree.c:1500
+msgid "_New Folder..."
+msgstr "_Ny mappe..."
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "End_re navn"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "Egenska_per..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "Sva_r til sender"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr "Føl_g opp..."
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr "Mer_k som fullført"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "Fj_ern flagg"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "_Merk som uviktig"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Merk som _ulest"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Merk som v_iktig"
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "A_ngre slett"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "Legg til sender i adresse_bok"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "_Påfør filtre"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "Oppre_tt regel fra melding"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "VFolder på e_mne"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "VFolder for se_nder"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "VFolder for mottake_re"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "VFolder på e-post_liste"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "VFolder for se_nder"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Filtrer på em_ne"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Filtrer på sen_der"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Filtrer på motta_ker"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Filtrer på e-_postliste"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filtrer på sen_der"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Forvalgt"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopier lokasjon for lenke"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Treff:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Tildelt"
+
+#: mail/em-format-html-display.c:597
+#, fuzzy
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr "Denne meldingen er digitalt signert, men kan ikke finnes autentisk."
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Rediger signatur"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Rediger signatur"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
 msgstr ""
-"Denne meldingen er digitalt signert. Klikk låsikonet for mer informasjon."
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Avbrutt"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "Krypter med PGP"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Ustøttet schema"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Feil under verifisering av sertifikater."
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Vis «inline»"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Skjul"
@@ -11709,183 +12353,206 @@ msgstr "Skjul"
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Henter melding %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern kropp."
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peker til lokal fil (%s) gyldig på nettsted «%s»"
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peker til eksterne data (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjente eksterne data («%s»-type)"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-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/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Denne meldingen er digitalt signert og er funnet autentisk."
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-msgid "No signature present"
-msgstr ""
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Kunne ikke initiere Bonobo"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Ustøttet schema"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Flytter meldinger"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Fra"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Til"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "Postprogram"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
+msgid "Session not initialised"
+msgstr "Kunne ikke initiere Bonobo"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Denne meldingen er digitalt signert og er funnet autentisk."
+
+#: mail/em-format.c:1212
+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/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Venter..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Pinger %s"
 
-#: mail/em-popup.c:593
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Feil ved mellomlagring av %s: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Klarte ikke å opprette rør til «%s»: %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Klarte ikke å slå opp vert «%s»: %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Sva_r til sender"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Åpne lenke i nettleser"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Send _melding til liste..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Legg til sender i adressebok"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Åpne i %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "Denne tjeneren støtter ikke LDAPv3 schema-informasjon"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Abonner"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Mappe"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Vennligst velg en tjener."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Ingen tjener er valgt"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Ikke vis denne meldingen igjen."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11894,27 +12561,27 @@ msgstr ""
 "Feil under lasting av filter-informasjon:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Videresendt melding"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%a, %d.%m.%Y kl. %H.%M skrev %%s:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -11923,7 +12590,7 @@ msgstr ""
 "Kan ikke lagre til «%s»\n"
 " %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -11932,25 +12599,26 @@ msgstr ""
 "«%s» eksisterer allerede\n"
 "Vil du overskrive den?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Melding"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Lagre melding som..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Kunne ikke opprette midlertidig katalog: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Adresse"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -11960,59 +12628,426 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse meldingene?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Brukervalg for redigering"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/em-utils.c:2288
+#, fuzzy
 msgid ""
-"Configure mail preferences, including security and message display, here"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
 msgstr ""
-"Konfigurer brukervalg for e-post, inkludert sikkerhet og meldingsvisning her"
+"Denne operasjonen vil fjerne alle meldinger som er merket som slettet\n"
+"permanent. Hvis du fortsetter vil du ikke kunne gjenopprette disse "
+"meldingene.\n"
+"\n"
+"Vil du virkelig slette disse meldingene?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Konfigurer stavekontroll, signaturer og meldingskomposisjon her"
+#: mail/evolution-mail.schemas.in.in.h:1
+msgid "Automatic link recognition"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Konfigurer e-post-kontoer her"
+#: mail/evolution-mail.schemas.in.in.h:2
+msgid "Automatic smiley recognition"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution e-post"
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Konfigurasjonskontroll for Evolution e-postkonti"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution e-postkomponent"
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution e-postredigering"
+#: mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
+msgid "Default charset in which to compose messages"
+msgstr "Forvalgt emne for meldingen."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Konfigurasjonskontroll for Evolution e-postredigering"
+#: mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
+msgid "Default charset in which to compose messages."
+msgstr "Forvalgt emne for meldingen."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Komponent for mappevisning for Evolution e-post"
+#: mail/evolution-mail.schemas.in.in.h:8
+#, fuzzy
+msgid "Default charset in which to display messages"
+msgstr "Søk etter tekst i kroppen av vist melding"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Brukervalg-kontroll for Evolution e-post"
+#: mail/evolution-mail.schemas.in.in.h:9
+#, fuzzy
+msgid "Default charset in which to display messages."
+msgstr "Søk etter tekst i kroppen av vist melding"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/evolution-mail.schemas.in.in.h:10
+#, fuzzy
+msgid "Default forward style"
+msgstr "_Videresendingsstil:"
+
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default reply style"
+msgstr "Sva_rstil:"
+
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Empty Trash folders on exit"
+msgstr "_Tøm søppelkurven ved slutt"
+
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "_Tøm søppelkurven ved slutt"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "E-post-konti"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "Brukervalg for e-post"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "Utfør handlinger"
+
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Melding om ny e-post"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Melding om ny e-post"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr "S_pør ved sending av HTML-meldinger til kontakter som ikke ønsker dem"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "Spø_r ved sending av meldinger med kun Bcc-mottakere definert"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "Send HTML e-post?"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "Send HTML e-post?"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "Vi_s animerte bilder"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "Vi_s animerte bilder"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Vis melding i normal stil"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "_Forhåndsvisningsvindu"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "S_pill en lydfil når nye meldinger ankommer"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "Stave_kontroll"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "_Terminalskrift:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "Velg skrift med variabel bredde for bruk ved utskrift av HTML"
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Meldingsliste med tråder"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Meldingsliste med tråder"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "_Bruk denne som forvalgt konto"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "V_ariabel bredde:"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Import fra Elm for Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+msgid "Evolution mbox importer"
+msgstr "mbox-import for Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
+msgstr "MBox (.mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Netscape Mail importer"
+msgstr "Import av Netscape e-post for Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Import fra Outlook Express 4 for Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Pine importer"
+msgstr "Import fra Pine for Evolutions"
 
 #: mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
@@ -12052,34 +13087,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Import fra Elm for Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "mbox-import for Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (.mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Netscape Mail importer"
-msgstr "Import av Netscape e-post for Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Import fra Outlook Express 4 for Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Pine importer"
-msgstr "Import fra Pine for Evolutions"
-
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -12121,12 +13128,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importerer dine gamle data fra Netscape"
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Søppel"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Skanner e-postfiltre"
@@ -12135,7 +13136,7 @@ msgstr "Skanner e-postfiltre"
 msgid "Scanning directory"
 msgstr "Søker i katalog"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Starter import"
 
@@ -12210,23 +13211,23 @@ msgid "You have not filled in all of the required information."
 msgstr "Du har ikke fylt ut all nødvendig informasjon."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Kontoredigering for Evolution"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Vert:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "Bruker_navn:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikke opprette to kontoer med samme navn."
 
@@ -12235,35 +13236,35 @@ msgstr "Du kan ikke opprette to kontoer med samme navn."
 msgid "Mail to %s"
 msgstr "Send til %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "E-post fra %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Svart til"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "Følgende filter-regel/regler:\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12274,143 +13275,30 @@ msgstr ""
 "    «%s»\n"
 "Og har blitt oppdatert."
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "Kobler til..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Denne mappen kan ikke inneholde meldinger."
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Ny e-post melding"
 
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Kunne ikke åpne delt mappe: %s"
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "Send _melding"
 
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Kunne ikke opprette midlertidig katalog: %s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "Skriv en ny e-postmelding"
 
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Kunne ikke opprette midlertidig fil «%s»: %s"
-
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Kunne ikke lukke midlertidig mappe: %s"
-
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Velg en målmappe for å importere data"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Velg en målmappe for å importere data"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Opprett en ny mappe"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Spesifiser hvor mappen skal opprettes:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Kunne ikke slette mappe «%s»: %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Vild du virkelig slette mappe «%s»?"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Slett «%s»"
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Endre navn på mappe «%s» til:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-msgid "Rename Folder"
-msgstr "Endre navn på mappe"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Spesifisert mappenavn er ikke gyldig: %s"
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Egenskaper for skrift"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Egenskaper"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "_Mappenavn:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Vis"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Åpne i nytt vindu"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Flytt"
-
-#: mail/mail-component.c:2087
-msgid "_New Folder..."
-msgstr "_Ny mappe..."
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "End_re navn"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "Egenska_per..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Identitet"
 
@@ -12471,11 +13359,11 @@ msgstr ""
 "et navn for denne kontoen i feltet under. Dette navnet blir kun brukt for "
 "visning på skjermen."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Sjekker tjeneste"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Kobler til tjener..."
 
@@ -12557,26 +13445,35 @@ msgid "C_olors"
 msgstr "F_arger"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Ser etter nye meldinger"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "Sjekk s_taving mens jeg skriver"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Ser etter nye meldinger"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "_Farge for feilstavede ord:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Skriver meldinger"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12592,273 +13489,278 @@ msgstr ""
 "\n"
 "Klikk «Fullfør» for å lagre dine innstillinger."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "_Forvalgt"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Forvalgt oppførsel"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "Forvalgt t_egnkoding:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Sletter meldinger"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Alltid signer utgående meldinger når denne kontoen brukes"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "Ikke siter opprinnelig melding"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Ikke signer _møteforespørsler (for kompatibilitet med Outlook)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Ferdig"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "Mappe _for skisser:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "A_ktiver"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "E-post kontoer"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "E-post _adresse:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "_Tøm søppelkurven ved slutt"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Sertifikat-ID:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Kjør kommando..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "Fast _bredde:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "Filtre"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "Egenskaper for skrift"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "Formater meldinger med _HTML"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "_Merk sitering med"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Inline"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Etiketter og farger"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Laster bilder"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Plassering av postboks"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Meldingsredigering"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Meldingsvisning"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 msgid "Message Fonts"
 msgstr "Skrift for melding"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Melding om ny e-post"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Merk: du vil ikke bli spurt etter et passord før du kobler til første gang"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Tilleggsinformasjon"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "Or_ganisasjon:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-nø_kkel ID:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Velg en farge"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Spø_r ved sending av meldinger med kun Bcc-mottakere definert"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Skrifter ved utskrift"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "Siter opprinnelig melding"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Sitert"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "H_usk dette passordet"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "S_var-til:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Innkommende e-post"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "Alternativer for m_ottak"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "Husk dette _passordet"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Nødvendig informasjon"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "Gjenopprett forvalg"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "Sikk_erhet"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "Sikker MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr "Velg skrift med fast bredde for HTML"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr "Velg skrift med fast bredde for bruk ved utskrift av HTML"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr "Velg skrift med variabel bredde for HTML"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr "Velg skrift med variabel bredde for bruk ved utskrift av HTML"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Utgående e-post"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Mappe for sendte _meldinger:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Sendte meldinger og skisser"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Tjener kre_ver autentisering"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Tjenerkonfigurasjon"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Tjener_type: "
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Selv-signert sertifikat i kjeden"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "Spesifiser _filnavn:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "Stave_kontroll"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Standard Unix mbox"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12868,7 +13770,7 @@ msgstr ""
 "signatur. Navnet du oppgir vil kun brukes for\n"
 "visning på skjermen."
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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 "
@@ -12877,7 +13779,7 @@ msgstr ""
 "Denne siden lar deg konfigurere oppførsel for stavekontroll og språk. "
 "Språklisten her reflekterer kun de språkene du har installert en ordbok for."
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12885,11 +13787,15 @@ msgstr ""
 "Skriv navnet du vil referere til denne kontoen.\n"
 "For eksempel «Arbeid» eller «Personlig»"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "V_ariabel bredde:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12899,169 +13805,178 @@ msgstr ""
 "\n"
 "Klikk «Neste» for å begynne. "
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "_Legg til signatur"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "_Alltid last bilder fra nettet"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Alltid signer utgående meldinger når denne kontoen brukes"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "_Autentiseringstype: "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "_Autentiseringstype: "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr "Sjekk etter nye meldinger _automatisk hvert"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "Sett inn emotikoner _automatisk"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "_Pip når nye meldinger ankommer"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "_Bekreft ved tømming av mappe"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "_Forvalgt signatur:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "_Forvalg"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "Ikke gi beskjed når nye meldinger ankommer"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "_Aktiver"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "_Videresendingsstil:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "_Fullt navn:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "_HTML e-post"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "_Identitet"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Juni"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "_Last bilder hvis avsender er i adresseboken"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "_Bruk denne som forvalgt konto"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "_Merk meldinger som lest etter"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "Aldri last bilder fra _nettet"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "S_pill en lydfil når nye meldinger ankommer"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "S_pør ved sending av HTML-meldinger til kontakter som ikke ønsker dem"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "S_pør ved sending av meldinger med tomt emnefelt"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "_Mottak av e-post"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "Sva_rstil:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "Gjenopp_rett forvalg"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Slett..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "Ut_sending av e-post"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "Vi_s animerte bilder"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Signaturer"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr "_Forvalgt skrift:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr "_Terminalskrift:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "Br_uk sikker forbindelse (SSL):"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr "Br_uk samme skrifter som andre applikasjoner"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "beskrivelse"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13070,7 +13985,7 @@ msgstr ""
 "Feil under «%s»:\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13079,7 +13994,7 @@ msgstr ""
 "Feil under utføring av operasjon:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Arbeider"
 
@@ -13091,118 +14006,118 @@ msgstr "Filtrerer mappe"
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Kunne ikke lagre post i midlertidig fil %s: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Kunne ikke lagre post i midlertidig fil %s: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender «%s»"
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Feilet på melding %d av %d"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Fullført."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Lagrer melding til mappe"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter melding(er) til %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer meldinger til %s"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i «%s»"
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Åpner mappe %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "Åpner lager %s"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe «%s»"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Oppdaterer mappe"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Tømmer mappe"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tømmer søppel i «%s»"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter melding %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Henter %d melding(er)"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Lagrer %d melding(er)"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13211,7 +14126,7 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13220,11 +14135,11 @@ msgstr ""
 "Feil under lagring av av meldinger til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Lagrer vedlegg"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13233,21 +14148,25 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s på nytt"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Skill mellom store/små bokstaver"
@@ -13264,59 +14183,74 @@ msgstr "Finn:"
 msgid "Search"
 msgstr "Søk"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Rediger signatur"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Unntak"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Kontoinformasjon"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Avbryter..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Tjener: %s, Type: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Sti: %s, Type: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Send & motta e-post"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 msgid "Cancel _All"
 msgstr "Avbryt _alle"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Oppdaterer..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Operasjon avbrutt av bruker."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Skriv inn passord for %s"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Skriv inn passord"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "Husk dette passo_rdet"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr "Husk dette passo_rdet for resten av denne sesjonen"
 
@@ -13355,26 +14289,31 @@ msgstr "Oppgi et navn for denne signaturen."
 msgid "Name:"
 msgstr "Navn:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt melding - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Videresendt melding"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Åpner mappe %s"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Setter opp VFolder: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Oppdaterer vfoldere for URI: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13387,88 +14326,88 @@ msgstr ""
 "    «%s»\n"
 "Og har blitt oppdatert."
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "VFoldere"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Rediger VFolder"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Prøver å redigere en vfolder «%s» som ikke eksisterer."
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Ny VFolder"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Ulest"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Besvart"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Lavest"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Lavere"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Høyere"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Høyest"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
@@ -13524,11 +14463,11 @@ msgstr "Videresend"
 msgid "No Response Necessary"
 msgstr "Ingen respons nødvendig"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Svar til alle"
 
@@ -13580,41 +14519,139 @@ msgstr "_Abonner"
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr "Konfigurer spesielle mapper og oppførsel når du arbeider frakoblet her"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Evolution skall"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Mappeinnstillinger"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "80%"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Endre navn på denne snarveigruppen"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Slå av/på visning av mappelinjen"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Skjul snarveilinjen"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Forvalgt prioritet:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Forvalgt prioritet:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Konfigurasjonsgrensesnitt for Evolution e-post"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+#, fuzzy
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "Merk vedlegg for visning i meldingen som forvalg."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
 msgstr ""
-"Kan ikke overføre mappe:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Legg til en mappe"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Skisser"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Innboks"
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "Åpner forvalgt oppgavemappe"
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Utboks"
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Åpner forvalgt oppgavemappe"
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Sendt"
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Åpner forvalgt oppgavemappe"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Åpner forvalgt oppgavemappe"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Slå av/på visning av mappelinjen"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Slå av/på visning av snarveilinjen"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "E-post"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Kunne ikke oppdatere filene."
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13625,7 +14662,7 @@ msgstr ""
 "%s\n"
 "Feil: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13634,7 +14671,7 @@ msgstr ""
 "En feil oppsto under kopiering av filer til\n"
 "«%s»."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13645,7 +14682,7 @@ msgstr ""
 "Vennligst flytt denne for å tillate installasjon\n"
 "av Evolution's brukerfiler."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13743,10 +14780,11 @@ msgstr ""
 "Kunne ikke endre navn på mappe:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+msgid "The specified folder name is not valid: %s"
+msgstr "Spesifisert mappenavn er ikke gyldig: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -13770,19 +14808,15 @@ msgstr ""
 "Kan ikke opprette spesifisert katalog:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Opprett ny mappe"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Uten navn)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Velg type importerer som skal kjøres:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13796,11 +14830,11 @@ msgstr ""
 "Du kan velge «Automatisk» hvis du ikke vet, så vil Evolution prøve å finne "
 "ut hvilken type det er for deg."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Vennligst velg informasjon du ønsker å importere:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13808,7 +14842,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13817,21 +14851,21 @@ msgstr ""
 "Importerer %s\n"
 "Importerer oppføring %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "Velg importerer"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "Filen %s eksisterer ikke"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Evolution feil"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -13840,11 +14874,11 @@ msgstr ""
 "Ingen importerer som kan håndtere\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Importerer"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -13853,17 +14887,17 @@ msgstr ""
 "Importerer %s.\n"
 "Starter %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Feil under start av %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Feil under lasting av %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13872,35 +14906,35 @@ msgstr ""
 "Importerer %s\n"
 "Importerer oppføring 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Filnavn:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Velg en fil"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Filtype:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Importer data og innstillinger fra andre programmer"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Importer en enkelt fil"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -13908,47 +14942,28 @@ msgstr ""
 "Vennligst vent...\n"
 "Søker etter eksisterende oppsett"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Starter intelligent import"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Velg en målmappe for å importere data"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Importer"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Lukker forbindelser..."
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Feil under synkronisering av «%s»:\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "Synkroniserer mappe"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Synkroniserer «%s» (%d av %d) ..."
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Innstillinger for Evolution"
@@ -13983,7 +14998,7 @@ msgstr "Kunne ikke åpne delt mappe: %s"
 msgid "Cannot find the specified shared folder."
 msgstr "Kan ikke finne spesifisert delt mappe."
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -13992,17 +15007,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Assistent"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Ny"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Ingen mappenavn spesifisert."
@@ -14061,64 +15070,51 @@ 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:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "Ar_beid tilkoblet"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "Ar_beid frakoblet"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Arbeid frakoblet"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Ingen mappe vist)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Ingen)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution er koblet til. Klikk på denne knappen for å arbeide "
 "frakoblet."
 
-#: shell/e-shell-view.c:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution er i ferd med å koble fra."
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution er frakoblet. Klikk på denne knappen for å arbeide "
 "tilkoblet."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere i OAF"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Konfigurasjonsdatabase ikke funnet"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Vanlig feil"
 
@@ -14231,74 +15227,18 @@ msgstr "_Fjern"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne snarveien fra snarveilinjen"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Feil under lagring av snarveier."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Innboks"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Snarveier"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Ingen feil"
-
-#: 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:575
-msgid "The specified folder type is not valid"
-msgstr "Spesifisert mappetype er ikke gyldig"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "I/U-feil"
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr "Ikke nok plass til å opprette mappen"
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr "Mappen er ikke tom"
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "Spesifisert mappe ble ikke funnet"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "Funksjonen er ikke implementert i dette lageret"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "Operasjonen er ikke støttet"
-
-#: shell/e-storage.c:591
-msgid "The specified type is not supported in this storage"
-msgstr "Spesifisert type er ikke støttet for dette lageret"
-
-#: shell/e-storage.c:593
-msgid "The specified folder cannot be modified or removed"
-msgstr "Spesifisert mappe kan ikke endres eller fjernes"
-
-#: shell/e-storage.c:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "Kan ikke gjøre en mappe til barn av en av sine etterkommere"
-
-#: shell/e-storage.c:597
-msgid "Cannot create a folder with that name"
-msgstr "Kunne ikke opprette en mappe med det navnet"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Denne operasjonen kan ikke utføres i frakoblet modus"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Avkryssingsboks"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14309,6 +15249,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fullført)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Ny"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "«%s» i «%s»"
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14346,74 +15297,6 @@ msgstr ""
 "Feilen fra aktiveringssystemet er:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "CORBA-feil"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Avbrutt"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Ugyldig argument"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Har allerede en eier"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Ingen eier"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Ikke funnet"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Ustøttet type"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Ustøttet schema"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Ustøttet operasjon"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Intern feil"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Eksisterer"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "Ugyldig URI"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Har undermapper"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Ingen plass igjen"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "Gammel eier er død"
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Testtype"
-
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr "Testkomponent for Evolution"
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr "Aktive tilkoblinger"
@@ -14442,10 +15325,6 @@ msgstr "_E-post"
 msgid "_Tasks:"
 msgstr "_Oppgaver:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr "Mappe_navn:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder _type:"
 msgstr "Mappe_type:"
@@ -14508,22 +15387,6 @@ msgstr ""
 "\n"
 "Klikk på «Fullfør» for å lagre dine innstillinger. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "Konfigurer spesielle mapper og oppførsel når du arbeider frakoblet her"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Evolution skall"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Konfigurasjonskontroll for mappeinnstillinger i Evolution"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Mappeinnstillinger"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Klikk på «Importer» for å starte import av filen til Evolution."
@@ -14562,7 +15425,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Importerere"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Importer"
 
@@ -14578,16 +15441,16 @@ msgstr "Ikke spør meg igjen"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importere data fra følgende filer:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Evolution avslutter nå..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14622,7 +15485,7 @@ msgstr ""
 "Vi håper at du nyter resultatene av vårt harde arbeid, og vi venter i\n"
 "spenning på at du tilbyr din hjelp!\n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -14630,36 +15493,48 @@ msgstr ""
 "Takk\n"
 "Ximian Evolution utviklerene\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr "Ikke gi beskjed igjen"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan ikke aksessere Ximian Evolution-skallet."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan ikke initiere Ximian Evolution-skallet: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Start i frakoblet modus"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Start i tilkoblet modus"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr "Steng ned alle komponenter i Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift for alle komponentene til en fil."
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14668,31 +15543,60 @@ msgstr ""
 "%s: --online og --offline kan ikke brukes samtidig.\n"
 "  Bruk %s --help for mer informasjon.\n"
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Velg importerer"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Sertifikat-ID:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "Fremdrift"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Uttrykk"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Flett E-postadresse"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"Sertifikatet har gått ut: %s\n"
+"Utsteder: %s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14750,91 +15654,376 @@ msgid "Backup All"
 msgstr "Blackpool"
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "_Sertifikat-ID:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Ikke-betrodd sertifikat"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "_Sertifikat-ID:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Vanlig navn"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "_Sertifikat-ID:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "R_ediger"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Feil under verifisering av sertifikater."
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Uttrykk"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Organisasjon"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Organisasjonsenhet"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Vis"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "_Sertifikat-ID:"
+
+#: smime/gui/smime-ui.glade.h:42
+#, fuzzy
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr "Ugyldig sertifikatmyndighet (CA)"
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "_Sertifikat-ID:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Importer"
+msgid "Certificate already exists"
+msgstr "Kort-ID eksisterer allerede"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d.%m.%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Vermont"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "OK"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "_Sertifikat-ID:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "_Sertifikat-ID:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "Ikke-betrodd sertifikat"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "ID"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Emne er %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Kan ikke prosessere spool-mappen"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "Ugyldig sertifikatmyndighet (CA)"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Ugyldig sertifikatmyndighet (CA)"
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Ingen informasjon"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "vedlegg"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "_Sertifikat-ID:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Curitiba"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "North Carolina"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Uttrykk"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s ved %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Feil med sertifikatsignatur"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "Sett _inn"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Emne er %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Feil med sertifikatsignatur"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Skriv inn passord for %s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "_Sertifikat-ID:"
 
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
@@ -14885,7 +16074,7 @@ msgstr "Kopier utvalget"
 msgid "Copy to Folder..."
 msgstr "Kopier til mappe..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Klipp ut utvalget"
 
@@ -14901,7 +16090,7 @@ msgstr "Flytt kontakt(er) til en annen mappe..."
 msgid "Move to Folder..."
 msgstr "Flytt til mappe..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Lim inn fra utklippstavlen"
 
@@ -14909,8 +16098,8 @@ msgstr "Lim inn fra utklippstavlen"
 msgid "Previews the contacts to be printed"
 msgstr "Forhåndsviser kontaktene som skal skrives ut"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Forhåndsvisning av utskrift"
@@ -14955,13 +16144,13 @@ msgstr "Stopp innlesing"
 msgid "View the current contact"
 msgstr "Vis aktiv kontakt"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "H_andlinger"
 
@@ -14991,142 +16180,110 @@ msgstr "_Send melding til kontakt..."
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "Opprett en ny avtale for hele dagen"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Opprett en ny avtale"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "Opprett en ny mappe"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Dette er en møteforespørsel"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Opprett en ny oppgave"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Dag"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Slett alle hendelser"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Slett avtalen"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Slett denne hendelsen"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Slett denne hendelsen"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Gå til"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Gå tilbake"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Gå fremover"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Gå til _dato"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Gå til en spesifikk dato"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Gå til i dag"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "Liste"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Måned"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Ny _avtale"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Ny-Caledonia"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Nytt møte"
-
-#: ui/evolution-calendar.xml.h:27
-#, fuzzy
-msgid "New _Task"
-msgstr "Ny oppgave"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Forhåndsviser av kalenderen som skal skrives ut"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Skriv ut denne kalenderen"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publiser ledig/opptatt informasjon for denne kalenderen"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Bourges"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Offentlig mappe som inneholder avtaler og hendelser"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Vis detaljer"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Vis en dag"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Vis en måned"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Vis en uke"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Vis arbeidsuken"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Uke"
 
@@ -15191,7 +16348,7 @@ msgstr "Lagre denne oppføringen til disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Fil"
 
@@ -15408,7 +16565,7 @@ msgstr "Merk alle som l_est"
 msgid "Mark all visible messages as read"
 msgstr "Merk alle synlige meldinger som lest"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "Lim inn melding(er) fra utklippstavlen"
 
@@ -15464,16 +16621,6 @@ msgstr "_Reverser utvalg"
 msgid "_Threaded Message List"
 msgstr "Meldingsliste med _tråder"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Lukk dette vinduet"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "L_ukk"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "L_egg til sender i adressebok"
@@ -15631,257 +16778,282 @@ msgstr "Videresend den valgte meldingen til noen som et vedlegg"
 msgid "Increase the text size"
 msgstr "Større tekst"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Last b_ilder"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Merk som _viktig"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Merk som _ulest"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Merk som uv_iktig"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "Merk valgt(e) melding(er) som lest"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "Merk valgt(e) melding(er) som viktige"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Merk valgt(e) melding(er) som uviktige"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Merk valgt(e) melding(er) som ulest"
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Merk valgt(e) melding(er) som ulest"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Merk valgt(e) melding(er) som uviktige"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Merk valgte meldinger for sletting"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Flytt"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "Flytt valgt(e) melding(er) til en annen mappe"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Neste"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "Neste v_iktige melding"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "Neste _tråd"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "Neste _uleste melding"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Ikke funnet"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Åpne valgt melding i et nytt vindu"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Åpne valgt melding i redigeringsvinduet for å sende den på nytt"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Opprinnelig st_ørrelse"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "Fo_rrige uleste melding"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Post et svar"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr "Post et svar på en melding i en offentlig mappe"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "Forrig_e viktige melding"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Forhåndsvis meldingen som skal skrives ut"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Forrige"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Skriv ut denne meldingen"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "Om_diriger"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Omdiriger (bounce) den valgte meldingen til noen"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Ta teksten tilbake til sin opprinnelige størrelse"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "Søk i m_elding..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "_Mindre"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Lagre meldingen som en tekstfil"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Søk etter tekst i kroppen av vist melding"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr "Sett opp sideinnstillinger for din skriver"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Vis e-post-kilde"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Vis fulle _headere"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Søk etter tekst i kroppen av vist melding"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Vis melding i normal stil"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Vis melding med fulle e-post headere"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Vis e-post meldingen i sin råe form"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "Tekstst_ørrelse"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Angre slett av den valgte meldingen"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "VFolder på e-post_liste..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "VFolder for se_nder..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "VFolder for mottake_re..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "VFolder på e_mne..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "Vedl_agt"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "_Kopier til mappe"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "La_g filter fra melding"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "_Videresend melding"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "_Gå til"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "_Større"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "_Meldingsvisning"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Flytt til mappe"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "_Neste melding"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "_Normal visning"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "_Åpne melding"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "_Forrige melding"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "_Sitert"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "S_end på nytt..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "Ve_rktøy"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "A_ngre slett"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Lukk dette vinduet"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "L_ukk"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Legg ved"
@@ -16160,12 +17332,13 @@ msgid "Change Evolution's settings"
 msgstr "Endre innstillinger for Evolution"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "A_vslutt"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Dette er en møteforespørsel"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "Evolution vindu"
+msgid "E_xit"
+msgstr "A_vslutt"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16177,61 +17350,74 @@ msgstr "Importer data fra andre programmer"
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "Evolution vindu"
+msgid "Open a new window"
+msgstr "Åpne i nytt vindu"
 
 #: ui/evolution.xml.h:11
 msgid "Pi_lot Settings..."
 msgstr "Innstillinger for pi_lot..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Send / motta"
+
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr "Send kølagte oppføringer og hent nye oppføringer"
+
+#: ui/evolution.xml.h:14
 msgid "Set up Pilot configuration"
 msgstr "Konfigurer Pilot"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Vis informasjon om Ximian Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Send inn feilrapport"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "Sen_d inn feilrapport"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Send inn en feilrapport med Bug Buddy"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Bytt"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Skift til frakoblet arbeidsmodus."
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _OBS"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "_Om Ximian Evolution..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "_Importer..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Ny"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Send / motta"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "_Finn nå "
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Skriv ut sammendrag"
@@ -16360,12 +17546,12 @@ msgstr "Definer visninger..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -16498,7 +17684,7 @@ msgstr "_Søk"
 msgid "_Find Now"
 msgstr "_Finn nå "
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "_Tøm"
 
@@ -16514,24 +17700,258 @@ msgstr "ID for underoppføring"
 msgid "Text"
 msgstr "Tekst"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Tøm"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Finn nå "
 
+#~ msgid "Account Name"
+#~ msgstr "Kontonavn"
+
+#~ msgid "Server Name"
+#~ msgstr "Legg til skript"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "LDAP er ikke støttet i denne versjonen av Evolution"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Andre kontakter"
+
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "Konfigurer tilgang til LDAP-katalogtjenere her"
+
+#~ msgid "Directory Servers"
+#~ msgstr "Katalogtjenere"
+
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Kontroll for LDAP-konfigurasjon for Evolution adressebok"
+
+#~ msgid "Add LDAP Server"
+#~ msgstr "Legg til LDAP-tjener"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Steg 4: Vis navn"
+
+#~ msgid "Find contact in"
+#~ msgstr "Finn kontakt i"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Klikk her for å legge til en kontakt *"
+
+#~ msgid "Business Address"
+#~ msgstr "Arbeidsadresse"
+
+#~ msgid "Department"
+#~ msgstr "Avdeling"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "Ledig-/opptatt-URL"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Yrke"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Åpner oppgaver på %s"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Send likevel?"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Avbryt aktiv e-postoperasjon"
+#~ msgid "Folder _name"
+#~ msgstr "Mappe_navn:"
+
+#~ 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."
+
+#~ msgid "Connecting..."
+#~ msgstr "Kobler til..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Denne mappen kan ikke inneholde meldinger."
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Kunne ikke åpne delt mappe: %s"
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Velg en målmappe for å importere data"
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan ikke overføre mappe:\n"
+#~ "%s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "Legg til en mappe"
+
+#~ msgid "Drafts"
+#~ msgstr "Skisser"
+
+#~ msgid "Outbox"
+#~ msgstr "Utboks"
+
+#~ msgid "Sent"
+#~ msgstr "Sendt"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Feil under synkronisering av «%s»:\n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "Synkroniserer mappe"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Synkroniserer «%s» (%d av %d) ..."
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Ingen mappe vist)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(Ingen)"
+
+#~ msgid "No error"
+#~ msgstr "Ingen feil"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "En mappe med samme navn eksisterer allerede"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Spesifisert mappetype er ikke gyldig"
+
+#~ msgid "I/O error"
+#~ msgstr "I/U-feil"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Ikke nok plass til å opprette mappen"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Mappen er ikke tom"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Spesifisert mappe ble ikke funnet"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Funksjonen er ikke implementert i dette lageret"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Operasjonen er ikke støttet"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Spesifisert type er ikke støttet for dette lageret"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Spesifisert mappe kan ikke endres eller fjernes"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "Kan ikke gjøre en mappe til barn av en av sine etterkommere"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Kunne ikke opprette en mappe med det navnet"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Denne operasjonen kan ikke utføres i frakoblet modus"
+
+#~ msgid "Checkbox"
+#~ msgstr "Avkryssingsboks"
+
+#~ msgid "CORBA error"
+#~ msgstr "CORBA-feil"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Ugyldig argument"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Har allerede en eier"
+
+#~ msgid "No owner"
+#~ msgstr "Ingen eier"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Ustøttet type"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Ustøttet schema"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Ustøttet operasjon"
+
+#~ msgid "Internal error"
+#~ msgstr "Intern feil"
+
+#~ msgid "Exists"
+#~ msgstr "Eksisterer"
+
+#~ msgid "Invalid URI"
+#~ msgstr "Ugyldig URI"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Har undermapper"
+
+#~ msgid "No space left"
+#~ msgstr "Ingen plass igjen"
+
+#~ msgid "Old owner has died"
+#~ msgstr "Gammel eier er død"
+
+#~ msgid "Test type"
+#~ msgstr "Testtype"
+
+#~ msgid "Evolution Test Component"
+#~ msgstr "Testkomponent for Evolution"
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "Importer"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Opprett en ny avtale for hele dagen"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Ny _avtale"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Nytt møte"
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Feltnavn"
+#~ msgid "New _Task"
+#~ msgstr "Ny oppgave"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "Evolution vindu"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "Evolution vindu"
+
+#~ msgid "Toggle"
+#~ msgstr "Bytt"
 
-#~ msgid "Family Name"
-#~ msgstr "Etternavn"
+#~ msgid "Clear"
+#~ msgstr "Tøm"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Avbryt aktiv e-postoperasjon"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -16625,9 +18045,6 @@ msgstr "Finn nå "
 #~ msgid "VCard (.vcf, .gcrd)"
 #~ msgstr "VCard (.vcf, .gcrd)"
 
-#~ msgid "Loading..."
-#~ msgstr "Laster..."
-
 #~ msgid "Searching..."
 #~ msgstr "Søker..."
 
@@ -16679,10 +18096,6 @@ msgstr "Finn nå "
 #~ msgstr "EBook ikke lastet\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "Kort-ID eksisterer allerede"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Operasjon avbrutt"
 
@@ -16831,9 +18244,6 @@ msgstr "Finn nå "
 #~ msgid "Callback"
 #~ msgstr "Tilbakering"
 
-#~ msgid "Company"
-#~ msgstr "Firma"
-
 #~ msgid "Comp"
 #~ msgstr "Datamaskin"
 
@@ -16900,9 +18310,6 @@ msgstr "Finn nå "
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
 #~ msgid "Birth date"
 #~ msgstr "Fødselsdato"
 
@@ -16915,9 +18322,6 @@ msgstr "Finn nå "
 #~ msgid "Arbitrary"
 #~ msgstr "Tilfeldig"
 
-#~ msgid "ID"
-#~ msgstr "ID"
-
 #~ msgid "Last Use"
 #~ msgstr "Sist brukt"
 
@@ -16930,9 +18334,6 @@ msgstr "Finn nå "
 #~ msgid "Folder containing contact information"
 #~ msgstr "Mappe som inneholder kontaktinformasjon"
 
-#~ msgid "LDAP Server"
-#~ msgstr "LDAP-tjener"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "LDAP-tjener sømme inneholder kontaktinformasjon"
 
@@ -16942,18 +18343,6 @@ msgstr "Finn nå "
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Offentlig mappe som inneholder kontaktinformasjon"
 
-#~ msgid "_Contact"
-#~ msgstr "_Kontakt"
-
-#~ msgid "Create a new contact"
-#~ msgstr "Opprett en ny kontakt"
-
-#~ msgid "New Contact List"
-#~ msgstr "Ny kontaktliste"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "Opprett en ny kontaktliste"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "URIen som mappeutforskeren vil vise"
 
@@ -16969,9 +18358,6 @@ msgstr "Finn nå "
 #~ msgid "Is New Card"
 #~ msgstr "Er nytt kort"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TTD"
-
 #~ msgid "No cards"
 #~ msgstr "Ingen kort"
 
@@ -17018,30 +18404,6 @@ msgstr "Finn nå "
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "Offentlig mappe som inneholder oppgaver"
 
-#~ msgid "New appointment"
-#~ msgstr "Ny avtale"
-
-#~ msgid "_Appointment"
-#~ msgstr "A_vtale"
-
-#~ msgid "New meeting"
-#~ msgstr "Nytt møte"
-
-#~ msgid "M_eeting"
-#~ msgstr "Møt_e"
-
-#~ msgid "New task"
-#~ msgstr "Ny oppgave"
-
-#~ msgid "_Task"
-#~ msgstr "_Oppgave"
-
-#~ msgid "New All Day Appointment"
-#~ msgstr "Ny avtale for hele dagen"
-
-#~ msgid "All _Day Appointment"
-#~ msgstr "Avtale for hele _dagen"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "Kunne ikke oppdatere ugyldig objekt"
 
@@ -17087,9 +18449,6 @@ msgstr "Finn nå "
 #~ msgid "Opening calendar at %s"
 #~ msgstr "Åpner kalender på %s"
 
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Åpner forvalgt oppgavemappe"
-
 #~ msgid "Evaluation of the search expression did not yield a boolean value"
 #~ msgstr "Evaluering av søkeuttrykket ga ikke en boolsk verdi"
 
@@ -17127,9 +18486,6 @@ msgstr "Finn nå "
 #~ "Evolution har funnet GnomeCard filer.\n"
 #~ "Vil du importere dem til Evolution?"
 
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Konfigurasjonsgrensesnitt for Evolution e-post"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "Mappe som inneholder e-post"
 
@@ -17145,9 +18501,6 @@ msgstr "Finn nå "
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Virtuelle søppelmappe"
 
-#~ msgid "Properties..."
-#~ msgstr "Egenskaper ..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Endre denne mappens egenskaper"
 
@@ -17157,15 +18510,6 @@ msgstr "Finn nå "
 #~ msgid "You have unsent messages, do you wish to quit anyway?"
 #~ msgstr "Du har usendte meldinger, vil du avslutte likevel?"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Ny e-post melding"
-
-#~ msgid "_Mail Message"
-#~ msgstr "Send _melding"
-
-#~ msgid "Compose a new mail message"
-#~ msgstr "Skriv en ny e-postmelding"
-
 #~ msgid "New Message Post"
 #~ msgstr "Ny publisering av melding"
 
@@ -18973,9 +20317,6 @@ msgstr "Finn nå "
 #~ msgid "Cumberland"
 #~ msgstr "Cumberland"
 
-#~ msgid "Curitiba"
-#~ msgstr "Curitiba"
-
 #~ msgid "Curitiba Apt"
 #~ msgstr "Curitiba Apt"
 
@@ -21967,9 +23308,6 @@ msgstr "Finn nå "
 #~ msgid "North Bend"
 #~ msgstr "North Bend"
 
-#~ msgid "North Carolina"
-#~ msgstr "North Carolina"
-
 #~ msgid "North Conway"
 #~ msgstr "North Conway"
 
@@ -23581,9 +24919,6 @@ msgstr "Finn nå "
 #~ msgid "State College"
 #~ msgstr "State College"
 
-#~ msgid "Stauning"
-#~ msgstr "Stauning"
-
 #~ msgid "Staunton"
 #~ msgstr "Staunton"
 
@@ -24172,9 +25507,6 @@ msgstr "Finn nå "
 #~ msgid "United Arab Emirates "
 #~ msgstr "De forente arabiske emirater"
 
-#~ msgid "Unst"
-#~ msgstr "Unst"
-
 #~ msgid "Upington"
 #~ msgstr "Upington"
 
@@ -24283,12 +25615,6 @@ msgstr "Finn nå "
 #~ msgid "Veracruz"
 #~ msgstr "Veracruz"
 
-#~ msgid "Vermillion"
-#~ msgstr "Vermillion"
-
-#~ msgid "Vermont"
-#~ msgstr "Vermont"
-
 #~ msgid "Vernal"
 #~ msgstr "Vernal"
 
@@ -24817,9 +26143,6 @@ msgstr "Finn nå "
 #~ msgid " F"
 #~ msgstr " F"
 
-#~ msgid " C"
-#~ msgstr " C"
-
 #~ msgid "knots"
 #~ msgstr "knop"
 
@@ -25438,9 +26761,6 @@ msgstr "Finn nå "
 #~ msgid "Freezing haze"
 #~ msgstr "Frysende dis"
 
-#~ msgid "Spray"
-#~ msgstr "Yr"
-
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Yr i området"
 
@@ -25801,18 +27121,6 @@ msgstr "Finn nå "
 #~ msgid "Remove a folder added with \"Open Other User's Folder\""
 #~ msgstr "Fjern en mappe som er lagt til med «Åpne annen brukers mappe»"
 
-#~ msgid "Send / Receive"
-#~ msgstr "Send / motta"
-
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Send kølagte oppføringer og hent nye oppføringer"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Slå av/på visning av mappelinjen"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Slå av/på visning av snarveilinjen"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Vis den valgte mappen"
 
@@ -25840,9 +27148,6 @@ msgstr "Finn nå "
 #~ msgid "_Rename..."
 #~ msgstr "_Gi nytt navn..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Send / motta"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "_Snarveilinje"
 
diff --git a/po/pl.po b/po/pl.po
index 9d1b73c56d..a847d37a3b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2003-11-18 00:31+0100\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-05-04 16:42+0100\n"
 "Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -35,174 +35,180 @@ msgid "Could not read pilot's Address application block"
 msgstr "Nie można odczytać bloku aplikacji adresowej Pilota"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Foldery do uzupełniania"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Certificates"
 msgstr "Certyfikaty"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "Konfiguracja dostępu do serwerów katalogowych LDAP"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Konfiguracja kont pocztowych"
 
 #. Fix me *
 #. can not get name, should be a bug of e-book.Anyway, should set a default name.
 #.
 #. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "Serwery katalogowe"
-
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 msgid "Evolution Addressbook"
 msgstr "Książka adresowa Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Kontrola konfiguracji książki adresowej LDAP Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook address pop-up"
 msgstr "Wyskakujące okno zawierające adres z książki adresowej Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook address viewer"
 msgstr "Przeglądarka adresów książki adresowej Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook card viewer"
 msgstr "Przeglądarka kart książki adresowej Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Addressbook component"
 msgstr "Komponent książki adresowej Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Addressbook folder viewer"
 msgstr "Przeglądarka folderów książki adresowej Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 #, fuzzy
 msgid "Evolution S/Mime Certificate Management Control"
 msgstr "Kontrola preferencji poczty Evolution"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Kontrola konfiguracji ustawień folderu Evolution"
+
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:125
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "New Addressbook"
 msgstr "Nowa książka adresowa"
 
-#: addressbook/gui/component/addressbook-component.c:126
+#: addressbook/gui/component/addressbook-component.c:146
+#, fuzzy
+msgid "Properties..."
+msgstr "_Właściwości..."
+
+#: addressbook/gui/component/addressbook-component.c:147
 #: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:332 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 msgid "Delete"
 msgstr "Usuń"
 
-#: addressbook/gui/component/addressbook-component.c:127
-#: calendar/gui/calendar-component.c:333
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
 msgid "Rename"
 msgstr "Zmień nazwę"
 
-#: addressbook/gui/component/addressbook-component.c:185
+#: addressbook/gui/component/addressbook-component.c:217
 msgid "New Contact"
 msgstr "Nowy kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:186
+#: addressbook/gui/component/addressbook-component.c:218
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:187
+#: addressbook/gui/component/addressbook-component.c:219
 msgid "Create a new contact"
 msgstr "Tworzy nowy kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:192
+#: addressbook/gui/component/addressbook-component.c:224
 msgid "New Contact List"
 msgstr "Nowa lista kontaktów"
 
-#: addressbook/gui/component/addressbook-component.c:193
+#: addressbook/gui/component/addressbook-component.c:225
 msgid "Contact _List"
 msgstr "Lista _kontaktów"
 
-#: addressbook/gui/component/addressbook-component.c:194
+#: addressbook/gui/component/addressbook-component.c:226
 msgid "Create a new contact list"
 msgstr "Tworzy nową listę kontaktów"
 
-#: addressbook/gui/component/addressbook-component.c:336
-#: calendar/gui/calendar-component.c:629
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
 msgid "On This Computer"
 msgstr "Na tym komputerze"
 
 #. orange
-#: addressbook/gui/component/addressbook-component.c:346
-#: calendar/gui/calendar-component.c:637 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
 #: shell/e-config-upgrade.c:1456
 msgid "Personal"
 msgstr "Osobiste"
 
 #. red
-#: addressbook/gui/component/addressbook-component.c:353
-#: calendar/gui/calendar-component.c:644 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
 #: shell/e-config-upgrade.c:1455
 msgid "Work"
 msgstr "Praca"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "Dodaj serwer LDAP"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Nie można utworzyć katalogu %s: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "Nie można nawiązać połączenia z serwerem LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "Nie można dokonać uwierzytelnienia na serwerze LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "Nie można wykonać zapytania na głównym DSE"
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr ""
 "Serwer nie przekazał w odpowiedzi żadnych obsługiwanych podstaw wyszukiwania"
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Serwer nie obsługuje informacji schematu LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "Błąd przy pobieraniu informacji o schemacie"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr "Odpowiedź serwera nie zawiera poprawnych informacji o schemacie"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Nazwa konta"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Nazwa serwera"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "Ta kopia Evolution nie obsługuje protokołu LDAP"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Inne kontakty"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -210,7 +216,7 @@ msgstr ""
 "Nie można otworzyć tej książki adresowej. Upewnij się, że ścieżka\n"
 "istnieje oraz że ma ustawione odpowiednie uprawnienia."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -219,7 +225,7 @@ msgstr ""
 "Nie można otworzyć tej książki adresowej. Może to być spowodowane\n"
 "użyciem niepoprawnego URI lub nazwy serwera LDAP."
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -231,7 +237,7 @@ msgstr ""
 "poniżej adresu i ponownie skompilować Evolution ze źródeł\n"
 "dostępnych w CVS.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -244,44 +250,43 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Nie można otworzyć książki adresowej"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "Anonimowy dostęp do serwera LDAP"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "Nie można dokonać uwierzytelnienia.\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sWprowadź hasło dla %s (użytkownik %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "Nazwa rozpoczyna się od"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "E-mail rozpoczyna się od"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Kategorią jest"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Jakiekolwiek pole zawiera"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Zaawansowane..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -294,7 +299,7 @@ msgstr ""
 "Spróbuj doprecyzować zapytanie lub zwiększ limit w ustawieniach serwera "
 "katalogowego, powiązanego z tą książką adresową."
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -306,32 +311,46 @@ msgstr ""
 "swoje zapytanie lub zwiększ limit czasowy w preferencjach\n"
 "serwera katalogowego obsługującego tą książkę adresową."
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "Podprogram obsługujący tę książkę adresową nie może przeanalizować tego "
 "zapytania."
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "Program obsługujący tę książkę adresową odrzucił wykonanie tego zapytania."
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "Zapytanie nie zakończyło się pomyślnie."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Dowolna kategoria"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "URI wyświetlany przez kalendarz"
 
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
+msgstr ""
+
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
@@ -352,6 +371,7 @@ msgstr " Wyświ_etl obsługiwane typy "
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -385,8 +405,9 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "Dodaj serwer LDAP"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "Druid konfiguracji LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -402,9 +423,9 @@ msgid "Anonymously"
 msgstr "Anonimowo"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -414,50 +435,51 @@ msgstr ""
 "\n"
 "Kliknij przycisk \"Zakończ\" aby zapisać wprowadzone ustawienia."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "Nawiązywanie połączenia"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "_Wyróżniona nazwa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr "Zmodyfikuj serwer LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
 msgstr "Adres e-mail:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 "Evolution wykorzysta przy uwierzytelnianiu na serwerze podaną wyróżnioną "
 "nazwę (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution wykorzysta przy uwierzytelnianiu na serwerze podany adres e-mail."
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "Zakończone"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Ogólne"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "Druid konfiguracji LDAP"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "Grupa"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Nigdy"
 
@@ -486,7 +508,7 @@ msgid "S_earch scope: "
 msgstr "_Zakres wyszukiwania: "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
 #: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Wyszukiwanie"
@@ -547,28 +569,32 @@ msgstr ""
 "dotyczących przeszukiwania LDAP oraz tworzenia i modyfikowania kontaktów. "
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 "Określenie wyświetlanej nazwy jest ostatnią wymaganą czynnością związaną z "
 "konfiguracją serwera LDAP."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "Krok 1: Informacje o serwerze"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "Krok 2: Nawiązywanie połączenia z serwerem"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "Krok 1: Informacje o serwerze"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "Krok 3: Przeszukiwanie katalogu"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Krok 2: Nawiązywanie połączenia z serwerem"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "Krok 4: Wyświetlana nazwa"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Krok 3: Przeszukiwanie katalogu"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -580,20 +606,6 @@ msgstr "Obsługiwane podstawy wyszukiwania"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"Pierwszą czynnością jaką należy wykonać przy konfiguracji serwera LDAP jest "
-"wprowadzenie jego nazwy oraz danych na temat sposobu logowania się do "
-"niego.\n"
-"Zapytaj swojego administratora systemu, jeśli nie masz pewności, jakie "
-"informacje\n"
-"powinny zostać wprowadzone."
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -605,7 +617,7 @@ msgstr ""
 "Zapytaj swojego administratora systemu, czy zachodzi konieczność zmiany\n"
 "tych opcji."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -616,7 +628,7 @@ msgstr ""
 "się wyszukiwanie. Po pozostawieniu tego pola pustym, wyszukiwanie rozpocznie "
 "się od głównego katalogu drzewa katalogów."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -631,14 +643,14 @@ msgstr ""
 "Zakres wyszukiwania \"one\" dołączy tylko wpisy leżące poziom ponad\n"
 "podstawą wyszukiwania.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
+#, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "Ten asystent pomoże w uzyskaniu dostępu do sieciowych usług katalogowych\n"
 "udostępnianych przez serwery wykorzystujące protokół LDAP.\n"
@@ -647,13 +659,13 @@ msgstr ""
 "jego temat. Skontaktuj się ze swoim adminsitratorem systemu jeśli potrzebna "
 "jest pomoc przy wyszukiwaniu tych informacji."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Jest to pełna nazwa serwera LDAP. Na przykład: \"ldap.mojafirma.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -663,7 +675,7 @@ msgstr ""
 "liczby\n"
 "spowoduje spowolnienie działania książki adresowej."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -673,7 +685,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:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -682,6 +694,15 @@ msgstr ""
 "Jest to nazwa serwera, 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:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Jest to nazwa serwera, 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:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -710,21 +731,36 @@ msgid "Using email address"
 msgstr "Użycie adresu e-mail"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Kiedy możliwe"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+"Pierwszą czynnością jaką należy wykonać przy konfiguracji serwera LDAP jest "
+"wprowadzenie jego nazwy oraz danych na temat sposobu logowania się do "
+"niego.\n"
+"Zapytaj swojego administratora systemu, jeśli nie masz pewności, jakie "
+"informacje\n"
+"powinny zostać wprowadzone."
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "_Wyświetlana nazwa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "_Limit pobierania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -732,39 +768,39 @@ msgstr "_Limit pobierania:"
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "_Metoda logowania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "Numer p_ortu:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "_Podstawa wyszukiwania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "_Nazwa serwera:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "_Czas oczekiwania (minuty):"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "karty"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr "zakładka-nawiązywanie połączenia"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr "zakładka-ogólne"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr "zakładka-wyszukiwanie"
 
@@ -777,7 +813,7 @@ msgid "Remove All"
 msgstr "Usuń wszystko"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Usuń"
@@ -815,14 +851,10 @@ msgstr "Nazwa"
 msgid "Source"
 msgstr "Źródło"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Wybór kontaktów z książki adresowej"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "Wybór folderu kontaktów do wyszukiwania"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Znajdź"
@@ -898,7 +930,8 @@ msgid "D_epartment:"
 msgstr "Wy_dział:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:18
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Szczegóły"
 
@@ -965,12 +998,13 @@ msgid "_Categories..."
 msgstr "_Kategorie..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:695
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:44
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:108 ui/evolution-tasks.xml.h:18
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
+#: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Usuń"
 
@@ -2093,7 +2127,7 @@ msgid "Esq."
 msgstr " "
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Pełne imię i nazwisko"
 
@@ -2319,9 +2353,9 @@ msgstr "Prześlij kontakt"
 msgid "Send Message to Contact"
 msgstr "Wyślij list do kontaktu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:76
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Wydrukuj"
@@ -2343,9 +2377,12 @@ msgstr "Przenieś do folderu..."
 msgid "Cut"
 msgstr "Wytnij"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Skopiuj"
 
@@ -2355,7 +2392,7 @@ msgid "Paste"
 msgstr "Wklej"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "Bieżący widok"
 
@@ -2372,166 +2409,171 @@ msgstr ""
 "uruchomić Evolution."
 
 #: 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:2
 msgid "Assistant"
 msgstr "Asystent"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Faks służbowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Telefon służbowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Telefon służbowy 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Telefon callbacka"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Telefon samochodowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategorie"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Telefon firmowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Oddział"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "E-mail 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "E-mail 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#, fuzzy
+msgid "Family Name"
+msgstr "Nazwa pola"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Plik jako"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "URL sygnalizujący zajętość"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Adres domowy"
+#, fuzzy
+msgid "Given Name"
+msgstr "Nazwa pola"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Faks w domu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Telefon domowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Telefon domowy 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Telefon samochodowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Jordania"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Menedżer"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Telefon komórkowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Pseudonim"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Notatka"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Biuro"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organizacja"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Inny adres"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Inny faks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Inny telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Telefon główny"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Zawód"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Rola"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Małżonek"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Tytuł"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Bez nazwy"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Witryna sieci web"
 
@@ -2622,10 +2664,18 @@ msgstr "Członkowie listy"
 msgid "Job Title"
 msgstr "Tytuł służbowy"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Adres domowy"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 msgid "Work Address"
 msgstr "Adres pracy"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Inny adres"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 msgid "Home page"
@@ -2636,107 +2686,104 @@ msgstr "Witryna domowa"
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Sukces"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:995
-#: shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Nieznany błąd"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Repozytorium rozłączone"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Brak uprawnień"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Contact not found"
 msgstr "Nie odnaleziono kontaktu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Contact ID already exists"
 msgstr "Kontakt z tym ID już istnieje"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Protokół nie jest obsługiwany"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Anulowano"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "Uwierzytelnienie nie powiodło się"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "Wymagane uwierzytelnienie"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS nie jest dostępny"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "Książka adresowa nie istnieje"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Inny błąd"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Czy chcesz zapisać zmiany?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr "_Porzuć"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Błąd przy dodawaniu listy"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Error adding contact"
 msgstr "Błąd przy dodawaniu kontaktu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Błąd przy modyfikacji listy"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying contact"
 msgstr "Błąd przy modyfikacji kontaktu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Błąd przy usuwaniu listy"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 msgid "Error removing contact"
 msgstr "Błąd przy usuwaniu kontaktu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2745,7 +2792,7 @@ msgstr ""
 "Otwarcie %d kontakwó spowoduje jednoczesne otwarcie %d nowych okien.\n"
 "Czy na pewno chcesz wyświetlić te wszystkie kontakty?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2754,49 +2801,49 @@ msgstr ""
 "%s istnieje.\n"
 "Czy chcesz go nadpisać?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "Nadpisz"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Błąd przy zapisie %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "karta.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Przeniesienie kart do folderu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Skopiowanie karty do folderu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Przeniesienie kart do folderu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Skopiowanie kart do folderu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Plik VCard z wieloma pozycjami"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "Plik VCard z pozycją %s"
@@ -2990,7 +3037,7 @@ msgstr "Marginesy"
 msgid "Number of columns:"
 msgstr "Liczba kolumn:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Opcje"
 
@@ -3243,9 +3290,9 @@ msgid "Evolution's Tasks component"
 msgstr "Komponent zadań Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1084 calendar/gui/print.c:1797
-#: calendar/gui/tasks-control.c:488
-#: calendar/importers/icalendar-importer.c:711
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
 #: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
 msgid "Tasks"
 msgstr "Zadania"
@@ -3254,19 +3301,19 @@ msgstr "Zadania"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Usługa przypominania za pomocą alarmu dla kalendarza Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Rozpoczęcie:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Zakończenie:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Alarm Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm o %s"
@@ -3341,15 +3388,15 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Bez pytania o ten program w przyszłości."
 
-#: calendar/gui/alarm-notify/notify-main.c:154
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Nie można zainicjować Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:157
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Nie można zainicjować gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:166
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Nie można utworzyć generatora usługi przypominania za pomocą alarmu"
 
@@ -3357,23 +3404,157 @@ msgstr "Nie można utworzyć generatora usługi przypominania za pomocą alarmu"
 msgid "invalid time"
 msgstr "niepoprawny czas"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "Błąd iKalendarza"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Kolor dzisiejszych zadań"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Kolor dzisiejszych zadań"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr ""
+"Wyświetlanie _czasów zakończenia terminów w widoku tygodniowym i miesięcznym"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Wyświetla podgląd kalendarza w postaci przygotowanej do druku"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "Potw_ierdzanie przed usunięciem elementów"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "Potw_ierdzanie przed usunięciem elementów"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Usuwa zakończone zadania"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Wyświetlanie _numerów tygodni w przeglądarce dat"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Zestawienie zawiera"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Opis zawiera"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Komentarz zawiera"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1134
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Niedopasowane"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3386,97 +3567,106 @@ msgstr ""
 "\n"
 "Czy rzeczywiście usunąć te zadania?"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "zwraca mniej niż"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "dni"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:276
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "Kalendarz \"%s\" zostanie usunięty. Czy na pewno chcesz kontynuować?"
 
-#: calendar/gui/calendar-component.c:316
+#: calendar/gui/calendar-component.c:408
 #, fuzzy
 msgid "Rename this calendar to"
 msgstr "Drukuje zawartość kalendarza"
 
-#: calendar/gui/calendar-component.c:331
+#: calendar/gui/calendar-component.c:428
 msgid "New Calendar"
 msgstr "Nowy kalendarz"
 
-#: calendar/gui/calendar-component.c:514
+#: calendar/gui/calendar-component.c:632
 msgid "New appointment"
 msgstr "Nowy termin"
 
-#: calendar/gui/calendar-component.c:515
+#: calendar/gui/calendar-component.c:633
 msgid "_Appointment"
 msgstr "_Termin"
 
-#: calendar/gui/calendar-component.c:516 ui/evolution-calendar.xml.h:4
+#: calendar/gui/calendar-component.c:634
 msgid "Create a new appointment"
 msgstr "Tworzy nowy termin"
 
-#: calendar/gui/calendar-component.c:521
+#: calendar/gui/calendar-component.c:639
 msgid "New meeting"
 msgstr "Nowe spotkanie"
 
-#: calendar/gui/calendar-component.c:522
+#: calendar/gui/calendar-component.c:640
 msgid "M_eeting"
 msgstr "Spot_kanie"
 
-#: calendar/gui/calendar-component.c:523
+#: calendar/gui/calendar-component.c:641
 msgid "Create a new meeting request"
 msgstr "Tworzy nową prośbę o spotkanie"
 
-#: calendar/gui/calendar-component.c:528
+#: calendar/gui/calendar-component.c:646
 msgid "New all day appointment"
 msgstr "Nowe spotkanie całodniowe"
 
-#: calendar/gui/calendar-component.c:529
+#: calendar/gui/calendar-component.c:647
 msgid "All _Day Appointment"
 msgstr "Nowy t_ermin całodniowy"
 
-#: calendar/gui/calendar-component.c:530
+#: calendar/gui/calendar-component.c:648
 msgid "Create a new all-day appointment"
 msgstr "Tworzy nowy termin całodniowy"
 
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
+
 #. create the remote source group
-#: calendar/gui/calendar-component.c:653
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr "Na sieci web"
 
@@ -3592,7 +3782,7 @@ msgstr "Adresat:"
 msgid "With these arguments:"
 msgstr "Argumenty programu:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:46
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -3608,6 +3798,10 @@ msgstr "godzin"
 msgid "minutes"
 msgstr "minut"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3640,7 +3834,7 @@ msgstr "Wysłanie listu"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
 #: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Zestawienie:"
@@ -3670,7 +3864,7 @@ msgstr "koniec terminu"
 msgid "hour(s)"
 msgstr "godzin"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minut"
 
@@ -3724,7 +3918,7 @@ msgstr "Dni"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Piątek"
 
@@ -3738,7 +3932,7 @@ msgstr "Minut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Poniedziałek"
 
@@ -3748,7 +3942,7 @@ msgstr "_Nie"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Sobota"
 
@@ -3762,7 +3956,7 @@ 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:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Niedziela"
 
@@ -3780,7 +3974,7 @@ msgstr "Lista zadań"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Czwartek"
 
@@ -3798,7 +3992,7 @@ msgstr "Format czasu:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Środa"
 
@@ -3808,12 +4002,12 @@ msgstr "Początek _tygodnia:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Środa"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Tydzień roboczy"
 
@@ -3850,7 +4044,7 @@ msgid "_Fri"
 msgstr "_Pią"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "Ogó_lne"
 
@@ -3891,7 +4085,7 @@ msgstr "Ś_ro"
 msgid "before every appointment"
 msgstr "przed każdym terminem"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
@@ -3899,11 +4093,11 @@ msgstr ""
 "Usuwane zdarzenie jest spotkaniem. Czy chcesz wysłać powiadomienie o "
 "anulowaniu?"
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Czy na pewno chcesz anulować i usunąć to spotkanie?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
@@ -3911,11 +4105,11 @@ msgstr ""
 "Usuwane zadanie jest przypisane. Czy chcesz wysłać powiadomienie o "
 "anulowaniu?"
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Czy na pewno chcesz anulować i usunąć to zadanie?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -3923,50 +4117,50 @@ msgstr ""
 "Usuwany wpis dziennika jest opublikowany. Czy chcesz wysłać powiadomienie o "
 "anulowaniu?"
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Czy na pewno chcesz anulować i usunąć ten wpis dziennika?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Zdarzenie zostało usunięte."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Zadanie zostało usunięte."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Wpis dziennika został usunięty."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Wprowadzono zmiany. Anulować je wszystkie i zamknąć edytor?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Nie wprowadzono żadnych zmian, zamknąć edytor?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Zdarzenie zostało zmienione."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Zadanie zostało zmienione."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Wpis dziennika został zmieniony."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Wprowadzono zmiany. Anulować je wszystkie i uaktualnić edytor?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Nie wprowadzono żadnych zmian, uaktualnić edytor?"
@@ -3976,166 +4170,170 @@ msgstr "%s Nie wprowadzono żadnych zmian, uaktualnić edytor?"
 msgid "Validation error: %s"
 msgstr "Wykryto błąd przy weryfikacji poprawności: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " do "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Zakończone "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Zakończone"
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Należne "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Należne "
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "Nie można uaktualnić obiektu"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Zmodyfikuj termin"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Zadanie - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Wpis dziennika - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Brak zestawienia"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Zapisz jako..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Zmiany dokonane w tym elemencie mogą zostać porzucone, jeśli nadejdzie "
 "aktualizacja"
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Nie można uzyskać bieżącej wersji!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+msgid "Select destination source"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Czy na pewno chcesz usunąć termin \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Czy na pewno chcesz usunąć ten pozbawiony nazwy termin?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Czy na pewno chcesz usunąć zadanie \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Czy na pewno chcesz usunąć to pozbawione nazwy zadanie?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Czy na pewno chcesz usunąć wpis dziennika zatytułowany \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Czy na pewno chcesz usunąć ten niezatytułowany wpis dziennika?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Czy na pewno chcesz usunąć %d terminów?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Czy na pewno chcesz usunąć %d zadań?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Czy na pewno chcesz usunąć %d wpisów dziennika"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "Nie można usunąć zdarzenia na skutek błędu mechanizmu CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "Nie można usunąć zadania na skutek błędu mechanizmu CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Nie można usunąć wpisu dziennika na skutek błędu mechanizmu CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Nie można usunąć elementu na skutek błędu mechanizmu CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "Nie można usunąć zdarzenia na skutek braku uprawnień"
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "Nie można usunąć zadania na skutek braku uprawnień"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Nie można usunąć wpisu dziennika na skutek braku uprawnień"
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "Nie można usunąć elementu na skutek braku uprawnień"
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Nie można usunąć zdarzenia na skutek błędu mechanizmu CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Nie można usunąć zadania na skutek błędu mechanizmu CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Nie można usunąć wpisu dziennika na skutek błędu mechanizmu CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "Nie można usunąć elementu na skutek błędu"
 
@@ -4151,43 +4349,43 @@ msgstr "Oddelegowanie do:"
 msgid "Enter Delegate"
 msgstr "Oddelegowanie"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Termin"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Przypomnienie"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Rekurencja"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Planowanie"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Spotkanie"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "Data początkowa jest niepoprawna"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "Data końcowa jest niepoprawna"
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "Czas początkowy jest niepoprawny"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "Czas końcowy jest niepoprawny"
 
@@ -4256,31 +4454,31 @@ msgid "_Start time:"
 msgstr "Cza_s rozpoczęcia:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:704
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
 #: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Brak"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr "Wybrany organizator nie posiada już konta."
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "Wymagany jest organizator."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "Wymagany jest co najmniej jeden uczestnik."
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Oddeleguj do..."
 
@@ -4321,17 +4519,11 @@ msgid "Member"
 msgstr "Członek"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Rola"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
@@ -4355,6 +4547,7 @@ msgid "_Invite Others..."
 msgstr "_Zaproś innych..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4387,6 +4580,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Nie można utworzyć katalogu %s: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 msgid "A group must be selected"
 msgstr "Należy wybrać grupę"
 
@@ -4411,33 +4605,58 @@ msgstr "Położenie kalendarza"
 msgid "Calendar Name"
 msgstr "Nazwa kalendarza"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Nie można utworzyć katalogu %s: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "<b>Opcje kalendarza</b>"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Lista zadań"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Lista zadań"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Lista zadań"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr "Modyfikujesz zdarzenie okresowe, czy chcesz je zmodyfikować?"
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Modyfikujesz zadanie okresowe, czy chcesz je zmodyfikować?"
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr "Modyfikujesz okresowy wpis dziennika, czy chcesz go zmodyfikować?"
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr "Tylko ta instancja"
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Ta instancja i przyszłe"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr "Ta instancja i przyszłe"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr "Wszystkie instancje"
 
@@ -4490,6 +4709,11 @@ msgstr "w"
 msgid "occurrences"
 msgstr "wystąpienia"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Data/Czas:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "_Dodaj"
@@ -4554,7 +4778,7 @@ msgstr "tygodni"
 msgid "year(s)"
 msgstr "lat"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
@@ -4564,31 +4788,31 @@ msgstr ""
 "\n"
 "Czy chcesz zapisać wprowadzone zmiany?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "_Porzuć zmiany"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 msgid "Save Event"
 msgstr "Zapisz zdarzenie"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Została utworzona informacja o spotkaniu. Czy wysłać ją?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Informacje o spotkaniu zostały zmienione. Czy wysłać aktualną wersję?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "Została utworzona informacja o przypisaniu zadania. Czy wysłać ją?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "Informacje o zadaniu zostały zmienione. Czy wysłać aktualną wersję?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Data zakończenia jest niepoprawna"
 
@@ -4599,42 +4823,42 @@ msgstr "% zakończenia"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
-#: calendar/gui/print.c:2318
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Zakończone"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:231
-#: mail/message-list.c:914
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Wysoki"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
-#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "W trakcie"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:235
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Niski"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:233 mail/message-list.c:913
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Zwykły"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:217
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Nie uruchomiony"
 
@@ -4643,7 +4867,7 @@ msgid "Progress"
 msgstr "Postęp"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Niezdefiniowany"
 
@@ -4663,21 +4887,21 @@ msgstr "_Stan:"
 msgid "_Web Page:"
 msgstr "Witryna _web:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Proste"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Przyporządkowanie"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "Data docelowa jest niepoprawna"
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr "Data docelowa jest wcześniejsza niż data rozpoczęcia!"
 
@@ -4685,9 +4909,9 @@ msgstr "Data docelowa jest wcześniejsza niż data rozpoczęcia!"
 msgid "Con_fidential"
 msgstr "Taj_ny"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Opis:"
 
@@ -4792,26 +5016,21 @@ msgstr "%s o %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s z nieznanym typem warunku"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Publiczny"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Prywatny"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Tajny"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategorie"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Description"
@@ -4823,11 +5042,12 @@ msgid "Start Date"
 msgstr "Data rozpoczęcia"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1083
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Zestawienie"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "kolor"
 
@@ -4835,13 +5055,12 @@ msgstr "kolor"
 msgid "component"
 msgstr "komponent"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Wolny"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Zajęty"
 
@@ -4853,7 +5072,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "E"
 
@@ -4887,17 +5106,17 @@ msgstr "Nie"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1647
-#: camel/camel-gpg-context.c:1698 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Nieznany"
 
@@ -4909,180 +5128,178 @@ msgstr "Powtarzanie"
 msgid "Assigned"
 msgstr "Przyporządkowano"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Aktualizowanie obiektów"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Usuwanie zaznaczonych obiektów"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Aktualizowanie obiektów"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Nowy _termin..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Nowe zdarzenie _całodniowe"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "Nowe spotkanie"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Nowe zadanie"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "Wy_drukuj..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:118 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "Wk_lej"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Przejdź do d_zisiaj"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "_Przejdź do daty..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Opublikuj informację o zajętości"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:30
-msgid "_Settings..."
-msgstr "_Ustawienia..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:670 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Otwórz"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:672 mail/em-popup.c:589 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:124
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Z_apisz jako..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:43
-#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:105
-#: ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "S_kopiuj"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "Zap_lanuj spotkanie..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "Prześlij w formacie i_Calendar..."
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Usuń to _wystąpienie"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Usuń w_szystkie wystąpienia"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "_Ustawienia..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 msgid "Open _Web Page"
 msgstr "_Otwórz stronę web"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "P_rzypisz zadanie"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "Prześlij w formacie i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "_Oznacz jako zakończone"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Oznacz zadania jako zakończone"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "_Usuń zaznaczone zadania"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Kliknij, aby dodać zadanie"
@@ -5096,8 +5313,8 @@ msgstr "% zakończenia"
 msgid "Alarms"
 msgstr "Alarmy"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1172
-#: camel/camel-filter-driver.c:1267 mail/mail-send-recv.c:576
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Gotowe"
 
@@ -5126,18 +5343,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5156,7 +5373,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5169,125 +5386,125 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr "start_calendar_server(): %s"
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr "Tak (powtarzalność złożona)"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "Codziennie"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "Co %d dni"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "Co tydzień"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "Co %d tygodni"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr "Co tydzień w "
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Co %d tygodni w "
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " i "
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr "%s. dzień "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr "%s. %s "
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "co miesiąc"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr "co %d miesięcy"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "Co rok"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "Co %d lat"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr " łącznie %d razy"
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ", kończąc dnia "
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>Początek:</b> "
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Koniec:</b>"
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>Zakończone:</b> "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>Termin końcowy:</b>"
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "Informacje iKalendarza"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "Błąd iKalendarza"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Nieznana osoba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5295,322 +5512,321 @@ msgstr ""
 "<br> Przejrzyj wyświetlone informacje, a następnie wybierz czynność z "
 "poniższego menu."
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Brak</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "Położenie:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:203
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Stan:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Zaakceptowane"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Próbna akceptacja"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Odrzucone"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Wybór czynności:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Aktualizacja"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:985 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Akceptacja"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Próbna akceptacja"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Odrzucenie"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Wysłanie informacji o zajętości"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Pobranie stanu wezwanej osoby"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Wysłanie najświeższej informacji"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
 #: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, 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:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Informacje o spotkaniu"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> zwraca się o obecność osoby %s na spotkaniu."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Propozycja spotkania"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Aktualizacja spotkania"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Zwrócenie się o aktualizację spotkania"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, 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:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Odpowiedź na spotkanie"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> anulował spotkanie."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Anulowanie spotkania"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, 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:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Niepoprawna wiadomość o spotkaniu"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Informacje o zadaniu"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> zwraca się do osoby %s o wykonanie przez zadania."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, 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:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Propozycja zadania"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, 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:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Aktualizacja zadania"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, 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:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Zwrócenie się o aktualizację zadania"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, 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:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Odpowiedź na zadanie"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> anulował zadanie."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Anulowanie zadania"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Niepoprawna wiadomość o zadaniu"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, 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:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Informacja o zajętości"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, 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:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Zwrócenie się o informację o zajętości"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, 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:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Odpowiedź z informacją o zajętości"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Niepoprawna wiadomość o zajętości"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr "Forma listu jest niepoprawna"
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "Lista zawiera tylko nieobsługiwane żądania."
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Załącznik nie zawiera poprawnego komunikatu kalendarza"
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 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:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "Nie można uaktualnić pliku kalendarza!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Aktualizacja zakończona\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 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:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Obiekt jest niepoprawny i nie można go zaktualizować\n"
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Odpowiedź nie pochodzi od aktualnego uczestnika. Czy dodać nadawcę jako "
 "uczestnika?"
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 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:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr "Wystąpił błąd w podsystemie CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr "Nie można odnaleźć obiektu\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Brak uprawnień potrzebnych do aktualizacji kalendarza\n"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Stan uczestnika został uaktualniony\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "Nie można uaktualnić stanu uczestnika!\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Usunięcie zakończone"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Element został wysłany!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Nie można wysłać elementu!\n"
 
@@ -5771,7 +5987,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -5863,12 +6079,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:739 calendar/gui/gnome-cal.c:1764
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Nie masz uprawnień do otwarcia folderu w \"%s\""
 
-#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1978
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5877,39 +6093,39 @@ msgstr ""
 "Błąd przy URI %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:959
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "Wykańczanie zadań..."
 
-#: calendar/gui/e-tasks.c:982
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "Usuwanie zaznaczonych obiektów..."
 
-#: calendar/gui/e-tasks.c:1007
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "Oczyszczanie"
 
-#: calendar/gui/gnome-cal.c:1603 mail/importers/netscape-importer.c:1843
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
 msgid "Calendar"
 msgstr "Kalendarz"
 
-#: calendar/gui/gnome-cal.c:1736
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nie można otworzyć folderu w \"%s\""
 
-#: calendar/gui/gnome-cal.c:1750
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoda wymagana do otwarcia \"%s\" nie jest obsługiwana"
 
-#: calendar/gui/gnome-cal.c:1807
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Dodawanie alarmów powiązanych z %s"
 
-#: calendar/gui/gnome-cal.c:1999
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5921,7 +6137,7 @@ msgstr ""
 "nieoczekiwanie zakończył działanie. Aby znów móc go użyć, należy ponownie "
 "uruchomić Evolution."
 
-#: calendar/gui/gnome-cal.c:2007
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5933,7 +6149,7 @@ msgstr ""
 "nieoczekiwanie zakończył działanie. Aby znów móc go użyć, należy ponownie "
 "uruchomić Evolution."
 
-#: calendar/gui/gnome-cal.c:2847
+#: calendar/gui/gnome-cal.c:2848
 msgid "Purging"
 msgstr ""
 
@@ -5993,296 +6209,334 @@ msgstr "Październik"
 msgid "September"
 msgstr "Wrzesień"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Należy podać organizatora."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Wymagany jest co najmniej jeden uczestnik"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Informacja o spotkaniu"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Informacja o zadaniu"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Informacja dziennika"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Informacja o zajętości"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Informacja kalendarza"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Aktualizacja"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Odśwież"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "Kontrpropozycja"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informacja o zajętości (od %s do %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "Informacja w formacie iCalendar"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Musisz należeć do uczestników zdarzenia."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Ni"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Po"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Wt"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Śr"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Cz"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Pt"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "So"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Wybrany dzień dzień (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Wybrany tydzień (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Wybrany miesiąc (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Wybrany rok (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Zadanie"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Stan: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorytet: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procent zakończenia: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorie: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Kontakty: "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:565 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Podgląd wydruku"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Wydruk elementu"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Ustawienia wydruku"
 
+#: calendar/gui/tasks-component.c:338
+#, fuzzy, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr "Kalendarz \"%s\" zostanie usunięty. Czy na pewno chcesz kontynuować?"
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Drukuje zawartość kalendarza"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Lista zadań"
+
+#: calendar/gui/tasks-component.c:590
+#, fuzzy
+msgid "New task"
+msgstr "Nowe zadanie"
+
+#: calendar/gui/tasks-component.c:591
+#, fuzzy
+msgid "_Task"
+msgstr "_Zadania"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Tworzy nowe zadanie"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "URI folderu zadań, który należy wyświetlić"
 
-#: calendar/gui/tasks-control.c:449
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6295,11 +6549,11 @@ msgstr ""
 "\n"
 "Czy rzeczywiście usunąć te zadania?"
 
-#: calendar/gui/tasks-control.c:452
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Bez pytania o to w przyszłości."
 
-#: calendar/gui/tasks-control.c:594
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "Wydruku zadań"
 
@@ -6327,15 +6581,15 @@ msgstr "Pliki iCalendar (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "Pliki vCalendar (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:464
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "Przypomnienie!!"
 
-#: calendar/importers/icalendar-importer.c:704
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "Zdarzenia kalendarza"
 
-#: calendar/importers/icalendar-importer.c:729
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6343,7 +6597,7 @@ msgstr ""
 "Odnaleziono pliki kalendarza GNOME.\n"
 "Czy chcesz zaimportować je do Evolution?"
 
-#: calendar/importers/icalendar-importer.c:736
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Kalendarz GNOME"
 
@@ -7957,63 +8211,63 @@ msgstr "Do zakończenia tej operacji konieczne jest połączenie z siecią"
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Nie można utworzyć potoku do \"%s\": %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:553
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Nie można utworzyć procesu potomnego \"%s\": %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Otrzymano niepoprawny strumień komunikatów z %s: %s"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:948
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Synchronizowanie folderów"
 
-#: camel/camel-filter-driver.c:1037 camel/camel-filter-driver.c:1410
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Błąd przy analizie składni filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:1046 camel/camel-filter-driver.c:1416
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Błąd przy wykonywaniu filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:1113
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Nie można otworzyć folderu kolejki"
 
-#: camel/camel-filter-driver.c:1122
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Nie można przetworzyć folderu kolejki"
 
-#: camel/camel-filter-driver.c:1137
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Pobieranie %d. listu (%d%%)"
 
-#: camel/camel-filter-driver.c:1141
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Nie można otworzyć listu"
 
-#: camel/camel-filter-driver.c:1142 camel/camel-filter-driver.c:1154
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Niepowodzenie przy %d. liście"
 
-#: camel/camel-filter-driver.c:1168 camel/camel-filter-driver.c:1262
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Synchronizowanie folderu"
 
-#: camel/camel-filter-driver.c:1229
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Pobieranie %d. listu z %d"
 
-#: camel/camel-filter-driver.c:1244
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Niepowodzenie przy liście %d z %d"
@@ -8030,7 +8284,7 @@ msgstr "Niepoprawne argumenty funkcji (system-flag)"
 msgid "Invalid arguments to (user-tag)"
 msgstr "Niepoprawne argumenty funkcji (user-tag)"
 
-#: camel/camel-filter-search.c:676 camel/camel-filter-search.c:684
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Błąd przy wykonywaniu wyszukiwania przez filtr: %s: %s"
@@ -8062,34 +8316,34 @@ msgstr "(match-all) wymaga pojedynczego wyniku logicznego"
 msgid "Performing query on unknown header: %s"
 msgstr "Wykonywanie zapytania na nieznanym nagłówku: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nieobsługiwana operacja: dołączenie listu: typ %s"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nieobsługiwana operacja: wyszukiwanie według wyrażenia: typ %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nieobsługiwana operacja: wyszukiwanie według uid: dla %s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Przenoszenie listów"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr "Kopiowanie listów"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 msgid "Filtering new message(s)"
 msgstr "Filtrowanie nowych wiadomości"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8100,15 +8354,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr "Nie można rozpoznać żądania podania hasła od GPG."
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8117,31 +8371,31 @@ msgstr ""
 "Należy podać ciąg znaków odblokowujący klucz dla\n"
 "użytkownika: \"%s\""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1410 camel/camel-gpg-context.c:1490
-#: camel/camel-gpg-context.c:1597 mail/mail-send-recv.c:572
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Anulowano."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Nie można odblokować tajnego klucza: podano 3 niepoprawne ciągi znaków."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Nieoczekiwana odpowiedź od programu GnuPG: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr "Nie podano danych"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nie można zaszyfrować listu: nie podano poprawnych odbiorców."
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8153,62 +8407,63 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Nie można zaszyfrować wiadomości z użyciem GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:406
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Nie można zapisać danych: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1646
-#: camel/camel-gpg-context.c:1697
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nie można uruchomić gpg: %s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1402
-#: camel/camel-gpg-context.c:1483 camel/camel-gpg-context.c:1506
-#: camel/camel-gpg-context.c:1590 camel/camel-gpg-context.c:1614
-#: camel/camel-gpg-context.c:1668 camel/camel-gpg-context.c:1719
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr "Nie można uruchomić gpg."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "To jest część listu podpisana cyfrowo"
 
-#: camel/camel-gpg-context.c:1369 camel/camel-gpg-context.c:1378
-#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:709
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
 #, fuzzy
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 "Nie można zweryfikować podpisu listu: nie można utworzyć pliku tymczasowego: "
 "%s"
 
-#: camel/camel-gpg-context.c:1385
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Nie można zweryfikować podpisu listu: nie można utworzyć pliku tymczasowego: "
 "%s"
 
-#: camel/camel-gpg-context.c:1466
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nie można zapisać danych: %s"
 
-#: camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1531
 msgid "This is a digitally encrypted message part"
 msgstr "To jest część listu zaszyfrowana cyfrowo"
 
-#: camel/camel-gpg-context.c:1621 camel/camel-smime-context.c:963
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
 msgid "Encrypted content"
 msgstr "Zaszyfrowana zawartość"
 
-#: camel/camel-gpg-context.c:1625
+#: camel/camel-gpg-context.c:1632
 msgid "Unable to parse message content"
 msgstr "Nie można przeanalizować zawartości listu"
 
@@ -8317,7 +8572,7 @@ msgstr "Nie można odszyfrować części MIME: błąd na poziomie protokołu"
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "Nie można odszyfrować części MIME: niepoprawna struktura"
 
-#: camel/camel-multipart-signed.c:691
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "błąd składniowy"
 
@@ -8645,12 +8900,12 @@ msgstr "Dostarczyciel poczty dla folderów wirtualnych"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Do odczytu poczty jako zapytania na innym zbiorze folderów"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Brak dostawcy dla protokołu \"%s\""
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8723,6 +8978,16 @@ msgstr ""
 "Nie można utworzyć folderu: Niepoprawna operacja na tym miejscu "
 "przechowywania"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Śmietnik"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+msgid "Junk"
+msgstr "Śmieć"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "Nie można uzyskać certyfikatu wydawcy"
@@ -9097,55 +9362,70 @@ msgid "Failed to cache %s: %s"
 msgstr "Nie można zapisać w cache %s: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Nawiązywanie połączenia z serwerem..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Nie można nawiązać połączenia z serwerem LDAP"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "Polecenie powłoki"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Sprawdzanie nowej poczty"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Check for new messages in all folders"
 msgstr "Sprawdzanie nowych listów we wszystkich folderach"
 
-#: camel/providers/imap/camel-imap-provider.c:48
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Foldery"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Wyświetlanie tylko zasubskrybowanych folderów"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "Nadpisanie przestrzeni nazw podanej przez serwer"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Przestrzeń nazw"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 "Zastosowywanie filtrów w odniesieniu do nowych listów w INBOX na tym serwerze"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Automatyczne sprawdzanie nowych listów co"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Przeglądanie i przechowywanie poczty na serwerach IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Hasło"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9673,7 +9953,7 @@ msgstr "Nie można zamknąć folderu źródłowego %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Nie można zamknąć folderu tymczasowego: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nie można zmienić nazwy folderu: %s"
@@ -9956,7 +10236,7 @@ msgstr "Usuwanie po %s dniach"
 msgid "Disable support for all POP3 extensions"
 msgstr "Wyłączenie wsparcia dla wszystkich rozszerzeń POP3"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -10048,7 +10328,7 @@ msgid "No such folder `%s'."
 msgstr "Folder \"%s\" nie istnieje."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10104,7 +10384,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Wysyłanie listów za pomocą programu sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10398,7 +10678,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "załącznik"
 
@@ -10442,11 +10722,11 @@ msgstr "Typ MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerowanie automatycznego wyświetlenia załącznika"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 msgid "You need to configure an account before you can compose mail."
 msgstr "Przed wysłaniem listu należy skonfigurować konto"
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Kliknij tu aby otworzyć książkę adresową"
 
@@ -10457,45 +10737,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Odpowiedź do:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Temat:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Dla:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Podaj adres odbiorcy listu"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Podaj adresy, pod które zostanie przesłana kopia listu"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10505,14 +10785,19 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Wyślij do:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr "Cel wysyłania"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Załącza plik do listu"
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Załączenie plików"
@@ -10546,21 +10831,21 @@ msgstr "Plik istnieje, nadpisać?"
 msgid "Error saving file: %s"
 msgstr "Błąd przy zapisie pliku: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Błąd przy odczycie pliku : %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Błąd przy dostępie do pliku: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Nie można pobrać listu z edytora"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10569,7 +10854,7 @@ msgstr ""
 "Nie można zmienić położenia w pliku: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10578,7 +10863,7 @@ msgstr ""
 "Nie można przyciąć pliku: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10587,7 +10872,7 @@ msgstr ""
 "Nie można skopiować deskryptora: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10596,7 +10881,7 @@ msgstr ""
 "Błąd przy automatycznym zapisie listu: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10604,7 +10889,7 @@ msgstr ""
 "Odnaleziono niezapisane pliki z poprzedniej sesji Evolution.\n"
 "Czy chcesz spróbować je odzyskać?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10615,28 +10900,28 @@ msgstr ""
 "\n"
 "Czy chcesz zapisać zmiany?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Uwaga: Zmodyfikowany list"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Otwarcie pliku"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "Podpis:"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "Wygenerowany automatycznie"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Tworzenie listu"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10644,7 +10929,7 @@ msgstr ""
 "Nie można otworzyć okna tworzenia listu:\n"
 "Nie można uaktywnić formantu wyboru adresu."
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10656,7 +10941,7 @@ msgstr ""
 "Upewnij się, że w systemie zainstalowane są\n"
 "poprawne wersje pakietów gtkhtml i  libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10664,7 +10949,7 @@ msgstr ""
 "Nie można otworzyć okna tworzenia listu:\n"
 "Nie można uaktywnić komponentu edytora HTML-a."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10673,11 +10958,13 @@ msgstr ""
 "modyfikacjom.)</b>"
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Evolution - pakiet do pracy grupowej"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10934,13 +11221,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11073,19 +11360,19 @@ msgstr ""
 "Błąd w wyrażeniu regularnym \"%s\":\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Ważne"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "Do zrobienia"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Później"
@@ -11190,7 +11477,7 @@ msgstr "temu"
 msgid "months"
 msgstr "miesięcy"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "sekund"
 
@@ -11287,7 +11574,7 @@ msgstr "Wyrażenie"
 msgid "Follow Up"
 msgstr "Podążaj"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:703
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "Etykieta"
 
@@ -11368,8 +11655,9 @@ msgstr "Określony nagłówek"
 msgid "Stop Processing"
 msgstr "Zatrzymanie przetwarzania"
 
-#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1462 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Temat"
 
@@ -11466,7 +11754,7 @@ msgid "starts with"
 msgstr "rozpoczyna się od"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:918
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Nazwa reguły \"%s\" nie jest unikalna, wybierz inną."
@@ -11550,7 +11838,7 @@ msgstr "Przeglądarka folderu pocztowego Evolution"
 msgid "Evolution Mail preferences control"
 msgstr "Kontrola preferencji poczty Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:773
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
 #: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
 #: mail/importers/pine-importer.c:572
 msgid "Mail"
@@ -11560,7 +11848,7 @@ msgstr "Poczta"
 msgid "Mail Accounts"
 msgstr "Konta pocztowe"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
 msgid "Mail Preferences"
 msgstr "Ustawienia poczty"
 
@@ -11605,7 +11893,7 @@ msgid "Protocol"
 msgstr "Protokół"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr "Bez nazwy"
 
@@ -11629,20 +11917,17 @@ msgstr "Dodanie skryptu generującego podpis"
 msgid "Signature(s)"
 msgstr "Podpis(y)"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "Zamierzasz wysłać list zapisany w HTML-u. Upewnij się, że wymienieni niżej\n"
 "odbiorcy chcą otrzymywać listy w tej postaci:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Czy pomimo tego wysłać?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11650,7 +11935,7 @@ msgstr ""
 "List nie zawiera tematu.\n"
 "Rzeczywiście wysłać?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11659,11 +11944,11 @@ msgstr ""
 "ukrywać adresy jej członków, list zawierał będzie tylko ukrytych adresatów "
 "(bcc)."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Ten list zawiera tylko ukrytych adresatów (bcc)"
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11673,11 +11958,11 @@ msgstr ""
 "nagłówek Apparently-To.\n"
 "Czy pomimo tego wysłać?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Przed wysłaniem listu należy podać jego odbiorców."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11694,163 +11979,287 @@ msgstr "Utwórz _wirtualny folder na podstawie wyszukiwania..."
 msgid "<click here to select a folder>"
 msgstr "<kliknij, aby wybrać folder> "
 
-#: mail/em-folder-selector.c:234
-msgid "Folder _name"
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Tworzenie nowego folderu"
+
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Określ miejsce utworzenia folderu:"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
 msgstr "_Nazwa folderu:"
 
-#: mail/em-folder-view.c:589 mail/em-folder-view.c:603
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Nie można utworzyć katalogu tymczasowego: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Nie można utworzyć katalogu tymczasowego: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Nie można utworzyć katalogu tymczasowego: %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Nie można zamknąć folderu tymczasowego: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+#, fuzzy
+msgid "Loading..."
+msgstr "Oczekiwanie..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Wybór folderu"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Tworzenie nowego folderu"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Nie można usunąć folderu \"%s\": %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Czy rzeczywiście usunąć folder \"%s\"?"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Usunięcie \"%s\""
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Zmiana nazwy folderu \"%s\" na:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+msgid "Rename Folder"
+msgstr "Zmień nazwę folderu"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr "Folder o nazwie \"%s\" już istnieje. Użyj innej nazwy."
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Ustawienia czcionek"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+#, fuzzy
+msgid "Properties"
+msgstr "_Właściwości..."
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "Nazwa f_olderu:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Widok"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Otwórz w nowym _oknie"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Przenieś"
+
+#: mail/em-folder-tree.c:1500
+#, fuzzy
+msgid "_New Folder..."
+msgstr "Nowy VFolder"
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "_Zmień nazwę"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "_Właściwości..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:671 mail/em-popup.c:588
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "Z_redaguj jako nowy list..."
 
-#: mail/em-folder-view.c:673
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "Wy_drukuj"
 
-#: mail/em-folder-view.c:676 ui/evolution-mail-message.xml.h:122
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "Odpo_wiedz nadawcy"
 
-#: mail/em-folder-view.c:677 mail/em-popup.c:649
-#: ui/evolution-mail-message.xml.h:84
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Odpowiedz na _listę"
 
-#: mail/em-folder-view.c:678 mail/em-popup.c:650
-#: ui/evolution-mail-message.xml.h:83
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Odpowiedz wszystki_m"
 
-#: mail/em-folder-view.c:679 mail/em-popup.c:652
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "_Prześlij"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr "Po_dążaj..."
 
-#: mail/em-folder-view.c:683
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:684
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "Wy_czyść flagę"
 
-#: mail/em-folder-view.c:687 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "O_znacz jako przeczytane"
 
-#: mail/em-folder-view.c:688
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "Oznacz jako ni_eprzeczytane"
 
-#: mail/em-folder-view.c:689
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Oz_nacz jako ważne"
 
-#: mail/em-folder-view.c:690
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "Ozn_acz jako nieważne"
 
-#: mail/em-folder-view.c:691 ui/evolution-mail-message.xml.h:51
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
 msgid "Mark as _Junk"
 msgstr "Oznacz jako ś_mieci"
 
-#: mail/em-folder-view.c:692 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
 msgid "Mark as _Not Junk"
 msgstr "Oz_nacz jako ważne"
 
-#: mail/em-folder-view.c:696
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "_Cofnij usunięcie"
 
-#: mail/em-folder-view.c:699
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "P_rzenieś do folderu..."
 
-#: mail/em-folder-view.c:700 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "S_kopiuj do folderu..."
 
-#: mail/em-folder-view.c:708
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "Dodaj nadawcę do _książki adresowej"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "Zastosuj fi_ltry"
 
-#: mail/em-folder-view.c:714
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "_Utwórz regułę na podstawie listu"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "VFolder w oparciu o _temat"
 
-#: mail/em-folder-view.c:716
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "VFolder w oparciu o _nadawcę"
 
-#: mail/em-folder-view.c:717
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "VFolder w oparciu o _odbiorców"
 
-#: mail/em-folder-view.c:718
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "VFolder w oparciu o _listę dyskusyjną"
 
-#: mail/em-folder-view.c:720
+#: mail/em-folder-view.c:730
 msgid "VFolder on Thread"
 msgstr "VFolder w oparciu o _wątek"
 
-#: mail/em-folder-view.c:724
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Filtr w oparciu o t_emat"
 
-#: mail/em-folder-view.c:725
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Filtr w oparciu o n_adawcę"
 
-#: mail/em-folder-view.c:726
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Filtr w oparciu o o_dbiorców"
 
-#: mail/em-folder-view.c:727
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Filtr w oparciu o li_stę dyskusyjną"
 
-#: mail/em-folder-view.c:729
+#: mail/em-folder-view.c:739
 msgid "Filter on Thread"
 msgstr "Filtr w oparciu o wątek"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1507 mail/em-folder-view.c:1545
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Domyślne"
 
-#: mail/em-folder-view.c:1579
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Wydrukuj list"
 
-#: mail/em-folder-view.c:1820
+#: mail/em-folder-view.c:1825
 msgid "_Copy Link Location"
 msgstr "Skopiuj położ_enie odnośnika"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, c-format
 msgid "Matches: %d"
 msgstr "Dopasowania: %d"
 
-#: mail/em-format-html-display.c:570
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Przyporządkowano"
+
+#: mail/em-format-html-display.c:597
 #, fuzzy
 msgid ""
 "This message is not signed.  There is no guarantee the sender of the message "
@@ -11858,62 +12267,100 @@ msgid ""
 msgstr ""
 "List został podpisany cyfrowo lecz nie potwierdzono jego autentyczności."
 
-#: mail/em-format-html-display.c:571
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Nieprawidłowy podpis"
+
+#: mail/em-format-html-display.c:598
 msgid ""
 "This message is signed and is valid, the sender of this message is very "
 "likely who they claim to be."
 msgstr ""
 
-#: mail/em-format-html-display.c:572
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Nieprawidłowy podpis"
+
+#: mail/em-format-html-display.c:599
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:573
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr ""
 
-#: mail/em-format-html-display.c:579
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Przerwane"
+
+#: mail/em-format-html-display.c:606
 msgid ""
 "This message is not encrypted.  It's content may be viewed in transit across "
 "The Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:580
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+#, fuzzy
+msgid "Encrypted, weak"
+msgstr "Zaszyfrowana zawartość"
+
+#: mail/em-format-html-display.c:607
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:581
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "Szyfrowanie PGP"
+
+#: mail/em-format-html-display.c:608
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 
-#: mail/em-format-html-display.c:582
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+#, fuzzy
+msgid "Encrypted, strong"
+msgstr "Zaszyfrowana zawartość"
+
+#: mail/em-format-html-display.c:609
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:703 mail/em-format-html.c:591
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
 #, fuzzy
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 "Nie można przetworzyć jako list MIME. Wyświetlanie w postaci źródłowej."
 
-#: mail/em-format-html-display.c:826
-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/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Nieobsługiwany schemat"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Nie można zweryfikować pola dostępu dla służb wymiaru sprawiedl."
 
 #: mail/em-format-html-display.c:917
 #, fuzzy
@@ -11929,105 +12376,86 @@ msgstr "_Ukryj"
 msgid "Page %d of %d"
 msgstr "Strona %d z %d"
 
-#: mail/em-format-html.c:454 mail/em-format-html.c:456
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Pobieranie listu %s"
 
-#: mail/em-format-html.c:803
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Niepoprawna forma części external-body."
 
-#: mail/em-format-html.c:833
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Wskaźnik do witryny FTP (%s)"
 
-#: mail/em-format-html.c:844
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Wskaźnik do lokalnego pliku (%s) poprawny na witrynie \"%s\""
 
-#: mail/em-format-html.c:846
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Wskaźnik do lokalnego pliku (%s)"
 
-#: mail/em-format-html.c:867
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Wskaźnik na zdalne dane (%s)"
 
-#: mail/em-format-html.c:878
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Wskaźnik na nieznane zewnętrzne dane (typu \"%s\")"
 
-#: mail/em-format-html.c:1000 mail/em-format.c:1215
-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/em-format-html.c:1001 mail/em-format.c:1213
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "List został podpisany cyfrowo i potwierdzono jego autentyczność."
-
-#: mail/em-format-html.c:1023 mail/em-format.c:1188
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Nie można zainicjować Bonobo"
-
-#: mail/em-format-html.c:1034 mail/em-format.c:1199
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Nieobsługiwany schemat"
-
-#: mail/em-format-html.c:1083
+#: mail/em-format-html.c:1029
 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/em-format-html.c:1172
+#: mail/em-format-html.c:1141
 msgid "Formatting message"
 msgstr "Formatowanie listu"
 
-#: mail/em-format-html.c:1447 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Od"
 
-#: mail/em-format-html.c:1449 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Odpowiedź do"
 
-#: mail/em-format-html.c:1451 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Dla"
 
-#: mail/em-format-html.c:1453 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1455 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1474
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "Program pocztowy"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1501
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1504
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1515 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
@@ -12037,63 +12465,114 @@ msgstr "Data"
 msgid "%s attachment"
 msgstr "Załącznik: %s"
 
-#: mail/em-popup.c:598
+#: mail/em-format.c:1185
+#, fuzzy
+msgid "Session not initialised"
+msgstr "Nie można zainicjować Bonobo"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "List został podpisany cyfrowo i potwierdzono jego autentyczność."
+
+#: mail/em-format.c:1212
+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/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Oczekiwanie..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Odpytywanie %s"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Nie można zapisać w cache %s: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Nie można utworzyć potoku do \"%s\": %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Nie można rozpoznać nazwy komputera \"%s\": %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Zapisz jako..."
 
-#: mail/em-popup.c:646
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr "Ustaw jako _tło"
 
-#: mail/em-popup.c:648
+#: mail/em-popup.c:649
 msgid "_Reply to sender"
 msgstr "Odpo_wiedz nadawcy"
 
-#: mail/em-popup.c:685
+#: mail/em-popup.c:697
 msgid "_Open Link in Browser"
 msgstr "Otwórz odnośnik w p_rzeglądarce"
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:698
 msgid "Se_nd message to..."
 msgstr "Wyślij _list do..."
 
-#: mail/em-popup.c:687
+#: mail/em-popup.c:699
 msgid "_Add to Addressbook"
 msgstr "Dodaj d_o książki adresowej"
 
-#: mail/em-popup.c:793
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Otwórz za pomocą programu %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "Serwer nie obsługuje informacji schematu LDAPv3"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Zapisz"
 
-#: mail/em-subscribe-editor.c:612
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Folder"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Wybierz serwer."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Nie wybrano serwera"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Bez wyświetlania tego komunikatu w przyszłości."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12102,26 +12581,26 @@ msgstr ""
 "Błąd przy wczytywaniu informacji o filtrze:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Filtry"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Przesyłany list ----------"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "nieznany nadawca"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "W liście z %a, %d-%m-%Y, godz. %H:%M, %%s pisze: "
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12130,7 +12609,7 @@ msgstr ""
 "Nie można zapisać do \"%s\"\n"
 " %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12139,24 +12618,39 @@ msgstr ""
 "Plik o nazwie \"%s\" już istnieje.\n"
 "Czy chcesz go nadpisać?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 msgid "message"
 msgstr "list"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Zapis listu pod podaną nazwą"
 
-#: mail/em-utils.c:1893
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Nie można utworzyć katalogu tymczasowego: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Adres"
+
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
+msgid ""
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Wykonanie tej operacji spowoduje trwałe usunięcie wszystkich listów "
+"oznaczonych do usunięcia. W przypadku kontynuowania operacji późniejsze "
+"odzyskanie listów nie będzie możliwe.\n"
+"\n"
+"Czy rzeczywiście usunąć te listy?"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2288
+#, fuzzy
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12166,6 +12660,387 @@ msgstr ""
 "\n"
 "Czy rzeczywiście usunąć te listy?"
 
+#: mail/evolution-mail.schemas.in.in.h:1
+msgid "Automatic link recognition"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:2
+msgid "Automatic smiley recognition"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
+msgid "Default charset in which to compose messages"
+msgstr "Domyślny temat listu."
+
+#: mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
+msgid "Default charset in which to compose messages."
+msgstr "Domyślny temat listu."
+
+#: mail/evolution-mail.schemas.in.in.h:8
+#, fuzzy
+msgid "Default charset in which to display messages"
+msgstr "Wyszukuje tekst w treści wyświetlanego listu"
+
+#: mail/evolution-mail.schemas.in.in.h:9
+#, fuzzy
+msgid "Default charset in which to display messages."
+msgstr "Wyszukuje tekst w treści wyświetlanego listu"
+
+#: mail/evolution-mail.schemas.in.in.h:10
+#, fuzzy
+msgid "Default forward style"
+msgstr "Sposób p_rzesyłania:"
+
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default reply style"
+msgstr "Sposób odpo_wiadania:"
+
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Empty Trash folders on exit"
+msgstr "_Opróżnianie folderów śmietnika przy zakończeniu"
+
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "_Opróżnianie folderów śmietnika przy zakończeniu"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
+msgstr "Konta pocztowe"
+
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "Wykonywanie czynności"
+
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Powiadamianie o nowej poczcie"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Powiadamianie o nowej poczcie"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+"Potwierdzanie przy wysyłaniu listów w formacie HTML do osób, które ich nie "
+"chcą"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "Potwierdzanie przy wysyłaniu listu tylko z _ukrytymi adresatami (Bcc)"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "Wysłanie listu w formacie HTML"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "Wysłanie listu w formacie HTML"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "Wyświetlanie _animowanych obrazów"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "Wyświetlanie _animowanych obrazów"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Wyświetla list w zwykły sposób"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "_Podgląd listu"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "_Odtwarzanie dźwięku po otrzymaniu nowej poczty"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "Sprawdzanie p_isowni"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "_Czcionka terminala:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "Wybór czcionki o zmiennej szerokości używanej na wydruku"
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Przełącza grupowanie listów w wątki"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Przełącza grupowanie listów w wątki"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "Ustawienie jako konto _domyślne"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "_Zmienna szerokość:"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr "Importer Elm Evolution"
@@ -12282,10 +13157,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importuje stare dane Netscape'a"
 
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1119
-msgid "Trash"
-msgstr "Śmietnik"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Skanowanie filtrów poczty"
@@ -12294,7 +13165,7 @@ msgstr "Skanowanie filtrów poczty"
 msgid "Scanning directory"
 msgstr "Analizowanie katalogu"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Uruchamianie importu"
 
@@ -12370,19 +13241,19 @@ msgid "You have not filled in all of the required information."
 msgstr "Nie zostały podane wszystkie wymagane informacje."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Modyfikacja konta Evolution"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Komputer:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "Nazwa _użytkownika:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "Ś_cieżka:"
 
@@ -12395,35 +13266,35 @@ msgstr "Nie można utworzyć dwóch kont o tej samej nazwie."
 msgid "Mail to %s"
 msgstr "List do %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Tematem jest %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "List od %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "lista dyskusyjna %s"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Odpowiedz na _listę"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Dodanie reguły filtru"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "Następujące reguły filtru:\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12434,23 +13305,23 @@ msgstr ""
 "   \"%s\"\n"
 "I zostały zaktualizowane."
 
-#: mail/mail-component.c:211
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr "Na tym komputerze"
 
-#: mail/mail-component.c:362
+#: mail/mail-component.c:379
 msgid "New Mail Message"
 msgstr "Nowy list"
 
-#: mail/mail-component.c:363
+#: mail/mail-component.c:380
 msgid "_Mail Message"
 msgstr "_List"
 
-#: mail/mail-component.c:364
+#: mail/mail-component.c:381
 msgid "Compose a new mail message"
 msgstr "Tworzy nowy list"
 
-#: mail/mail-component.c:445
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
@@ -12459,7 +13330,7 @@ msgstr ""
 "Podczas migracji danych pocztowych wystąpił poniższy błąd:\n"
 "%s"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Tożsamość"
 
@@ -12521,11 +13392,11 @@ msgstr ""
 "tego konta. Nazwa będzie używana tylko przy wyświetlaniu celem odróżnienia "
 "go od innych kont."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Sprawdzanie usługi"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Nawiązywanie połączenia z serwerem..."
 
@@ -12606,26 +13477,35 @@ msgid "C_olors"
 msgstr "K_olory"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Sprawdzanie nowej poczty"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "Sp_rawdzanie pisowni podczas pisania"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Sprawdzanie nowej poczty"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "Kolor _błędnie napisanych słów:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Tworzenie listów"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12641,271 +13521,276 @@ msgstr ""
 "\n"
 "Kliknij \"Zastosuj\", aby zapisać ustawienia."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "D_omyślne"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Domyślne zachowanie"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "Domyślny _zestaw znaków:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Usuwanie poczty"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Podpisyw_anie cyfrowe wszystkich wychodzących listów (domyślnie)"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "Bez cytowania oryginalnego listu"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 "Bez podpisywania próśb o _spotkanie (dla zgodności z programem Outlook)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Gotowe"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "Folder ze _szkicami:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "U_aktywnij"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "Konta pocztowe"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "Adres _e-mail:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "_Opróżnianie folderów śmietnika przy zakończeniu"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Encry_ption certificate:"
 msgstr "C_ertyfikat szyfrujący:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Druid kont Evolution"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Wykonanie polecenia..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "_Stała szerokość:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "Filtry"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "Ustawienia czcionek"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "Zapis listów w formacie _HTML"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "_Wyróżnianie cytatów za pomocą koloru"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Etykiety i kolory"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Pobieranie obrazów"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Konfiguracja poczty"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Położenie skrzynki"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Edytor listów"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Wyświetlanie listu"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 msgid "Message Fonts"
 msgstr "Czcionki wiadomości"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Powiadamianie o nowej poczcie"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Uwaga: zapytanie o hasło pojawi się dopiero przy pierwszej próbie połączenia"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Informacje opcjonalne"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "_Organizacja:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _klucza PGP/GPG:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Wybór koloru"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Potwierdzanie przy wysyłaniu listu tylko z _ukrytymi adresatami (Bcc)"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Drukowane czcionki"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Katalog maildir Qmaila"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "Cytowanie oryginalnego listu"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Jako cytat"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "_Zapamiętanie hasła"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "O_dpowiedź do:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Odbieranie poczty"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "Opcje _odbioru"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "Zapamiętanie tego _hasła"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Wymagane informacje"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "Przywróć domyślne"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "B_ezpieczeństwo"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "Bezpieczne MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr "Wybór czcionki o stałej szerokości używanej w HTML-u"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr "Wybór czcionki o stałej szerokości używanej na wydruku"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr "Wybór czcionki o zmiennej szerokości używanej w HTML-u"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr "Wybór czcionki o zmiennej szerokości używanej na wydruku"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Wysyłanie listów"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Folder z _wysłanymi listami:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Listy wysłane i szkice"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Serwer wymaga _uwierzytelnienia"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Konfiguracja serwera"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "_Typ serwera:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Si_gning certificate:"
 msgstr "Certyfikat szyfr_ujący:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "Nazwa p_liku:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "Sprawdzanie p_isowni"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Standardowy uniksowy plik mbox"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12915,7 +13800,7 @@ msgstr ""
 "podpis. Wpisana nazwa będzie używana tylko przy\n"
 "wyświetlaniu."
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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 "
@@ -12925,7 +13810,7 @@ msgstr ""
 "język. Lista dostępnych języków odnosi się tylko do języków, dla których "
 "zostały zainstalowane słowniki."
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12933,11 +13818,15 @@ msgstr ""
 "Wpisz nazwę, przy użyciu której chcesz się odnosić do tego konta.\n"
 "Na przykład: \"Służbowe\" lub \"Prywatne\""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "_Zmienna szerokość:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12947,161 +13836,170 @@ msgstr ""
 "\n"
 "Aby rozpocząć, kliknij \"Naprzód\"."
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "_Dodaj podpis"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "Pobieranie obrazów z sieci w _każdym przypadku"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 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:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "Typ _uwierzytelniania: "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "Typ _uwierzytelniania: "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr "_Automatyczne sprawdzanie nowych listów co"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "_Automatyczne wstawianie obrazów z buźkami"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "_Brzęczyk po otrzymaniu nowej poczty"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "P_otwierdzanie oczyszczenia folderu"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "_Domyślny podpis:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "_Domyślne"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Bez powiadamiania o nadejściu nowej poczty"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "_Uaktywnij"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Szyfrowanie wychodzących listów (domyślnie)"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "Sposób p_rzesyłania:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "_Pełna nazwa:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "Listy w _HTML-u"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "_Tożsamość"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Śmieć"
+
+#: mail/mail-config.glade.h:156
 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:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "Ustawienie jako konto _domyślne"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "O_znaczanie listów jako \"przeczytane\" po upływie"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Nazwa:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "_Bez pobierania jakichkolwiek obrazów z sieci"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "_Odtwarzanie dźwięku po otrzymaniu nowej poczty"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 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:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Potwierdzanie przy wysyłaniu listu bez _tematu"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "O_dbieranie poczty"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "Sposób odpo_wiadania:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "_Przywróć domyślne"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Skrypt:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 msgid "_Select..."
 msgstr "_Wybierz..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "Wy_syłanie listów"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "Wyświetlanie _animowanych obrazów"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Podpisy"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr "_Zwykła czcionka:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr "_Czcionka terminala:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "Wykorzystanie bezpiecznego połączenia (_SSL):"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr "_Używanie tych samych czcionek co inne aplikacje"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "opis"
 
@@ -13110,7 +14008,7 @@ msgstr "opis"
 msgid "Pinging %s"
 msgstr "Odpytywanie %s"
 
-#: mail/mail-mt.c:256
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13119,7 +14017,7 @@ msgstr ""
 "Błąd podczas operacji \"%s\":\n"
 "%s"
 
-#: mail/mail-mt.c:259
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13128,7 +14026,7 @@ msgstr ""
 "Błąd przy wykonywaniu operacji:\n"
 "%s"
 
-#: mail/mail-mt.c:910
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Wykonywanie operacji"
 
@@ -13195,10 +14093,6 @@ msgstr "Kopiowanie listów do %s"
 msgid "Scanning folders in \"%s\""
 msgstr "Analizowanie folderów w \"%s\""
 
-#: mail/mail-ops.c:1125
-msgid "Junk"
-msgstr "Śmieć"
-
 #: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Przesłane listy"
@@ -13240,22 +14134,22 @@ msgstr "Opróżnianie śmietnika w \"%s\""
 msgid "Local Folders"
 msgstr "Lokalne foldery"
 
-#: mail/mail-ops.c:1758
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Pobieranie listu %s"
 
-#: mail/mail-ops.c:1830
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Pobieranie %d listów"
 
-#: mail/mail-ops.c:1914
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Zapisywanie %d listów"
 
-#: mail/mail-ops.c:1962
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13264,7 +14158,7 @@ msgstr ""
 "Nie można utworzyć pliku wyjściowego: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1990
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13273,11 +14167,11 @@ msgstr ""
 "Błąd przy zapisie listów do: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2061
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Zapisywanie załącznika"
 
-#: mail/mail-ops.c:2078
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13286,22 +14180,22 @@ msgstr ""
 "Nie można utworzyć pliku wyjściowego: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2108
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie można zapisać danych: %s"
 
-#: mail/mail-ops.c:2256
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odłączanie od %s"
 
-#: mail/mail-ops.c:2256
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ponowne nawiązywanie połączenia z %s"
 
-#: mail/mail-ops.c:2358
+#: mail/mail-ops.c:2366
 msgid "Changing junk status"
 msgstr ""
 
@@ -13321,6 +14215,21 @@ msgstr "Znajdź:"
 msgid "Search"
 msgstr "Znajdź"
 
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Modyfikacja podpisu"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Wyjątki"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Informacje o koncie"
+
 #: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Anulowanie..."
@@ -13356,24 +14265,24 @@ msgstr "Aktualizowanie..."
 msgid "Waiting..."
 msgstr "Oczekiwanie..."
 
-#: mail/mail-session.c:231
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Operacja anulowana przez użytkownika."
 
-#: mail/mail-session.c:264
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Wprowadź hasło dla %s"
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Wprowadź hasło"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "_Zapamiętanie hasła"
 
-#: mail/mail-session.c:290
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamiętanie tego hasła na czas bieżącej sesji"
 
@@ -13421,17 +14330,22 @@ msgstr "Przesłany list - %s"
 msgid "Forwarded message"
 msgstr "Przesłany list"
 
-#: mail/mail-vfolder.c:90
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Otwieranie folderu %s"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Ustawianie vfolderu: %s"
 
-#: mail/mail-vfolder.c:208
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Aktualizowanie vfolderów pod uri: %s"
 
-#: mail/mail-vfolder.c:466
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13444,88 +14358,88 @@ msgstr ""
 "   \"%s\"\n"
 "I zostały zaktualizowane."
 
-#: mail/mail-vfolder.c:777
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "VFoldery"
 
-#: mail/mail-vfolder.c:836
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "vFoldery"
 
-#: mail/mail-vfolder.c:875
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Modyfikacja VFoldera"
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Próba zmodyfikowania vfoldera \"%s\", który nie istnieje"
 
-#: mail/mail-vfolder.c:967
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Nowy VFolder"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Niewidziany"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Widziany"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Z odpowiedzią"
 
-#: mail/message-list.c:905
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Wiele niewidzianych listów"
 
-#: mail/message-list.c:906
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Wiele listów"
 
-#: mail/message-list.c:910
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Najniższy"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Niższy"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Wyższy"
 
-#: mail/message-list.c:916
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Najwyższy"
 
-#: mail/message-list.c:1233
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1240
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Dziś %k:%M"
 
-#: mail/message-list.c:1249
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Wczoraj %k:%M"
 
-#: mail/message-list.c:1261
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
-#: mail/message-list.c:1271
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3073
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Aktualizowanie zestawienia listów"
 
@@ -13583,11 +14497,11 @@ msgstr "Prześlij"
 msgid "No Response Necessary"
 msgstr "Odpowiedź niekonieczna"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:81
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:82
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Wszystkim"
 
@@ -13649,22 +14563,120 @@ msgstr ""
 msgid "Evolution Shell"
 msgstr "Powłoka Evolution"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Kontrola konfiguracji ustawień folderu Evolution"
-
 #: shell/GNOME_Evolution_Shell.server.in.in.h:4
 msgid "Folder Settings"
 msgstr "Ustawienia folderów"
 
-#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" w \"%s\""
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "80%"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Zmienia nazwę grupy skrótów"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+msgid "Default width of the folder bar pane"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Ukrywa pasek skrótów"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Domyślny priorytet:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Domyślny priorytet:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Kontrola konfiguracji kalendarza Evolution"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+#, fuzzy
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "Oznaczenie domyślnego wyświetlenia załącznika jako treści."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
+msgid ""
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Path to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+msgid "Path to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+msgid "Path to the default tasks folder"
+msgstr ""
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Dodanie folderu"
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "URI folderu zadań, który należy wyświetlić"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+msgid "Whether to show the folder bar"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Ukrywa pasek skrótów"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "E-mail"
 
 #: shell/e-setup.c:144
 msgid "Could not update files correctly"
@@ -13790,11 +14802,6 @@ msgstr ""
 msgid "Really delete folder \"%s\"?"
 msgstr "Czy rzeczywiście usunąć folder \"%s\"?"
 
-#: shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Usunięcie \"%s\""
-
 #: shell/e-shell-folder-commands.c:489
 #, c-format
 msgid ""
@@ -13804,26 +14811,12 @@ msgstr ""
 "Nie można zmienić nazwy folderu:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Zmiana nazwy folderu \"%s\" na:"
-
-#: shell/e-shell-folder-commands.c:541
-msgid "Rename Folder"
-msgstr "Zmień nazwę folderu"
-
 #: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Podana nazwa folderu nie jest poprawna: %s"
 
-#: shell/e-shell-folder-commands.c:554
-#, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr "Folder o nazwie \"%s\" już istnieje. Użyj innej nazwy."
-
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
 msgstr "Wybrany folder nie należy do innego użytkownika"
@@ -13846,19 +14839,15 @@ msgstr ""
 "Nie można utworzyć podanego folderu:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Tworzenie nowego folderu"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Bez nazwy)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Wybierz typ uruchamianego importera:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13872,11 +14861,11 @@ msgstr ""
 "Jeśli nie znasz typu pliku, wybierz \"Automatycznie\", a Evolution spróbuje "
 "go rozpoznać."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Wybierz informacje, które chcesz zaimportować:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13884,7 +14873,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13893,21 +14882,21 @@ msgstr ""
 "Importowanie %s\n"
 "Importowanie %d. elementu."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "Wybór importera"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "Plik %s nie istnieje."
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Błąd Evolution"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -13916,11 +14905,11 @@ msgstr ""
 "Żaden z importerów nie potrafi obsłużyć pliku\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Importowanie"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -13929,17 +14918,17 @@ msgstr ""
 "Importowanie %s.\n"
 "Rozpoczynanie %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Błąd przy uruchamianiu %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Błąd przy odczycie %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13948,31 +14937,31 @@ msgstr ""
 "Importowanie %s\n"
 "Importowanie 1. elementu."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Automatycznie"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 msgid "_Filename:"
 msgstr "_Nazwa pliku:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Wybór pliku"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 msgid "File _type:"
 msgstr "_Typ pliku:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 msgid "Import data and settings from _older programs"
 msgstr "Import danych i ustawień ze _starszych programów"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 msgid "Import a _single file"
 msgstr "Imp_ort pojedynczego pliku"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -13980,46 +14969,27 @@ msgstr ""
 "Poczekaj chwilę...\n"
 "Trwa analizowanie istniejących konfiguracji"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Uruchamianie inteligentnych importerów"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Wybierz folder, do którego powinny zostać zaimportowane te dane"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 msgid "_Import"
 msgstr "Za_importuj"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Zamykanie połączeń..."
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Błąd podczas synchronizacji \"%s\":\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "Synchronizowanie folderu"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Synchronizowanie \"%s\" (%d z %d) ..."
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Ustawienia Evolution"
@@ -14054,7 +15024,7 @@ msgstr "Nie można otworzyć współdzielonego folderu: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Nie można odnaleźć podanego współdzielonego folderu."
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14063,7 +15033,7 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 msgid "Quit Assistant"
 msgstr ""
 
@@ -14124,33 +15094,47 @@ msgstr "Utworzenie nowego skrótu"
 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:769 shell/e-shell-window-commands.c:313
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "Praca _z podłączeniem"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:326
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
 #: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "Praca _bez podłączenia"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:339
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
 #: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Praca bez podłączenia"
 
-#: shell/e-shell.c:987
+#: shell/e-shell-window.c:324
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-window.c:331
+msgid "Ximian Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-window.c:337
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Niepoprawny argumenty"
 
-#: shell/e-shell.c:989
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Nie można dokonać rejestracji na serwerze OAF"
 
-#: shell/e-shell.c:991
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Nie odnaleziono bazy danych konfiguracji"
 
-#: shell/e-shell.c:993
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Błąd ogólny"
 
@@ -14252,10 +15236,6 @@ msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Otwiera w nowym oknie folder powiązany ze skrótem"
 
 #: shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "_Zmień nazwę"
-
-#: shell/e-shortcuts-view.c:427
 msgid "Rename this shortcut"
 msgstr "Zmienia nazwę skrótu"
 
@@ -14289,6 +15269,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (zakończono %d%%)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Nowy"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "\"%s\" w \"%s\""
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14326,66 +15317,6 @@ msgstr ""
 "Opis błędu otrzymany od systemu aktywacji:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "Błąd Corby"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Przerwane"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Niepoprawny argument"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Ma już właściciela"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Brak właściciela"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Nie odnaleziono"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Nieobsługiwany typ"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Nieobsługiwany schemat"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Nieobsługiwana operacja"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Błąd wewnętrzny"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Istnieje"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "Niepoprawny URI"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Zawiera foldery podrzędne"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Brak miejsca"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "Poprzedni właściciel zakończył działanie"
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr "Aktywne połączenia"
@@ -14416,18 +15347,10 @@ msgstr "_Poczta:"
 msgid "_Tasks:"
 msgstr "_Zadania:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr "_Nazwa folderu:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder _type:"
 msgstr "_Typ folderu:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Określ miejsce utworzenia folderu:"
-
 #: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "Otwarcie folderu innego użytkownika"
@@ -14526,7 +15449,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Importery"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:27
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Zaimportuj"
 
@@ -14542,7 +15465,7 @@ msgstr "Nie pytaj o to ponownie"
 msgid "Evolution can import data from the following files:"
 msgstr "Można zaimportować do Evolution dane z następujących plików:"
 
-#: shell/main.c:114 shell/main.c:557
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -14615,28 +15538,28 @@ msgstr "Nie można uzyskać dostępu do powłoki Ximian Evolution."
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nie można zainicjować powłoki Ximian Evolution: %s"
 
-#: shell/main.c:524
+#: shell/main.c:526
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:526
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Rozpoczyna w trybie bez podłączenia"
 
-#: shell/main.c:528
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Rozpoczyna w trybie z podłączeniem"
 
-#: shell/main.c:531
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr "Wymusza zamknięcie wszystkich komponentów Evolution"
 
-#: shell/main.c:534
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 "Zapisuje do pliku informacje dotyczące przebiegu wykonania komponentów."
 
-#: shell/main.c:561
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14645,31 +15568,55 @@ msgstr ""
 "%s: Nie można jednocześnie użyć opcji --online i --offline.\n"
 "  Aby uzyskać więcej informacji, uruchom %s --help.\n"
 
-#: smime/gui/certificate-manager.c:134 smime/gui/certificate-manager.c:275
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+msgid "Select a cert to import..."
+msgstr ""
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 msgid "Certificate Name"
 msgstr "Nazwa certyfikatu"
 
-#: smime/gui/certificate-manager.c:140 smime/gui/certificate-manager.c:287
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 msgid "Purposes"
 msgstr "Zastosowania"
 
-#: smime/gui/certificate-manager.c:146 smime/gui/smime-ui.glade.h:35
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr "Numer seryjny"
 
-#: smime/gui/certificate-manager.c:152
+#: smime/gui/certificate-manager.c:174
 msgid "Expires"
 msgstr "Traci ważność"
 
-#: smime/gui/certificate-manager.c:196 smime/gui/certificate-manager.c:330
-msgid "Select a cert to import..."
-msgstr ""
-
-#: smime/gui/certificate-manager.c:281
+#: smime/gui/certificate-manager.c:323
 msgid "E-Mail Address"
 msgstr "Adres e-mail"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"Certyfikat uległ przedawnieniu: %s\n"
+"Wydawca: %s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<To nie jest część certyfikatu>"
@@ -14731,126 +15678,359 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
 msgid "Certificate"
 msgstr "Certyfikat"
 
 #: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Niewiarygodny certyfikat"
+
+#: smime/gui/smime-ui.glade.h:16
 msgid "Certificate details"
 msgstr "Szczegóły certyfikatu"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:17
 msgid "Common Name (CN)"
 msgstr "Wspólna nazwa (CN)"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:18
 msgid "Contact Certificates"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:21
 #, no-c-format
 msgid "Do you want to trust \"%s\" for the following purposes?"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:21
+#: smime/gui/smime-ui.glade.h:22
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:23
 msgid "Edit"
 msgstr "Edycja"
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Nie można zweryfikować certyfikatu."
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Wyrażenie"
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:29
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:31
 msgid "Organization (O)"
 msgstr "Organizacja (O)"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:32
 msgid "Organizational Unit (OU)"
 msgstr "Jednostka organizacyjna (OU)"
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/gui/smime-ui.glade.h:37
 msgid "Trust this CA to identify email users."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:37
+#: smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify software developers."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:38
+#: smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify web sites."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:39
+#: smime/gui/smime-ui.glade.h:40
 msgid "View"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:40
+#: smime/gui/smime-ui.glade.h:41
 #, fuzzy
 msgid "View Certificate"
 msgstr "ID _certyfikatu:"
 
-#: smime/gui/smime-ui.glade.h:41
+#: smime/gui/smime-ui.glade.h:42
 #, fuzzy
 msgid "You have been asked to trust a new Certificate Authority (CA)."
 msgstr "Nie poprawny ośrodek certyfikacji (CA)"
 
-#: smime/gui/smime-ui.glade.h:42
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:43
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "ID _certyfikatu:"
 
-#: smime/lib/e-cert-db.c:443
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Karta z tym ID już istnieje"
 
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Osobiste"
+
+#: smime/lib/e-cert.c:488
+msgid "Version 1"
+msgstr ""
+
+#: smime/lib/e-cert.c:491
+msgid "Version 2"
+msgstr ""
+
+#: smime/lib/e-cert.c:494
+msgid "Version 3"
+msgstr ""
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr "Cc"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "OK"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "Nazwa certyfikatu"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "Nazwa certyfikatu"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "Niewiarygodny certyfikat"
+
+#: smime/lib/e-cert.c:621
+msgid "UID"
+msgstr ""
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Tematem jest %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Nie można przetworzyć folderu kolejki"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "Nie poprawny ośrodek certyfikacji (CA)"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Nie poprawny ośrodek certyfikacji (CA)"
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "przychodzące"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Brak informacji"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "załącznik"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "Nazwa certyfikatu"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Chorwacja"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+msgid "Not Critical"
+msgstr ""
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Wyrażenie"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s o %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Błędny podpis certyfikatu"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "W_staw"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Tematem jest %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Błędny podpis certyfikatu"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Wprowadź hasło dla %s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "ID _certyfikatu:"
+
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
 msgstr "Dodawany załącznik."
@@ -14900,7 +16080,7 @@ msgstr "Kopiuje zaznaczenie"
 msgid "Copy to Folder..."
 msgstr "Skopiuj do folderu..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Wycina zaznaczenie"
 
@@ -14916,7 +16096,7 @@ msgstr "Przenosi kontakty do innego folderu..."
 msgid "Move to Folder..."
 msgstr "Przenieś do folderu..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Wkleja zawartość schowka"
 
@@ -14924,8 +16104,8 @@ msgstr "Wkleja zawartość schowka"
 msgid "Previews the contacts to be printed"
 msgstr "Wyświetla podgląd kontaktów w postaci przygotowanej do druku"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:77
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Podgląd wyd_ruku"
@@ -14970,11 +16150,11 @@ msgstr "Zatrzymuje wczytywanie"
 msgid "View the current contact"
 msgstr "Wyświetla bieżący kontakt"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: 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:103
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
@@ -15005,131 +16185,107 @@ msgid "_Send Message to Contact..."
 msgstr "Wyślij _list do kontaktu..."
 
 #: ui/evolution-calendar.xml.h:3
-msgid "Create a new all-day event"
-msgstr "Tworzy nowe zdarzenie całodniowe"
-
-#: ui/evolution-calendar.xml.h:5
 msgid "Create a new calendar"
 msgstr "Tworzy nowy kalendarz"
 
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a new meeting"
-msgstr "Tworzy nowe spotkanie"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Tworzy nowe zadanie"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Dzień"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Usuń wszystkie wystąpienia"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Usuwa termin"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Usuń to wystąpienie"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Usuwa to wystąpienie"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Przejdź do"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Wstecz"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Naprzód"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Przejdź do _daty"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Przechodzi do podanej daty"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Przejdź do dzisiaj"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "Lista"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Miesiąc"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Nowy _termin"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 msgid "New _Calendar"
 msgstr "Nowy _kalendarz"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "New _Meeting"
-msgstr "Nowe _spotkanie"
-
-#: ui/evolution-calendar.xml.h:27
-msgid "New _Task"
-msgstr "Nowe _zadanie"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Wyświetla podgląd kalendarza w postaci przygotowanej do druku"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Drukuje zawartość kalendarza"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publikuje informację o zajętości na podstawie tego kalendarza"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 msgid "Purg_e"
 msgstr "Opróżn_ij"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 msgid "Purge old appointments and meetings"
 msgstr "Usuwa stare terminy i spotkania"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Wyświetl szczegóły"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Wyświetla jeden dzień"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Wyświetla jeden miesiąc"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Wyświetla jeden tydzień"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Wyświetla tydzień roboczy"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Tydzień"
 
@@ -15411,7 +16567,7 @@ msgstr "Oznacz wszystkie jako p_rzeczytane"
 msgid "Mark all visible messages as read"
 msgstr "Oznacza wszystkie widoczne listy jako przeczytane"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "Wkleja listy ze schowka"
 
@@ -15463,10 +16619,6 @@ msgstr "_Folder"
 msgid "_Invert Selection"
 msgstr "_Odwróć zaznaczenie"
 
-#: ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Właściwości..."
-
 #: ui/evolution-mail-list.xml.h:28
 msgid "_Threaded Message List"
 msgstr "Grupowanie listów w wąt_ki"
@@ -15627,263 +16779,268 @@ msgstr "Przesyła zaznaczony list do innej osoby w postaci załącznika"
 msgid "Increase the text size"
 msgstr "Zwiększa rozmiar tekstu"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Pobierz _obrazy"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Oz_nacz jako ważne"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Oznacz jako ni_eprzeczytane"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Ozn_acz jako nieważne"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "Oznacza zaznaczone listy jako przeczytane"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "Oznacza zaznaczone listy jako ważne"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:56
 #, fuzzy
 msgid "Mark the selected message(s) as junk"
 msgstr "Oznacza zaznaczone listy jako nieważne"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:57
 #, fuzzy
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Oznacza zaznaczone listy jako nieprzeczytane"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Oznacza zaznaczone listy jako nieprzeczytane"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Oznacza zaznaczone listy jako nieważne"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Oznacza zaznaczone listy do usunięcie"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Przenieś"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "Przenosi zaznaczone listy do innego folderu"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Następny"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "Kolejny _ważny list"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "Kolejny wą_tek"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "Kolejny _nieprzeczytany list"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Nie odnaleziono"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Otwiera zaznaczony list w nowym oknie"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 "Otwiera zaznaczony list w oknie redagowania umożliwiając jego ponowne "
 "wysłanie"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "_Pierwotny rozmiar"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "Poprzedni ni_eprzeczytany list"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:73
 msgid "Post a Repl_y"
 msgstr "Umieść o_dpowiedź"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr "Umieszcza odpowiedź na list w publicznym folderze"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "P_oprzednia ważna wiadomość"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Wyświetla podgląd listu w postaci przygotowanej do druku"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Drukuje list"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "Prze_kieruj"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Przekierowuje (odbija) zaznaczony list do innej osoby"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Przywraca pierwotny rozmiar tekstu"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "S_earch in Message..."
 msgstr "_Przeszukaj list..."
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "_Mniejszy"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Zapisuje list w pliku tekstowym"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Wyszukuje tekst w treści wyświetlanego listu"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr "Ustala ustawienia strony bieżącej drukarki"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Wyświetlanie postaci ź_ródłowej listu"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Wyświetlanie wszystkich _nagłówków"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Wyświetlanie mrugającego kursora w treści wyświetlanych wiadomości"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Wyświetla list w zwykły sposób"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Wyświetla list wraz ze wszystkimi nagłówkami"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Wyświetla list w surowej, źródłowej postaci"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "_Rozmiar tekstu"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Cofa oznaczenie do usunięcia dla wszystkich zaznaczonych listów"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "VFolder w oparciu o _listę dyskusyjną..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "VFolder w oparciu o _nadawcę..."
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "VFolder w oparciu o _odbiorców..."
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "VFolder w oparciu o _temat..."
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "_Załączony"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "S_kopiuj do folderu"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "_Utwórz filtr na podstawie listu"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "Prześlij _list"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "_Przejdź do"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "W _treści listu"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "_Większe"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "Wyświetlanie lis_tu"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "P_rzenieś do folderu"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "_Kolejny list"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "_Zwykłe wyświetlanie"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "_Otwórz list"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "_Poprzedni list"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "Jako _cytat"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "Wyślij p_onownie..."
 
-#: ui/evolution-mail-message.xml.h:125 ui/evolution.xml.h:31
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "_Narzędzia"
 
-#: ui/evolution-mail-message.xml.h:126
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "_Cofnij usunięcie"
 
@@ -15897,11 +17054,6 @@ msgstr "Zamyka bieżące okno"
 msgid "_Close"
 msgstr "Zam_knij"
 
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
-msgid "_View"
-msgstr "_Widok"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Załącz"
@@ -16474,10 +17626,6 @@ msgstr "Ukraiński"
 msgid "Visual"
 msgstr "Wizualny"
 
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Nowy"
-
 #: widgets/misc/e-charset-picker.c:168
 #, c-format
 msgid "Unknown character set: %s"
@@ -16547,3 +17695,131 @@ msgstr "Tekst"
 #: widgets/misc/e-search-bar.c:930
 msgid "Find _Now"
 msgstr "Znajdź _teraz"
+
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "Konfiguracja dostępu do serwerów katalogowych LDAP"
+
+#~ msgid "Directory Servers"
+#~ msgstr "Serwery katalogowe"
+
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Kontrola konfiguracji książki adresowej LDAP Evolution"
+
+#~ msgid "Account Name"
+#~ msgstr "Nazwa konta"
+
+#~ msgid "Server Name"
+#~ msgstr "Nazwa serwera"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "Ta kopia Evolution nie obsługuje protokołu LDAP"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Inne kontakty"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Krok 4: Wyświetlana nazwa"
+
+#~ msgid "Find contact in"
+#~ msgstr "Wybór folderu kontaktów do wyszukiwania"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Kliknij, aby dodać kontakt *"
+
+#~ msgid "Business Address"
+#~ msgstr "Adres firmowy"
+
+#~ msgid "Department"
+#~ msgstr "Oddział"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "URL sygnalizujący zajętość"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Zawód"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Czy pomimo tego wysłać?"
+
+#~ msgid "Folder _name"
+#~ msgstr "_Nazwa folderu:"
+
+#~ 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."
+
+#~ msgid "Add a Folder"
+#~ msgstr "Dodanie folderu"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Błąd podczas synchronizacji \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "Synchronizowanie folderu"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Synchronizowanie \"%s\" (%d z %d) ..."
+
+#~ msgid "CORBA error"
+#~ msgstr "Błąd Corby"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Niepoprawny argument"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Ma już właściciela"
+
+#~ msgid "No owner"
+#~ msgstr "Brak właściciela"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Nieobsługiwany typ"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Nieobsługiwany schemat"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Nieobsługiwana operacja"
+
+#~ msgid "Internal error"
+#~ msgstr "Błąd wewnętrzny"
+
+#~ msgid "Exists"
+#~ msgstr "Istnieje"
+
+#~ msgid "Invalid URI"
+#~ msgstr "Niepoprawny URI"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Zawiera foldery podrzędne"
+
+#~ msgid "No space left"
+#~ msgstr "Brak miejsca"
+
+#~ msgid "Old owner has died"
+#~ msgstr "Poprzedni właściciel zakończył działanie"
+
+#~ msgid "Create a new all-day event"
+#~ msgstr "Tworzy nowe zdarzenie całodniowe"
+
+#~ msgid "Create a new meeting"
+#~ msgstr "Tworzy nowe spotkanie"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Nowy _termin"
+
+#~ msgid "New _Meeting"
+#~ msgstr "Nowe _spotkanie"
+
+#~ msgid "New _Task"
+#~ msgstr "Nowe _zadanie"
diff --git a/po/pt.po b/po/pt.po
index 8c8faffd52..536ff2a676 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.4\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-05-22 01:35+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
@@ -30,51 +30,184 @@ msgstr "Incapaz de ler %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Incapaz de ler bloco da aplicação de Endereços da pilot"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Pastas de Completar Automaticamente"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "ID _Certificado:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Configure aqui as suas contas de correio"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Contactos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
+msgstr "Livro de Endereços Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address pop-up"
+msgstr "Popup de endereços do Livro de Endereços Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address viewer"
+msgstr "Visualizador de endereços do Livro de Endereços Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook card viewer"
+msgstr "Visualizador de cartões do Livro de Endereços Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook component"
+msgstr "Componente de Livro de Endereços Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook folder viewer"
+msgstr "Visualizador de pasta de Livro de Endereços Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Controlo preferências de Correio Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Controlo de definições de configuração de pasta Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Livro Endereços"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Propriedades..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Apagar"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "_Renomear"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Novo Contacto:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Contacto"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "Criar um novo contacto"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Nova Lista Contactos"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "Nova Lista Contactos"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "Criar uma nova lista de contactos"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Pessoal"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Trabalho"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "Servidor LDAP"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Incapaz de criar directório %s: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "Incapaz de se ligação ao servidor LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "Falha ao autenticar-se no servidor LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "Incapaz de efectuar pesquisa no DSE Raíz"
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "O servidor respondeu com nenhuma base de procura suportada"
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Este servidor não suporta esquema de informação LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "Erro ao obter informação de esquema"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr "Servidor não respondeu com informação de esquema válida"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Nome Conta"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Nome Servidor"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP não foi activado nesta compilação do Evolution"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Outros Contactos"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -82,7 +215,7 @@ msgstr ""
 "Incapaz de abrir este livro de endereços. Verifique que o caminho\n"
 "existe e de que tem permissões para lhe aceder."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -92,7 +225,7 @@ msgstr ""
 "ou introduziu um URI incorrecto ou o servir LDAP não está\n"
 "acessível."
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -104,7 +237,7 @@ msgstr ""
 "compilar a aplicação a partir do código fonte em CVS após\n"
 "obter o OpenLDAP do link abaixo.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -118,44 +251,43 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Incapaz de abrir ivro de endereços"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "A aceder anonimamente ao Servidor LDAP"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "Falha ao autenticar-se.\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sIntroduza senha para %s (utilizador %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "Nome começa por"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "Email começa por"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Categoria é"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Qualquer campo contém"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Avançado..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -167,7 +299,7 @@ msgstr ""
 "forma mais específica ou eleve o limite de resultados nas preferências\n"
 "do servidor de directório para este livro de endereços."
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -179,90 +311,43 @@ msgstr ""
 "forma mais específica ou eleve o limite de tempo nas preferências do\n"
 "servidor de directório para este livro de endereços."
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "O backend para este livro de endereços foi incapaz de parsear a procura."
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "O backend para este livro de endereços recusou-se a efectuar esta procura."
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "Esta procura não terminou com sucesso."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Qualquer Categoria"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "O URI que o calendário irá mostrar"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "ID _Certificado:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "Configurar aqui acesso a servidores de directório LDAP"
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Contactos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "Servidores Directório"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Livro de Endereços Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Controlo Configuração Livro Endereços LDAP do Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "Popup de endereços do Livro de Endereços Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "Visualizador de endereços do Livro de Endereços Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Visualizador de cartões do Livro de Endereços Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr "Componente de Livro de Endereços Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook folder viewer"
-msgstr "Visualizador de pasta de Livro de Endereços Evolution"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Controlo preferências de Correio Evolution"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -285,6 +370,7 @@ msgstr "  Mostrar _Bases Suportadas "
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -318,8 +404,9 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "Adicionar Servidor LDAP"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "Assistente Configuração LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -335,9 +422,9 @@ msgid "Anonymously"
 msgstr "Anonimamente"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -347,48 +434,49 @@ msgstr ""
 "\n"
 "Prima o botão \"Terminar\" para gravar as configurações que aqui introduziu."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "A ligar"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "_Nome distinto:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr "Editar Servidor LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
 msgstr "Endereço email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution irá utilizar este DN para o autenticar no servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution irá utilizar este endereço email para o autenticar no servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "Terminado"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Geral"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "Assistente Configuração LDAP"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "Grupo"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Nunca"
 
@@ -417,8 +505,8 @@ msgid "S_earch scope: "
 msgstr "Â_mbito procura: "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "A Procurar"
 
@@ -479,28 +567,32 @@ msgstr ""
 "para procuras LDAP e para criar e editar contactos. "
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 "Especificar um nome de apresentação é o último passo requerido para "
 "configurar ums ervidor LDAP."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "Passo 1: Informação Servidor"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "Passo 2: A Ligar-se ao Servidor"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "Passo 1: Informação Servidor"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "Passo 3: A Procurar no Directório"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Passo 2: A Ligar-se ao Servidor"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "Passo 4: Nome Apresentação"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Passo 3: A Procurar no Directório"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -512,18 +604,6 @@ msgstr "Bases Procura Suportadas"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"O primeiro passo na configuração de um servidor LDAP é especificar o nome e "
-"a sua\n"
-"informação de autenticação. Pergunte ao seu administrador de sistemas caso "
-"desconheça a informação."
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -536,7 +616,7 @@ msgstr ""
 "sistemas\n"
 "caso necessite de alterar estas opções."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -547,7 +627,7 @@ msgstr ""
 "irão começar.\n"
 "Se deixar vazio, as procuras iniciar-se-ão na raiz da árvore de directório."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -562,14 +642,14 @@ msgstr ""
 "da sua base de procura. Um âmbito de procura de \"um\" apenas incluirá "
 "entradas um nível abaixo da sua base.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
+#, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "Este assistente irá ajuda-lo a aceder a serviços de directórios online\n"
 "utilizando servidores LDAP (Lightweight Directory Access Protocol).\n"
@@ -578,7 +658,7 @@ msgstr ""
 "sobre o servidor. Contacte o seu administrador de sistemas se necessitar\n"
 "de ajuda a descobrir esta informação."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -586,7 +666,7 @@ msgstr ""
 "Este é o nome completo do seu servidor ldap. Por exemplo, \"ldap."
 "minhaempresa.pt\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -596,7 +676,7 @@ msgstr ""
 "para\n"
 "ser demasiado grande irá tornar mais lento o seu livro de endereços."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -606,7 +686,7 @@ msgstr ""
 "configurar isto para \"Endereço Email\" requer acesso anónimo ao seu "
 "servidor ldap."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -616,6 +696,16 @@ msgstr ""
 "Evolution.\n"
 "É apenas para fins visuais."
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Este é o nome para este servidor que irá ser mostrado na sua lista de pasta "
+"Evolution.\n"
+"É apenas para fins visuais."
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -646,21 +736,34 @@ msgid "Using email address"
 msgstr "utilizar endereço email"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Sempre Que Possível"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+"O primeiro passo na configuração de um servidor LDAP é especificar o nome e "
+"a sua\n"
+"informação de autenticação. Pergunte ao seu administrador de sistemas caso "
+"desconheça a informação."
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "_Nome apresentação:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "Limite _descarregar:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -668,54 +771,52 @@ msgstr "Limite _descarregar:"
 msgid "_Edit"
 msgstr "_Editar"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "Método autenticação:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "Número _porto:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "Ba_se procura:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "Nome _servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "E_xpiração (minutos):"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "cartões"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr "aba-a-ligar-se"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr "aba-geral"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr "aba-procura"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Nome"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Interface de selecção de nome de Livro de Endereços Evolution"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Remover Todos"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Remover"
@@ -742,23 +843,21 @@ msgstr "Adicionar aos Contactos"
 msgid "Unnamed Contact"
 msgstr "Contacto Sem Nome"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Nome"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Origem"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Seleccionar Contactos do Livro Endereços"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "Procurar Contacto em"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Interface de selecção de nome de Livro de Endereços Evolution"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Procurar"
@@ -835,7 +934,8 @@ msgid "D_epartment:"
 msgstr "D_epartamento:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalhes"
 
@@ -902,12 +1002,12 @@ msgid "_Categories..."
 msgstr "_Categorias..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "Apa_gar"
@@ -2030,7 +2130,7 @@ msgid "Esq."
 msgstr "Esq."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Nome completo"
 
@@ -2124,11 +2224,27 @@ msgstr "Editor Lista Contactos"
 msgid "Save List as VCard"
 msgstr "Gravar Lista como VCard"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Contacto Alterado:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Contacto em Conflito:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Detectado Contacto Duplicado"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"O nome ou email alterado deste contacto já existe\n"
+"nesta pasta. Ainda assim deseja adiciona-lo?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Novo Contacto:"
@@ -2145,22 +2261,6 @@ msgstr ""
 "O nome ou endereço de email deste contacto já existe nesta\n"
 "pasta. Ainda assim deseja adiciona-lo?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Contacto Alterado:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Contacto em Conflito:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"O nome ou email alterado deste contacto já existe\n"
-"nesta pasta. Ainda assim deseja adiciona-lo?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2259,9 +2359,9 @@ msgstr "Reenviar Contacto"
 msgid "Send Message to Contact"
 msgstr "Enviar Mensagem para Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimir"
@@ -2283,9 +2383,12 @@ msgstr "Ir para pasta..."
 msgid "Cut"
 msgstr "Cortar"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiar"
 
@@ -2294,16 +2397,8 @@ msgstr "Copiar"
 msgid "Paste"
 msgstr "Colar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Apagar"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "Vista Actual"
 
@@ -2319,166 +2414,170 @@ msgstr ""
 "crashou. Terá de reiniciar o Evolution para o poder utilizar novamente"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "* Click here to add a contact *"
-msgstr "* Clique aqui para adicionar um contacto *"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Assistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant Phone"
 msgstr "Telefone Assistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Address"
-msgstr "Endereço Profissional"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Fax Profissional"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Telefone Profissional"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Telefone Profissional 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Telefone Retorno Chamada"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Telefone Carro"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Categorias"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Telefone Empresa"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Departamento"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "Email 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "Email 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Sobrenome"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Arquivar Como"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "URL Livre-ocupado"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Endereço Casa"
+#, fuzzy
+msgid "Given Name"
+msgstr "Nome Campo"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Fax Pessoal"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Telefone Casa 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Telefone Casa 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "RDIS"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Telefone"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Jordão"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Gestor"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Telefone Celular"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Alcunha"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Escritório"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organização"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Outro Endereço"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Outro Fax"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Outro Telefone"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Telefone Principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Profissão"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Rádio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Papel"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Esposa"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Título"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Unst"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Página Web"
 
@@ -2571,11 +2670,19 @@ msgstr "Membros"
 msgid "Job Title"
 msgstr "Título car_go:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Endereço Casa"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Endereço Casa"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Outro Endereço"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2588,112 +2695,109 @@ msgstr "Fax Pessoal"
 msgid "Blog"
 msgstr "Bolonha"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Sucesso"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Repositório desligado"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Permissão negada"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Cartão não encontrado"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "ID cartão já existe"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Protocolo não suportado"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "Autenticação Falhou"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "Autenticação Requerida"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS Indisponível"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "Livro de endereços não existe"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Outro erro"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Deseja gravar as alterações?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Erro ao adicionar lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Erro ao adicionar cartão"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Erro ao alterar lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Erro ao modificar cartão"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Erro ao remover"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Erro ao remover cartão"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2702,7 +2806,7 @@ msgstr ""
 "Abrir %d cartões irá também abrir %d novas janelas.\n"
 "Deseja mesmo visualizar todos estes cartões?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2711,49 +2815,49 @@ msgstr ""
 "%s já existe\n"
 "Deseja sobrepo-lo?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "Sobrepor"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Erro a gravar %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "cartao.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Mover cartão para"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Copiar cartão para"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Mover cartões para"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Copiar cartões para"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Múltiplos VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard de %s"
@@ -2948,7 +3052,7 @@ msgstr "Margens"
 msgid "Number of columns:"
 msgstr "Número de colunas:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Opções"
 
@@ -3135,18 +3239,18 @@ msgstr "Lista Sem Nome"
 msgid "Split Multi-Day Events:"
 msgstr "Dividir Eventos Multi-Dias:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Incapaz de iniciar servidor wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Incapaz de inicializar wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Incapaz de ler bloco aplicação Calendário da pilot"
 
@@ -3154,24 +3258,83 @@ msgstr "Incapaz de ler bloco aplicação Calendário da pilot"
 msgid "Default Priority:"
 msgstr "Prioridade por Omissão:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Incapaz de ler bloco aplicação A Fazer da pilot"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Calendário e Tarefas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Calendário"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configure o seu fuso-horário. Calendário e Lista de Tarefas aqui "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Calendário e Tarefas Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Controlo de configuração de Calendário Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Visualizador mensagem de agendamento do Calendário Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Visualizador Calendário Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Editor Calendário/Tarefas Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Visualizador Tarefas Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Componente de Calendário e Tarefas Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Componente Teste Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Tarefas"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Serviço de alarme de notificação de Calendário Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "A Iniciar:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "A Acabar:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Alarme Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarme a %s"
@@ -3246,43 +3409,172 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Não perguntar novamente sobre esta aplicação."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Serviço de alarme de notificação de Calendário Evolution"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Incapaz de inicializar Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Incapaz de inicializar gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Incapaz de criar a fábrica de serviço de alarme de notificação"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "hora inválida"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "Erro iCalendário"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Cor das tarefas cujo prazo termina hoje"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Cor das tarefas cujo prazo termina hoje"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "Mo_strar horas de término de compromissos nas vistas de mês e semana"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Antevê o calendário a ser impresso"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "Pedir confirmação ao _apagar itens"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "Pedir confirmação ao _apagar itens"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Apagar tarefas terminadas"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Mostrar _números das semanas no navegador de datas"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Resumo contém"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Descrição contém"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Comentário contém"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Sem equivalência"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3294,81 +3586,110 @@ msgstr ""
 "\n"
 "Apagar mesmo estas tarefas?"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "devolve menor do que"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "dias"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Imprimir este calendário"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Nova Caledónia"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "Novo compromisso"
+
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "_Compromisso"
+
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Criar um novo compromisso"
+
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "Nova reunião"
+
+#: calendar/gui/calendar-component.c:640
+msgid "M_eeting"
+msgstr "R_eunião"
+
+#: calendar/gui/calendar-component.c:641
 #, fuzzy
-msgid "Rename"
-msgstr "_Renomear"
+msgid "Create a new meeting request"
+msgstr "Criar uma nova convocatória de reunião"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Novo Compromisso de Dia Completo"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Pessoal"
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr "Compromisso _Dia Completo"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Trabalho"
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Criar um novo compromisso"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3485,7 +3806,7 @@ msgstr "Enviar Para:"
 msgid "With these arguments:"
 msgstr "Com estes argumentos:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr "diálogo1"
 
@@ -3501,6 +3822,10 @@ msgstr "horas"
 msgid "minutes"
 msgstr "minutos"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3533,8 +3858,8 @@ msgstr "Enviar um Email"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Resumo:"
 
@@ -3563,7 +3888,7 @@ msgstr "fim do compromisso"
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -3617,7 +3942,7 @@ msgstr "Dias"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Sexta Feira"
 
@@ -3631,7 +3956,7 @@ msgstr "Minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Segunda Feira"
 
@@ -3641,7 +3966,7 @@ msgstr "_Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -3655,7 +3980,7 @@ msgstr "Mostrar _números das semanas no navegador de datas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -3673,7 +3998,7 @@ msgstr "Lista Tarefas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Quinta Feira"
 
@@ -3691,7 +4016,7 @@ msgstr "Formato hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Terça Feira"
 
@@ -3701,12 +4026,12 @@ msgstr "S_emana começa:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Quarta feira"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Semana Trabalho"
 
@@ -3743,7 +4068,7 @@ msgid "_Fri"
 msgstr "Se_x"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Geral"
 
@@ -3783,7 +4108,7 @@ msgstr "_Qua"
 msgid "before every appointment"
 msgstr "antes todos compromissos"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
@@ -3791,11 +4116,11 @@ msgstr ""
 "O evento a ser apagado é uma reunião, deseja enviar uma notificação de "
 "cancelamento?"
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Tem a certeza de que deseja cancelar e apagar esta reunião?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
@@ -3803,11 +4128,11 @@ msgstr ""
 "A tarefa a ser apagada está atribuida, deseja enviar uma notificação de "
 "cancelamento?"
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Tem a certeza que deseja cancelar e apagar esta tarefa?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -3815,51 +4140,51 @@ msgstr ""
 "A entrada de diário a ser apagada está publicada, deseja enviar uma "
 "notificação de cancelamento?"
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Tem a certeza que deseja cancelar e apagar esta entrada de diário?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Este evento foi apagado."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Esta tarefa foi apagada."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Esta entrada de diário foi apagada."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Efectuou alterações. Esquecer estas alterações e fechar o editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Não efectuou quaisquer alterações, fechar o editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Este evento foi alterado."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Esta tarefa foi alterada."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Esta entrada de diário foi alterada."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Efectuou alterações. Esquecer essas alterações e actualizar o editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Não efectuou quaisquer alterações, actualizar o editor?"
@@ -3869,165 +4194,170 @@ msgstr "%s  Não efectuou quaisquer alterações, actualizar o editor?"
 msgid "Validation error: %s"
 msgstr "Erro validação: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " para "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Terminada "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Terminada "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Prazo "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Prazo "
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "Incapaz de actualizar objecto"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Editar Compromisso"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Compromisso - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada diário - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Nenhum resumo"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Gravar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Alterações efectuadas a este item serão descartadas se chegarem actualizações"
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Incapaz de obter versão actual!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Seleccione uma pasta de destino para importar estes dados"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Tem a certeza que deseja apagar o compromisso `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Tem a certeza que deseja apagar este compromisso sem título?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Tem a certeza que deseja apagar a tarefa `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Tem a certeza que deseja apagar esta tarefa sem título?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Tem a certeza que deseja apagar a entrada de diário `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Tem a certeza que deseja apagar esta entrada de diário sem título?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Tem a certeza que deseja apagar %d compromissos?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Tem a certeza que deseja apagar %d tarefas?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Tem a certeza que deseja apagar %d entradas de diário?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "O evento não pode ser apagado devido a um erro corba"
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "A tarefa não pode ser apagada devido a um erro corba"
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "A entrada de diário não pode ser apagada devido a um erro corba"
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "O item não pode ser apagado devido a um erro corba"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "O evento não pode ser apagado pois foram negadas permissões"
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "A tarefa não pode ser apagada pois foram negadas permissões"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "A entrada de diário não pode ser apagada pois foram negadas permissões"
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "O item não pode ser apagado pois foram negadas permissões"
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "O evento não pode ser apagado devido a um erro corba"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "A tarefa não pode ser apagada devido a um erro corba"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "A entrada de diário não pode ser apagada devido a um erro corba"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "O item não pode ser apagado devido a um erro corba"
@@ -4044,43 +4374,43 @@ msgstr "Delegar Para:"
 msgid "Enter Delegate"
 msgstr "Introduzir Delegado"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Compromisso"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Lembrete"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Recorrência"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Calendarizar"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Reunião"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "Data de início está errada"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "Data de término está errada"
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "Hora de início está errada"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "Hora de término está errada"
 
@@ -4150,31 +4480,31 @@ msgid "_Start time:"
 msgstr "Hora _início:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Nenhuma"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr "O organizador seleccionado já não possui nenhuma conta."
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "É necessário um organizador."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "É necessário pelo menos um participante."
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Delegar Para..."
 
@@ -4215,21 +4545,15 @@ msgid "Member"
 msgstr "Membro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Papel"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
@@ -4249,6 +4573,7 @@ msgid "_Invite Others..."
 msgstr "Conv_idar Outros..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4281,6 +4606,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Incapaz de criar directório %s: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "Tem de ser enviado um organizador."
@@ -4310,33 +4636,58 @@ msgstr "Informação calendário"
 msgid "Calendar Name"
 msgstr "Calendário"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Incapaz de criar directório %s: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Informação calendário"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Lista Tarefas"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Lista Tarefas"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Lista Tarefas"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr "Está a alterar um evento recorrente, o que deseja alterar?"
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Está a alterar uma tarefa recorrente, o que deseja alterar?"
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr "Está a alterar uma entrada de diário recorrente, o que deseja alterar?"
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr "Apenas Esta Instância"
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Esta e Futuras Instâncias"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr "Esta e Futuras Instâncias"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr "Todas Instâncias"
 
@@ -4384,10 +4735,15 @@ msgstr "dia"
 msgid "on the"
 msgstr "no"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "ocorrências"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Data/Hora:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "A_dicionar"
@@ -4452,7 +4808,7 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
@@ -4462,31 +4818,31 @@ msgstr ""
 "\n"
 "Deseja gravar as alterações?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "_Descartar Alterações"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 msgid "Save Event"
 msgstr "Gravar Evento"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "A informação de reunião foi criada. Envia-la?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "A informação de reunião foi alterada. Enviar uma versão actualizada?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "A informação de atribuição de tarefa foi criada. Envia-la?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "A informação de tarefa foi alterada. Enviar uma versão actualizada?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Data de terminada está errada"
 
@@ -4496,43 +4852,43 @@ msgid "% _Complete"
 msgstr "% Terminada"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Terminado"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Alta"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "Em Curso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Baixa"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Por Iniciar"
 
@@ -4541,7 +4897,7 @@ msgid "Progress"
 msgstr "Progresso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Indefinida"
 
@@ -4563,21 +4919,21 @@ msgstr "E_stado:"
 msgid "_Web Page:"
 msgstr "Endereço página _web:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Básico"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Compromisso"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "Data final prazo está errada"
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4585,9 +4941,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "Con_fidencial"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Descrição:"
 
@@ -4692,26 +5048,21 @@ msgstr "%s em %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s para um tipo de disparo desconhecido"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Público"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Categorias"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4724,28 +5075,26 @@ msgid "Start Date"
 msgstr "Data Início"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Resumo"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "cor"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Compromisso"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Livre"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Ocupado"
 
@@ -4757,7 +5106,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "E"
 
@@ -4765,7 +5114,7 @@ msgstr "E"
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4775,7 +5124,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4783,7 +5132,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Sim"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4791,17 +5140,17 @@ msgstr "Não"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Desconhecida"
 
@@ -4813,181 +5162,179 @@ msgstr "Recorrente"
 msgid "Assigned"
 msgstr "Atribuida"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "A actualizar objectos"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "A apagar objectos seleccionados"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "A actualizar objectos"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Novo _Compromisso..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Novo _Evento Dia Completo"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "Nova Reunião"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "Im_primir..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "Co_lar"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Ir para _Hoje"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "_Ir para Data..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar Informação Livre/Ocupado"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "Configuraçõe_s..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Gravar Como..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "A_gendar Reunião..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "_Reenviar como iCalendário"
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Apagar esta _Ocorrência"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "_Apagar Todas Ocorrências"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "Configuraçõe_s..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Abrir Mensagem"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "_Atribuir Tarefa"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "_Reenviar como iCalendário"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "_Marcar como Terminada"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar Tarefas Seleccionadas como Terminadas"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "_Apagar Tarefas Seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Clicar para adicionar uma tarefa"
@@ -5001,8 +5348,8 @@ msgstr "% Terminada"
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Terminada"
 
@@ -5031,18 +5378,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5061,7 +5408,7 @@ msgstr "%02i divisões minutos"
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5074,125 +5421,125 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sim. (Recorrência Complexa)"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "Todos dias"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "A cada %d dias"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "Todas semanas"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "A cada %d semanas"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr "Todas as semanas à "
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr "A cada %d semanas à "
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " e "
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr "O %s dia de "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr "O %s %s de "
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "todos os meses"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr "a cada %d meses"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "Todos os anos"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "A cada %d anos"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr " um total de %d vezes"
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ", a terminar em "
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>Início:</b> "
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Fim:</b> "
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>Terminada:</b> "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>Expira:</b> "
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "Informação iCalendário"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "Erro iCalendário"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Uma pessoa desconhecida"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5200,322 +5547,321 @@ msgstr ""
 "<br> Reveja a informação seguinte, e depois seleccione uma acção do menu "
 "abaixo."
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Nenhum</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "Localização:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Estado:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Aceite"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Aceite Tentativamente"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Recusada"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Seleccione uma acção:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Actualizar"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Aceitar"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Aceitar tentativamente"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Recusar"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Enviar Informação Livre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Actualizar estado respostas"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Enviar Última Informação"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, 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:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Informação Reunião"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> pede a presença de %s na reunião."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> pede a sua presença na reunião."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Proposta Reunião"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> deseja adicionar uma reunião existente."
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Actualização Reunião"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> deseja receber a mais recente informação de reunião."
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Pedido Actualização Reunião"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, 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:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Resposta Reunião"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> cancelou uma reunião."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Cancelamento Reunião"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> enviou uma mensagem imperceptível."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Mensagem Reunião Inválida"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Informação Tarefa"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> requer que %s execute uma tarefa."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> requer que você execute uma tarefa."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Proposta Tarefa"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> deseja adicionar a uma tarefa existente."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Actualização Tarefa"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> deseja receber a mais recente informação de tarefa."
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Pedido Actualização Tarefa"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, 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:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Resposta Tarefa"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> cancelou uma tarefa."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Cancelamento Tarefa"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Mensagem Tarefa Inválida"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, 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:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Informação Livre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> pede a sua informação de livre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Pedido Livre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, 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:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Resposta Livre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Mensagem Livre/Ocupado Inválida"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr "A mensagem não parece estar correctamente criada"
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "A mensagem apenas contém pedidos não suportados."
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr "O anexo não contém uma mensagem de calendário válida"
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr "O anexo não contém itens de calendário visíveis"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "Ficheiro de calendário não pode ser actualizado!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Actualização terminada\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Estado de participante não pode ser actualizado porque o item já não existe"
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objecto está inválido e não pode ser actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Esta resposta não é de um participante actual. Addicionar como participante?"
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Estado de participante não pode ser actualizado devido a um estado "
 "inválido!\n"
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr "Ocorreu um erro no systema CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr "Objecto não foi encontrado\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Não possui as permissões adequadas para actualizar o calendário\n"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Estado de participante actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "Estado de participante não pode ser actualizado!\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Apagar Terminado"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Item enviado!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "O item não pode ser enviado!\n"
 
@@ -5675,7 +6021,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -5739,49 +6085,44 @@ msgstr "Hora _início reunião:"
 msgid "Meeting _end time:"
 msgstr "Hora _fim reunião:"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "_Data Início:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "Data _Término:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "_Prioridade:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Página"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "A abrir tarefas em %s"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Incapaz de ler as tarefas em `%s'"
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "O método requerido para ler `%s' não é suportado"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Não possui permissões para abrir a pasta em `%s'"
 
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5790,48 +6131,39 @@ msgstr ""
 "Erro em %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "A terminar tarefas..."
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "A apagar objectos seleccionados..."
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "A Expurgar"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Tarefas"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Calendário"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Incapaz de abrir a pasta em `%s'"
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "O método requerido para abrir `%s' não é suportado"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "A adicionar alarmes para %s"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5842,7 +6174,7 @@ msgstr ""
 "%s\n"
 " crashou. Terá de reiniciar o Evolution para o poder utilizar novamente"
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5853,58 +6185,11 @@ msgstr ""
 "%s\n"
 " crashou. Terá de reiniciar o Evolution para o poder utilizar novamente"
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Turim"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Calendário e Tarefas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Calendário"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configure o seu fuso-horário. Calendário e Lista de Tarefas aqui "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Calendário e Tarefas Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Controlo de configuração de Calendário Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Visualizador mensagem de agendamento do Calendário Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Visualizador Calendário Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Editor Calendário/Tarefas Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Visualizador Tarefas Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Componente de Calendário e Tarefas Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Componente Teste Evolution"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Abril"
@@ -5961,296 +6246,332 @@ msgstr "Outubro"
 msgid "September"
 msgstr "Setembro"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Tem de ser enviado um organizador."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "É necessário pelo menos um participante"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Informação evento"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Informação tarefa"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Informação diário"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Informação livre/ocupado"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Informação calendário"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Actualizado"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "Contra-proposta"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informação livre/ocupado (%s para %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "Informação icalendário"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Tem de ser um participante do evento."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1º"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2º"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3º"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4º"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5º"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6º"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7º"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8º"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9º"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10º"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11º"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12º"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13º"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14º"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15º"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16º"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17º"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18º"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19º"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20º"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21º"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22º"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23º"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24º"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25º"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26º"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27º"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28º"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29º"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30º"
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31º"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Sg"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Te"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Qa"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Qi"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Sx"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Sá"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Dia seleccionado (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Semana seleccionada (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Mês seleccionado (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Ano seleccionado (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Tarefa"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percentagem Terminado: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorias: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Contactos: "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Antever Impressão"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Imprimir Item"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Configurar Impressão"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Renomear este atalho"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Lista Tarefas"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Nova tarefa"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Tarefa"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Criar uma nova tarefa"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "O URI da pasta de tarefas a apresentar"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6262,11 +6583,11 @@ msgstr ""
 "\n"
 "Apagar mesmo estas tarefas?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Não perguntar novamente."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "Imprimir Tarefas"
 
@@ -6294,15 +6615,15 @@ msgstr "Ficheiros iCalendário (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "Ficheiros vCalendário (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "Lembrete!!"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "Eventos Calendário"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6310,7 +6631,7 @@ msgstr ""
 "Evolution encontrou ficheiro do Calendário Gnome.\n"
 "Deseja importa-los para o Evolution?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Calendário Gnome"
 
@@ -7843,27 +8164,27 @@ msgstr "Pacífico/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacífico/Yap"
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "Assinatura não é suportada por esta cifra"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "Verificação não é suportada por esta cifra"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Encriptação não é suportada por esta cifra"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Desencriptação não é suportada por esta cifra"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr "Não pode importar chaves com esta cifra"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr "Não pode exportar chaves com esta cifra"
 
@@ -7915,86 +8236,86 @@ msgstr "A preparar pasta '%s' para estar desligada"
 msgid "You must be working online to complete this operation"
 msgstr "Tem de estar a trabalhar ligado para terminar esta operação"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Falha ao criar canal a '%s': %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Falha ao criar processo filho '%s': %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Fluxo de mensagem inválido recebido de %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "A sincronizar pastas"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro ao parsear filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro ao executar filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Incapaz de abrir pasta de spool"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Incapaz de processar pasta de spool"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "A receber mensagem %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Incapaz de abrir mensagem"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Falha na mensagem %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "A sincronizar pasta"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "A receber mensagem %d de %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Falha na mensagem %d de %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Falha ao receber mensagem"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr "Argumentos inválidos para (flag-sistema)"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr "Argumentos inválidos para (etiqueta-utilizador)"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro ao executar procura de filtro: %s: %s"
@@ -8026,35 +8347,35 @@ msgstr "(coincidir-todas) requer um único resultado boleano"
 msgid "Performing query on unknown header: %s"
 msgstr "A efectuar procura em cabeçalho desconhecido: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Operação não suportada: concatenar mensagem: para %s"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Operação não suportada: procurar por expressão: para %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Operação não suportada: procura por uids: para %s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "A mover mensagens"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr "A copiar mensagens"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "A onter %d mensagem(ns)"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8065,15 +8386,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr "Falha ao parsear dica id utilizador gpg."
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr "Falha ao parsear pedido frase-senha gpg."
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8082,31 +8403,31 @@ msgstr ""
 "Necessita de uma frase-senha para destrancar a chave\n"
 "para o utilizador: \"%s\""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Cancelado."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Falha ao destrancar chave secreta: indicadas 3 frases-senha incorrectas."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Resposta de GnuPG inesperada: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr "Nenhuns dados indicados"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Falha ao encriptar: Nenhum recipiente válido especificado."
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8117,51 +8438,65 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Failed to GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Incapaz de escrever dados: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Falha ao executar gpg: %s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr "Falha ao executar gpg."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "Esta é uma parte de mensagem assinada digitalmente"
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr ""
+"Incapaz de verificar assinatura da mensagem: incapaz de criar ficheiro "
+"temporário: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Incapaz de verificar assinatura da mensagem: incapaz de criar ficheiro "
 "temporário: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Incapaz de escrever dados: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Esta é uma parte de mensagem assinada digitalmente"
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Conteudo índice corpos"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Incapaz de recuperar mensagem do editor"
@@ -8261,15 +8596,15 @@ msgstr "Erro ao escrever ficheiro temporário de correio: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Erro ao copiar ficheiro temporário de correio: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Falha ao desencriptar parte MIME: erro protocolo"
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "Falha ao desencriptar parte MIME: estrutura inválida"
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "erro parseamento"
 
@@ -8590,12 +8925,12 @@ msgstr "Fornecedor de pasta virtual de email"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Para ler correio como uma consulta de outro conjunto de pastas"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Nenhum fornecedor disponível para o protocolo `%s'"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8604,71 +8939,82 @@ msgstr ""
 "Incapaz de criar directório %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Introduza Senha para %s"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Indefinida"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Editar assinatura"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Editar assinatura"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Certificado assinado pelo próprio em cadeia"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "Certificado não é de confiança"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Gravar assinatura"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Erro parseamento"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Servidor: %s, Tipo: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Incapaz de obter pasta: Operação inválida neste armazenamento"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Incapaz de criar pasta: Operação inválida neste armazenamento"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Lixo"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "Junho"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "Incapaz de obter certificado do emissor"
@@ -8877,7 +9223,7 @@ msgstr ""
 "Lista Revogação Certificados expirou: %s\n"
 "Emissor: %s"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Incapaz de parsear URL `%s'"
@@ -8896,22 +9242,22 @@ msgstr "Nenhuma mensagem %s em %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Incapaz de copiar ou mover mensagens para uma Pasta Virtual"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Incapaz de apagar pasta: %s: Operação inválida"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Incapaz de apagar pasta: %s: Pasta não existe"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Incapaz de renomear pasta: %s: Operação inválida"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Incapaz de renomear pasta: %s: Pasta não existe"
@@ -8991,7 +9337,7 @@ msgstr "Incapaz de obter mensagem: %s"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9005,7 +9351,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Mensagem inexistente"
@@ -9043,54 +9389,69 @@ msgid "Failed to cache %s: %s"
 msgstr "Falha ao efectuar cache %s: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "A ligar-se ao servidor..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Incapaz de se ligação ao servidor LDAP"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "Empresa"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "A verificar novo correio"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Check for new messages in all folders"
 msgstr "A verificar novas mensagens em todas as pastas"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Pastas"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Mostrar apenas pastas subscritas"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "Substituir nome-espaço de pasta indicado pelo servidor"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Nome-espaço"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Aplicar filtros às novas mensagens na CAIXA ENTRADA neste servidor"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "Verificar novo correio _automaticamente a cada"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para ler e armazenar correio em servidores IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Senha"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9344,7 +9705,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Incapaz de renomear pasta %s para %s: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Incapaz de renomear '%s': %s"
@@ -9459,29 +9820,29 @@ msgstr "A verificar por novas mensagens"
 msgid "Storing folder"
 msgstr "A armazenar pasta"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Incapaz de criar tranca de pasta em %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Incapaz de abrir caixa de correio: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "Adição correio cancelada"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Incapaz de adicionar mensagem ao ficheiro mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9490,11 +9851,11 @@ msgstr ""
 "Incapaz de obter mensagem: %s da pasta %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "A pasta parece estar irreversivelmente corrompida."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Falha na construção de mensagem: Caixa de correio corrompida?"
 
@@ -9562,12 +9923,17 @@ msgstr "Incapaz de criar directório %s: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "Incapaz de obter pasta: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "ID cartão já existe"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Incapaz de renomear pasta %s para %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "O nome de pasta especificado é inválido: %s"
@@ -9611,7 +9977,7 @@ msgstr "Incapaz de fechar pasta origem %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Incapaz de fechar pasta temporária: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Incapaz de renomear pasta: %s"
@@ -9898,7 +10264,7 @@ msgstr "Apagar após %s dia(s)"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -9987,7 +10353,7 @@ msgid "No such folder `%s'."
 msgstr "Pasta `%s' inexistente."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10041,7 +10407,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Entrega de correio através da aplicação sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10209,7 +10575,7 @@ msgstr "Entrega de correio SMTP via %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Incapaz de enviar mensagem: endereço de remetente inválido."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "A enviar mensagem"
 
@@ -10330,7 +10696,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "anexo"
 
@@ -10374,14 +10740,14 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir apresentação automática do anexo"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Tem de configurar uma conta\n"
 "antes de poder compor correio."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Clique aqui para o livro de endereços"
 
@@ -10392,45 +10758,45 @@ msgstr "Clique 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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Responder-A:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatários da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Introduza os endereços que irão receber uma cópia da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10441,14 +10807,19 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Afixar Em:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr "Destino afixagem"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Anexar um ficheiro à mensagem"
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Anexar ficheiro(s)"
@@ -10483,21 +10854,21 @@ msgstr "Ficheiro existe, sobrepor?"
 msgid "Error saving file: %s"
 msgstr "Erro ao gravar ficheiro: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao ler ficheiro: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro ao aceder a ficheiro: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Incapaz de recuperar mensagem do editor"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10506,7 +10877,7 @@ msgstr ""
 "Incapaz de procurar no ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10515,7 +10886,7 @@ msgstr ""
 "Incapaz de truncar ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10524,7 +10895,7 @@ msgstr ""
 "Incapaz de copiar descritor de ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10533,7 +10904,7 @@ msgstr ""
 "Erro ao gravar mensagem automaticamente: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10541,7 +10912,7 @@ msgstr ""
 "Ximian Evolution encontrou ficheiros por gravar de uma sessão anterior.\n"
 "Deseja tentar recupera-los?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10552,28 +10923,28 @@ msgstr ""
 "\n"
 "Deseja gravar as suas alterações?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Aviso: Mensagem Modificada"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "Assinatura:"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "Auto-gerada"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Escrever uma mensagem"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10581,7 +10952,7 @@ msgstr ""
 "Incapaz de criar janela de composição:\n"
 "Incapaz de activar controlo de selecção de endereços."
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10593,7 +10964,7 @@ msgstr ""
 "Certifique-se de que possui instaladas as versões\n"
 "correctas do gtkhtml e libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10601,7 +10972,7 @@ msgstr ""
 "Incapaz de criar janela de composição:\n"
 "Incapaz de activar componente de editor HTML."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10610,11 +10981,13 @@ msgstr ""
 "pode ser editado.)<b>"
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "O pacote de colaboração Evolution"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10870,13 +11243,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -10995,7 +11368,7 @@ msgstr "Então"
 msgid "You must specify a folder."
 msgstr "Tem de especificar uma pasta."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Seleccionar Pasta"
@@ -11009,24 +11382,24 @@ msgstr ""
 "Erro na expressão regular '%s':\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Importante"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "A Fazer"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Mais Tarde"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Teste"
 
@@ -11126,7 +11499,7 @@ msgstr "atrás"
 msgid "months"
 msgstr "meses"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "segundos"
 
@@ -11223,7 +11596,7 @@ msgstr "Expressão"
 msgid "Follow Up"
 msgstr "Seguimento"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "Etiqueta"
 
@@ -11293,112 +11666,118 @@ msgid "Source Account"
 msgstr "Conta de Origem"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Aguaceiros"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Cabeçalho específico"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Parar Processamento"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Assunto"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "Retirar Estado"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "contém"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "não contém"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "não termina em"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "não existe"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "does not return"
 msgstr "não devolve"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "não se assemelha a"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "não começa por"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "termina em"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "existe"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr "está Marcada"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr "é posterior"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "is before"
 msgstr "é anterior"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "é maior do que"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "é menor do que"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr "não está Marcada"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "não é"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "é"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr "devolve maior do que"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr "devolve menor do que"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr "devolve"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "assemelha-se a"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "começa por"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Nome regra '%s' não é único, seleccione outro."
@@ -11423,18 +11802,80 @@ msgstr "Nome regra"
 msgid "Score Rules"
 msgstr "Regras Pontuação"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Tem de indicar um nome para esta vpasta."
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr "Tem de especificar pelo menos uma pasta como origem."
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 msgid "VFolder source"
 msgstr "Origem vPasta"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Preferências Compositor"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Configure aqui as suas preferências de correio, incluindo segurança e "
+"apresentação de mensagens"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Configure aqui correcção ortográfica, assinaturas e o compositor de mensagens"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Configure aqui as suas contas de correio"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Correio Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Controlo configuração contas Correio Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Componente Correio Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Compositor de Correio Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Controlo configuração compositor de Correio Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail folder viewer"
+msgstr "Visualizador de pasta de Correio Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Controlo preferências de Correio Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Correio"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Contas Correio"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "Preferências Correio"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Tem a certeza que quer apagar esta conta?"
@@ -11476,7 +11917,7 @@ msgid "Protocol"
 msgstr "Protocolo"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr "Sem nome"
 
@@ -11500,20 +11941,17 @@ msgstr "Adicionar assinatura script"
 msgid "Signature(s)"
 msgstr "Assinatura(s)"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "Está prestes a enviar uma mensagem formatada em HTML. Certifique-se de que\n"
 "os seguintes destinatários estão dispostos e podem receber correio em HTML:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Ainda assim enviar?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11521,7 +11959,7 @@ msgstr ""
 "Esta mensagem não tem assunto.\n"
 "Enviar mesmo assim?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11530,11 +11968,11 @@ msgstr ""
 "para esconder os endereços da lista, esta mensagem apenas conterá "
 "destinatários em Bcc."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Esta mensagem apenas contém destinatários em Bcc."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11544,11 +11982,11 @@ msgstr ""
 "adicionando um cabeçalho Aparentemente-Para.\n"
 "Ainda assim enviar?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Tem de especificar destinatários por forma a enviar esta mensagem."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11560,189 +11998,402 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Criar Pasta _Virtual a Partir Procura..."
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "Correio"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<clique aqui para seleccionar uma pasta>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" em \"%s\""
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Criar Nova Pasta"
 
-#: mail/em-folder-selector.c:267
-#, fuzzy
-msgid "Folder _name"
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Especificar onde criar a pasta:"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
 msgstr "_Nome pasta:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Incapaz de criar directório temporário: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Incapaz de criar directório temporário: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Incapaz de criar ficheiro temporário '%s': %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Incapaz de fechar pasta temporária: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "A Ler..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Seleccionar pasta"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Criar uma nova pasta"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Incapaz de apagar pasta `%s': %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Apagar mesmo a pasta \"%s\"?"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Apagar \"%s\""
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Renomear a pasta \"%s\" para:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+msgid "Rename Folder"
+msgstr "Renomear Pasta"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Propriedades Fonte"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Propriedades"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "Nome _Pasta:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Ver"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Åbrir em Nova Janela"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Mover"
+
+#: mail/em-folder-tree.c:1500
+msgid "_New Folder..."
+msgstr "_Nova Pasta..."
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "_Renomear"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "_Propriedades..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "_Editar como Nova Mensagem..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Reponder ao Remetente"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Reponder para _Lista"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Reponder _a Todos"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "R_eencaminhar"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr "Dar Se_guimento..."
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr "Marcar _Terminada"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "L_impar Marca"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "_Marcar como Lida"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "Marcar _por Ler"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Marcar como _Importante"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "_Marcar como Irrele_vante"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Marcar _por Ler"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Marcar como _Importante"
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "R_ecuperar"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "Mo_ver para Pasta..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Copiar para Pasta..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "Adicionar Remetente ao Li_vro Endereços"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "Aplicar _Filtros"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "Criar Regra a Par_tir Mensagem"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "VPasta no A_ssunto"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "VPasta no Remete_nte"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "VPasta nos Destinatá_rios"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "VPasta na _Lista Distribuição"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "VPasta no Remete_nte"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Filtrar no Ass_unto"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Filtrar no _Remetente"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Filtrar no _Destinatário"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Filtrar na _Lista Distribuição"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filtrar no _Remetente"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Por Omissão"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Imprimir Mensagem"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Copiar Localização Link"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Equivalências:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Atribuida"
+
+#: mail/em-format-html-display.c:597
+#, fuzzy
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
 msgstr ""
-"Esta mensagem está assinada digitalmente. Clique no ícone de cadeado para "
-"mais informações."
+"Esta mensagem está assinada digitalmente mas não foi provada como autêntica."
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Editar assinatura"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Editar assinatura"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+#, fuzzy
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"O bloco_entrada contém uma assinatura inválida, ou uma assinatura que não "
+"pode ser verificada."
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Interrompido"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "Encriptação PGP"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Incapaz de parsear mensagem MIME. A mostrar em código."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Esquema não suportado"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Incapaz de verificar assinatura de folha"
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Ver Imbutido"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Esconder"
@@ -11752,184 +12403,207 @@ msgstr "Esconder"
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "A obter mensagem %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Parte corpo-externo mal formada."
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Ponteiro para servidor FTP (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Ponteiro para ficheiro local (%s) válido no servidor \"%s\""
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Ponteiro para ficheiro local (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Ponteiro para dados remotos (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Ponteiro para dados externos desconhecidos (tipo \"%s\")"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-"Esta mensagem está assinada digitalmente mas não foi provada como autêntica."
-
-#: mail/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Esta mensagem está assinada digitalmente e foi considerada autêntica."
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-msgid "No signature present"
-msgstr ""
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Incapaz de inicializar Bonobo"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Esquema não suportado"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Incapaz de parsear mensagem MIME. A mostrar em código."
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "A mover mensagens"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "De"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Responder-Para"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Para"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "Aplicação E-mail"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "anexo %s"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Incapaz de parsear mensagem MIME. A mostrar em código."
+msgid "Session not initialised"
+msgstr "Incapaz de inicializar Bonobo"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Esta mensagem está assinada digitalmente e foi considerada autêntica."
+
+#: mail/em-format.c:1212
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"Esta mensagem está assinada digitalmente mas não foi provada como autêntica."
+
+#: mail/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
 
-#: mail/em-popup.c:593
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "A Aguardar..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "A Pingar %s"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Falha ao efectuar cache %s: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Falha ao criar canal a '%s': %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Falha ao resolver servidor '%s': %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Gravar Como..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Reponder ao Remetente"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Abrir Link no Browser"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Enviar _mensagem para lista..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Adicionar Remetente ao Livro de Endereços"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir em %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "Este servidor não suporta esquema de informação LDAPv3"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Subscrever"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Pasta"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Seleccione um servidor."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Não foi seleccionado nenhum servidor"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Não mostrar esta mensagem novamente."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11938,27 +12612,27 @@ msgstr ""
 "Erro ao ler informação de filtro:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Mensagem Reencaminhada"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "um remetente desconhecido"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "A %a, %Y-%m-%d às %H:%M, %%s escreveu:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -11967,7 +12641,7 @@ msgstr ""
 "Incapaz de gravar para `%s'\n"
 " %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -11976,25 +12650,26 @@ msgstr ""
 "`%s' já existe.\n"
 "Sobrepo-lo?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Mensagem"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Gravar Mensagem Como..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Incapaz de criar directório temporário: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Endereço"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12004,61 +12679,428 @@ msgstr ""
 "\n"
 "Apagar mesmo estas mensagens?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Preferências Compositor"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/em-utils.c:2288
+#, fuzzy
 msgid ""
-"Configure mail preferences, including security and message display, here"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
 msgstr ""
-"Configure aqui as suas preferências de correio, incluindo segurança e "
-"apresentação de mensagens"
+"Esta operação irá apagar permanentemente todas as mensagens marcadas\n"
+"como apagadas. Se continuar, não lhe será possível recuperar estas "
+"mensagens.\n"
+"\n"
+"Apagar mesmo estas mensagens?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/evolution-mail.schemas.in.in.h:1
+#, fuzzy
+msgid "Automatic link recognition"
+msgstr "_Detectar links automaticamente"
+
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "_Detectar links automaticamente"
+
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
 msgstr ""
-"Configure aqui correcção ortográfica, assinaturas e o compositor de mensagens"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Configure aqui as suas contas de correio"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Correio Evolution"
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Controlo configuração contas Correio Evolution"
+#: mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
+msgid "Default charset in which to compose messages"
+msgstr "Assunto por omissão da mensagem."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Componente Correio Evolution"
+#: mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
+msgid "Default charset in which to compose messages."
+msgstr "Assunto por omissão da mensagem."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Compositor de Correio Evolution"
+#: mail/evolution-mail.schemas.in.in.h:8
+#, fuzzy
+msgid "Default charset in which to display messages"
+msgstr "Procurar texto no corpo da mensagem apresentada"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Controlo configuração compositor de Correio Evolution"
+#: mail/evolution-mail.schemas.in.in.h:9
+#, fuzzy
+msgid "Default charset in which to display messages."
+msgstr "Procurar texto no corpo da mensagem apresentada"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Visualizador de pasta de Correio Evolution"
+#: mail/evolution-mail.schemas.in.in.h:10
+#, fuzzy
+msgid "Default forward style"
+msgstr "_Estilo reencaminhamento:"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Controlo preferências de Correio Evolution"
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default reply style"
+msgstr "Estilo _resposta:"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Empty Trash folders on exit"
+msgstr "_Esvaziar pasta de lixo ao sair"
+
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "_Esvaziar pasta de lixo ao sair"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "Contas Correio"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "Preferências Correio"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "Executar acções"
+
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Notificação Novo Correio"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Notificação Novo Correio"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr "_Avisar ao enviar mensagens HTML para contactos que as não desejam"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "Avisar _quando enviar mensagens apenas com destinatários em Bcc"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "Enviar Mail HTML?"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "Enviar Mail HTML?"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "Mo_strar imagens animadas"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "Mo_strar imagens animadas"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Mostrar mensagem em estilo normal"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "_Painel Antevisão"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "_Reproduzir som ao chegar correio novo"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "Verificação _Ortográfica"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "Fonte _Consola:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "Seleccione fonte HTML largura variável para impressão"
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Lista Mensagem em Árvore"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Lista Mensagem em Árvore"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "_Tornar esta a minha conta por omissão"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "Largura v_ariável:"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Importador Elm do Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+msgid "Evolution mbox importer"
+msgstr "Importador mbox do Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Netscape Mail importer"
+msgstr "Importador Correio Netscape do Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Importador Outlook Express 4 do Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Pine importer"
+msgstr "Importador Pine do Evolution"
 
 #: mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
@@ -12098,34 +13140,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Importador Elm do Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Importador mbox do Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Netscape Mail importer"
-msgstr "Importador Correio Netscape do Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Importador Outlook Express 4 do Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Pine importer"
-msgstr "Importador Pine do Evolution"
-
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -12187,12 +13201,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution está a importar os seus antigos dados Netscape"
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Lixo"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "A analisar filtros de correio"
@@ -12201,7 +13209,7 @@ msgstr "A analisar filtros de correio"
 msgid "Scanning directory"
 msgstr "A analisar directório"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "A iniciar importação"
 
@@ -12276,23 +13284,23 @@ msgid "You have not filled in all of the required information."
 msgstr "Não preencheu toda a informação necessária."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Editor Conta Evolution"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "_Nome utilizador:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Caminho"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Não pode criar duas contas com o mesmo nome."
 
@@ -12301,35 +13309,35 @@ msgstr "Não pode criar duas contas com o mesmo nome."
 msgid "Mail to %s"
 msgstr "Correio para %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Assunto é %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Correio de %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "lista distribuição %s"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Repondido para"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Adicionar Regra Filtro"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "A(s) seguinte(s) regra(s) de filtro:\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12340,143 +13348,30 @@ msgstr ""
 "    '%s'\n"
 "E foi actualizado."
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "A Ligar-se..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Esta pasta não pode conter mensagens."
-
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Incapaz de abrir pasta partilhada: %s."
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Nova Mensagem Correio"
 
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Incapaz de criar directório temporário: %s"
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "_Mensagem Correio"
 
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Incapaz de criar ficheiro temporário '%s': %s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "Compor uma nova mensagem correio"
 
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Incapaz de fechar pasta temporária: %s"
-
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Seleccione uma pasta de destino para importar estes dados"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Seleccione uma pasta de destino para importar estes dados"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Criar uma nova pasta"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Especificar onde criar a pasta:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Incapaz de apagar pasta `%s': %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Apagar mesmo a pasta \"%s\"?"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Apagar \"%s\""
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Renomear a pasta \"%s\" para:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-msgid "Rename Folder"
-msgstr "Renomear Pasta"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "O nome de pasta especificado é inválido: %s"
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Propriedades Fonte"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Propriedades"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "Nome _Pasta:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Ver"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Åbrir em Nova Janela"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Mover"
-
-#: mail/mail-component.c:2087
-msgid "_New Folder..."
-msgstr "_Nova Pasta..."
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "_Renomear"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Propriedades..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Identidade"
 
@@ -12537,11 +13432,11 @@ msgstr ""
 "no espaço abaixo um nome para esta conta. Este nome será apenas utilizado "
 "para fins de visualização."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "A Verificar Serviço"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "A ligar-se ao servidor..."
 
@@ -12623,26 +13518,35 @@ msgid "C_olors"
 msgstr "C_ores"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "A Verificar Correio Novo"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "Verificar ortografia _quando escrevo"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "A Verificar Correio Novo"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "Cor para palavras _mal escritas:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Compor Mensagens"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Configuração"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12658,273 +13562,278 @@ msgstr ""
 "\n"
 "Clique em \"Aplicar\" para gravar as suas configurações."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "_Omissão"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Comportamento por Omissão"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "Codificação caract_eres por omissão:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "A Apagar Correio"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Assinar sempre as mensagens ao utilizar esta conta"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "Não citar mensagem original"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Não assinar pedidos de reunião (para compatibilidade com o Outlook)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Terminado"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "_Pasta rascunhos:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "_Activar"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "Contas Email"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "Endereço em_ail:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "_Esvaziar pasta de lixo ao sair"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "ID _Certificado:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Assistente de Contas Evolution"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Executar Comando..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "Largura fi_xa:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "<< Menos Opções"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "Propriedades Fonte"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "Formatar mensagens em _HTML"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "_Realçar citações com"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Imbutido"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Etiquetas e Cores"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "A Ler Imagens"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Configuração Correio"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Localização caixa correio"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Compositor Mensagens"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Visualização Mensagens"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 msgid "Message Fonts"
 msgstr "Fontes Mensagem"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Notificação Novo Correio"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Nota: não lhe será pedida nenhuma senha até que se ligue pela primeira vez"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Informação Opcional"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "Or_ganização:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "ID C_have PGP/GPG:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Seleccione uma cor"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Avisar _quando enviar mensagens apenas com destinatários em Bcc"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Fontes Impressas"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Dir correio Qmail "
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "Citar mensagem original"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Citada"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "Recordar esta sen_ha"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "Res_ponder-A:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "A Receber Correio"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "_Opções Recepção"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "Recordar esta _senha"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Informação Requerida"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "Repor Omissões"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "S_egurança"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME Seguro (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr "Seleccione fonte HTML largura fixa"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr "Seleccione fonte HTML largura fixa para impressão"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr "Seleccione fonte HTML largura variável"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr "Seleccione fonte HTML largura variável para impressão"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "A Enviar Correio"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Pasta _mensagens enviadas:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Mensagens Enviadas e Rascunhos"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Ser_vidor requer autenticação"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Configuração Servidor"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "_Tipo Servidor: "
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Certificado assinado pelo próprio em cadeia"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "Especifique nome _ficheiro:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "Verificação _Ortográfica"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "mbox Padrão Unix"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12934,7 +13843,7 @@ msgstr ""
 "sua assinatura. O nome que especificar será utilizado\n"
 "apenas para visualização. "
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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 "
@@ -12944,7 +13853,7 @@ msgstr ""
 "ortográfica e idioma. A listagem de idiomas reflecte apenas aqueles para os "
 "quais possui um dicionário instalado."
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12952,11 +13861,15 @@ msgstr ""
 "Indique o nome pelo qual deseja referir-se a esta conta.\n"
 "Por exemplo: \"Trabalho\" ou \"Pessoal\""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "Largura v_ariável:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12966,169 +13879,178 @@ msgstr ""
 "\n"
 "Clique \"Prosseguir\" para começar. "
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "_Adicionar Assinatura"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "_Ler sempre as imagens da rede"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Assinar sempre as mensagens ao utilizar esta conta"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "Tipo _Autenticação: "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "Tipo _autenticação: "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr "Verificar novo correio _automaticamente a cada"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "Inserir imagens de risonhos _automaticamente"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "Emitir _beep ao chegar novo correio"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "_Confirmar ao expurgar uma pasta"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "Assinatura por _omissão:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "_Omissões"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Não me notificar ao receber novo correio"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "_Activar"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "_Estilo reencaminhamento:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "_Nome completo:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "Correio _HTML"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "_Identidade"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Junho"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "_Ler imagens se o remetente estiver no livro de endereços"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "_Tornar esta a minha conta por omissão"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensagens como lidas após"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "_Nunca ler as imagens da rede"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "_Reproduzir som ao chegar correio novo"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Avisar ao enviar mensagens HTML para contactos que as não desejam"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Avisar ao enviar mensagens sem linha de assunto definida"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "A _Receber Correio"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "Estilo _resposta:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "_Repor omissões"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Script:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Apagar..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "A En_viar Correio"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "Mo_strar imagens animadas"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "A_ssinaturas"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr "Fonte _Padrão:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr "Fonte _Consola:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "_Utilizar ligação segura (SSL):"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr "_Utilizar a mesma fonte que as outras aplicações"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "descrição"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr "A Pingar %s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13137,7 +14059,7 @@ msgstr ""
 "Erro durante '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13146,7 +14068,7 @@ msgstr ""
 "Erro durante execução da operação:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "A Trabalhar"
 
@@ -13158,118 +14080,118 @@ msgstr "A Filtrar Pasta"
 msgid "Fetching Mail"
 msgstr "A Obter Correio"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Falha ao armazenar correio no ficheiro temporário %s: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Falha ao armazenar correio no ficheiro temporário %s: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "A envias \"%s\""
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "A enviar mensagem %d de %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Falha na mensagem %d de %d"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Terminado."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "A gravar mensagem na pasta"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "A mover mensagens para %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "A copiar mensagens para %s"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "A analisar pastas em \"%s\""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Mensagens reencaminhadas"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "A abrir pasta %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "A abrir armazenamento %s"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "A remover pasta %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "A armazenar pasta '%s'"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "A actualizar pasta"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "A expurgar pasta"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "A esvaziar lixo em '%s'"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Pastas Locais"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "A obter mensagem %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "A onter %d mensagem(ns)"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "A gravar %d mensagem(ns)"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13278,7 +14200,7 @@ msgstr ""
 "Incapaz de criar ficheiro de resultado: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13287,11 +14209,11 @@ msgstr ""
 "Erro ao gravar mensagens para: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "A gravar anexo"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13300,21 +14222,25 @@ msgstr ""
 "Incapaz de criar ficheiro de resultado: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Incapaz de escrever dados: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "A desligar-se de %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "A ligar-se novamente a %s"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Sensível Capitalização"
@@ -13331,59 +14257,74 @@ msgstr "Procurar:"
 msgid "Search"
 msgstr "Procurar"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Editar assinatura"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Excepções"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Informação Conta"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "A Cancelar..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Servidor: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Caminho: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Enviat & Receber Correio"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 msgid "Cancel _All"
 msgstr "Cancelar _Tudo"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "A Actualizar..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "A Aguardar..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Utilizador cancelou operação."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduza Senha para %s"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Introduza Senha"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "_Recordar esta senha"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Recordar esta senha durante o resto desta sessão"
 
@@ -13422,26 +14363,31 @@ msgstr "Introduza um nome para esta assinatura."
 msgid "Name:"
 msgstr "Nome:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensagem reencaminhada - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Mensagem reencaminhada"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "A abrir pasta %s"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "A configurar vpasta: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "A actualizar vpastas para uri: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13454,88 +14400,88 @@ msgstr ""
 "    '%s'\n"
 "E foram actualizadas."
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "VPastas"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "vPastas"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Editar VPasta"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "A tentar editar uma vpasta '%s' que não existe."
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Nova VPasta"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Por Ver"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Múltiplas Mensagens Por Ver"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Múltiplas Mensagens"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Mais Baixo"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Baixo"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Alto"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Mais Alto"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Hoje %l:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Ontem %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "A gerar lista de mensagens"
 
@@ -13591,11 +14537,11 @@ msgstr "Reencaminhar"
 msgid "No Response Necessary"
 msgstr "Nenhuma Resposta Necessária"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Reponder a Todos"
 
@@ -13647,41 +14593,140 @@ msgstr "_Subscrever"
 msgid "_Unsubscribe"
 msgstr "_Dessubscrever"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+"Configure aqui pastas especiais e comportamento de pastas quando desligado"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Consola Evolution"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Definições Pastas"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "380"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Renomear este grupo de atalhos"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Alternar se mostrar ou não barra de pastas"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Esconder a barra de atalhos"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Prioridade por Omissão:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Prioridade por Omissão:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Interface configuração Correio Evolution"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+#, fuzzy
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "Marcar anexo para por omissão ser mostrado imbutido."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
-"Incapaz de transferir pasta:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Adicionar uma Pasta"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Rascunhos"
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "A abrir pasta de tarefas por omissão"
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Caixa Entrada"
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "A abrir pasta de tarefas por omissão"
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Caixa Saida"
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "A abrir pasta de tarefas por omissão"
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Enviada"
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "A abrir pasta de tarefas por omissão"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Alternar se mostrar ou não barra de pastas"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Alternar se mostrar ou não barra de atalhos"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "Email"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Incapaz de actualizar correctamente ficheiros"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13692,7 +14737,7 @@ msgstr ""
 "%s\n"
 "Erro: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13701,7 +14746,7 @@ msgstr ""
 "Ocorreu um erro ao copiar ficheiros para\n"
 "`%s'."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13712,7 +14757,7 @@ msgstr ""
 "Mova-o por forma a permitir a instalação dos\n"
 "ficheiros de utilizadores Evolution."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13810,10 +14855,11 @@ msgstr ""
 "Incapaz de renomear pasta:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+msgid "The specified folder name is not valid: %s"
+msgstr "O nome de pasta especificado é inválido: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -13837,19 +14883,15 @@ msgstr ""
 "Incapaz de criar a pasta especificada:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Criar Nova Pasta"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Sem Título)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Seleccione o tipo de importador a executar:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13863,11 +14905,11 @@ msgstr ""
 "Se não souber pode seleccionar \"Automático\" e o Evolution tentará "
 "descobrir."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Seleccione a informação que deseja importar:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13875,7 +14917,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13884,21 +14926,21 @@ msgstr ""
 "A importar %s\n"
 "A importar item %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "Seleccionar importador"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "Ficheiro %s não existe"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Erro Evolution"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -13907,11 +14949,11 @@ msgstr ""
 "Não existe nenhum importador capaz de converter\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "A Importar"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -13920,17 +14962,17 @@ msgstr ""
 "A importar %s.\n"
 "A iniciar %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Erro ao iniciar %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Erro ao ler %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13939,35 +14981,35 @@ msgstr ""
 "A importar %s\n"
 "A importar item 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Automático"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Nome ficheiro:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Seleccione um ficheiro"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Tipo ficheiro:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Importar dados e configurações de aplicações antigas"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Importar um único ficheiro"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -13975,47 +15017,28 @@ msgstr ""
 "Aguarde por favor...\n"
 "A analisar configurações existentes"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "A Iniciar Importadores Inteligentes"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Seleccione uma pasta de destino para importar estes dados"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Importar"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "A fechar ligações..."
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Erro ao sincronizar \"%s\":\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "A Sincr. Pasta"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "A Sincronizar \"%s\" (%d de %d)..."
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Configurações Evolution"
@@ -14050,7 +15073,7 @@ msgstr "Incapaz de abrir pasta partilhada: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Incapaz de encontrar a pasta partilhada especificada."
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14059,17 +15082,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Assistente"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Novo"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Nenhum nome de pasta especificado."
@@ -14128,64 +15145,51 @@ msgstr "Criar Novo Atalho"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Seleccione a pasta para onde quer que o atalho aponte:"
 
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "Trabalhar _Ligado"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "Trabalhar _Desligado"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Trabalhar Desligado"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Nenhuma pasta apresentada)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Nenhum)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution de momento está ligado. Clique neste botão para trabalhar "
 "desligado."
 
-#: shell/e-shell-view.c:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution está no processo de se desligar."
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution de momento está desligado. Clique neste botão para "
 "trabalhar ligado."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Argumentos inválidos"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Incapaz de se registar no OAF"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Base de dados de configuração não encontrada"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Erro genérico"
 
@@ -14298,74 +15302,18 @@ msgstr "Re_mover"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Remover este atalho da barra de atalhos"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Erro ao gravar atalhos."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Caixa Entrada"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Atalhos"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Nenhum erro"
-
-#: 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:575
-msgid "The specified folder type is not valid"
-msgstr "O tipo de pasta seleccionado não é válido"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "Erro I/O"
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr "Espaço insuficiente para criar a pasta"
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr "A pasta não está vazia"
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "A pasta especificada não foi encontrada"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "Função não implementada neste armazenamento"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "Operação não suportada"
-
-#: shell/e-storage.c:591
-msgid "The specified type is not supported in this storage"
-msgstr "O tipo especificado não é suportado neste armazenamento"
-
-#: 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:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "Impossível tornar uma pasta filha de um dos seus descendentes"
-
-#: shell/e-storage.c:597
-msgid "Cannot create a folder with that name"
-msgstr "Impossível criar uma pasta com esse nome"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Esta operação não pode ser executada em modo desligado"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Caixa Selecção"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14376,6 +15324,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% terminado)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Novo"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "\"%s\" em \"%s\""
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14413,74 +15372,6 @@ msgstr ""
 "O erro do sistema de activação é:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "Erro CORBA"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Interrompido"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Argumento inválido"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Já possui um dono"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Sem dono"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Não encontrado"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Tipo não suportado"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Esquema não suportado"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Operação não suportada"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Erro interno"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Existe"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "URI inválido"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Possui subpastas"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Sem espaço livre"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "Dono antigo terminou"
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Tipo teste"
-
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr "Componente Teste Evolution"
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr "Ligações Activas"
@@ -14509,10 +15400,6 @@ msgstr "C_orreio:"
 msgid "_Tasks:"
 msgstr "_Tarefas:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr "_Nome pasta:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder _type:"
 msgstr "_Tipo pasta:"
@@ -14575,23 +15462,6 @@ msgstr ""
 "\n"
 "Prima o botão \"Aplicar\" para gravar as suas configurações. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-"Configure aqui pastas especiais e comportamento de pastas quando desligado"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Consola Evolution"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Controlo de definições de configuração de pasta Evolution"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Definições Pastas"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -14631,7 +15501,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Importadores"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Importar"
 
@@ -14647,16 +15517,16 @@ msgstr "Não me perguntar novamente"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution pode importar dados dos seguintes ficheiros:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Evolution está a terminar..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14693,7 +15563,7 @@ msgstr ""
 "Esperamos que lhe agrade o resultado do nosso trabalho, e aguardamos\n"
 "as suas contribuições!\n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -14701,37 +15571,49 @@ msgstr ""
 "Obrigado\n"
 "A Equipa do Ximian Evolution\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr "Não me dizer novamente"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Incapaz de aceder à consola Ximian Evolution."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Incapaz de inicializar a consola Ximian Evolution: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Iniciar em modo desligado"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Iniciar em modo ligado"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr "Forçar todos os componentes Evolution a terminar"
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 "Enviar o resultado de depuração de todos os componentes para um ficheiro."
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14740,31 +15622,60 @@ msgstr ""
 "%s: --online e --offline não podem ser utilizados em conjunto.\n"
 "  Utilize %s --help para mais informações.\n"
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Seleccionar importador"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "ID _Certificado:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "Progresso"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Expressão"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Endereço Email:"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"Certificado expirou: %s\n"
+"Emissor: %s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14822,91 +15733,376 @@ msgid "Backup All"
 msgstr "Blackpool"
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "ID _Certificado:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Certificado não é de confiança"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "ID _Certificado:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Nome Comum"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "ID _Certificado:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "_Editar"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Falha ao verificar certificados."
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Expressão"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Organização"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Unidade Organizacional"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Ver"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "ID _Certificado:"
+
+#: smime/gui/smime-ui.glade.h:42
+#, fuzzy
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr "Autoridade Certificação (CA) inválida"
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "ID _Certificado:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Importar"
+msgid "Certificate already exists"
+msgstr "ID cartão já existe"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Vermont"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "OK"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "ID _Certificado:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "ID _Certificado:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "Certificado não é de confiança"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "ID"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Assunto é %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Incapaz de processar pasta de spool"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "Autoridade Certificação (CA) inválida"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Autoridade Certificação (CA) inválida"
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Nenhuma Informação"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "anexo"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "ID _Certificado:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Curitiba"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "Carolina do Norte"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Expressão"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s em %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Falha na assinatura do certificado"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "_Inserir"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Assunto é %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Falha na assinatura do certificado"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Introduza Senha para %s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "ID _Certificado:"
 
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
@@ -14957,7 +16153,7 @@ msgstr "Copiar a selecção"
 msgid "Copy to Folder..."
 msgstr "Copiar para Pasta..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Cortar a selecção"
 
@@ -14973,7 +16169,7 @@ msgstr "Mover Contacto(s) para Outra Pasta..."
 msgid "Move to Folder..."
 msgstr "Mover para Pasta..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Colar da área de transferência"
 
@@ -14981,8 +16177,8 @@ msgstr "Colar da área de transferência"
 msgid "Previews the contacts to be printed"
 msgstr "Antevê os contactos a serem impressos"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Ante_ver Impressão"
@@ -15027,13 +16223,13 @@ msgstr "Parar Leitura"
 msgid "View the current contact"
 msgstr "Ver o contacto actual"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "_Acções"
 
@@ -15063,142 +16259,110 @@ msgstr "_Enviar Mensagem a Contacto..."
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "Criar um novo compromisso de dia completo"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Criar um novo compromisso"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "Criar uma nova pasta"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Criar uma nova convocatória de reunião"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Criar uma nova tarefa"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Dia"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Apagar Todas Ocorrências"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Apagar o compromisso"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Apagar esta Ocorrência"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Apagar esta ocorrência"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Ir Para"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Ir atrás"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Ir em frente"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Ir para _Data"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Ir para uma data específica"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Ir para hoje"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "Lista"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Mês"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Novo _Compromisso"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Nova Caledónia"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Nova Reunião"
-
-#: ui/evolution-calendar.xml.h:27
-#, fuzzy
-msgid "New _Task"
-msgstr "Nova Tarefa"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Antevê o calendário a ser impresso"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Imprimir este calendário"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publicar informação Livre/Ocupado para este calendário"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Bourges"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Pasta pública que contém compromissos e eventos"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Mostrar Detalhes"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Mostrar um dia"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Mostrar um mês"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Mostrar uma semana"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Mostrar a semana de trabalho"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Semana"
 
@@ -15263,7 +16427,7 @@ msgstr "Gravar este item para disco"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Ficheiro"
 
@@ -15481,7 +16645,7 @@ msgstr "_Marcar Todas como Lidas"
 msgid "Mark all visible messages as read"
 msgstr "Marcar todas as mensagens visíveis como lidas"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "Colar mensagem(ns) da área de transferência"
 
@@ -15538,16 +16702,6 @@ msgstr "_Inverter Selecção"
 msgid "_Threaded Message List"
 msgstr "Lis_ta Mensagens em Árvore"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Fechar esta janela"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "_Fechar"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "A_dicionar Remetente ao Livro de Endereços"
@@ -15707,257 +16861,282 @@ msgstr "Reencaminhar mensagem seleccionada como anexo para alguém"
 msgid "Increase the text size"
 msgstr "Aumentar o tamanho do texto"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Ler _Imagens"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Marcar como I_mportante"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Marcar como _Por Ler"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Marcar como _Irrelevante"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "Marcar a(s) mensagem(ns) seleccionada(s) como lida(s)"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "Marcar a(s) mensagem(ns) seleccionada(s) como importante(s)"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Marcar a(s) mensagem(ns) seleccionada(s) como irrelevante(s)"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Marcar a(s) mensagem(ns) seleccionada(s) como por ler"
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Marcar a(s) mensagem(ns) seleccionada(s) como por ler"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Marcar a(s) mensagem(ns) seleccionada(s) como irrelevante(s)"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar a(s) mensagem(ns) seleccionada(s) para remoção"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Mover"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "Mover mensagem(s) seleccionada(s) para outra pasta"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Seguinte"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "Mensagem _Importante Seguinte"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "Árvore Seguin_te"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "Mensagem Por Ler Seg_uinte"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Não encontrado"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Abrir a mensagem seleccionada numa nova janela"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Abrir a mensagem seleccionada no compositor para a reenviar"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Tamanho _Original"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "Mensagem Por Ler Ante_rior"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Afixar uma Resposta"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr "Afixar uma resposta a uma mensagem numa pasta Pública"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "Mensagem Importante Ant_erior"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Antever a mensagem a ser impressa"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Anterior"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Imprimir esta mensagem"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "Re_direccionar"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redireccionar a mensagem seleccionada para alguém"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Repor o texto no seu tamanho original"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "procurar M_ensagem..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "_Menor"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Gravar a mensagem como ficheiro de texto"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Procurar texto no corpo da mensagem apresentada"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr "Definir as configurações de página para a impressora actual"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Mostrar _Fonte Email"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Mostrar Cabeçal_hos Completos"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Procurar texto no corpo da mensagem apresentada"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Mostrar mensagem em estilo normal"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Mostrar mensagem com todos os cabeçalhos de email"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Mostrar a fonte em bruto da mensagem de email"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "Tamanho Te_xto"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Desfazer remoção das mensagens seleccionadas"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "VPasta à _Lista Distribuição..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "VPasta ao Remete_nte..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "VPasta ao _Destinatário..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "VPasta ao A_ssunto..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "_Anexado"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "_Copiar para Pasta"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "_Criar Filtro a Partir Mensagem"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "R_eencaminhar Mensagem"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "_Ir Para"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "_Imbutido"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "M_aior"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "Apresentação _Mensagem"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Mover para Pasta"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "Mensagem Segui_nte"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "Apresentação _Normal"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "_Abrir Mensagem"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "Mensagem _Anterior"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "_Citado"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "_Reenviar..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "Ferramen_tas"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "Des_fazer Remoção"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Fechar esta janela"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "_Fechar"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Anexar"
@@ -16236,12 +17415,13 @@ msgid "Change Evolution's settings"
 msgstr "Alterar configurações Evolution"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "_Sair"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Criar uma nova convocatória de reunião"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "_Janela Evolution"
+msgid "E_xit"
+msgstr "_Sair"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16253,61 +17433,74 @@ msgstr "Importar dados de outras aplicações"
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "_Janela Evolution"
+msgid "Open a new window"
+msgstr "Åbrir em Nova Janela"
 
 #: ui/evolution.xml.h:11
 msgid "Pi_lot Settings..."
 msgstr "Configuração Pi_lot..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Enviar / Receber"
+
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr "Enviar itens em fila e obter novos"
+
+#: ui/evolution.xml.h:14
 msgid "Set up Pilot configuration"
 msgstr "Definir configuração Pilot"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Mostrar informação sobre o Ximian Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Enviar Relatório Erro"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "Enviar Relatório _Erro"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar um relatório de erro (bug) utilizando o Bug Buddy"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Alternar"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Alternar se estamos a trabalhar online ou não."
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "Perg Freq. _Ximian Evolution"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "_Sobre o Ximian Evolution..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Novo"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Enviar / Receber"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "_Procurar Agora"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Imprimir Resumo"
@@ -16436,12 +17629,12 @@ msgstr "Definir Vistas..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "STQQSSD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -16574,7 +17767,7 @@ msgstr "_Procura"
 msgid "_Find Now"
 msgstr "_Procurar Agora"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "_Limpar"
 
@@ -16590,24 +17783,259 @@ msgstr "ID Subitem"
 msgid "Text"
 msgstr "Texto"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Limpar"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Procurar Agora"
 
+#~ msgid "Account Name"
+#~ msgstr "Nome Conta"
+
+#~ msgid "Server Name"
+#~ msgstr "Nome Servidor"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "LDAP não foi activado nesta compilação do Evolution"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Outros Contactos"
+
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "Configurar aqui acesso a servidores de directório LDAP"
+
+#~ msgid "Directory Servers"
+#~ msgstr "Servidores Directório"
+
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Controlo Configuração Livro Endereços LDAP do Evolution"
+
+#~ msgid "Add LDAP Server"
+#~ msgstr "Adicionar Servidor LDAP"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Passo 4: Nome Apresentação"
+
+#~ msgid "Find contact in"
+#~ msgstr "Procurar Contacto em"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Clique aqui para adicionar um contacto *"
+
+#~ msgid "Business Address"
+#~ msgstr "Endereço Profissional"
+
+#~ msgid "Department"
+#~ msgstr "Departamento"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "URL Livre-ocupado"
+
+#~ msgid "ISDN"
+#~ msgstr "RDIS"
+
+#~ msgid "Profession"
+#~ msgstr "Profissão"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "A abrir tarefas em %s"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Ainda assim enviar?"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Cancelar a operação de correio actual"
+#~ msgid "Folder _name"
+#~ msgstr "_Nome pasta:"
+
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "Esta mensagem está assinada digitalmente. Clique no ícone de cadeado para "
+#~ "mais informações."
+
+#~ msgid "Connecting..."
+#~ msgstr "A Ligar-se..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Esta pasta não pode conter mensagens."
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Incapaz de abrir pasta partilhada: %s."
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Seleccione uma pasta de destino para importar estes dados"
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Incapaz de transferir pasta:\n"
+#~ "%s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "Adicionar uma Pasta"
+
+#~ msgid "Drafts"
+#~ msgstr "Rascunhos"
+
+#~ msgid "Outbox"
+#~ msgstr "Caixa Saida"
+
+#~ msgid "Sent"
+#~ msgstr "Enviada"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Erro ao sincronizar \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "A Sincr. Pasta"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "A Sincronizar \"%s\" (%d de %d)..."
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Nenhuma pasta apresentada)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(Nenhum)"
+
+#~ msgid "No error"
+#~ msgstr "Nenhum erro"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Já existe uma pasta com o mesmo nome"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "O tipo de pasta seleccionado não é válido"
+
+#~ msgid "I/O error"
+#~ msgstr "Erro I/O"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Espaço insuficiente para criar a pasta"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "A pasta não está vazia"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "A pasta especificada não foi encontrada"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Função não implementada neste armazenamento"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Operação não suportada"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "O tipo especificado não é suportado neste armazenamento"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "A pasta especificada não pode ser modificada ou removida"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "Impossível tornar uma pasta filha de um dos seus descendentes"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Impossível criar uma pasta com esse nome"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Esta operação não pode ser executada em modo desligado"
+
+#~ msgid "Checkbox"
+#~ msgstr "Caixa Selecção"
+
+#~ msgid "CORBA error"
+#~ msgstr "Erro CORBA"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Argumento inválido"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Já possui um dono"
+
+#~ msgid "No owner"
+#~ msgstr "Sem dono"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Tipo não suportado"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Esquema não suportado"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Operação não suportada"
+
+#~ msgid "Internal error"
+#~ msgstr "Erro interno"
+
+#~ msgid "Exists"
+#~ msgstr "Existe"
+
+#~ msgid "Invalid URI"
+#~ msgstr "URI inválido"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Possui subpastas"
+
+#~ msgid "No space left"
+#~ msgstr "Sem espaço livre"
+
+#~ msgid "Old owner has died"
+#~ msgstr "Dono antigo terminou"
+
+#~ msgid "Test type"
+#~ msgstr "Tipo teste"
+
+#~ msgid "Evolution Test Component"
+#~ msgstr "Componente Teste Evolution"
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "Importar"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Criar um novo compromisso de dia completo"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Novo _Compromisso"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Nova Reunião"
+
+#, fuzzy
+#~ msgid "New _Task"
+#~ msgstr "Nova Tarefa"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "_Janela Evolution"
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Nome Campo"
+#~ msgid "Open a new Evolution window"
+#~ msgstr "_Janela Evolution"
+
+#~ msgid "Toggle"
+#~ msgstr "Alternar"
 
-#~ msgid "Family Name"
-#~ msgstr "Sobrenome"
+#~ msgid "Clear"
+#~ msgstr "Limpar"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Cancelar a operação de correio actual"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -16700,9 +18128,6 @@ msgstr "Procurar Agora"
 #~ msgid "VCard (.vcf, .gcrd)"
 #~ msgstr "VCard (.vcf, .gcrd)"
 
-#~ msgid "Loading..."
-#~ msgstr "A Ler..."
-
 #~ msgid "Searching..."
 #~ msgstr "A Procurar..."
 
@@ -16754,10 +18179,6 @@ msgstr "Procurar Agora"
 #~ msgstr "EBook não carregado\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "ID cartão já existe"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Operação cancelada"
 
@@ -16904,9 +18325,6 @@ msgstr "Procurar Agora"
 #~ msgid "Callback"
 #~ msgstr "Retorno Chamada"
 
-#~ msgid "Company"
-#~ msgstr "Empresa"
-
 #~ msgid "Comp"
 #~ msgstr "Emp"
 
@@ -16973,9 +18391,6 @@ msgstr "Procurar Agora"
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#~ msgid "Phone"
-#~ msgstr "Telefone"
-
 #~ msgid "Birth date"
 #~ msgstr "Data nascimento"
 
@@ -16988,9 +18403,6 @@ msgstr "Procurar Agora"
 #~ msgid "Arbitrary"
 #~ msgstr "Facultativo"
 
-#~ msgid "ID"
-#~ msgstr "ID"
-
 #~ msgid "Last Use"
 #~ msgstr "Última utilização"
 
@@ -17003,9 +18415,6 @@ msgstr "Procurar Agora"
 #~ msgid "Folder containing contact information"
 #~ msgstr "Pasta que contém informações do contacto"
 
-#~ msgid "LDAP Server"
-#~ msgstr "Servidor LDAP"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "Servidor LDAP que contém informações do contacto"
 
@@ -17015,18 +18424,6 @@ msgstr "Procurar Agora"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Pasta pública que contém informações do contacto"
 
-#~ msgid "_Contact"
-#~ msgstr "_Contacto"
-
-#~ msgid "Create a new contact"
-#~ msgstr "Criar um novo contacto"
-
-#~ msgid "New Contact List"
-#~ msgstr "Nova Lista Contactos"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "Criar uma nova lista de contactos"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "O URI que o Navegador de Pastas irá mostrar"
 
@@ -17042,9 +18439,6 @@ msgstr "Procurar Agora"
 #~ msgid "Is New Card"
 #~ msgstr "É Novo Cartão"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "Nenhum cartão"
 
@@ -17091,30 +18485,6 @@ msgstr "Procurar Agora"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "Pasta pública que contém itens a-fazer"
 
-#~ msgid "New appointment"
-#~ msgstr "Novo compromisso"
-
-#~ msgid "_Appointment"
-#~ msgstr "_Compromisso"
-
-#~ msgid "New meeting"
-#~ msgstr "Nova reunião"
-
-#~ msgid "M_eeting"
-#~ msgstr "R_eunião"
-
-#~ msgid "New task"
-#~ msgstr "Nova tarefa"
-
-#~ msgid "_Task"
-#~ msgstr "_Tarefa"
-
-#~ msgid "New All Day Appointment"
-#~ msgstr "Novo Compromisso de Dia Completo"
-
-#~ msgid "All _Day Appointment"
-#~ msgstr "Compromisso _Dia Completo"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "Incapaz de actualizar objecto inválido"
 
@@ -17160,9 +18530,6 @@ msgstr "Procurar Agora"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "A abrir calendário em %s"
 
-#~ msgid "Opening default tasks folder"
-#~ msgstr "A abrir pasta de tarefas por omissão"
-
 #~ msgid "Evaluation of the search expression did not yield a boolean value"
 #~ msgstr "Avaliação da expressão de procura não devolveu um valor boleano"
 
@@ -17203,9 +18570,6 @@ msgstr "Procurar Agora"
 #~ "Evolution encontrou ficheiros GnomeCard\n"
 #~ "Deseja importa-los para o Evolution?"
 
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Interface configuração Correio Evolution"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "Pasta que contém correio"
 
@@ -17221,9 +18585,6 @@ msgstr "Procurar Agora"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Pasta Virtual de Lixo"
 
-#~ msgid "Properties..."
-#~ msgstr "Propriedades..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Alterar as propriedades desta pasta"
 
@@ -17233,15 +18594,6 @@ msgstr "Procurar Agora"
 #~ msgid "You have unsent messages, do you wish to quit anyway?"
 #~ msgstr "Tem mensagens por enviar, deseja mesmo sair?"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Nova Mensagem Correio"
-
-#~ msgid "_Mail Message"
-#~ msgstr "_Mensagem Correio"
-
-#~ msgid "Compose a new mail message"
-#~ msgstr "Compor uma nova mensagem correio"
-
 #~ msgid "New Message Post"
 #~ msgstr "Afixar Nova Mensagem"
 
@@ -19049,9 +20401,6 @@ msgstr "Procurar Agora"
 #~ msgid "Cumberland"
 #~ msgstr "Cumberland"
 
-#~ msgid "Curitiba"
-#~ msgstr "Curitiba"
-
 #~ msgid "Curitiba Apt"
 #~ msgstr "Curitiba Apt"
 
@@ -22043,9 +23392,6 @@ msgstr "Procurar Agora"
 #~ msgid "North Bend"
 #~ msgstr "North Bend"
 
-#~ msgid "North Carolina"
-#~ msgstr "Carolina do Norte"
-
 #~ msgid "North Conway"
 #~ msgstr "North Conway"
 
@@ -23657,9 +25003,6 @@ msgstr "Procurar Agora"
 #~ msgid "State College"
 #~ msgstr "State College"
 
-#~ msgid "Stauning"
-#~ msgstr "Stauning"
-
 #~ msgid "Staunton"
 #~ msgstr "Staunton"
 
@@ -24248,9 +25591,6 @@ msgstr "Procurar Agora"
 #~ msgid "United Arab Emirates "
 #~ msgstr "Emirados Árabes Unidos"
 
-#~ msgid "Unst"
-#~ msgstr "Unst"
-
 #~ msgid "Upington"
 #~ msgstr "Upington"
 
@@ -24359,12 +25699,6 @@ msgstr "Procurar Agora"
 #~ msgid "Veracruz"
 #~ msgstr "Veracruz"
 
-#~ msgid "Vermillion"
-#~ msgstr "Vermillion"
-
-#~ msgid "Vermont"
-#~ msgstr "Vermont"
-
 #~ msgid "Vernal"
 #~ msgstr "Vernal"
 
@@ -24893,9 +26227,6 @@ msgstr "Procurar Agora"
 #~ msgid " F"
 #~ msgstr " F"
 
-#~ msgid " C"
-#~ msgstr " C"
-
 #~ msgid "knots"
 #~ msgstr "nós"
 
@@ -25514,9 +26845,6 @@ msgstr "Procurar Agora"
 #~ msgid "Freezing haze"
 #~ msgstr "Nevoeiro com gelo"
 
-#~ msgid "Spray"
-#~ msgstr "Aguaceiros"
-
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Aguaceiros nas proximidades"
 
@@ -25880,18 +27208,6 @@ msgstr "Procurar Agora"
 #~ msgid "Remove a folder added with \"Open Other User's Folder\""
 #~ msgstr "Remover uma pasta adicionada por \"Abrir Pasta Outro Utilizador\""
 
-#~ msgid "Send / Receive"
-#~ msgstr "Enviar / Receber"
-
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Enviar itens em fila e obter novos"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Alternar se mostrar ou não barra de pastas"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Alternar se mostrar ou não barra de atalhos"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Ver a pasta seleccionada"
 
@@ -25919,9 +27235,6 @@ msgstr "Procurar Agora"
 #~ msgid "_Rename..."
 #~ msgstr "_Renomear..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Enviar / Receber"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "Barra _Atalhos"
 
@@ -25964,9 +27277,6 @@ msgstr "Procurar Agora"
 #~ msgid "Font Preferences"
 #~ msgstr "Preferências Fontes"
 
-#~ msgid "Automatically _detect links"
-#~ msgstr "_Detectar links automaticamente"
-
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 
@@ -26195,18 +27505,12 @@ msgstr "Procurar Agora"
 #~ msgid "1234"
 #~ msgstr "1234"
 
-#~ msgid "380"
-#~ msgstr "380"
-
 #~ msgid "666"
 #~ msgstr "666"
 
 #~ msgid "<- _Remove"
 #~ msgstr "<- _Remover"
 
-#~ msgid "<< Fewer Options"
-#~ msgstr "<< Menos Opções"
-
 #~ msgid "Add (or Edit) Attribute Mappings"
 #~ msgstr "Adicionar (ou Editar) Mapeamentos Atributos"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 84a83e81ce..58b2b4f119 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.4.1\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-06-19 09:53-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"
@@ -28,51 +28,184 @@ msgstr "Não foi possível carregar %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Não foi possível ler os dados do aplicativo de endereços do pilot"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Pastas autocompletar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "I_D do certificado:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Configure as suas contas de correio aqui"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Contatos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
+msgstr "Catálogo de endereços do Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address pop-up"
+msgstr "Pop-up de endereços do catálogo de endereços do Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address viewer"
+msgstr "Visualizador de endereços do catálogo de endereços do Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook card viewer"
+msgstr "Visualizador de cartão do catálogo de endereços do Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook component"
+msgstr "Componente do catálogo de endereços do Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook folder viewer"
+msgstr "Visualizador de pastas do catálogo de endereços do Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Controle de preferências do correio do Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Controle de configuração das configurações de pasta do Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Catálogo de endereços"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Propriedades..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Excluir"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "_Renomear"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Novo contato:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Contato"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "Criar um novo contato"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Nova lista de contatos"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "Nova lista de contatos"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "Criar uma nova lista de contatos"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Pessoal"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Trabalho"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "Servidor LDAP"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Não foi possível criar o diretório %s: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "Falha ao conectar ao servidor LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "Falha ao se autenticar com o servidor LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "Não foi possível realizar consulta na DSE Raiz"
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "O servidor respondeu com sem bases de busca suportadas"
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Este servidor não suporta informação de schema LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "Erro ao recuperar informação de schema"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 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:1636
-msgid "Account Name"
-msgstr "Nome da conta"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Nome do servidor"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-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-storage.c:178
-msgid "Other Contacts"
-msgstr "Outros contatos"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -81,7 +214,7 @@ msgstr ""
 "Por favor, verifique se o arquivo existe e que você\n"
 "possui as permissões para acessá-lo."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -91,7 +224,7 @@ msgstr ""
 "significa que você forneceu uma URI incorreta ou que o\n"
 "servidor LDAP está fora do ar."
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -103,7 +236,7 @@ msgstr ""
 "você deve recompilar o programa dos fontes em CVS após\n"
 "obter o OpenLDAP a partir do link abaixo.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -117,44 +250,43 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Não é possível abrir o catálogo de endereços"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "Acessando servidor LDAP anonimamente"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "Falhou a autenticação.\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sEntre senha para %s (usuário %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "Nome começa com"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "E-mail começa com"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Categoria é"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Qualquer campo contém"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Avançado..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -167,7 +299,7 @@ msgstr ""
 "resultados nas preferências do servidor de diretório para este\n"
 "catálogo de endereços."
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -179,91 +311,44 @@ msgstr ""
 "torne a sua busca mais específica ou aumente o limite de tempo nas\n"
 "preferências do servidor de diretório para este catálogo de endereços."
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "O backend para este catálogo de endereços não pôde analisar esta consulta."
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "O backend para este catálogo de endereços recusou-se a processar esta "
 "consulta."
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "Esta consulta não terminou com sucesso."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Qualquer categoria"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "A URI que a agenda vai exibir"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "I_D do certificado:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "Configure o acesso a servidores de diretório LDAP aqui"
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Contatos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "Servidores de diretório"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Catálogo de endereços do Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Controle de configuração LDAP do catálogo de endereços do Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "Pop-up de endereços do catálogo de endereços do Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "Visualizador de endereços do catálogo de endereços do Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Visualizador de cartão do catálogo de endereços do Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr "Componente do catálogo de endereços do Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook folder viewer"
-msgstr "Visualizador de pastas do catálogo de endereços do Evolution"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Controle de preferências do correio do Evolution"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -286,6 +371,7 @@ msgstr "  E_xibir bases suportadas "
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -319,8 +405,9 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "Adicionar servidor LDAP"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "Assistente de configuração LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -336,9 +423,9 @@ msgid "Anonymously"
 msgstr "Anonimamente"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -349,48 +436,49 @@ msgstr ""
 "Por favor, clique no botão \"Concluir\" para salvar as configurações que\n"
 "foram feitas aqui."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "Conectando"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "_Distinguished name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr "Editar servidor LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
 msgstr "Endereço de e-mail:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "O Evolution usará este DN para autenticá-lo com o servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "O Evolution usará este endereço de e-mail para autenticá-lo com o servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "Concluído"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Geral"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "Assistente de configuração LDAP"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "Grupo"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Nunca"
 
@@ -419,8 +507,8 @@ msgid "S_earch scope: "
 msgstr "_Escopo de busca: "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Buscando"
 
@@ -481,28 +569,32 @@ msgstr ""
 "buscas LDAP e para a criação e edição de contatos. "
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 "Especificar um nome para exibição é o último passo necessário para "
 "configurar um servidor LDAP."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "Passo 1: Informação do servidor"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "Passo 2: Conectando ao servidor"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "Passo 1: Informação do servidor"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "Passo 3: Buscando o diretório"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Passo 2: Conectando ao servidor"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "Passo 4: Nome para exibição"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Passo 3: Buscando o diretório"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -514,18 +606,6 @@ msgstr "Bases de busca suportadas"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"O primeiro passo para configurar um servidor LDAP é fornecer o seu nome e a "
-"sua informação de\n"
-"login. Por favor, pergunte ao seu administrador de sistemas se você não "
-"souber esta informação."
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -538,7 +618,7 @@ msgstr ""
 "sistemas s se você\n"
 "precisa mudar estas opções."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -550,7 +630,7 @@ msgstr ""
 "começarão. Se você deixar este campo vazio as buscas começarão na raiz da "
 "árvore do diretório."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -566,14 +646,14 @@ msgstr ""
 "Um escopo de busca de \"um\" incluirá apenas as entradas um nível abaixo da "
 "sua base.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
+#, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "Este assistente o ajudará a acessar serviços de diretório on-line\n"
 "usando servidores LDAP (Lightweight Directory Access Protocol). \n"
@@ -582,7 +662,7 @@ msgstr ""
 "sobre o servidor. Por favor, entre em contato com o seu administrador de\n"
 "sistemas caso você precise de ajuda para descobrir esta informação."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -590,7 +670,7 @@ msgstr ""
 "Este é o nome completo do seu servidor LDAP. Por exemplo, \"ldap."
 "minhaempresa.com.br\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -600,7 +680,7 @@ msgstr ""
 "grande \n"
 "a este número diminuirá a velocidade de seu catálogo de endereços."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -609,7 +689,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:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -618,6 +698,15 @@ msgstr ""
 "Este é o nome deste servidor que aparecerá na lista de pastas do Evolution.\n"
 "Ele é usado apenas para exibição. "
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Este é o nome deste servidor que aparecerá na lista de pastas do Evolution.\n"
+"Ele é usado apenas para exibição. "
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -647,21 +736,34 @@ msgid "Using email address"
 msgstr "Usando endereço de e-mail"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Quando possível"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+"O primeiro passo para configurar um servidor LDAP é fornecer o seu nome e a "
+"sua informação de\n"
+"login. Por favor, pergunte ao seu administrador de sistemas se você não "
+"souber esta informação."
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "_Nome para exibição:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "_Limite de transferência:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -669,54 +771,52 @@ msgstr "_Limite de transferência:"
 msgid "_Edit"
 msgstr "_Editar"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "Método de _login:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "Número da _porta:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "_Base de busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "Nome do _servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "_Tempo limite (minutos):"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "cartões"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr "searching-tab"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Nome"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Interface para seleção de nomes do catálogo de endereços do Evolution"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Remover todos"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Remover"
@@ -743,23 +843,21 @@ msgstr "Adicionar a contatos"
 msgid "Unnamed Contact"
 msgstr "Contato sem nome"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Nome"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Fonte"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Selecionar contatos do catálago de endereços"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "Localizar contato em"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Interface para seleção de nomes do catálogo de endereços do Evolution"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Localizar"
@@ -836,7 +934,8 @@ msgid "D_epartment:"
 msgstr "_Departamento:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalhes"
 
@@ -903,12 +1002,12 @@ msgid "_Categories..."
 msgstr "Ca_tegorias..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "E_xcluir"
@@ -2031,7 +2130,7 @@ msgid "Esq."
 msgstr "Esq."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Nome completo"
 
@@ -2124,11 +2223,27 @@ msgstr "Editor de lista de contatos"
 msgid "Save List as VCard"
 msgstr "Salvar lista como VCard"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Contato alterado:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Contato conflitante:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Detectado um contato duplicado"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"O nome ou e-mail alterado deste contato já existe nesta\n"
+"pasta. Você deseja adicioná-lo mesmo assim?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Novo contato:"
@@ -2145,22 +2260,6 @@ msgstr ""
 "O nome ou e-mail deste contato já existe nesta pasta.\n"
 "Você deseja adicioná-lo mesmo assim?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Contato alterado:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Contato conflitante:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"O nome ou e-mail alterado deste contato já existe nesta\n"
-"pasta. Você deseja adicioná-lo mesmo assim?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2259,9 +2358,9 @@ msgstr "Encaminhar contato"
 msgid "Send Message to Contact"
 msgstr "Enviar mensagem ao contato"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimir"
@@ -2283,9 +2382,12 @@ msgstr "Mover para pasta..."
 msgid "Cut"
 msgstr "Recortar"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiar"
 
@@ -2294,16 +2396,8 @@ msgstr "Copiar"
 msgid "Paste"
 msgstr "Colar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Excluir"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "Visão atual"
 
@@ -2319,166 +2413,170 @@ msgstr ""
 "capotou. Você tera que reiniciar o Evolution para poder usá-lo novamente"
 
 #: 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:2
 msgid "Assistant"
 msgstr "Assistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Fax comercial"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Telefone comercial"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Telefone comercial 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Telefone de retorno"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Telefone no carro"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Categorias"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Telefone da empresa"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Departamento"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "E-mail 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "E-mail 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Sobrenome"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Arquivar como"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "URL livre-ocupado"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Endereço residencial"
+#, fuzzy
+msgid "Given Name"
+msgstr "Nome do campo"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Fax residencial"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Telefone residencial"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Telefone residencial 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Fone"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Jordânia"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Gerente"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Telefone celular"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Apelido"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Escritório"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Empresa"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Outro endereço"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Outro fax"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Outro telefone"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Telefone principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Profissão"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Rádio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Papel"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Cônjuge"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Tratamento"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Unst"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Site web"
 
@@ -2571,11 +2669,19 @@ msgstr "Membros"
 msgid "Job Title"
 msgstr "_Função:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Endereço residencial"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Endereço residencial"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Outro endereço"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2588,112 +2694,109 @@ msgstr "Fax residencial"
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Sucesso"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Repositório desconectado"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Permissão negada"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Cartão não encontrado"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "O ID do cartão já existe"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Protocolo não suportado"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Cancelada"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "Falhou a autenticação"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "Autenticação exigida"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS não disponível"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "Catálogo de endereços não existe"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Outro erro"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Você deseja salvar as modificações?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Erro ao adicionar lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Erro ao adicionar cartão"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Erro ao modificar lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Erro ao modificar cartão"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Erro ao remover lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Erro ao remover cartão"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2702,7 +2805,7 @@ msgstr ""
 "Abrir %d cartões também abrirá %d novas janelas.\n"
 "Você realmente deseja exibir todos estes cartões?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2711,49 +2814,49 @@ msgstr ""
 "%s já existe\n"
 "Você deseja sobrescrevê-lo?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "Sobrescrever"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Erro ao salvar %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "cartao.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Mover cartão para"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Copiar cartão para"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Mover cartões para"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Copiar cartões para"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Vários VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard para %s"
@@ -2948,7 +3051,7 @@ msgstr "Margens"
 msgid "Number of columns:"
 msgstr "Número de colunas:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Opções"
 
@@ -3135,18 +3238,18 @@ msgstr "Lista sem nome"
 msgid "Split Multi-Day Events:"
 msgstr "Eventos de vários dias partidos:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Não foi possível iniciar o servidor wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Não foi possível iniciar wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Não foi possível ler os dados do aplicativo de agenda do pilot"
 
@@ -3154,24 +3257,83 @@ msgstr "Não foi possível ler os dados do aplicativo de agenda do pilot"
 msgid "Default Priority:"
 msgstr "Prioridade padrão:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Não foi possível ler os dados do aplicativo de tarefas do pilot"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Agenda e tarefas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Agenda"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configure o seu fuso horário, agenda e lista de tarefas aqui "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Agenda e tarefas do Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Controle de configuração da agenda do Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Visualizador de mensagem de agendamento da agenda do Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Visualizador da agenda do Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Editor da agenda e tarefas do Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Visualizador das terefas do Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Componente de agenda e tarefas do Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Componente de teste do Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Tarefas"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Serviço de notificação de alarme da agenda do Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Iniciando:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Terminando:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Alarme do Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarme em %s"
@@ -3246,43 +3408,172 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Não me pergunte sobre este programa novamente."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Serviço de notificação de alarme da agenda do Evolution"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Não foi possível iniciar Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Não foi possível iniciar gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Não foi possível criar a fábrica de serviço de notificação de alarme"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "hora inválida"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "Erro de iCalendar"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Cor das tarefas com prazo para hoje"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Cor das tarefas com prazo para hoje"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "Exibir _hora de término de compromissos nas visões de semana e mês"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Visualiza a impressão da agenda a ser impressa"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "_Pedir confirmação ao apagar itens"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "_Pedir confirmação ao apagar itens"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Excluir tarefas concluídas"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Exibir _números de semana no navegador de datas"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Resumo contém"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Descrição contém"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Comentário contém"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Não casadas"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3295,81 +3586,110 @@ msgstr ""
 "\n"
 "Apagar estas tarefas mesmo assim?"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "retorna menor que"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "dias"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A, %d de %B de %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d de %B de %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Imprimir esta agenda"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Nova Caledônia"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "Novo compromisso"
+
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "_Compromisso"
+
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Criar um novo compromisso"
+
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "Nova reunião"
+
+#: calendar/gui/calendar-component.c:640
+msgid "M_eeting"
+msgstr "_Reunião"
+
+#: calendar/gui/calendar-component.c:641
 #, fuzzy
-msgid "Rename"
-msgstr "_Renomear"
+msgid "Create a new meeting request"
+msgstr "Criar um novo pedido de reunião"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Novo compromisso de dia inteiro"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Pessoal"
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr "Compromisso de _dia inteiro"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Trabalho"
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Criar um novo compromisso"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3486,7 +3806,7 @@ msgstr "Enviar para:"
 msgid "With these arguments:"
 msgstr "Com estes argumentos:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -3502,6 +3822,10 @@ msgstr "horas"
 msgid "minutes"
 msgstr "minutos"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3534,8 +3858,8 @@ msgstr "Enviar um e-mail"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Resumo:"
 
@@ -3564,7 +3888,7 @@ msgstr "fim do compromisso"
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -3618,7 +3942,7 @@ msgstr "Dias"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Sexta-feira"
 
@@ -3632,7 +3956,7 @@ msgstr "Minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Segunda-feira"
 
@@ -3642,7 +3966,7 @@ msgstr "D_om"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -3656,7 +3980,7 @@ 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:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Domigo"
 
@@ -3674,7 +3998,7 @@ msgstr "Lista de tarefas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Quinta-feira"
 
@@ -3692,7 +4016,7 @@ msgstr "Formato da hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Terça-feira"
 
@@ -3702,12 +4026,12 @@ msgstr "Se_mana começa:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Semana útil"
 
@@ -3744,7 +4068,7 @@ msgid "_Fri"
 msgstr "Se_x"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Geral"
 
@@ -3784,7 +4108,7 @@ msgstr "Qu_a"
 msgid "before every appointment"
 msgstr "antes de cada compromisso"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
@@ -3792,11 +4116,11 @@ msgstr ""
 "O evento sendo apagado é uma reunião. Você gostaria de enviar um aviso de "
 "cancelamento?"
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Você tem certeza que deseja cancelar e excluir esta reunião?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
@@ -3804,11 +4128,11 @@ msgstr ""
 "A tarefa sendo apagada está atribuída. Você gostaria de enviar um aviso de "
 "cancelamento?"
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Você tem certeza que deseja cancelar e excluir esta tarefa?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -3816,51 +4140,51 @@ msgstr ""
 "O item de diário sendo apagado está publicado. Você gostaria de enviar um "
 "aviso de cancelamento?"
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Você tem certeza que deseja cancelar e excluir este item de diário?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Este evento foi excluído."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Esta tarefa foi excluída."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Este item de diário foi excluído."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Você fez alterações. Esquecer estas alterações e fechar o editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Você não fez alterações, fechar o editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Este evento foi mudado."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Esta tarefa foi mudada."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Este item de diário foi mudado."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Você fez alterações. Esquecer estas alterações e atualizar o editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Você não fez alterações, atualizar o editor?"
@@ -3870,165 +4194,170 @@ msgstr "%s  Você não fez alterações, atualizar o editor?"
 msgid "Validation error: %s"
 msgstr "Erro de validação: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " para "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Concluída "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Concluída "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Prazo "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Prazo "
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "Não foi possível atualizar objeto"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Editar compromisso"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Compromisso - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Item de diário - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Sem resumo"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Salvar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Mudanças feitas a este item podem ser descartadas se um atualização chegar"
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Não foi possível obter a versão atual!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Selecionar uma pasta destino para onde importar estes dados"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Você tem certeza que deseja excluir o comprimisso `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Você tem certeza que deseja excluir este comprimisso sem título?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Você tem certeza que deseja excluir a tarefa `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Você tem certeza que deseja excluir esta tarefa sem título?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Você tem certeza que deseja excluir o item de diário `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Você tem certeza que deseja excluir este item de diário sem título?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Você tem certeza que deseja excluir %d comprimissos?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Você tem certeza que deseja excluir %d tarefas?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Você tem certeza que deseja excluir %d itens de diário?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "O evento não pôde ser excluído devido a um erro do corba"
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "A tarefa não pôde ser excluída devido a um erro do corba"
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "O item de diário não pôde ser excluído devido a um erro do corba"
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "O item não pôde ser excluído devido a um erro do corba"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "O evento não pôde ser excluído porque a permissão foi negada"
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "A tarefa não pôde ser excluída porque a permissão foi negada"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "O item de diário não pôde ser excluído porque a permissão foi negada"
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "O item não pôde ser excluído porque a permissão foi negada"
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "O evento não pôde ser excluído devido a um erro do corba"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "A tarefa não pôde ser excluída devido a um erro do corba"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "O item de diário não pôde ser excluído devido a um erro do corba"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "O item não pôde ser excluído devido a um erro do corba"
@@ -4045,43 +4374,43 @@ msgstr "Delegar para:"
 msgid "Enter Delegate"
 msgstr "Entrar delegado"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Compromisso"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Lembrete"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Repetição"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Agendamento"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Reunião"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "A data de início está errada"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "A data de término está errada"
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "A hora de início está errada"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "A hora de término está errada"
 
@@ -4151,31 +4480,31 @@ msgid "_Start time:"
 msgstr "Hora de _início:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Nenhum"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr "O organizador selecionada não possui mais uma conta."
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "Um organizador é exigido."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "Pelo menos um participante é necessário."
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Delegar para..."
 
@@ -4216,21 +4545,15 @@ msgid "Member"
 msgstr "Membro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Papel"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
@@ -4250,6 +4573,7 @@ msgid "_Invite Others..."
 msgstr "_Convidar outros..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4282,6 +4606,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Não foi possível criar o diretório %s: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "Um organizador deve ser configurado."
@@ -4311,38 +4636,63 @@ msgstr "Informação de agenda"
 msgid "Calendar Name"
 msgstr "Agenda"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Não foi possível criar o diretório %s: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Informação de agenda"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Lista de tarefas"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Lista de tarefas"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Lista de tarefas"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 "Você está modificando um evento recorrente, o que você gostaria de modificar?"
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 "Você está modificando uma tarefa recorrente, o que você gostaria de "
 "modificar?"
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 "Você está modificando um item de diário recorrente, o que você gostaria de "
 "modificar?"
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr "Esta instância apenas"
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Esta e futuras instâncias"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr "Esta e futuras instâncias"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr "Todas as instâncias"
 
@@ -4390,10 +4740,15 @@ msgstr "dia"
 msgid "on the"
 msgstr "no"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "ocorrências"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Data/hora:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "_Adicionar"
@@ -4458,7 +4813,7 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
@@ -4468,31 +4823,31 @@ msgstr ""
 "\n"
 "Você deseja salvar as suas modificações?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "_Descartar mudanças"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 msgid "Save Event"
 msgstr "Salvar evento"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "A informação da reunião foi criada. Enviá-la?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "A informação da reunião mudou. Enviar uma versão atualizada?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "A informação de atribuição de tarefa foi criada. Enviá-la?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "A informação da tarefa mudou. Enviar uma versão atualizada?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "A data de conclusão está errada"
 
@@ -4502,43 +4857,43 @@ msgid "% _Complete"
 msgstr "% Concluída"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Concluída"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Alta"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "Em progresso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Baixa"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Não iniciada"
 
@@ -4547,7 +4902,7 @@ msgid "Progress"
 msgstr "Progresso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Indefinido"
 
@@ -4569,21 +4924,21 @@ msgstr "_Estado:"
 msgid "_Web Page:"
 msgstr "Endereço da página _web:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Básico"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Atribuição"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "O prazo de conclusão está errado"
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4591,9 +4946,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "_Confidencial"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Descrição:"
 
@@ -4698,26 +5053,21 @@ msgstr "%s em %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s para um tipo de gatilho desconhecido"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Público"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Particular"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Categorias"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4730,28 +5080,26 @@ msgid "Start Date"
 msgstr "Data de início"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Resumo"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "cor"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Compromisso"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Livre"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Ocupado"
 
@@ -4763,7 +5111,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "L"
 
@@ -4771,7 +5119,7 @@ msgstr "L"
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4781,7 +5129,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4789,7 +5137,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Sim"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4797,17 +5145,17 @@ msgstr "Não"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Desconhecido"
 
@@ -4819,181 +5167,179 @@ msgstr "Repetindo"
 msgid "Assigned"
 msgstr "Atribuido"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Atualizando objetos"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Excluindo objetos selecionados"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Atualizando objetos"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Novo _compromisso..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Novo _evento de dia inteiro"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "Nova reunião"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Nova tarefa"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "C_olar"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Ir para _hoje"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "Ir para _data..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar informação de livre/ocupado"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "_Configurações..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "A_brir"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Salvar como..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "Agendar _reunião..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "_Encaminar como iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Excluir esta _ocorrência"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Excluir _todas as ocorrências"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "_Configurações..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "A_brir mensagem"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "_Atribuir tarefa"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "_Encaminar como iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "_Marcar como concluída"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar tarefas selecionadas como concluídas"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "_Excluir tarefas selecionadas"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Clique para adicionar uma tarefa"
@@ -5007,8 +5353,8 @@ msgstr "% Concluída"
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Concluída"
 
@@ -5037,18 +5383,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5067,7 +5413,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5080,125 +5426,125 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sim. (Repetição complexa)"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "Todo dia"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "A cada %d dias"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "Toda semana"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "A cada %d semanas"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr "Toda semana em "
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr "A cada %d semanas em "
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " e "
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr "O %s dia de "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr "O %s %s de "
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "todo mês"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr "a cada %d meses"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "Todo ano"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "A cada %d anos"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr " um total de %d vezes"
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ", terminando em "
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>Inicia:</b> "
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Termina:</b> "
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>Concluída:</b> "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>Prazo:</b> "
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "Informação de iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "Erro de iCalendar"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Uma razão desconhecida"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5206,321 +5552,320 @@ 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:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Nenhum</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "Local:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Estado:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Aceito"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Aceito preliminarmente"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Recusado"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Escolher uma ação:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Atualizar"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Aceitar"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Aceitar preliminarmente"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Recusar"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Enviar informação de livre/ocupado"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Atualizar estado do respondente"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Enviar informação mais recente"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, 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:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Informação de reunião"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> requisita a presença de %s em uma reunião."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Proposta de reunião"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Atualização de reunião"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "_Pedido de atualização de reunião"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, 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:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Resposta a reunião"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> cancelou a reunião."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Cancelamento de reunião"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, 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:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Mensagem de reunião inválida"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Informação de tarefa"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> requisita que %s execute uma tarefa."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, 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:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Proposta de tarefa"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, 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:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Atualização de tarefa"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, 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:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Pedido de atualização de tarefa"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, 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:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Resposta a tarefa"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> cancelou uma tarefa."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Cancelamento de tarefa"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Mensagem de tarefa inválida"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, 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:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Informação de livre/ocupado"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, 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:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Pedido de livre/ocupado"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, 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:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Resposta de livre/ocupado"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Mensagem de livre/ocupado inválida"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 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:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "A mensagem contém apenas pedidos não suportados."
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 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:1614
+#: calendar/gui/e-itip-control.c:1612
 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:1853
+#: calendar/gui/e-itip-control.c:1851
 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:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Atualização concluída\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 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:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objeto é inválido e não pode ser atualizado\n"
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 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:1923
+#: calendar/gui/e-itip-control.c:1921
 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:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr "Ocorreu um erro no sistema CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr "Objeto não pôde ser encontrado\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Você não possui as permissões corretas para atualizar a agenda\n"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Estado do participante atualizado\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 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:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Remoção concluída"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Item enviado!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "O item não pôde ser enviado!\n"
 
@@ -5680,7 +6025,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -5744,49 +6089,44 @@ 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:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "_Data de início:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "Pra_zo de conclusão:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "_Prioridade:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Página"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Abrindo tarefas em %s"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Não foi possível carregar as tarefas em `%s'"
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "O método necessário para carregar `%s' não é suportado"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Você não possui as permissões para abrir a pasta em `%s'"
 
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5795,48 +6135,39 @@ msgstr ""
 "Erro em %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "Concluindo tarefas..."
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "Excluindo objetos selecionados..."
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "Excluindo permanentemente"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Tarefas"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Agenda"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, 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:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "O método necessário para abrir `%s' não é suportado"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Adicionando alarmes para %s"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5847,7 +6178,7 @@ msgstr ""
 "%s\n"
 " capotou. Você tera que reiniciar o Evolution para poder usá-lo novamente"
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5858,58 +6189,11 @@ msgstr ""
 "%s\n"
 " capotou. Você tera que reiniciar o Evolution para poder usá-lo novamente"
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Turin"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Agenda e tarefas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Agenda"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configure o seu fuso horário, agenda e lista de tarefas aqui "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Agenda e tarefas do Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Controle de configuração da agenda do Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Visualizador de mensagem de agendamento da agenda do Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Visualizador da agenda do Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Editor da agenda e tarefas do Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Visualizador das terefas do Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Componente de agenda e tarefas do Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Componente de teste do Evolution"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Abril"
@@ -5966,296 +6250,332 @@ msgstr "Outubro"
 msgid "September"
 msgstr "Setembro"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Um organizador deve ser configurado."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Pelo menos um participante é necessário"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Informação de evento"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Informação de tarefa"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Informação de diário"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Informação de livre/ocupado"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Informação de agenda"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Atualizado"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "Contra proposta"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informação de livre/ocupado (%s para %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "Informação iCalendar"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Você deve ser um participante do evento."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1º de"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2 de"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3 de"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4 de"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5 de"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6 de"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7 de"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8 de"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9 de"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10 de"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11 de"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12 de"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13 de"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14 de"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15 de"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16 de"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17 de"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18 de"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19 de"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20 de"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21 de"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22 de"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23 de"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24 de"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25 de"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26 de"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27 de"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28 de"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29 de"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30 de"
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31 de"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Se"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Te"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Qu"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Qu"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Se"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Sá"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Dia selecionado (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Semana selecionada (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Mês selecionado (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Ano selecionado (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Tarefa"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percentagem concluída: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorias: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Contatos: "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Visualizar impressão"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Imprimir item"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Configurar impressão..."
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Renomear este atalho"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Lista de tarefas"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Nova tarefa"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Tarefa"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Criar uma nova tarefa"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "A URI da pasta de tarefas a ser exibida"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6268,11 +6588,11 @@ msgstr ""
 "\n"
 "Apagar estas tarefas mesmo assim?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Não me pergunte novamente."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "Imprimir tarefas"
 
@@ -6300,15 +6620,15 @@ msgstr "Arquivos iCalendar (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "Arquivos vCalendar (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "Lembrete!!"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "Eventos de agenda"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6316,7 +6636,7 @@ msgstr ""
 "O Evolution achou arquivos da Agenda Gnome.\n"
 "Você gostaria de importá-los no Evolution?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Agenda Gnome"
 
@@ -7849,27 +8169,27 @@ msgstr "Pacífico/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacífico/Yap"
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "Assinaturas não são suportadas por esta cifra"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "Verificação não é suportada por esta cifra"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Cifragem não é suportada por esta cifra"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Decifragem não é suportada por esta cifra"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr "Você não pode importar chaves com esta cifra"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr "Você não pode exportar chaves com esta cifra"
 
@@ -7921,86 +8241,86 @@ msgstr "Preparando pasta '%s' para desconexão"
 msgid "You must be working online to complete this operation"
 msgstr "Você deve estar trabalhando conectado para completar esta operação"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Falhou a criação do pipe para '%s': %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Falhou a criação do processo filho '%s': %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Stream de mensagem inválida recebida de %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Sincronizando pastas"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro ao analisar filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro ao executar filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Não é possível abrir a pasta de fila"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Não é possível processar a pasta de fila"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Obtendo mensagem %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Não é possível abrir mensagem"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Falhou na mensagem %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Sincronizando pasta"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Obtendo mensagem %d de %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Falhou na mensagem %d de %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Falhou a recuperação da mensagem"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr "Argumentos inválidos para (system-flag)"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr "Argumentos inválidos para (user-tag)"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro ao executar busca por filtro: %s: %s"
@@ -8032,35 +8352,35 @@ msgstr "(match-all) requer um simples resultado booleano"
 msgid "Performing query on unknown header: %s"
 msgstr "Executando consulta por cabeçalho desconhecido: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Operação não suportada: anexar mensagem: para %s"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Operação não suportada: busca por expressão: para %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Operação não suportada: busca por uids: para %s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Movendo mensagens"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr "Copiando mensagens"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Recuperando %d mensagem(ns)"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8071,15 +8391,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr "Falhou a análise da dica de id de usuário do gpg."
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr "Falhou a análise da requisição de frase senha do gpg."
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8088,31 +8408,31 @@ msgstr ""
 "Você precisa de uma frase senha para destravar a chave\n"
 "para o usuário: \"%s\""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Cancelada."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Falhou o destravamento da chave secreta: fornecidas 3 frases chave inválidas."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Resposta inesperada do GnuPG: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr "Não foram fornecidos dados"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Falhou a cifragem: Não foram especificados destinatários válidos."
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8123,51 +8443,65 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Falhou a execução de GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Não foi possível escrever dados: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Falhou a execução do gpg: %s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr "Falhou a execução do gpg."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "Esta é uma parte de mensagem assinada digitalmente"
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr ""
+"Não é possível verificar assinatura da mensagem: não foi possível criar "
+"arquivo temporário: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Não é possível verificar assinatura da mensagem: não foi possível criar "
 "arquivo temporário: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Não foi possível escrever dados: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Esta é uma parte de mensagem assinada digitalmente"
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Indexar conteúdo do corpo"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Não foi possível recuperar mensagem do editor"
@@ -8268,15 +8602,15 @@ msgstr "Erro ao escrever arquivo de correio temporário: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Erro ao copiar arquivo de correio temporário: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Falhou a decifragem da parte MIME: erro de protocolo"
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "Falhou a decifragem da parte MIME: estrutura inválida"
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "erro de análise"
 
@@ -8599,12 +8933,12 @@ msgstr "Provedor de correio em pastas virtuais"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Para ler correio como uma consulta a um outro conjunto de pastas"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Não existe provedor disponível para o protocolo `%s'"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8613,71 +8947,82 @@ msgstr ""
 "Não foi possível criar diretório %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Entre senha para %s"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Indefinido"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Editar assinatura"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Editar assinatura"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Certificado auto-assinado na cadeia"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "Certificado não-confiável"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Salvar assinatura"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Erro de análise"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Servidor: %s, Tipo: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Não é possível obter pasta: Operação inválida neste repositório"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Não é possível criar pasta: Operação inválida neste repositório"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Lixeira"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "Junho"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "Não é possível obter certificado do emissor"
@@ -8887,7 +9232,7 @@ msgstr ""
 "Lista de revogação do certificado expirou: %s\n"
 "Emissor: %s"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Não foi possível analisar URL `%s'"
@@ -8906,22 +9251,22 @@ msgstr "Não existe tal mensagem %s em %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Não é possível copiar ou mover mensagem para uma pasta virtual"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Não é possível excluir pasta: %s: Operação inválida"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Não é possível excluir pasta: %s: Não existe tal pasta"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Não é possível renomear pasta: %s: Operação inválida"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Não é possível renomear pasta: %s: Não existe tal pasta"
@@ -9001,7 +9346,7 @@ msgstr "Não foi possível recuperar a mensagem: %s"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9015,7 +9360,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Não existe tal mensagem"
@@ -9053,54 +9398,69 @@ msgid "Failed to cache %s: %s"
 msgstr "Falhou a criação de cache para %s: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Conectando ao servidor..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Falha ao conectar ao servidor LDAP"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "Empresa"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Verificando novas mensagens"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 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:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Pastas"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Exibir apenas pastas assinadas"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "Ignorar o espaço de nomes de pasta fornecido pelo servidor"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Espaço de nomes"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Aplicar filtros às novas mensagens na INBOX deste servidor"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Verificar automaticamente novas mensagens a cada"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para ler e armazenar correio em servidores IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Senha"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Esta opção conectará ao servidor IMAP usando uma senha em texto claro."
@@ -9352,7 +9712,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Não foi possível renomear pasta %s para %s: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Não foi possível renomear '%s': %s"
@@ -9467,29 +9827,29 @@ msgstr "Verificando novas mensagens"
 msgid "Storing folder"
 msgstr "Armazenando pasta"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Não é possível criar bloqueio de pasta em %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Não é possível abrir mbox: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "Acréscimo de correio cancelado"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Não é possível acrescentar mensagem ao arquivo mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9498,11 +9858,11 @@ msgstr ""
 "Não é possível obter mensagem: %s da pasta %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "A pasta aparenta estar corrompida de modo irrecuperável."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Falha ao construir a mensagem: mbox corrompida?"
 
@@ -9570,12 +9930,17 @@ msgstr "Não foi possível criar o diretório %s: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "Não é possível obter pasta: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "O ID do cartão já existe"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Não foi possível renomear pasta %s para %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "O nome de pasta especificado não é válido: %s"
@@ -9619,7 +9984,7 @@ msgstr "Não foi possível fechar pasta fonte %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Não foi possível fechar pasta temporária: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Não foi possível renomear pasta: %s"
@@ -9906,7 +10271,7 @@ msgstr "Excluir após %s dia(s)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Desativar suporte para todas as extensões do POP3"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -9995,7 +10360,7 @@ 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:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10052,7 +10417,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Entrega de correio usando o programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10218,7 +10583,7 @@ msgstr "Entrega de correio SMTP via %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Não é possível enviar mensagem: endereço do remetente não é válido."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Enviando mensagem"
 
@@ -10341,7 +10706,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "anexo"
 
@@ -10385,14 +10750,14 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir exibição automática de anexo"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Você deve configurar uma conta\n"
 "antes de poder redigir uma mensagem."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Clique aqui para o catálogo de endereços"
 
@@ -10403,45 +10768,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Responder-a:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Entre os destinatários da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Entre os endereços que receberão uma cópia da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10452,14 +10817,19 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Publicar para:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr "Publicando destino"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Anexar um arquivo à mensagem"
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Anexar arquivo(s)"
@@ -10494,21 +10864,21 @@ msgstr "Arquivo existe, sobrescrever?"
 msgid "Error saving file: %s"
 msgstr "Erro ao salvar arquivo: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao carregar arquivo: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro ao acessar arquivo: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Não foi possível recuperar mensagem do editor"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10517,7 +10887,7 @@ msgstr ""
 "Não é possível buscar no arquivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10526,7 +10896,7 @@ msgstr ""
 "Não é possível truncar arquivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10535,7 +10905,7 @@ msgstr ""
 "Não é possível copiar descritor de arquivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10544,7 +10914,7 @@ msgstr ""
 "Erro ao salvar automaticamente mensagem: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10552,7 +10922,7 @@ msgstr ""
 "O Ximian Evolution encontrou arquivos não salvos de uma sessão anterior.\n"
 "Você gostaria de tentar recuperá-los?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10563,28 +10933,28 @@ msgstr ""
 "\n"
 "Você deseja salvar as suas modificações?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Alerta: Mensagem modificada"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Abrir arquivo"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "Assinatura:"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "Auto-gerado"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Redigir uma mensagem"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10592,7 +10962,7 @@ msgstr ""
 "Não foi possível criar janela de redator:\n"
 "Não é possível ativar o controle seletor de endereços."
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10604,7 +10974,7 @@ msgstr ""
 "Por favor, verifique se você possui as versões\n"
 "corretas de gtkhtml e libgtkhtml instaladas.\n"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10612,7 +10982,7 @@ msgstr ""
 "Não foi possível criar janela de redator:\n"
 "Não é possível ativar o componente editor de HTML."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10621,11 +10991,13 @@ msgstr ""
 "editado.)<b>"
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "O conjunto de aplicativos de groupware Evolution"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10881,13 +11253,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11006,7 +11378,7 @@ msgstr "Então"
 msgid "You must specify a folder."
 msgstr "Você deve especificar uma pasta."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Selecionar pasta"
@@ -11020,24 +11392,24 @@ msgstr ""
 "Erro na expressão regular '%s':\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Importante"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "A fazer"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Mais tarde"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Teste"
 
@@ -11137,7 +11509,7 @@ msgstr "atrás"
 msgid "months"
 msgstr "meses"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "segundos"
 
@@ -11234,7 +11606,7 @@ msgstr "Expressão"
 msgid "Follow Up"
 msgstr "Continuar"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "Rótulo"
 
@@ -11304,112 +11676,118 @@ msgid "Source Account"
 msgstr "Conta fonte"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Maresia"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Cabeçalho específico"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Parar o processamento"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Assunto"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "Desconfigurar estado"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "contém"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "não contém"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "não termina com"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "não existe"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "does not return"
 msgstr "não retorna"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "não soa como"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "não começa com"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "termina com"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "existe"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr "está Marcada"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr "é após"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "is before"
 msgstr "é antes"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "é maior que"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "é menor que"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr "não está Marcada"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "não é"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "é"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr "retorna maior que"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr "retorna menor que"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr "retorna"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "soa como"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "começa com"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "O nome de regra '%s' não é único, escolha outro."
@@ -11434,18 +11812,81 @@ msgstr "Nome da regra"
 msgid "Score Rules"
 msgstr "Regras de pontuação"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Você deve nomear esta pasta virtual."
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr "Você precisa especificar pelo menos uma pasta como uma fonte."
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 msgid "VFolder source"
 msgstr "Fonte de pastas virtuais"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Preferências do redator"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Configure preferências de correio, incluindo segurança e exibição de "
+"mensagens, aqui"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Configure a verificação ortográfica, assinaturas e o redator de mensagens "
+"aqui"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Configure as suas contas de correio aqui"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Correio do Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Controle de configuração de contas do correio do Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Componente correio do Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Redator do correio do Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Controle de configuração do redator do correio do Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail folder viewer"
+msgstr "Visualizador de pastas do correio do Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Controle de preferências do correio do Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Correio"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Contas de correio"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "Preferências de correio"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Você tem certeza que deseja excluir esta conta?"
@@ -11487,7 +11928,7 @@ msgid "Protocol"
 msgstr "Protocolo"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr "Sem nome"
 
@@ -11511,21 +11952,18 @@ msgstr "Adicionar script de assinatura"
 msgid "Signature(s)"
 msgstr "Assinatura(s)"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "Você está enviando uma mensagem em formato HTML. Por favor, verifique se os\n"
 "seguintes destinatários desejam e são capazes de receber correio neste "
 "formato:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Enviar mesmo assim?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11533,7 +11971,7 @@ msgstr ""
 "Esta mensagem não possui um assunto.\n"
 "Enviar mesmo assim?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11542,11 +11980,11 @@ msgstr ""
 "está configurada para esconder os endereços da lista, esta mensagem conterá "
 "apenas destinatários Bcc."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Esta mensagem contém apenas destinatários Bcc."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11556,11 +11994,11 @@ msgstr ""
 "cabeçalho Apparently-To.\n"
 "Enviar mesmo assim?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Você deve especificar destinatários para poder enviar esta mensagem."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11572,189 +12010,403 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Criar pasta _virtual a partir da busca..."
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "Correio"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<clique aqui para selecionar uma pasta>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" em \"%s\""
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Criar nova pasta"
 
-#: mail/em-folder-selector.c:267
-#, fuzzy
-msgid "Folder _name"
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Especificar onde criar a pasta:"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
 msgstr "_Nome da pasta:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Não foi possível criar diretório temporário: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Não foi possível criar diretório temporário: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Não foi possível criar arquivo temporário '%s': %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Não foi possível fechar pasta temporária: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Carregando..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Selecionar pasta"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Criar uma nova pasta"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Não foi possível excluir a pasta `%s': %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Excluir mesmo pasta \"%s\"?"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Excluir \"%s\""
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Renomear a pasta \"%s\" para:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+msgid "Rename Folder"
+msgstr "Renomear pasta"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Propriedades da fonte"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Propriedades"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "_Nome da pasta:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Ver"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Abrir em nova janela"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Mover"
+
+#: mail/em-folder-tree.c:1500
+msgid "_New Folder..."
+msgstr "_Nova pasta..."
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "_Renomear"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "_Propriedades..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "_Editar como nova mensagem..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Responder ao remetente"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Responder a _lista"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "Encamin_har"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr "_Continuar..."
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr "Marcar como concl_uída"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "Lim_par marca"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Marcar como li_da"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "Marcar como _não lida"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Marcar como i_mportante"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "Marcar como sem imp_ortância"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Marcar como _não lida"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Marcar como i_mportante"
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "Des_fazer exclusão"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "Mo_ver para pasta..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "Copiar para p_asta..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "Adicionar remetente ao catálo_go de endereços"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "Aplicar _filtros"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "Criar _regra a partir da mensagem"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "Pasta virtual por _assunto"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "Pasta virtual por _remetente"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "Pasta virtual por _destinatários"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "Pasta virtual por _lista de discussão"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "Pasta virtual por _remetente"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Filtro por a_ssunto"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Filtro por r_emetente"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Filtro por des_tinatários"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Filtro por l_ista de discussão"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filtro por r_emetente"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Padrão"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Imprimir mensagem"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Copiar local do vínculo"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Casa:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Atribuido"
+
+#: mail/em-format-html-display.c:597
+#, fuzzy
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr ""
+"Esta mensagem está assinada digitalmente mas não é possível estabelecer sua "
+"autenticidade."
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Editar assinatura"
+
+#: mail/em-format-html-display.c:598
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
 msgstr ""
-"Esta mensagem está assinada digitalmente. Clique no cadeado para mais "
-"informações."
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Editar assinatura"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+#, fuzzy
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"O input_token contém uma assinatura inválida ou uma assinatura que não pode "
+"ser verificada."
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Interrompido"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "Cifrar com PGP"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Não foi possível analisar mensagem MIME. Exibindo como fonte."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Schema não suportado"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Não é possível verificar a assinatura folha"
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Ver embutido"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Esconder"
@@ -11764,185 +12416,208 @@ msgstr "Esconder"
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Recuperando mensagem %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Parte external-body malformada."
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Apontador para site FTP (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Apontador para arquivo local (%s) válido no site \"%s\""
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Apontador para arquivo local (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Apontador para dados remotos (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Apontador para dados externos desconhecidos (tipo \"%s\")"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-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/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Esta mensagem está assinada digitalmente e é autêntica."
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-msgid "No signature present"
-msgstr ""
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Não foi possível iniciar Bonobo"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Schema não suportado"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Não foi possível analisar mensagem MIME. Exibindo como fonte."
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Movendo mensagens"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "De"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Responder-a"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Para"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "Programa de correio"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "anexo %s"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Não foi possível analisar mensagem MIME. Exibindo como fonte."
+msgid "Session not initialised"
+msgstr "Não foi possível iniciar Bonobo"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Esta mensagem está assinada digitalmente e é autêntica."
+
+#: mail/em-format.c:1212
+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/em-popup.c:593
+#: mail/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Esperando..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Pinging %s"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Falhou a criação de cache para %s: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Falhou a criação do pipe para '%s': %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Falhou a resolução da máquina `%s': %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Salvar como..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Responder ao remetente"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Abrir vínculo no navegador"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Enviar _mensagem a lista..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Adicionar remetente ao catálogo de endereços"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir em %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "Este servidor não suporta informação de schema LDAPv3"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Assinar"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Pasta"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Por favor selecione um servidor."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Não foi selecionado um servidor"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Não exibir esta mensagem novamente."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11951,27 +12626,27 @@ msgstr ""
 "Erro ao carregar informação do filtro:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Mensagem encaminhada"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "um remetente desconhecido"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Em %a, %Y-%m-%d às %H:%M, %%s escreveu:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -11980,7 +12655,7 @@ msgstr ""
 "Não é possível salvar para `%s'\n"
 " %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -11989,25 +12664,26 @@ msgstr ""
 "`%s' já existe.\n"
 "Sobrescrevê-lo?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Mensagem"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Salvar mensagem como..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Não foi possível criar diretório temporário: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Endereço"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12017,62 +12693,426 @@ msgstr ""
 "\n"
 "Apagar estas mensagens mesmo assim?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Preferências do redator"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/em-utils.c:2288
+#, fuzzy
 msgid ""
-"Configure mail preferences, including security and message display, here"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
 msgstr ""
-"Configure preferências de correio, incluindo segurança e exibição de "
-"mensagens, aqui"
+"Esta operação apagará permanentemente todas as mensagens marcadas para\n"
+"exclusão. Se você continuar você não será capaz de recuperar estas "
+"mensagens.\n"
+"\n"
+"Apagar estas mensagens mesmo assim?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/evolution-mail.schemas.in.in.h:1
+msgid "Automatic link recognition"
 msgstr ""
-"Configure a verificação ortográfica, assinaturas e o redator de mensagens "
-"aqui"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Configure as suas contas de correio aqui"
+#: mail/evolution-mail.schemas.in.in.h:2
+msgid "Automatic smiley recognition"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Correio do Evolution"
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Controle de configuração de contas do correio do Evolution"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Componente correio do Evolution"
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Redator do correio do Evolution"
+#: mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
+msgid "Default charset in which to compose messages"
+msgstr "Assunto padrão para a mensagem."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Controle de configuração do redator do correio do Evolution"
+#: mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
+msgid "Default charset in which to compose messages."
+msgstr "Assunto padrão para a mensagem."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Visualizador de pastas do correio do Evolution"
+#: mail/evolution-mail.schemas.in.in.h:8
+#, fuzzy
+msgid "Default charset in which to display messages"
+msgstr "Buscar por texto no corpo da mensagem exibida"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Controle de preferências do correio do Evolution"
+#: mail/evolution-mail.schemas.in.in.h:9
+#, fuzzy
+msgid "Default charset in which to display messages."
+msgstr "Buscar por texto no corpo da mensagem exibida"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/evolution-mail.schemas.in.in.h:10
+#, fuzzy
+msgid "Default forward style"
+msgstr "Estilo de _encaminhamento:"
+
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default reply style"
+msgstr "Estilo de _resposta:"
+
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Empty Trash folders on exit"
+msgstr "_Esvaziar lixeiras ao sair"
+
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "_Esvaziar lixeiras ao sair"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "Contas de correio"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "Preferências de correio"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "Executar ações"
+
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Notificação de nova mensagem"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Notificação de nova mensagem"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr "_Perguntar ao enviar mensagens HTML para contatos que não as querem"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "Perguntar ao enviar mensagens com apenas destinatários _Bcc"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "Enviar correio HTML?"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "Enviar correio HTML?"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "_Exibir imagens animadas"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "_Exibir imagens animadas"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Exibir a mensagem no estilo normal"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "_Painel de visualização"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "Toque um _arquivo de som quando uma nova mensagem chegar"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "_Verificação ortográfica"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "Fonte de _terminal:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "Selecionar fonte HTML de largura variável para impressão"
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Lista de mensagens encadeadas"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Lista de mensagens encadeadas"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "_Torne esta a minha conta padrão"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "Largura v_ariável:"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Importador Elm do Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+msgid "Evolution mbox importer"
+msgstr "Importador mbox do Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Netscape Mail importer"
+msgstr "Importador Netscape Mail do Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Importador Outlook Express 4 do Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Pine importer"
+msgstr "Importador Pine do Evolution"
 
 #: mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
@@ -12112,34 +13152,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Importador Elm do Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Importador mbox do Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Netscape Mail importer"
-msgstr "Importador Netscape Mail do Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Importador Outlook Express 4 do Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Pine importer"
-msgstr "Importador Pine do Evolution"
-
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -12201,12 +13213,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "O Evolution está importando seus dados antigos do Netscape"
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Lixeira"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Varrendo filtros de correio"
@@ -12215,7 +13221,7 @@ msgstr "Varrendo filtros de correio"
 msgid "Scanning directory"
 msgstr "Varrendo diretório"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Iniciando a importação"
 
@@ -12290,23 +13296,23 @@ msgid "You have not filled in all of the required information."
 msgstr "Você não preencheu toda a informação exigida."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Editor de contas do Evolution"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Máquina:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "Nome do _usuário:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Caminho:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Você não pode criar duas contas com o mesmo nome."
 
@@ -12315,35 +13321,35 @@ msgstr "Você não pode criar duas contas com o mesmo nome."
 msgid "Mail to %s"
 msgstr "Correio para %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Assunto é %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Correio de %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "Lista de discussão %s"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Em resposta a"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Adicionar regra de filtro"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "A(s) seguinte(s) regra(s) de filtro:\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12354,143 +13360,30 @@ msgstr ""
 "    '%s'\n"
 "e foi(foram) atualizada(s)."
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "Conectando..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Esta pasta não pode conter mensagens."
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Nova mensagem de correio"
 
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Não foi possível abrir pasta compartilhada: %s."
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "_Mensagem de correio"
 
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Não foi possível criar diretório temporário: %s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "Redigir uma nova mensagem de correio"
 
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Não foi possível criar arquivo temporário '%s': %s"
-
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Não foi possível fechar pasta temporária: %s"
-
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Selecionar uma pasta destino para onde importar estes dados"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Selecionar uma pasta destino para onde importar estes dados"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Criar uma nova pasta"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Especificar onde criar a pasta:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Não foi possível excluir a pasta `%s': %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Excluir mesmo pasta \"%s\"?"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Excluir \"%s\""
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Renomear a pasta \"%s\" para:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-msgid "Rename Folder"
-msgstr "Renomear pasta"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "O nome de pasta especificado não é válido: %s"
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Propriedades da fonte"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Propriedades"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "_Nome da pasta:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Ver"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Abrir em nova janela"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Mover"
-
-#: mail/mail-component.c:2087
-msgid "_New Folder..."
-msgstr "_Nova pasta..."
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "_Renomear"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Propriedades..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Identidade"
 
@@ -12552,11 +13445,11 @@ msgstr ""
 "Evolution. Por favor entre um nome para esta conta no espaço abaixo. Este "
 "nome será usado apenas para propósitos de exibição."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Verificando serviço"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Conectando ao servidor..."
 
@@ -12638,26 +13531,35 @@ msgid "C_olors"
 msgstr "_Cores"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Verificando novas mensagens"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "Verificar a ortografia enquanto eu _digito"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Verificando novas mensagens"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "Cor das palavras _erradas:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Redigindo mensagens"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Configuração"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12673,133 +13575,138 @@ msgstr ""
 "\n"
 "Pressione \"Aplicar\" para salvar suas configurações."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "_Padrão"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Comportamento padrão"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "Co_dificação de caracteres padrão:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Excluindo correio"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Sempre _assinar mensagens enviadas usando esta conta"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "Não citar a mensagem original"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "_Não assinar pedidos de reunião (para compatibilidade com o Outlook)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Terminado"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "P_asta de rascunhos:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "A_tivar"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "Contas de correio"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "Endereço de e-_mail:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "_Esvaziar lixeiras ao sair"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "I_D do certificado:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Assistente de contas do Evolution"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Executar comando..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "Largura fi_xa:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "Filtros"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "Propriedades da fonte"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "Formatar mensagens em _HTML"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "_Realçar citações com"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Embutido"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Rótulos e cores"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Carregando imagens"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Configuração de correio"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Localização da caixa de correio"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Redator de mensagens"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Exibição de mensagens"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 msgid "Message Fonts"
 msgstr "Fontes de mensagem"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Notificação de nova mensagem"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -12807,140 +13714,140 @@ msgstr ""
 "Nota: não será pedido que você forneça uma senha até que você faça a "
 "primeira conexão"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Informação opcional"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "Empres_a:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da c_have PGP/GPG:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Escolha uma cor"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Perguntar ao enviar mensagens com apenas destinatários _Bcc"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Fontes de impressão"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "Citar mensagem original"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "_Lembrar esta senha"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "Respon_der-a:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Recebendo mensagem"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "_Opções de recepção"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "_Lembrar esta senha"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Informação exigida"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "Restaurar padrões"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "_Segurança"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr "Selecionar fonte HTML de largura fixa"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr "Selecionar fonte HTML de largura fixa para impressão"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr "Selecionar fonte HTML de largura variável"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr "Selecionar fonte HTML de largura variável para impressão"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Enviando mensagem"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Pasta de _mensagens enviadas:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Mensagens enviadas e rascunhos"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Servi_dor requer autenticação"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Configuração do servidor"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "_Tipo do servidor: "
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Certificado auto-assinado na cadeia"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "Nome do _arquivo:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "_Verificação ortográfica"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Mbox padrão do Unix"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12950,7 +13857,7 @@ msgstr ""
 "assinatura. O nome que você especificar será\n"
 "usado apenas para propósitos de exibição. "
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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 "
@@ -12960,7 +13867,7 @@ msgstr ""
 "correção ortográfica. A lista de línguas aqui reflete apenas as línguas para "
 "as quais você possui um dicionário instalado."
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12968,11 +13875,15 @@ msgstr ""
 "Digite o nome pelo qual você gostaria de chamar esta conta.\n"
 "Por exemplo: \"Trabalho\" ou \"Pessoal\""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "Largura v_ariável:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12982,169 +13893,178 @@ msgstr ""
 "\n"
 "Pressione \"Próximo\" para começar. "
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "_Adicionar assinatura"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "_Sempre carregar imagens da rede"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Sempre _assinar mensagens enviadas usando esta conta"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "Tipo de _autenticação: "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "Tipo de _autenticação: "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr "_Verificar automaticamente novas mensagens a cada"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "Inserir automaticamente imagens de _carinhas"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "_Soe um bip quando uma nova mensagem chegar"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "C_onfirmar ao excluir permanentemente uma pasta"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "Assinat_ura padrão:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "_Padrões"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "Não me noti_fique quando uma nova mensagem chegar"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "_Ativar"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "Estilo de _encaminhamento:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "Nome _completo:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "Correio _HTML"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "_Identidade"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Junho"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "C_arregar imagens se o remetente está no catálogo de endereços"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "_Torne esta a minha conta padrão"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensagens como lidas após"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "_Nunca carregar imagens da rede"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "Toque um _arquivo de som quando uma nova mensagem chegar"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 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:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Perguntar ao enviar mensagens com um assunto vazio"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "_Recebendo correio"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "Estilo de _resposta:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "_Restaurar padrões"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Script:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Excluir..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "_Enviando correio"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "_Exibir imagens animadas"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "A_ssinaturas"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr "Fonte _padrão:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr "Fonte de _terminal:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "Usar conexão se_gura (SSL)"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar as mesmas fontes que outros aplicativos usam"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "descrição"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13153,7 +14073,7 @@ msgstr ""
 "Erro enquanto '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13162,7 +14082,7 @@ msgstr ""
 "Erro ao executar operação:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Trabalhando"
 
@@ -13174,118 +14094,118 @@ msgstr "Filtrando pasta"
 msgid "Fetching Mail"
 msgstr "Pegando correio"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Falha ao armazenar correio no arquivo temporário %s: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Falha ao armazenar correio no arquivo temporário %s: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensagem %d de %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Falha na mensagem %d de %d"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Concluída."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Salvando mensagem na pasta"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensagens para %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensagens para %s"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Varrendo pastas em \"%s\""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Mensagens encaminhadas"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo pasta %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo repositório %s"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Removendo pasta %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Armazenando pasta '%s'"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Atualizando pasta"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Excluindo permanentemente pasta"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Esvaziando lixeira em '%s'"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Pastas locais"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recuperando mensagem %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Recuperando %d mensagem(ns)"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvando %d mensagem(ns)"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13294,7 +14214,7 @@ msgstr ""
 "Não é possível criar arquivo de saída: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13303,11 +14223,11 @@ msgstr ""
 "Erro ao salvar mensagens para: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Salvando anexo"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13316,21 +14236,25 @@ msgstr ""
 "Não é possível criar arquivo de saída: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Não foi possível escrever dados: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectando a %s"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Diferenciar maiúsculas de minúsculas"
@@ -13348,59 +14272,74 @@ msgstr "Localizar:"
 msgid "Search"
 msgstr "_Buscar"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Editar assinatura"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Exceções"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Informação de conta"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Cancelando..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Servidor: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Caminho: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Receber e enviar correio"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 msgid "Cancel _All"
 msgstr "Cancelar _todos"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Atualizando..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Esperando..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "O usuário cancelou a operação."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Entre senha para %s"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Entre senha"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "_Lembrar esta senha"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Lembrar esta senha pelo restante desta sessão"
 
@@ -13439,26 +14378,31 @@ msgstr "Entre um nome para esta assinatura."
 msgid "Name:"
 msgstr "Nome:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensagem encaminhada - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Mensagem encaminhada"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Abrindo pasta %s"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Preparando pasta virtual: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Atualizando pastas virtuais para URI: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13471,88 +14415,88 @@ msgstr ""
 "    '%s'\n"
 "e foi(foram) atualizada(s)."
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "Pastas virtuais"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "Pastas virtuais"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Editar pasta virtual"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Tentando editar uma pasta virtual '%s' que não existe."
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Nova pasta virtual"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Não vista"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Várias mensagens não vistas"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Várias mensagens"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Mínima"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Mais baixa"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Mais alta"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Máxima"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Hoje %k:%M"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Ontem %k:%M"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Gerando lista de mensagens"
 
@@ -13608,11 +14552,11 @@ msgstr "Encaminhar"
 msgid "No Response Necessary"
 msgstr "Não é necessário resposta"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Responder a todos"
 
@@ -13664,41 +14608,139 @@ msgstr "_Assinar"
 msgid "_Unsubscribe"
 msgstr "_Cancelar assinatura"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr "Configure pastas especiais e comportamento desconectado de pastas aqui"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Shell do Evolution"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Configurações de pastas"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "80%"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Renomear este grupo de atalhos"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Alternar a exibição da barra de pastas"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Esconder a barra de atalhos"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Prioridade padrão:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Prioridade padrão:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Interface de configuração do correio do Evolution"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+#, fuzzy
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "Marcar anexo para exibição embutida por padrão."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
 msgstr ""
-"Não é possível transferir pasta:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Adicionar uma pasta"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Rascunho"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Caixa de entrada"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "Abrindo pasta de tarefas padrão"
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Caixa de saída"
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Abrindo pasta de tarefas padrão"
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Enviada"
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Abrindo pasta de tarefas padrão"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Abrindo pasta de tarefas padrão"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Alternar a exibição da barra de pastas"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Alternar a exibição da barra de atalhos"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "E-mail"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Não foi possível atualizar os arquivos corretamente"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13709,7 +14751,7 @@ msgstr ""
 "%s\n"
 "Erro: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13718,7 +14760,7 @@ msgstr ""
 "Um erro ocorreu ao copiar arquivos em\n"
 "`%s'."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13729,7 +14771,7 @@ msgstr ""
 "Por favor o mova para permitir a instalação\n"
 "dos arquivos de usuário do Evolution."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13827,10 +14869,11 @@ msgstr ""
 "Não é possível renomear pasta:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+msgid "The specified folder name is not valid: %s"
+msgstr "O nome de pasta especificado não é válido: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -13854,19 +14897,15 @@ msgstr ""
 "Não é possível criar a pasta especificada:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Criar nova pasta"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Sem nome)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Escolha o tipo de importador a executar:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13880,11 +14919,11 @@ msgstr ""
 "Você pode selecionar \"Automático\" se você não sabe e o Evolution tentará "
 "descobrir sozinho."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Por favor selecione a informação que você gostaria de importar:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13892,7 +14931,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13901,21 +14940,21 @@ msgstr ""
 "Importando %s\n"
 "Importando item %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "Selecionar importador"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "Arquivo %s não existe"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Erro do Evolution"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -13924,11 +14963,11 @@ msgstr ""
 "Não existe importador capaz de tratar\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Importando"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -13937,17 +14976,17 @@ msgstr ""
 "Importando %s.\n"
 "Iniciando %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Erro ao iniciar %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Erro ao carregar %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13956,35 +14995,35 @@ msgstr ""
 "Importando %s\n"
 "Importando item 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Automático"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Nome do arquivo:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Selecionar um arquivo"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Tipo do arquivo:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Importar dados e configurações de programas antigos"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Importar um único arquivo"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -13992,47 +15031,28 @@ msgstr ""
 "Por favor aguarde...\n"
 "Varrendo a procura de configurações existentes"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Iniciando importadores inteligentes"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Selecionar uma pasta destino para onde importar estes dados"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Importar"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Fechando conexões..."
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Erro sincronizando \"%s\":\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "Sincronizando pasta"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Sincronizando \"%s\" (%d of %d) ..."
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Configurações do Evolution"
@@ -14067,7 +15087,7 @@ msgstr "Não foi possível abrir pasta compartilhada: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Não é possível localizar a pasta compartilhada especificada."
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14076,17 +15096,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Assistente"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Novo"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Não foi especificado um nome de pasta."
@@ -14145,64 +15159,51 @@ msgstr "Criar 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:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "_Trabalhar conectado"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "_Trabalhar desconectado"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Trabalhar desconectado"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Nenhuma pasta exibida)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Nenhum)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 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:2090
+#: shell/e-shell-window.c:331
 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:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "O Ximian Evolution está atualmente desconectado. Clique neste botão para "
 "trabalhar conectado."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Argumentos inválidos"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Não é possível registrar no OAF"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Não foi localizado o banco de dados de configuração"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Erro genérico"
 
@@ -14315,75 +15316,18 @@ msgstr "Re_mover"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Remove este atalho da barra de atalhos"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Erro ao salvar atalhos."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Caixa de entrada"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Atalhos"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Sem erro"
-
-#: 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:575
-msgid "The specified folder type is not valid"
-msgstr "O tipo de pasta especificado não é válido"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "Erro de E/S"
-
-#: 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:581
-msgid "The folder is not empty"
-msgstr "A pasta não está vazia"
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "A pasta especificada não foi achada"
-
-#: 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:589
-msgid "Operation not supported"
-msgstr "Operação não suportada"
-
-#: 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: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: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:597
-msgid "Cannot create a folder with that name"
-msgstr "Não é possível criar uma pasta com este nome"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Esta operação não pode ser realizada em modo desconectado"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Caixa de marcação"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14394,6 +15338,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% cumprida)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Novo"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "\"%s\" em \"%s\""
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14431,74 +15386,6 @@ msgstr ""
 "O erro do sistema de ativação é:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "Erro CORBA"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Interrompido"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Argumento inválido"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Já possui um dono"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Sem dono"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Não encontrado"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Tipo não suportado"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Schema não suportado"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Operação não suportada"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Erro interno"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Existe"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "URI inválida"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Possui sub-pastas"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Sem espaço remanescente"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "O dono anterior morreu"
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Tipo teste"
-
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr "Componente de teste do Evolution"
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr "Conexões ativas"
@@ -14527,10 +15414,6 @@ msgstr "C_orreio:"
 msgid "_Tasks:"
 msgstr "_Tarefas:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr "_Nome da pasta:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder _type:"
 msgstr "_Tipo da pasta:"
@@ -14593,22 +15476,6 @@ msgstr ""
 "\n"
 "Clique no botão \"Aplicar\" para salvar as suas configurações. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "Configure pastas especiais e comportamento desconectado de pastas aqui"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Shell do Evolution"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Controle de configuração das configurações de pasta do Evolution"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Configurações de pastas"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -14648,7 +15515,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Importadores"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Importar"
 
@@ -14664,16 +15531,16 @@ msgstr "Não pergunte-me novamente"
 msgid "Evolution can import data from the following files:"
 msgstr "O Evolution pode importar dados dos seguintes arquivos:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "O Evolution está saindo agora ..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14708,7 +15575,7 @@ msgstr ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -14716,36 +15583,48 @@ msgstr ""
 "Obrigado\n"
 "O time do Ximian Evolution\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr "Não me diga novamente"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Não é possível acessar a shell do Ximian Evolution."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Não é possível iniciar a shell do Ximian Evolution: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Iniciar no modo desconectado"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Iniciar no modo conectado"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr "Desligar a força todos os componentes do Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Enviar a saída de depuração de todos os componentes para um arquivo."
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14754,31 +15633,60 @@ msgstr ""
 "%s: --online e --offline não podem ser usados juntos.\n"
 "  Use %s --help para mais informações.\n"
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Selecionar importador"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "I_D do certificado:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "Progresso"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Expressão"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Mesclar endereço de e-mail:"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"Certificado expirou: %s\n"
+"Emissor: %s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14836,91 +15744,376 @@ msgid "Backup All"
 msgstr "Blackpool"
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "I_D do certificado:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Certificado não-confiável"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "I_D do certificado:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Nome comum"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "I_D do certificado:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "_Editar"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Falhou a verificação dos certificados."
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Expressão"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Empresa"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Unidade organizacional"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Ver"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "I_D do certificado:"
+
+#: smime/gui/smime-ui.glade.h:42
+#, fuzzy
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr "Autoridade de certificação (CA) inválida"
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "I_D do certificado:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Importar"
+msgid "Certificate already exists"
+msgstr "O ID do cartão já existe"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Vermont"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr "° C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "OK"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "I_D do certificado:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "I_D do certificado:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "Certificado não-confiável"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "ID"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Assunto é %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Não é possível processar a pasta de fila"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "Autoridade de certificação (CA) inválida"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Autoridade de certificação (CA) inválida"
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Sem informação"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "anexo"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "I_D do certificado:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Curitiba"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "North Carolina"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Expressão"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s em %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Falha da assinatura do certificado"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "_Inserir"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Assunto é %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Falha da assinatura do certificado"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Entre senha para %s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "I_D do certificado:"
 
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
@@ -14971,7 +16164,7 @@ msgstr "Copiar a seleção"
 msgid "Copy to Folder..."
 msgstr "Copiar para pasta..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Recortar a seleção"
 
@@ -14987,7 +16180,7 @@ msgstr "Mover contato(s) para outra pasta..."
 msgid "Move to Folder..."
 msgstr "Mover para pasta..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Colar a área de transferência"
 
@@ -14995,8 +16188,8 @@ msgstr "Colar a área de transferência"
 msgid "Previews the contacts to be printed"
 msgstr "Visualiza a impressão dos contatos a serem impressos"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Vi_sualizar impressão"
@@ -15041,13 +16234,13 @@ msgstr "Parar a carga"
 msgid "View the current contact"
 msgstr "Ver o contato atual"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "_Ações"
 
@@ -15077,142 +16270,110 @@ msgstr "_Enviar mensagem ao contato..."
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "Criar um novo compromisso de dia inteiro"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Criar um novo compromisso"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "Criar uma nova pasta"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Criar um novo pedido de reunião"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Criar uma nova tarefa"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Dia"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Excluir todas as ocorrências"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Excluir o compromisso"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Excluir esta ocorrência"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Excluir esta ocorrência"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Ir para"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Voltar"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Avançar"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Ir para _data"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Ir para uma data específica"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Ir para hoje"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "Lista"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Mês"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Novo _compromisso"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Nova Caledônia"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Nova reunião"
-
-#: ui/evolution-calendar.xml.h:27
-#, fuzzy
-msgid "New _Task"
-msgstr "Nova tarefa"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Visualiza a impressão da agenda a ser impressa"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Imprimir esta agenda"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publicar informação de livre/ocupado para esta agenda"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Bourges"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Pasta pública contendo compromissos e eventos"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Exibir detalhes"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Exibir um dia"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Exibir um mês"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Exibir uma semana"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Exibir a semana útil"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Semana"
 
@@ -15277,7 +16438,7 @@ msgstr "Salvar este item para disco"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Arquivo"
 
@@ -15497,7 +16658,7 @@ msgstr "Marcar _todas como lidas"
 msgid "Mark all visible messages as read"
 msgstr "Marcar como lidas todas as mensagens visíveis"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "Colar mensagem(ns) da área de transferência"
 
@@ -15556,16 +16717,6 @@ msgstr "_Inverter seleção"
 msgid "_Threaded Message List"
 msgstr "Lista de mensagens _encadeadas"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Fechar esta janela"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "_Fechar"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "A_dicionar remetente ao catálogo de endereços"
@@ -15723,257 +16874,282 @@ msgstr "Encaminhar a alguém a mensagem selecionada como um anexo"
 msgid "Increase the text size"
 msgstr "Aumentar o tamanho do texto"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Carregar _imagens"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Marcar como i_mportantes"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Marcar como _não lida"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Marcar como _sem importância"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "Marcar a(s) mensagem(ns) selecionada(s) como lida(s)"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "Marcar a(s) mensagem(ns) selecionada(s) como importante(s)"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Marcar a(s) mensagem(ns) selecionada(s) como sem importância"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Marcar a(s) mensagem(ns) selecionada(s) como não lida(s)"
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Marcar a(s) mensagem(ns) selecionada(s) como não lida(s)"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Marcar a(s) mensagem(ns) selecionada(s) como sem importância"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar as mensagens selecionadas para exclusão"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Mover"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "Mover a(s) mensagem(ns) selecionada(s) para outra pasta"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Próxima"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "Próxima mensagem _importante"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "Próximo _encadeamento"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "Próxima mensagem _não lida"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Não encontrado"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Abrir a mensagem selecionada em uma nova janela"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Abrir a mensagem selecionada no redator para reenviá-la"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Tamanho _original"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "Mensagem não lida an_terior"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Publicar uma resposta"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr "Publicar uma resposta a uma mensagem em uma pasta pública"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "Mensagem im_portante anterior"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Visualiza a impressão da mensagem a ser impressa"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Anterior"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Imprimir esta mensagem"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "_Redirecionar"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redirecionar (bounce) a alguém a mensagem selecionada"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Voltar o texto ao seu tamanho original"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "_Buscar mensagem..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "M_enor"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Salvar a mensagem como um arquivo texto"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Buscar por texto no corpo da mensagem exibida"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr "Configurar a página para a sua impressora atual"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Exibir _fonte do e-mail"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Exibir todos os _cabeçalhos"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Buscar por texto no corpo da mensagem exibida"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Exibir a mensagem no estilo normal"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Exibir a mensagem com todos os cabeçalhos de e-mail"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Exibir o fonte bruto da mensagem"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "_Tamanho do texto"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Cancelar exclusão das mensagens selecionadas"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "Pasta virtual por _lista de discussão..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "Pasta virtual por _remetente..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "Pasta virtual por _destinatários..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "Pasta virtual por _assunto..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "_Anexado"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "_Copiar para pasta"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "_Criar filtro a partir da mensagem"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "E_ncaminhar mensagem"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "_Ir para"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "_Embutido"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "_Maior"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "Exibição de _mensagem"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Mover para pasta"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "_Próxima mensagem"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "Exibição _normal"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "A_brir mensagem"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "_Mensagem anterior"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "_Citado"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "Reen_viar..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "_Ferramentas"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "Des_fazer exclusão"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Fechar esta janela"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "_Fechar"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Anexar"
@@ -16252,12 +17428,13 @@ msgid "Change Evolution's settings"
 msgstr "Mudar as configurações do Evolution"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "Sai_r"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Criar um novo pedido de reunião"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "_Janela do Evolution"
+msgid "E_xit"
+msgstr "Sai_r"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16269,61 +17446,74 @@ msgstr "Importar dados de outros programas"
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "_Janela do Evolution"
+msgid "Open a new window"
+msgstr "Abrir em nova janela"
 
 #: ui/evolution.xml.h:11
 msgid "Pi_lot Settings..."
 msgstr "Configurações do _pilot..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Enviar / receber"
+
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr "Enviar itens na fila de saída e recuperar novos itens"
+
+#: ui/evolution.xml.h:14
 msgid "Set up Pilot configuration"
 msgstr "Configurar o pilot"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Exibir informação sobre o Ximian Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Enviar relatório de erro"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "Enviar relatório de _erro"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar relatório de erro usando o Bug Buddy"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Alternar"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Alternar se estamos trabalhando desconectados."
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "_FAQ do Ximian Evolution"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "_Sobre o Ximian Evolution..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "Aj_uda"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Novo"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Enviar / receber"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "_Localizar agora"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Imprimir resumo"
@@ -16452,12 +17642,12 @@ msgstr "Definir visões..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "STQQSSD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -16590,7 +17780,7 @@ msgstr "_Buscar"
 msgid "_Find Now"
 msgstr "_Localizar agora"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "_Limpar"
 
@@ -16606,24 +17796,260 @@ msgstr "ID do subitem"
 msgid "Text"
 msgstr "Texto"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Limpar"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Localizar agora"
 
+#~ msgid "Account Name"
+#~ msgstr "Nome da conta"
+
+#~ msgid "Server Name"
+#~ msgstr "Nome do servidor"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "LDAP não está ativado nesta cópia do Evolution"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Outros contatos"
+
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "Configure o acesso a servidores de diretório LDAP aqui"
+
+#~ msgid "Directory Servers"
+#~ msgstr "Servidores de diretório"
+
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Controle de configuração LDAP do catálogo de endereços do Evolution"
+
+#~ msgid "Add LDAP Server"
+#~ msgstr "Adicionar servidor LDAP"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Passo 4: Nome para exibição"
+
+#~ msgid "Find contact in"
+#~ msgstr "Localizar contato em"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Clique aqui para adicionar um contato *"
+
+#~ msgid "Business Address"
+#~ msgstr "Endereço comercial"
+
+#~ msgid "Department"
+#~ msgstr "Departamento"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "URL livre-ocupado"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Profissão"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Abrindo tarefas em %s"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Enviar mesmo assim?"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Cancelar a operação de correio atual"
+#~ msgid "Folder _name"
+#~ msgstr "_Nome da pasta:"
+
+#~ 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."
+
+#~ msgid "Connecting..."
+#~ msgstr "Conectando..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Esta pasta não pode conter mensagens."
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Nome do campo"
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Não foi possível abrir pasta compartilhada: %s."
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Selecionar uma pasta destino para onde importar estes dados"
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Não é possível transferir pasta:\n"
+#~ "%s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "Adicionar uma pasta"
+
+#~ msgid "Drafts"
+#~ msgstr "Rascunho"
+
+#~ msgid "Outbox"
+#~ msgstr "Caixa de saída"
+
+#~ msgid "Sent"
+#~ msgstr "Enviada"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Erro sincronizando \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "Sincronizando pasta"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Sincronizando \"%s\" (%d of %d) ..."
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Nenhuma pasta exibida)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(Nenhum)"
+
+#~ msgid "No error"
+#~ msgstr "Sem erro"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Já existe uma pasta com o mesmo nome"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "O tipo de pasta especificado não é válido"
+
+#~ msgid "I/O error"
+#~ msgstr "Erro de E/S"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Não há espaço suficiente para criar a pasta"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "A pasta não está vazia"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "A pasta especificada não foi achada"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Função não implementada neste repositório"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Operação não suportada"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "O tipo especificado não é suportado neste repositório"
 
-#~ msgid "Family Name"
-#~ msgstr "Sobrenome"
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "A pasta especificada não pode ser modificada ou removida"
+
+#~ 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"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Não é possível criar uma pasta com este nome"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Esta operação não pode ser realizada em modo desconectado"
+
+#~ msgid "Checkbox"
+#~ msgstr "Caixa de marcação"
+
+#~ msgid "CORBA error"
+#~ msgstr "Erro CORBA"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Argumento inválido"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Já possui um dono"
+
+#~ msgid "No owner"
+#~ msgstr "Sem dono"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Tipo não suportado"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Schema não suportado"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Operação não suportada"
+
+#~ msgid "Internal error"
+#~ msgstr "Erro interno"
+
+#~ msgid "Exists"
+#~ msgstr "Existe"
+
+#~ msgid "Invalid URI"
+#~ msgstr "URI inválida"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Possui sub-pastas"
+
+#~ msgid "No space left"
+#~ msgstr "Sem espaço remanescente"
+
+#~ msgid "Old owner has died"
+#~ msgstr "O dono anterior morreu"
+
+#~ msgid "Test type"
+#~ msgstr "Tipo teste"
+
+#~ msgid "Evolution Test Component"
+#~ msgstr "Componente de teste do Evolution"
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "Importar"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Criar um novo compromisso de dia inteiro"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Novo _compromisso"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Nova reunião"
+
+#, fuzzy
+#~ msgid "New _Task"
+#~ msgstr "Nova tarefa"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "_Janela do Evolution"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "_Janela do Evolution"
+
+#~ msgid "Toggle"
+#~ msgstr "Alternar"
+
+#~ msgid "Clear"
+#~ msgstr "Limpar"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Cancelar a operação de correio atual"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -16716,9 +18142,6 @@ msgstr "Localizar agora"
 #~ msgid "VCard (.vcf, .gcrd)"
 #~ msgstr "VCard (.vcf, .gcrd)"
 
-#~ msgid "Loading..."
-#~ msgstr "Carregando..."
-
 #~ msgid "Searching..."
 #~ msgstr "Buscando..."
 
@@ -16770,10 +18193,6 @@ msgstr "Localizar agora"
 #~ msgstr "EBook não foi carregado\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "O ID do cartão já existe"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Operação cancelada"
 
@@ -16920,9 +18339,6 @@ msgstr "Localizar agora"
 #~ msgid "Callback"
 #~ msgstr "Callback"
 
-#~ msgid "Company"
-#~ msgstr "Empresa"
-
 #~ msgid "Comp"
 #~ msgstr "Empr"
 
@@ -16989,9 +18405,6 @@ msgstr "Localizar agora"
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#~ msgid "Phone"
-#~ msgstr "Fone"
-
 #~ msgid "Birth date"
 #~ msgstr "Data de nascimento"
 
@@ -17004,9 +18417,6 @@ msgstr "Localizar agora"
 #~ msgid "Arbitrary"
 #~ msgstr "Arbitrário"
 
-#~ msgid "ID"
-#~ msgstr "ID"
-
 #~ msgid "Last Use"
 #~ msgstr "Último uso"
 
@@ -17019,9 +18429,6 @@ msgstr "Localizar agora"
 #~ msgid "Folder containing contact information"
 #~ msgstr "Pasta contendo informação sobre contatos"
 
-#~ msgid "LDAP Server"
-#~ msgstr "Servidor LDAP"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "Servidor LDAP contendo informação sobre contatos"
 
@@ -17031,18 +18438,6 @@ msgstr "Localizar agora"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Pasta pública contendo informação sobre contatos"
 
-#~ msgid "_Contact"
-#~ msgstr "_Contato"
-
-#~ msgid "Create a new contact"
-#~ msgstr "Criar um novo contato"
-
-#~ msgid "New Contact List"
-#~ msgstr "Nova lista de contatos"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "Criar uma nova lista de contatos"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "A URI que o navegador de pastas vai exibir"
 
@@ -17058,9 +18453,6 @@ msgstr "Localizar agora"
 #~ msgid "Is New Card"
 #~ msgstr "É um novo cartão"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "Sem cartões"
 
@@ -17107,30 +18499,6 @@ msgstr "Localizar agora"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "Pasta pública contendo itens de tarefa"
 
-#~ msgid "New appointment"
-#~ msgstr "Novo compromisso"
-
-#~ msgid "_Appointment"
-#~ msgstr "_Compromisso"
-
-#~ msgid "New meeting"
-#~ msgstr "Nova reunião"
-
-#~ msgid "M_eeting"
-#~ msgstr "_Reunião"
-
-#~ msgid "New task"
-#~ msgstr "Nova tarefa"
-
-#~ msgid "_Task"
-#~ msgstr "_Tarefa"
-
-#~ msgid "New All Day Appointment"
-#~ msgstr "Novo compromisso de dia inteiro"
-
-#~ msgid "All _Day Appointment"
-#~ msgstr "Compromisso de _dia inteiro"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "Não foi possível atualizar objeto inválido"
 
@@ -17176,9 +18544,6 @@ msgstr "Localizar agora"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "Abrindo agenda em %s"
 
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Abrindo pasta de tarefas padrão"
-
 #~ msgid "Evaluation of the search expression did not yield a boolean value"
 #~ msgstr "Avaliação da expressão de busca não forneceu um valor booleano"
 
@@ -17219,9 +18584,6 @@ msgstr "Localizar agora"
 #~ "O Evolution achou arquivos do GnomeCard.\n"
 #~ "Você gostaria que eles fossem importados no Evolution?"
 
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Interface de configuração do correio do Evolution"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "Pasta contendo correio"
 
@@ -17237,9 +18599,6 @@ msgstr "Localizar agora"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Pasta lixeira virtual"
 
-#~ msgid "Properties..."
-#~ msgstr "Propriedades..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Modificar as propriedades desta pasta"
 
@@ -17249,15 +18608,6 @@ msgstr "Localizar agora"
 #~ msgid "You have unsent messages, do you wish to quit anyway?"
 #~ msgstr "Você possui mensagens não enviadas, deseja sair mesmo assim?"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Nova mensagem de correio"
-
-#~ msgid "_Mail Message"
-#~ msgstr "_Mensagem de correio"
-
-#~ msgid "Compose a new mail message"
-#~ msgstr "Redigir uma nova mensagem de correio"
-
 #~ msgid "New Message Post"
 #~ msgstr "Publicar nova mensagem"
 
@@ -19066,9 +20416,6 @@ msgstr "Localizar agora"
 #~ msgid "Cumberland"
 #~ msgstr "Cumberland"
 
-#~ msgid "Curitiba"
-#~ msgstr "Curitiba"
-
 #~ msgid "Curitiba Apt"
 #~ msgstr "Arpt Curitiba"
 
@@ -22060,9 +23407,6 @@ msgstr "Localizar agora"
 #~ msgid "North Bend"
 #~ msgstr "North Bend"
 
-#~ msgid "North Carolina"
-#~ msgstr "North Carolina"
-
 #~ msgid "North Conway"
 #~ msgstr "North Conway"
 
@@ -23674,9 +25018,6 @@ msgstr "Localizar agora"
 #~ msgid "State College"
 #~ msgstr "State College"
 
-#~ msgid "Stauning"
-#~ msgstr "Stauning"
-
 #~ msgid "Staunton"
 #~ msgstr "Staunton"
 
@@ -24265,9 +25606,6 @@ msgstr "Localizar agora"
 #~ msgid "United Arab Emirates "
 #~ msgstr "Emirados Árabes Unidos"
 
-#~ msgid "Unst"
-#~ msgstr "Unst"
-
 #~ msgid "Upington"
 #~ msgstr "Upington"
 
@@ -24376,12 +25714,6 @@ msgstr "Localizar agora"
 #~ msgid "Veracruz"
 #~ msgstr "Veracruz"
 
-#~ msgid "Vermillion"
-#~ msgstr "Vermillion"
-
-#~ msgid "Vermont"
-#~ msgstr "Vermont"
-
 #~ msgid "Vernal"
 #~ msgstr "Vernal"
 
@@ -24910,9 +26242,6 @@ msgstr "Localizar agora"
 #~ msgid " F"
 #~ msgstr "° F"
 
-#~ msgid " C"
-#~ msgstr "° C"
-
 #~ msgid "knots"
 #~ msgstr "nós"
 
@@ -25531,9 +26860,6 @@ msgstr "Localizar agora"
 #~ msgid "Freezing haze"
 #~ msgstr "Névoa congelada"
 
-#~ msgid "Spray"
-#~ msgstr "Maresia"
-
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Maresia na vizinhança"
 
@@ -25898,18 +27224,6 @@ msgstr "Localizar agora"
 #~ msgstr ""
 #~ "Remover uma pasta adicionada com \"Abrir uma pasta de outro usuário\""
 
-#~ msgid "Send / Receive"
-#~ msgstr "Enviar / receber"
-
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Enviar itens na fila de saída e recuperar novos itens"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Alternar a exibição da barra de pastas"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Alternar a exibição da barra de atalhos"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Ver a pasta selecionada"
 
@@ -25937,9 +27251,6 @@ msgstr "Localizar agora"
 #~ msgid "_Rename..."
 #~ msgstr "_Renomear..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Enviar / receber"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "_Barra de atalhos"
 
diff --git a/po/ro.po b/po/ro.po
index 073f953a8a..c0fe77d757 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: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-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"
@@ -31,12 +31,171 @@ msgstr "Nu pot încărca %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Data terminare"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "ID certificat:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Crează sau editează conturile de mail şi alte preferinţe"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Contacte"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Editare agendă"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Procesator pentru apariţia adreselor din agendă"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Vizualizor agendă minicard Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Vizualizor agendă minicard Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Vizualizor agendă minicard Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Vizualizor agendă minicard Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Componenta Evolution pentru sumarul activităţilor."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Procesator pentru componenta de mail Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Agendă"
+
+#: addressbook/gui/component/addressbook-component.c:146
+#, fuzzy
+msgid "Properties..."
+msgstr "_Proprietăţi..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Şterg"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+msgid "Rename"
+msgstr "Redenumeşte"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Contact nou"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Contact"
+
+#: addressbook/gui/component/addressbook-component.c:219
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Crează contact nou"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Listă contacte nouă"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "_Contact"
+
+#: addressbook/gui/component/addressbook-component.c:226
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Crează listă nouă de contacte"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr ""
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+#, fuzzy
+msgid "Work"
+msgstr "Lucrez"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "Server LDAP"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Nu pot crea directorul %s: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr "Nu mă pot conecta la serverul LDAP."
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -44,50 +203,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Răspunsul serverului IMAP nu conţine informaţia %s"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Eroare la încarcarea informaţiei de filtrare:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "Răspunsul serverului IMAP nu conţine informaţia %s"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Nume cont"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-#, fuzzy
-msgid "Server Name"
-msgstr "Selecţie nume"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "Semnarea e nesuportată de acest cifru"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Alte contacte"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -95,7 +236,7 @@ msgstr ""
 "Nu pot deschide această agendă. Vă rog verificaţi dacă există calea\n"
 "şi daca aveţi drepturi de acces."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -106,7 +247,7 @@ msgstr ""
 "că aţi introdus URI incorect, sau serverul LDAP\n"
 "e căzut"
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -118,7 +259,7 @@ msgstr ""
 "programul din sursele CVS după ce descărcaţi OpenLDAP urmând\n"
 "legătura următoare.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -133,11 +274,11 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Nu pot deschide agenda"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr ""
@@ -145,39 +286,38 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "Introduceţi parola pentru %s"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 #, fuzzy
 msgid "Name begins with"
 msgstr "se termină cu"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 #, fuzzy
 msgid "Email begins with"
 msgstr "se termină cu"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 #, fuzzy
 msgid "Category is"
 msgstr "Categorii"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Orice câmp conţine"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Avansat..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -185,7 +325,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -193,96 +333,42 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 #, fuzzy
 msgid "Any Category"
 msgstr "Categorie:"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "URI afişat de calendar"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "ID certificat:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
 msgstr ""
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Contacte"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Editare agendă"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Interfaţa de selectare nume a agendei Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Procesator pentru apariţia adreselor din agendă"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Vizualizor agendă minicard Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Vizualizor agendă minicard Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Vizualizor agendă minicard Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Vizualizor agendă minicard Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Componenta Evolution pentru sumarul activităţilor."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -306,6 +392,7 @@ msgstr "Verific tipurile suportate"
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -341,8 +428,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Add LDAP Server"
-msgstr "Server LDAP"
+msgid "Addressbook Creation Assistant"
+msgstr "Surse agendă"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -361,60 +448,59 @@ msgstr "Anonim"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 #, fuzzy
 msgid "Connecting"
 msgstr "Deconectare de la %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "_Nume listă:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Edit LDAP Server"
 msgstr "Server LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address:"
 msgstr "Adresa email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Finished"
 msgstr "Găseşte:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
-msgid "LDAP Configuration Assistant"
-msgstr "Configurare mail"
+msgid "Group:"
+msgstr "Nume grup:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Never"
 msgstr "Fiecare"
@@ -439,8 +525,8 @@ msgid "S_earch scope: "
 msgstr "Scopul căutării:"
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 #, fuzzy
 msgid "Searching"
 msgstr "Caut..."
@@ -486,27 +572,28 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:47
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-#, fuzzy
-msgid "Step 1: Server Information"
-msgstr "Informaţie sursă"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
-msgid "Step 2: Connecting to Server"
-msgstr "Conectare la server..."
+msgid "Step 2: Server Information"
+msgstr "Informaţie sursă"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr ""
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Conectare la server..."
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr ""
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Conectare la server..."
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 #, fuzzy
@@ -520,14 +607,6 @@ msgstr "Stochez căutarea ca dosar V"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -535,7 +614,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -543,7 +622,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -553,43 +632,48 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 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:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 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:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 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:74
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -616,22 +700,30 @@ msgid "Using email address"
 msgstr "_Aceasta este adresa de expediere"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Display name:"
 msgstr "Afişează"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -639,62 +731,61 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Editează"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 #, fuzzy
 msgid "_Port number:"
 msgstr "Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 #, fuzzy
 msgid "_Search base:"
 msgstr "Domeniu căutare:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 #, fuzzy
 msgid "_Server name:"
 msgstr "Mesaj server:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Durata de sforăire (minute)"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid "cards"
 msgstr "Nepornit"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Deconectare de la %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid "general-tab"
 msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "searching-tab"
 msgstr "Caut..."
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Nume"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
+msgstr "Interfaţa de selectare nume a agendei Evolution."
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Şterge tot"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Şterge"
@@ -724,25 +815,21 @@ msgstr "Adaugă la contacte"
 msgid "Unnamed Contact"
 msgstr "Contact schimbat:"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Nume"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Sursă"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-#, fuzzy
-msgid "Find contact in"
-msgstr "Găseşte un contact"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Interfaţa de selectare nume a agendei Evolution."
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
 msgid "Find"
@@ -827,7 +914,8 @@ msgid "D_epartment:"
 msgstr "_Departament:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalii"
 
@@ -899,12 +987,12 @@ msgid "_Categories..."
 msgstr "Ca_tegorii..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Şterge"
@@ -2121,7 +2209,7 @@ msgid "Esq."
 msgstr "Esq."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Nume complet"
 
@@ -2219,11 +2307,27 @@ msgstr "Editor lista de contacte"
 msgid "Save List as VCard"
 msgstr "Salvează ca şi card V"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Contact schimbat:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Contact în conflict:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Dublează contactul detectat"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Emailul modificat sau numele acestui contact există deja\n"
+"în acest dosar. Doriţi să continuaţi în acest caz?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Contact nou"
@@ -2240,22 +2344,6 @@ msgstr ""
 "Numele sau adresa de email a acestui contact există deja\n"
 "în acest dosar. Doriţi să continuaţi în acest caz?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Contact schimbat:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Contact în conflict:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"Emailul modificat sau numele acestui contact există deja\n"
-"în acest dosar. Doriţi să continuaţi în acest caz?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2366,9 +2454,9 @@ msgstr "Înaintează _anexat"
 msgid "Send Message to Contact"
 msgstr "Trimite mesaj la contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Tipăreşte"
@@ -2392,9 +2480,12 @@ msgstr "Mut în folderul..."
 msgid "Cut"
 msgstr "Decupează"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiază"
 
@@ -2403,16 +2494,8 @@ msgstr "Copiază"
 msgid "Paste"
 msgstr "Lipeşte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Şterg"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 #, fuzzy
 msgid "Current View"
 msgstr "Vizualizarea _curentă"
@@ -2426,166 +2509,170 @@ msgid ""
 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:2
 msgid "Assistant"
 msgstr "Asistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Fax serviciu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Telefon serviciu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Telefon serviciu 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Telefon revenire"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Telefon maşină"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Categorii"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Telefon companie"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Departament"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "Email 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "Email 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Nume de familie"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Pune la fişier ca"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "URL liber-ocupat"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Adresa acasă"
+#, fuzzy
+msgid "Given Name"
+msgstr "Nume de familie"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Fax acasă"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Telefon acasă"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Telefon acasă 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Inexistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Corean"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Manager"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Telefon mobil"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Poreclă"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Notă"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Birou"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organizaţie"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Altă adresă"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Alt Fax"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Alt telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Telefon principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Profesie"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Rol"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Soţ/soţie"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Titlu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Nevăzut"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Site web"
 
@@ -2689,11 +2776,19 @@ msgstr "Membri"
 msgid "Job Title"
 msgstr "_Funcţia:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Adresa acasă"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Adresa acasă"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Altă adresă"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2706,174 +2801,171 @@ msgstr "Fax acasă"
 msgid "Blog"
 msgstr "întotdeauna"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Succes"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Eroare necunoscută"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Depozitare offline"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Acces interzis"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Nu găsesc card-ul"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "ID-ul card-ului există deja"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Protocol nesuportat"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Revocat"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "Eşec la autentificare."
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Necesită autentificare"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #, fuzzy
 msgid "Addressbook does not exist"
 msgstr "Dosarul `%s' nu există."
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Altă eroare"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Doriţi să salvaţi modificările?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 #, fuzzy
 msgid "_Discard"
 msgstr "Tipăreşte calendar"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Eroare adăugare listă"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Eroare adăugare card"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Eroare la modificarea listei"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Eroare la modificare card"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Eroare la ştergerea listei"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Eroare ştergere card"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, fuzzy
 msgid "Overwrite"
 msgstr "Suprascrieţi fişierul?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, fuzzy, c-format
 msgid "Error saving %s: %s"
 msgstr "Eroare la salvarea fişierului: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 #, fuzzy
 msgid "list"
 msgstr "Ceaţă"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Nepornit"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Nepornit"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Nepornit"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Nepornit"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Carduri V multiple"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "Card V pentru %s"
@@ -3073,7 +3165,7 @@ msgstr "Margini"
 msgid "Number of columns:"
 msgstr "Număr de coloane"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Opţiuni"
 
@@ -3266,18 +3358,18 @@ msgstr "Contact schimbat:"
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Nu pot porni serverul wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Nu pot porni wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nu pot citi pilotul blocului aplicaţie calendar"
 
@@ -3286,27 +3378,94 @@ msgstr "Nu pot citi pilotul blocului aplicaţie calendar"
 msgid "Default Priority:"
 msgstr "_Prioritate:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nu pot citi pilotul blocului aplicaţie ToDo"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Setări _mail..."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Calendar"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Setări _mail..."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Procesator pentru componenta de mail Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution calendar iTip/iMip vizualizator"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution calendar iTip/iMip vizualizator"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Editor de ştiri Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Editor de ştiri Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Componenta Evolution pentru afişarea mailului."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Compozitorul de mailuiri Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Sarcini"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Procesator pentru serviciul notificare alarme"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 #, fuzzy
 msgid "Starting:"
 msgstr "Setări"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 #, fuzzy
 msgid "Ending:"
 msgstr "Umbrire"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, fuzzy, c-format
 msgid "Alarm on %s"
 msgstr "Alarme"
@@ -3372,81 +3531,209 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Nu mă întreba din nou"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Procesator pentru serviciul notificare alarme"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Nu pot iniţializa Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Nu pot iniţializa gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Nu pot crea procesatorul servicului de notificare alarmă"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 #, fuzzy
 msgid "invalid time"
 msgstr "Ora d_e sfârşit"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "Calendar"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Culoare pentru sarcinile de astăzi"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Culoare pentru sarcinile de astăzi"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr ""
+"Arată termenul de final al întâlnirilor la afişarea săptămânii şi lunii"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Previzualizează calendar ce va fi tipărit"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#, fuzzy
+msgid "Units of default reminder"
+msgstr "Crează o întîlnire nouă"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Şterge sarcinile selectate"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Arată numărul de săptămâni"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Rezumatul conţine"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Descrierea conţine"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Comentariul conţine"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
 "events."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "e mai mic decât"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "zile"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 #, fuzzy
 msgid "%A %d %B %Y"
 msgstr "%A, %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 #, fuzzy
 msgid "%d %B %Y"
 msgstr "%A, %d %B %Y"
@@ -3454,47 +3741,81 @@ msgstr "%A, %d %B %Y"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Tipăreşte acest calendar"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Contact nou"
 
-#: calendar/gui/calendar-component.c:207
-msgid "Rename"
-msgstr "Redenumeşte"
+#: calendar/gui/calendar-component.c:632
+#, fuzzy
+msgid "New appointment"
+msgstr "Întâlnire nouă"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:633
+#, fuzzy
+msgid "_Appointment"
+msgstr "Întâlnire"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr ""
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Crează o întîlnire nouă"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
+#: calendar/gui/calendar-component.c:639
 #, fuzzy
-msgid "Work"
-msgstr "Lucrez"
+msgid "New meeting"
+msgstr "Întâlnire"
+
+#: calendar/gui/calendar-component.c:640
+#, fuzzy
+msgid "M_eeting"
+msgstr "Întâlnire"
+
+#: calendar/gui/calendar-component.c:641
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Aceasta e o cerere de întâlnire."
+
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Întâlnire nouă"
+
+#: calendar/gui/calendar-component.c:647
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "Întâlnire nouă"
+
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Crează o întîlnire nouă"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3617,7 +3938,7 @@ msgstr "Timite ca:"
 msgid "With these arguments:"
 msgstr "Cu argumentele:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr ""
 
@@ -3633,6 +3954,10 @@ msgstr "ore"
 msgid "minutes"
 msgstr "minute"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3666,8 +3991,8 @@ msgstr "Trimite un email"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Cuprins:"
 
@@ -3696,7 +4021,7 @@ msgstr "sfârşit întâlnire"
 msgid "hour(s)"
 msgstr "ora"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minut(e)"
 
@@ -3753,7 +4078,7 @@ msgstr "Zi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Vineri"
 
@@ -3769,7 +4094,7 @@ msgstr "minute"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Luni"
 
@@ -3780,7 +4105,7 @@ msgstr "Dum"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Sâmbătă"
 
@@ -3795,7 +4120,7 @@ msgstr "Arată numărul de săptămâni"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Duminică"
 
@@ -3816,7 +4141,7 @@ msgstr "Lista de sarcini"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Joi"
 
@@ -3835,7 +4160,7 @@ msgstr "Format timp:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Marţi"
 
@@ -3845,12 +4170,12 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Miercuri"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Săptămâna de lucru"
 
@@ -3893,7 +4218,7 @@ msgid "_Fri"
 msgstr "Vin"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_General"
 msgstr "General"
@@ -3944,78 +4269,78 @@ msgstr "Mie"
 msgid "before every appointment"
 msgstr "înainte de sfîrşitul întâlnirii"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Sunteţi sigur că doriţi să anulaţi şi ştergeţi această întâlnire?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Sunteţi sigur că doriţi să anulaţi şi ştergeţi această sarcină?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Sunteţi sigur că doriţi să anulaţi şi ştergeţi intrarea din jurnal?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Acest eveniment a fost şters."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Acestă sarcină a fost ştearsă."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Această intrare în jurnal a fost ştersă."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s Aţi făcut modificări. Ignoraţi aceste schimbări şi închideţi editorul?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s N-aţi făcut modificări, închideţi editorul?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Acest eveniment a fost modificat."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Această sarcina a fost modificată."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Această intrare în jurnal a fost modificată."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s Aţi făcut modificări. Ignoraţi aceste modificări şi actualizaţi editorul?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Nu aţi făcut modificări, actualizaţi editorul?"
@@ -4025,163 +4350,168 @@ msgstr "%s Nu aţi făcut modificări, actualizaţi editorul?"
 msgid "Validation error: %s"
 msgstr "Eroare necunoscută: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " la "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Terminat "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Terminat "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 #, fuzzy
 msgid "Could not update object"
 msgstr "Nu pot actualiza fişierele corect"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Editează întâlnire"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Întâlnire - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Sarcina - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Intrare jurnal - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Nu există rezumat"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Salvează ca..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Nu pot obţine versiunea curentă!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Alegeţi dosarul destinaţie pentru importul datelor"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi întălnirea `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi întălnirea"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Sunteţi sigur că doriţî să ştergeţi sarcina `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Sunteţi sigur că doriţî să ştergeţi această sarcină?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi intrarea din jurnal `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi această intrare din jurnal?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi întălnirea `%d'?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi task-ul `%d'?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi %d intrări din jurnal?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Această intrare în jurnal a fost ştersă."
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr ""
 
@@ -4200,46 +4530,46 @@ msgstr "Delegat la:"
 msgid "Enter Delegate"
 msgstr "Şterse"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Întâlnire"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Reaminteşte"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Revenire"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 #, fuzzy
 msgid "Scheduling"
 msgstr "Progra_mare întâlniri"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Întâlnire"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Data început"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 #, fuzzy
 msgid "Start time is wrong"
 msgstr "Ora de început"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr ""
 
@@ -4313,32 +4643,32 @@ msgid "_Start time:"
 msgstr "Ora de început"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Inexistent"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 #, fuzzy
 msgid "An organizer is required."
 msgstr "Un organizator trebuie setat."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Delegat la..."
 
@@ -4380,21 +4710,15 @@ msgid "Member"
 msgstr "Membru"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Rol"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stare"
@@ -4414,6 +4738,7 @@ msgid "_Invite Others..."
 msgstr "_Invită pe alţii..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4446,6 +4771,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Nu pot crea directorul %s: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "Un organizator trebuie setat."
@@ -4475,32 +4801,57 @@ msgstr "informaţie calendar"
 msgid "Calendar Name"
 msgstr "Calendar"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Nu pot crea directorul %s: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "informaţie calendar"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Lista de sarcini"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Lista de sarcini"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Lista de sarcini"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 msgid "This and Prior Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 #, fuzzy
 msgid "All Instances"
 msgstr "Avansat"
@@ -4555,10 +4906,15 @@ msgstr "ziua"
 msgid "on the"
 msgstr "în"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "apariţii"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Data/Ora"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 #, fuzzy
 msgid "A_dd"
@@ -4627,7 +4983,7 @@ msgstr "săptămîna"
 msgid "year(s)"
 msgstr "anul"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 #, fuzzy
 msgid ""
 "This event has been changed, but has not been saved.\n"
@@ -4637,40 +4993,40 @@ msgstr ""
 "Această semnătură a fost modificată, dar n-a fost salvată.\n"
 "Doriţi să salvaţi modificările?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 #, fuzzy
 msgid "Save Event"
 msgstr "Mesaj calendar"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 #, fuzzy
 msgid "The meeting information has been created. Send it?"
 msgstr ""
 "Informaţiile despre întâlnire au fost schimbate. Trimit o versiune "
 "actualizată?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 "Informaţiile despre întâlnire au fost schimbate. Trimit o versiune "
 "actualizată?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 #, fuzzy
 msgid "The task assignment information has been created. Send it?"
 msgstr ""
 "Informaţiile despre sarcină au fost schimbate. Trimit o versiune actualizată?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 "Informaţiile despre sarcină au fost schimbate. Trimit o versiune actualizată?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "Terminat "
@@ -4681,43 +5037,43 @@ msgid "% _Complete"
 msgstr "% Terminat"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Terminat"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Ridicat"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "În derulare"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Scăzut"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Nepornit"
 
@@ -4726,7 +5082,7 @@ msgid "Progress"
 msgstr "În desfăşurare"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Nedefinit"
 
@@ -4748,22 +5104,22 @@ msgstr "_Stare"
 msgid "_Web Page:"
 msgstr "Adresa paginii de web:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "De bază"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 #, fuzzy
 msgid "Assignment"
 msgstr "Alocat"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4772,9 +5128,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "Confidenţial"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Descriere:"
 
@@ -4880,26 +5236,21 @@ msgstr "%s server %s"
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Public"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Confidenţial"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Categorii"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4912,30 +5263,28 @@ msgid "Start Date"
 msgstr "Data început"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Rezumat"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " culoare"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Întâlnire"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 #, fuzzy
 msgid "Free"
 msgstr "Grec"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Ocupat"
 
@@ -4947,7 +5296,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "E"
 
@@ -4955,7 +5304,7 @@ msgstr "E"
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4965,7 +5314,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4973,7 +5322,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Da"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4981,17 +5330,17 @@ msgstr "Nu"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Necunoscut"
 
@@ -5003,198 +5352,196 @@ msgstr ""
 msgid "Assigned"
 msgstr "Alocat"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Şterge contactele selectate"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "întâlnire nouă..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Eveniment zilnic nou"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 #, fuzzy
 msgid "New Meeting"
 msgstr "Întâlnire"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Sarcină nouă"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Tipăreşte..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Lipeşte"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Mergi la _ziua"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Mergi la data..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "Aceasta e informaţie liber-ocupat."
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-#, fuzzy
-msgid "_Settings..."
-msgstr "Setări _mail..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "Deschide"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Salvează ca..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Copiază"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Progra_mare întâlniri"
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Înaintează ca şi _calendar i"
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Şterge această apariţie"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Şterge toate apariţiile"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+#, fuzzy
+msgid "_Settings..."
+msgstr "Setări _mail..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 #, fuzzy
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "Deschide mesajul"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Atribuie task (FIXME)"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Înaintează ca şi _calendar i"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Marchează ca terminat"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Marchează sarcinile ca terminate"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Şterge sarcinile selectate"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
@@ -5209,8 +5556,8 @@ msgstr "% Terminat"
 msgid "Alarms"
 msgstr "Alarme"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Terminat"
 
@@ -5239,18 +5586,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5269,7 +5616,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5282,493 +5629,492 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "Revenire simplă"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
 msgid "Every day"
 msgstr "Fiecare"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, fuzzy, c-format
 msgid "Every %d days"
 msgstr "%d zile"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 #, fuzzy
 msgid "Every week"
 msgstr "Fiecare"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, fuzzy, c-format
 msgid "Every %d weeks"
 msgstr "%d săptămîni"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, fuzzy, c-format
 msgid "Every %d weeks on "
 msgstr "%d săptămîni"
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 #, fuzzy
 msgid "every month"
 msgstr "O lună"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 #, fuzzy
 msgid "Every year"
 msgstr "Fiecare"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Ora de sfârşit a întâlnirii:"
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Terminat "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "Descriere:"
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "informaţie calendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Calendar"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 #, fuzzy
 msgid "An unknown person"
 msgstr "Eroare necunoscută"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 #, fuzzy
 msgid "Location:"
 msgstr "_Acţiune"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 #, fuzzy
 msgid "Status:"
 msgstr "_Stare"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 #, fuzzy
 msgid "Accepted"
 msgstr " Acceptă "
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr " Intenţie "
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 #, fuzzy
 msgid "Declined"
 msgstr " Refuză "
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Selectez o acţiune"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 #, fuzzy
 msgid "Update"
 msgstr "a fost după"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 #, fuzzy
 msgid "Accept"
 msgstr " Acceptă "
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 #, fuzzy
 msgid "Tentatively accept"
 msgstr " Intenţie "
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 #, fuzzy
 msgid "Decline"
 msgstr " Refuză "
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Informaţie sursă"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Informaţie"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Renunţă"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, 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:1264
+#: calendar/gui/e-itip-control.c:1262
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Informaţie opţională"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, 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:1271
+#: calendar/gui/e-itip-control.c:1269
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1270
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Întâlnire"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1277
+#: calendar/gui/e-itip-control.c:1275
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Ora de sfârşit a întâlnirii:"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1282
+#: calendar/gui/e-itip-control.c:1280
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Cerere de întâlnire (FIXME)"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, 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:1290
+#: calendar/gui/e-itip-control.c:1288
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Întâlnire"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, 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:1298
+#: calendar/gui/e-itip-control.c:1296
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Selectez o acţiune"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "Găseşte în mesaj"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1331
+#: calendar/gui/e-itip-control.c:1329
 #, fuzzy
 msgid "Task Information"
 msgstr "Informaţie"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, 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:1338
+#: calendar/gui/e-itip-control.c:1336
 #, 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:1339
+#: calendar/gui/e-itip-control.c:1337
 #, fuzzy
 msgid "Task Proposal"
 msgstr "Panou sarcini"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, 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:1344
+#: calendar/gui/e-itip-control.c:1342
 #, fuzzy
 msgid "Task Update"
 msgstr "a fost după"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, 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:1349
+#: calendar/gui/e-itip-control.c:1347
 #, fuzzy
 msgid "Task Update Request"
 msgstr "Ce_rere task (FIXME)"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, 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:1357
+#: calendar/gui/e-itip-control.c:1355
 #, fuzzy
 msgid "Task Reply"
 msgstr "Răspunde"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, 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:1365
+#: calendar/gui/e-itip-control.c:1363
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Aceasta e o anulare a unei sarcini"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Mesaj calendar"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, 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:1393
+#: calendar/gui/e-itip-control.c:1391
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Informaţie sursă"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, 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:1398
+#: calendar/gui/e-itip-control.c:1396
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "URL liber-ocupat"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, 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:1403
+#: calendar/gui/e-itip-control.c:1401
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "URL liber-ocupat"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Tipăreşte mesaj"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Dosarul pare a fi deteriorat irecuperabil."
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "Mesajul conţine numai cererile nesuportate."
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "Nu pot încărca cursorul\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Întâlnire încheiată:"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 #, 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:1945
+#: calendar/gui/e-itip-control.c:1943
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Bug buddy nu poate fi rulat."
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 #, 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:1951
+#: calendar/gui/e-itip-control.c:1949
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Adrese participare"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Adrese participare"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% Terminat"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Date trimise"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -5939,7 +6285,7 @@ msgstr "%a %m/%d/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
@@ -6003,100 +6349,86 @@ 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:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "Data de început:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "_Data scadentă:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "_Prioritate:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Pagină"
 
-#: calendar/gui/e-tasks.c:715
-#, fuzzy, c-format
-msgid "Opening tasks at %s"
-msgstr "Deschid rezerva %s"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nu pot incărca sarcinile în `%s'"
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoda necesară pentru a încărca `%s' nesuportată"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, 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:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "Eroare la start %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data terminare"
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Şterge contactele selectate"
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 #, fuzzy
 msgid "Expunging"
 msgstr "Distrug dosarul"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Sarcini"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Calendar"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nu pot deschide dosarul în `%s'"
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoda cerută pentru deshiderea `%s' nu e suportată"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarme"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6104,7 +6436,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6112,65 +6444,11 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Turc"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#, fuzzy
-msgid "Calendar and Tasks"
-msgstr "Setări _mail..."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Calendar"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Setări _mail..."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Procesator pentru componenta de mail Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution calendar iTip/iMip vizualizator"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Evolution calendar iTip/iMip vizualizator"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Editor de ştiri Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Editor de ştiri Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Componenta Evolution pentru afişarea mailului."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Compozitorul de mailuiri Evolution."
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aprilie"
@@ -6228,311 +6506,348 @@ msgstr "Octombrie"
 msgid "September"
 msgstr "Septembrie"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Un organizator trebuie setat."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 #, fuzzy
 msgid "Event information"
 msgstr "informaţie calendar"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 #, fuzzy
 msgid "Task information"
 msgstr "Informaţie"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 #, fuzzy
 msgid "Journal information"
 msgstr "Informaţie opţională"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Informaţie sursă"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 #, fuzzy
 msgid "Calendar information"
 msgstr "informaţie calendar"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 #, fuzzy
 msgid "Updated"
 msgstr "a fost după"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 #, fuzzy
 msgid "Refresh"
 msgstr "Reîmprospătează lista"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informaţie sursă"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 #, fuzzy
 msgid "iCalendar information"
 msgstr "informaţie calendar"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Du"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Mi"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Jo"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Vi"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Sâ"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 #, fuzzy
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Ziua curentă (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, fuzzy, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Săptămâna curentă (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 #, fuzzy
 msgid "Selected month (%b %Y)"
 msgstr "Luna curentă (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 #, fuzzy
 msgid "Selected year (%Y)"
 msgstr "Anul curent (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 #, fuzzy
 msgid "Task"
 msgstr "Sarcină"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, fuzzy, c-format
 msgid "Status: %s"
 msgstr "_Stare"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "_Prioritate:"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, fuzzy, c-format
 msgid "Percent Complete: %i"
 msgstr "Întâlnire încheiată:"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, fuzzy, c-format
 msgid "URL: %s"
 msgstr "URL:"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, fuzzy, c-format
 msgid "Categories: %s"
 msgstr ""
 "\n"
 "Categorii:  "
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 #, fuzzy
 msgid "Contacts: "
 msgstr "Contacte"
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Previzualizează tipărirea"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Tipăreşte elementul"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Setează tipărirea"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Redenumeşte această scurtătură"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Lista de sarcini"
+
+#: calendar/gui/tasks-component.c:590
+#, fuzzy
+msgid "New task"
+msgstr "Sarcină nouă"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "Sarcină"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Crează o sarcină nouă"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "De afişat URI pentru dosarul sarcini"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6540,12 +6855,12 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Nu mă întreba din nou"
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Tipăreşte calendar"
@@ -6578,17 +6893,17 @@ msgstr "Mesaj calendar"
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Reaminteşte"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Mesaj calendar"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6597,7 +6912,7 @@ msgstr ""
 "Evolution a găsit fişiere de mail Pine.\n"
 "Doriţi să le importaţi în Evolution?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Deschide calendar"
@@ -8160,28 +8475,28 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "Semnarea e nesuportată de acest cifru"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "Verificarea nu e suportată de acest cifru"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Criptarea nu e suportată de acest cifru"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Decriptarea nu e suportată de acest cifru"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 #, fuzzy
 msgid "You may not import keys with this cipher"
 msgstr "Decriptarea nu e suportată de acest cifru"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 #, fuzzy
 msgid "You may not export keys with this cipher"
 msgstr "Decriptarea nu e suportată de acest cifru"
@@ -8237,89 +8552,89 @@ msgstr "Creez dosar nou"
 msgid "You must be working online to complete this operation"
 msgstr "Pentru această operaţie trebuie să lucraţi online"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Eşec la decodarea mesajului."
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Eşec la decodarea mesajului."
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Nu pot crea directorul %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Sincronizare foldere"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Eroare parsare filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Eroare execuţie filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Nu pot deschide dosarul spool"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Nu pot procesa dosarul spool"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Primesc mesaj %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Nu pot deschide mesajul"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Eşuare la mesajul %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Sincronizare dosar"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Primesc mesajul %d din %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Eşuare la mesajul %d din %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Eşec la decodarea mesajului."
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Conţinut invalid al mesajului"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Conţinut invalid al mesajului"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Eroare execuţie filtru căutare: %s: %s"
@@ -8351,41 +8666,41 @@ msgstr "(potrivire totală) se cere un singur rezultat"
 msgid "Performing query on unknown header: %s"
 msgstr "Execută interogare în header necunoscut: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Eroare executare expresia căutare: %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Eroare executare expresia căutare: %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 #, fuzzy
 msgid "Moving messages"
 msgstr "Copiez mesaje"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 #, fuzzy
 msgid "Copying messages"
 msgstr "Copiez mesajele în %s"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Primesc mesaje"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8393,47 +8708,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Anulat."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Răspuns neaşteptat de la serverul IMAP: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 #, fuzzy
 msgid "No data provided"
 msgstr "Nici un destinatar specificat"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nu pot trimite mesajul: destinatar neprecizat."
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8441,49 +8756,61 @@ msgid ""
 "%s"
 msgstr "Eşec la decodarea mesajului."
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Eşec la decodarea mesajului."
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Nu pot scrie data: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Eşec la decodarea mesajului."
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Eşec la decodarea mesajului."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr "Nu pot crea fişier temp: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Nu pot crea fişier temp: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nu pot scrie data: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Mesaj criptat"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Nu pot primi mesajul de la editor"
@@ -8583,15 +8910,15 @@ msgstr "Eroare la scrierea fişierului cu mesaje temporar: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Eroare la copierea fişierului cu mesaje temporar: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 #, fuzzy
 msgid "parse error"
 msgstr "Altă eroare"
@@ -8912,12 +9239,12 @@ msgstr "Furnizor de email în dosar virtual"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Pentru citirea mailului ca o interogare a altui set de dosar"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Nici un furnizor valid pentru protocolul `%s'"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8926,73 +9253,84 @@ msgstr ""
 "Nu pot crea directorul %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Vă rog introduceţi %s fraza de trecere pentru %s"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Nedefinit"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Adaugă criteriu"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Adaugă criteriu"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "ID certificat:"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "ID certificat:"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Salvează semnătura"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Altă eroare"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Server: %s, Tip: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Gunoi"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "Iunie"
+
 #: camel/camel-tcp-stream-openssl.c:568
 #, fuzzy
 msgid "Unable to get issuer's certificate"
@@ -9198,7 +9536,7 @@ msgid ""
 "Issuer: %s"
 msgstr "ID certificat:"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Nu pot parsa URL `%s'"
@@ -9218,22 +9556,22 @@ msgstr "Nu există mesajul %s în %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Verific mesajele noi în toate dosarele"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nu pot lua dosarul: %s: %s"
@@ -9312,7 +9650,7 @@ msgstr "Eşec la decodarea mesajului."
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9326,7 +9664,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Nu există mesaj"
@@ -9364,55 +9702,70 @@ msgid "Failed to cache %s: %s"
 msgstr "Eşec la decodarea mesajului."
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Conectare la server..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Nu mă pot conecta la serverul LDAP."
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "_Compania:"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Verific mailurile noi"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 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:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Dosare"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Arată numai dosare înscrise"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Nume spaţiu"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Aplică filtrele pe mesajele noi din INBOX pe acest server"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "Verifică automat dacă sunt mailuri noi la fiecare"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 #, fuzzy
 msgid "IMAP"
 msgstr "IMAPv4"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Pentru citirea şi stocarea mesajelor pe servere IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Parola"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9671,7 +10024,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Nu pot redenumi dosarul %s în %s: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nu pot redenumi dosarul: %s"
@@ -9790,30 +10143,30 @@ msgstr "Salvez mesajele"
 msgid "Storing folder"
 msgstr "Sincronizare dosar"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Nu pot deschide căsuţa poştală: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "Operaţia anulată"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nu pot adăuga mesajul la fişierul mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9822,11 +10175,11 @@ msgstr ""
 "Nu pot lua mesajul: %s din dosarul %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Dosarul pare a fi deteriorat irecuperabil."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Construcţia mesajului eşuată: căsuţa poştală coruptă?"
 
@@ -9894,12 +10247,17 @@ msgstr "Nu pot crea directorul %s: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "ID-ul card-ului există deja"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Nu pot redenumi dosarul %s în %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Numele dosarului specificat este invalid."
@@ -9947,7 +10305,7 @@ msgstr "Nu pot închide dosarul sursă %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Nu pot închide dosarul temporar: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nu pot redenumi dosarul: %s"
@@ -10236,7 +10594,7 @@ msgstr "Ştergere după %s zi(le)"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -10328,7 +10686,7 @@ msgid "No such folder `%s'."
 msgstr "Nu există dosarul `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10383,7 +10741,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Mail trimis prin intermediul programului sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10557,7 +10915,7 @@ msgstr "SMTP mail livrat prin %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Nu pot trimite mesajul: adresa expeditorului invalidă."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Trimit mesaj"
 
@@ -10687,7 +11045,7 @@ msgstr "%.1fM"
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "anexă"
 
@@ -10732,14 +11090,14 @@ msgstr "Tip MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerez afişarea automată a anexei"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Trebuie să configuraţi o identitate\n"
 "înainte de a putea compune mailuri."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Clic aici pentru agendă"
 
@@ -10750,45 +11108,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Răspunde la:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "De la:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Subiect:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "La:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Introduceţi destinatarul mesajului"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Introduceţi adresele care vor primi o copie a mesajului"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10799,16 +11157,21 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "Port:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 #, fuzzy
 msgid "Posting destination"
 msgstr "Descriere:"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Anexează un fişier la mesaj"
+
 #: composer/e-msg-composer-select-file.c:119
 #, fuzzy
 msgid "Attach file(s)"
@@ -10844,21 +11207,21 @@ msgstr "Fişierul există, suprascriu?"
 msgid "Error saving file: %s"
 msgstr "Eroare la salvarea fişierului: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Eroare la încărcarea fişierului: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Eroare la accesarea fişierului: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Nu pot primi mesajul de la editor"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10867,7 +11230,7 @@ msgstr ""
 "Nu pot căuta în fişierul: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10876,7 +11239,7 @@ msgstr ""
 "Nu pot trunchia fişierul: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10885,7 +11248,7 @@ msgstr ""
 "Nu pot căuta în fişierul: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10894,7 +11257,7 @@ msgstr ""
 "Eroare la salvarea automată a mesajului: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
@@ -10903,7 +11266,7 @@ msgstr ""
 "Evolution a găsit fişiere nesalvate într-o sesiune anterioară.\n"
 "Doriţi să încerc o restaurare?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10913,36 +11276,36 @@ msgstr ""
 "Acest mesaj nu a fost trimis.\n"
 "Doriţi să salvaţi modificările?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Mesaje înaintate"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Deschide fişier"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 #, fuzzy
 msgid "Signature:"
 msgstr "Salvează semnătura"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Compune un mesaj"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10953,7 +11316,7 @@ msgstr ""
 "Nu pot crea fereastra de compunere pentru că n-aţi configurat încă\n"
 "nici o identitate în componenţa mailului."
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10962,19 +11325,20 @@ msgstr ""
 "Nu pot crea fereastra de compunere pentru că n-aţi configurat încă\n"
 "nici o identitate în componenţa mailului."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Suita de programe Evolution"
 
 #: data/evolution.desktop.in.in.h:2
 #, fuzzy
-msgid "Ximian Evolution"
+msgid "Ximian Evolution (Unstable)"
 msgstr "Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -11240,13 +11604,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11378,7 +11742,7 @@ msgstr "Atunci"
 msgid "You must specify a folder."
 msgstr "Nume stil:"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Alege dosar"
@@ -11392,26 +11756,26 @@ msgstr ""
 "Eroare în expresia regulată '%s':\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Important"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 #, fuzzy
 msgid "To Do"
 msgstr "La"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 #, fuzzy
 msgid "Later"
 msgstr "după"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Test"
 
@@ -11517,7 +11881,7 @@ msgstr ""
 msgid "months"
 msgstr "luni"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "secunde"
 
@@ -11617,7 +11981,7 @@ msgstr "Expresie"
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 #, fuzzy
 msgid "Label"
 msgstr "eticheta26"
@@ -11691,121 +12055,127 @@ msgid "Source Account"
 msgstr "Cont sursă"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "zile"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Antet specific"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Opresc procesarea"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Subiect"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "Setează starea"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "conţine"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "nu conţine"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "nu se termină cu"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "nu există"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 #, fuzzy
 msgid "does not return"
 msgstr "nu există"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "nu sună ca"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "nu începe cu"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "se termină cu"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "există"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 #, fuzzy
 msgid "is Flagged"
 msgstr "Marcat"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 #, fuzzy
 msgid "is after"
 msgstr "a fost după"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "is before"
 msgstr "a fost înainte"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "e mai mare decât"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "e mai mic decât"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Marcat"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "nu este"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "este"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 #, fuzzy
 msgid "returns greater than"
 msgstr "e mai mare decât"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 #, fuzzy
 msgid "returns less than"
 msgstr "e mai mic decât"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 #, fuzzy
 msgid "returns"
 msgstr "Ocupat"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "sună ca"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "începe cu"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
@@ -11831,20 +12201,90 @@ msgstr "Nume regulă:"
 msgid "Score Rules"
 msgstr "Reguli de punctaj"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "Schimbă numele acestui dosar"
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 #, fuzzy
 msgid "VFolder source"
 msgstr "Surse dosare V"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#, fuzzy
+msgid "Composer Preferences"
+msgstr "Preferinţe calendar"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#, fuzzy
+msgid "Configure your email accounts here"
+msgstr "Crează sau editează conturile de mail şi alte preferinţe"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Procesator pentru componenta de mail Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Compozitorul de mailuiri Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Compozitorul de mailuiri Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Procesator pentru componenta de mail Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Componenta Evolution pentru afişarea mailului."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Componenta Evolution pentru sumarul activităţilor."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Mail"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Conturi"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "Preferinţe calendar"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi acest cont?"
@@ -11889,7 +12329,7 @@ msgid "Protocol"
 msgstr ""
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 #, fuzzy
 msgid "Unnamed"
 msgstr "Contact schimbat:"
@@ -11919,19 +12359,15 @@ msgstr "Adaugă criteriu"
 msgid "Signature(s)"
 msgstr "Semnătură HTML:"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 
-#: mail/em-composer-utils.c:129
-#, fuzzy
-msgid "Send anyway?"
-msgstr "Trimite un email"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11939,18 +12375,18 @@ msgstr ""
 "Acest mesaj nu are subiect.\n"
 "Chiar trimiteţi?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 #, fuzzy
 msgid "This message contains only Bcc recipients."
 msgstr "Mesajul conţine numai cererile nesuportate."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 #, fuzzy
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -11962,11 +12398,11 @@ msgstr ""
 "adăugarea unui antet Aparent-la.\n"
 "Trimiteţi oricum?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Trebuie să specificaţi un destinatar pentru a trimite acest mesaj."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11979,198 +12415,415 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crează dosar virtual din mesaj"
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "Mail"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<clic aici să alegeţi un dosar>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, fuzzy, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "Deschide în %s..."
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Creză dosar nou..."
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Precizaţi unde să fie creat dosarul:"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
-msgid "Folder _name"
+msgid "Folder _name:"
 msgstr "Nume dosar:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Nu pot crea directorul temporar: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Nu pot crea directorul temporar: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Nu pot crea temporar mbox `%s': %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Nu pot închide dosarul temporar: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Încarc..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, fuzzy, c-format
+msgid "%s"
+msgstr "s"
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Alege dosarul"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Creez un dosar nou"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Nu pot şterge dosarul `%s': %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Şterge dosarul '%s'"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, fuzzy, c-format
+msgid "Delete \"%s\""
+msgstr "Şterg"
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, fuzzy, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Redenumşte dosarul '%s'"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+#, fuzzy
+msgid "Rename Folder"
+msgstr "Redenumşte dosarul '%s'"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Proprietăţi"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Proprietăţi"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "Nume dosar:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Vizualizare"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Deschide în fereastră nouă"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Mută"
+
+#: mail/em-folder-tree.c:1500
+#, fuzzy
+msgid "_New Folder..."
+msgstr "Dosar _nou"
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+#, fuzzy
+msgid "_Rename"
+msgstr "Redenumeşte"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "_Proprietăţi..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "_Editează ca mesaj nou..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "Ti_păreşte"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Răspunde la expeditor"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Răspunde la _listă"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Răspunde la toţi"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "_Înaintează"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Terminat"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Şterge"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Marchează ca citit"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marchez ca necitit"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Marchează ca important"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marchează ca important"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Marchez ca necitit"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Marchează ca important"
+
+#: mail/em-folder-view.c:706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Rec_uperează"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Mut în folderul..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Copiază în dosarul..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Adaugă expeditorul în agendă"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplică filtre"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Crează regulă din mesaj"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "Doasr V pe _subiect"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "Dosar V pe expeditor"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "Dosar V pe destinatari"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "Dosar V în lista de mail"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "VFolder în expeditor"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Filtru pe subiect"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Filtru pe expeditor"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Filtru pe destinatari"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Filtru pe lista de mail"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filtru pe expeditor"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default"
 msgstr "Implicit"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Tipăreşte mesaj"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Copiază legătura către locaţia"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Potriviri:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Alocat"
+
+#: mail/em-format-html-display.c:597
 #, fuzzy
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr "Acest mesaj este semnat digital şi este autentic."
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr "Acest mesaj este semnat digital dar nu se poate dovedi că e autentic."
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Adaugă criteriu"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Adaugă criteriu"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Nedefinit"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+#, fuzzy
+msgid "Encrypted, weak"
+msgstr "Mesaj criptat"
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "Criptare PGP"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+#, fuzzy
+msgid "Encrypted, strong"
+msgstr "Mesaj criptat"
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Nu pot parsa mesajul MIME. Afişez ca sursă."
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Operaţie anulată de utilizator."
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Eşec la verificarea certificatului."
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Vedere inline"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Ascund"
@@ -12180,96 +12833,73 @@ msgstr "Ascund"
 msgid "Page %d of %d"
 msgstr "Primesc mesajul %d din %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Primesc mesajul %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Corpul extern al mesajului parţial deformat."
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Indicator către site-ul FTP (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, 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/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Indicator către fişierul local (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Indicator către site-ul FTP (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Indicator către o dată externă necunoscută (tip \"%s\")"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-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/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Acest mesaj este semnat digital şi este autentic."
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-#, fuzzy
-msgid "No signature present"
-msgstr "Semnătură HTML:"
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Nu pot iniţializa GNOME"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Operaţie anulată de utilizator."
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nu pot parsa mesajul MIME. Afişez ca sursă."
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Copiez mesaje"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "De la"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Răspuns-la:"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "La"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 #, fuzzy
 msgid "Mailer"
 msgstr ""
@@ -12277,93 +12907,138 @@ msgstr ""
 "Program de mail:"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "%s anexă"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Nu pot parsa mesajul MIME. Afişez ca sursă."
+msgid "Session not initialised"
+msgstr "Nu pot iniţializa GNOME"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Acest mesaj este semnat digital şi este autentic."
+
+#: mail/em-format.c:1212
+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/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Aştept..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Trimit \"%s\""
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Eşec la decodarea mesajului."
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Eşec la decodarea mesajului."
 
-#: mail/em-popup.c:593
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Eşec la decodarea mesajului."
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Salvează ca..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 #, fuzzy
 msgid "Set as _Background"
 msgstr "Fundal:"
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Răspunde la expeditor"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Deschide legătura în navigator"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Trimite _mesaj către lista..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Adăugare agendă"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Deschide în %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "Răspunsul serverului IMAP nu conţine informaţia %s"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Abonează"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Dosar"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 #, fuzzy
 msgid "No server has been selected"
 msgstr "Acest eveniment a fost şters."
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Nu arăta acest mesaj din nou"
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12372,27 +13047,27 @@ msgstr ""
 "Eroare la încarcarea informaţiei de filtrare:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "_Filtre..."
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Mesaje înaintate"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Eroare necunoscută"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr ""
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12401,7 +13076,7 @@ msgstr ""
 "Nu pot lua mesajul: %s\n"
 "  %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12410,134 +13085,416 @@ msgstr ""
 "Fişier al cărui nume există deja.\n"
 "Îl suprascrieţi?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Mesaj"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Salvează mesajul ca..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "_Adresa:"
+
+#: mail/em-utils.c:2262
 #, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Nu pot crea directorul temporar: %s"
+msgid ""
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2288
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#: mail/evolution-mail.schemas.in.in.h:1
 #, fuzzy
-msgid "Composer Preferences"
-msgstr "Preferinţe calendar"
+msgid "Automatic link recognition"
+msgstr "Verifică automat dacă sunt mailuri noi la fiecare"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "Verifică automat dacă sunt mailuri noi la fiecare"
+
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:6
 #, fuzzy
-msgid "Configure your email accounts here"
-msgstr "Crează sau editează conturile de mail şi alte preferinţe"
+msgid "Default charset in which to compose messages"
+msgstr "Decupează mesajele selectate"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/evolution-mail.schemas.in.in.h:7
 #, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
+msgid "Default charset in which to compose messages."
+msgstr "Decupează mesajele selectate"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Procesator pentru componenta de mail Evolution."
+msgid "Default charset in which to display messages"
+msgstr "Caută textul în corpul mesajului afişat"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
-msgid "Evolution Mail component"
-msgstr "Compozitorul de mailuiri Evolution."
+msgid "Default charset in which to display messages."
+msgstr "Caută textul în corpul mesajului afişat"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Compozitorul de mailuiri Evolution."
+msgid "Default forward style"
+msgstr "Stilul implicit pentru \"Înaintează\" este: "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Procesator pentru componenta de mail Evolution."
+msgid "Default reply style"
+msgstr "Stilul implicit pentru \"Înaintează\" este: "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
 #, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Componenta Evolution pentru afişarea mailului."
+msgid "Empty Trash folders on exit"
+msgstr "Goleşte dosarul cu reziduuri la ieşire"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Componenta Evolution pentru sumarul activităţilor."
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Goleşte dosarul cu reziduuri la ieşire"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
-msgid "Mail Accounts"
-msgstr "Conturi"
+msgid "Height of the message-list pane"
+msgstr "Trimite mesajul mai târziu"
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
 #, fuzzy
-msgid "Mail Preferences"
-msgstr "Preferinţe calendar"
+msgid "List of accounts"
+msgstr "Conturi"
 
-#: mail/importers/elm-importer.c:105
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
-msgid "Evolution is importing your old Elm mail"
-msgstr "Componentă Evolution pentru manipularea mailului."
+msgid "Log filter actions"
+msgstr "Execută acţiunile"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
 #, fuzzy
-msgid "Importing..."
-msgstr "Se importă"
+msgid "New Mail Notify sound file"
+msgstr "Configurare mail"
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: mail/evolution-mail.schemas.in.in.h:37
 #, fuzzy
-msgid "Please wait"
-msgstr "se termină cu"
+msgid "New Mail Notify type"
+msgstr "Configurare mail"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, fuzzy, c-format
-msgid "Importing %s as %s"
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
 msgstr ""
-"Se importă %s.\n"
-"Start %s"
 
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, fuzzy, c-format
-msgid "Scanning %s"
-msgstr "Trimit \"%s\""
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
 
-#: mail/importers/elm-importer.c:547
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
-"Evolution a găsit fişiere de mail Elm.\n"
-"Doriţi să le importaţi în Evolution?"
 
-#: mail/importers/elm-importer.c:568
-msgid "Elm"
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr "Întreabă-mă când trimit mesaje fără subiect"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "Întreabă-mă când trimit mesaje fără subiect"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "Trimite implicit mail în format HTML."
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "Trimite implicit mail în format HTML."
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "Ploaie torenţială"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "Ploaie torenţială"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Arată mesajul într-un stil normal"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "Arată fereastra de previzualizare mesaje"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+msgid "Sound file to play when new mail arrives."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+msgid "Spell check inline"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "Contact original:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+msgid "The variable width font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Listă de mesaje înlănţuite"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Listă de mesaje înlănţuite"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+#, fuzzy
+msgid "Thread the message-list based on Subject"
+msgstr "Mesaj înaintat (fără subiect)"
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "Fă contul acesta contul meu implicit"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "Variabil"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
 msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
@@ -12572,6 +13529,49 @@ msgstr ""
 msgid "Evolution Pine importer"
 msgstr "Compozitorul de mailuiri Evolution."
 
+#: mail/importers/elm-importer.c:105
+#, fuzzy
+msgid "Evolution is importing your old Elm mail"
+msgstr "Componentă Evolution pentru manipularea mailului."
+
+#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
+#: mail/importers/pine-importer.c:115
+#, fuzzy
+msgid "Importing..."
+msgstr "Se importă"
+
+#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
+#: mail/importers/pine-importer.c:117
+#, fuzzy
+msgid "Please wait"
+msgstr "se termină cu"
+
+#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
+#: mail/importers/pine-importer.c:288
+#, fuzzy, c-format
+msgid "Importing %s as %s"
+msgstr ""
+"Se importă %s.\n"
+"Start %s"
+
+#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
+#: mail/importers/pine-importer.c:425
+#, fuzzy, c-format
+msgid "Scanning %s"
+msgstr "Trimit \"%s\""
+
+#: mail/importers/elm-importer.c:547
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution a găsit fişiere de mail Elm.\n"
+"Doriţi să le importaţi în Evolution?"
+
+#: mail/importers/elm-importer.c:568
+msgid "Elm"
+msgstr ""
+
 #: mail/importers/netscape-importer.c:75
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
@@ -12613,12 +13613,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Gunoi"
-
 #: mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
@@ -12629,7 +13623,7 @@ msgstr "Fişier mail-uri locale %s"
 msgid "Scanning directory"
 msgstr "Scanez dosarul IMAP"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 #, fuzzy
 msgid "Starting import"
 msgstr "_Data început:"
@@ -12708,26 +13702,26 @@ msgid "You have not filled in all of the required information."
 msgstr "Nu aţi completat toată informaţia cerută."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Editor de conturi Evolution"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Host:"
 msgstr "Gazdă:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "Nume utilizator:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Path:"
 msgstr "Cale:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -12736,35 +13730,35 @@ msgstr ""
 msgid "Mail to %s"
 msgstr "Mail la %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Subiectul este %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Mail de la %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s lista de mail"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Răspuns la"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Adaugă regulă de filtrare"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12772,147 +13766,32 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:194
-#, fuzzy
-msgid "Connecting..."
-msgstr "Conectare la server..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr ""
+#: mail/mail-component.c:379
+#, fuzzy
+msgid "New Mail Message"
+msgstr "Mesaj _mail"
 
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Nu pot redenumi dosarul: %s"
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "Mesaj _mail"
 
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Nu pot crea directorul temporar: %s"
-
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Nu pot crea temporar mbox `%s': %s"
-
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Nu pot închide dosarul temporar: %s"
+#: mail/mail-component.c:381
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Compune un mesaj"
 
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Alegeţi dosarul destinaţie pentru importul datelor"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Alegeţi dosarul destinaţie pentru importul datelor"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Creez un dosar nou"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Precizaţi unde să fie creat dosarul:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Nu pot şterge dosarul `%s': %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Şterge dosarul '%s'"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, fuzzy, c-format
-msgid "Delete \"%s\""
-msgstr "Şterg"
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, fuzzy, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Redenumşte dosarul '%s'"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-#, fuzzy
-msgid "Rename Folder"
-msgstr "Redenumşte dosarul '%s'"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, fuzzy, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Numele dosarului specificat este invalid."
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Proprietăţi"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Proprietăţi"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "Nume dosar:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Vizualizare"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Deschide în fereastră nouă"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Mută"
-
-#: mail/mail-component.c:2087
-#, fuzzy
-msgid "_New Folder..."
-msgstr "Dosar _nou"
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-#, fuzzy
-msgid "_Rename"
-msgstr "Redenumeşte"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Proprietăţi..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Identitate"
 
@@ -12980,11 +13859,11 @@ msgstr ""
 "rog introduceţi mai jos un nume pentru acest cont. Acest nume va fi folosit "
 "doar pentru afişare."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Conectare la server..."
 
@@ -13074,30 +13953,39 @@ msgid "C_olors"
 msgstr "Închide"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Verific mailurile noi"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "Verific mailurile noi"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Culoare pentru sarcinile de astăzi"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Compune un mesaj"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 #, fuzzy
 msgid "Configuration"
 msgstr "Configurare mail"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -13115,333 +14003,342 @@ msgstr ""
 "\n"
 "Clic \"Terminare\" pentru a salva setările"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "Implicit"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Implicit"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Setul de caractere implicit: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Primesc mail"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Nu pot deschide mesajul"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Gata"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Dosar ciorne:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "E_nable"
 msgstr "Validează"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Email-ul conţine"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email _address:"
 msgstr "Adresa email:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "Goleşte dosarul cu reziduuri la ieşire"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "ID certificat:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Asistentul de conturi Evolution"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Execută acţiunile"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "se termină cu"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "Opţiuni"
+
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Font Properties"
 msgstr "Proprietăţi"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Mesaje înaintate"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "Iluminează citatele cu "
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "În linie"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Salvează şi închide"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Loading Images"
 msgstr "Încarcă _imaginile"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Configurare mail"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Locaţie căsuţă poştală"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Composer"
 msgstr "Antet mesaj"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Message Display"
 msgstr "Afişează mesaj"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Fonts"
 msgstr "Numele conţine"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Configurare mail"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Informaţie opţională"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_zaţie:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID cheie PGP:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Alege o culoare"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Întreabă-mă când trimit mesaje fără subiect"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Tipăreşte contactele selectate"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Maildir Qmail "
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Quote original message"
 msgstr "Nu pot deschide mesajul"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Cotat"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_member this password"
 msgstr "Memorez această parolă"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Răspunde la:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Primesc email"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Opţiuni primire"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Memorez această parolă"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Informaţie cerută"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Implicit"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Securitate"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME securizat"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Trimit email"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Dosar mesaje trimise:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Trimite şi mesajele ciornă"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Serverul necesită _autentificare"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Configurare server"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Tip server:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "ID certificat:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nume stil:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Mbox Unix standard"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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:121
+#: mail/mail-config.glade.h:124
 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:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variabil"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -13452,200 +14349,209 @@ msgstr ""
 "\n"
 "Clic \"Următorul\" pentru a începe"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Semnătură HTML:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 #, fuzzy
 msgid "_Always load images off the net"
 msgstr "Întotdeauna încarcă imaginile neconectat"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Tip de autentificare: "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Tip de autentificare: "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "Verifică automat dacă sunt mailuri noi la fiecare"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Verifică automat dacă sunt mailuri noi la fiecare"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Distrug dosarul"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Semnătură HTML:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Defaults"
 msgstr "Implicit"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Enable"
 msgstr "Validează"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Înaintează ca"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 #, fuzzy
 msgid "_Full name:"
 msgstr "Nume complet:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "În mailuri HTML"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitate"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Iunie"
+
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Load images if sender is in addressbook"
 msgstr "Încarcă imaginile dacă expeditorul e în agendă"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Fă contul acesta contul meu implicit"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Marchează mesajele ca \"Citit\" după"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Name:"
 msgstr "Nume:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Never load images off the net"
 msgstr "Nu încărca niciodată imaginile neconectat"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 #, 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:159
+#: mail/mail-config.glade.h:165
 #, 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:160
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Primesc mail"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Răspunde la toţi"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Script:"
 msgstr "_Securitate"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Şterge..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Trimit mail"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Ploaie torenţială"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Signatures"
 msgstr "Semnătură HTML:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Standard Font:"
 msgstr "Mbox Unix standard"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Terminal Font:"
 msgstr "Contact original:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Foloseşte conectare securizată (SSL)"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "description"
 msgstr "Descriere:"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Trimit \"%s\""
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13654,7 +14560,7 @@ msgstr ""
 "Eroare în timpul '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13663,7 +14569,7 @@ msgstr ""
 "Eroare în timpul operaţiei:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Lucrez"
 
@@ -13677,121 +14583,121 @@ msgstr "Actualizez dosarul"
 msgid "Fetching Mail"
 msgstr "Primesc mail"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Eşuare la stocarea mesajului în fişierul temporar %s: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Eşuare la stocarea mesajului în fişierul temporar %s: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Trimit \"%s\""
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Trimit mesajul %d din %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Eşec la mesajul %d din %d"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Terminat"
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Salvez mesaj în dosar"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mut mesajele în %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiez mesajele în %s"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scanez dosarele în \"%s\""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Mesaje înaintate"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Deschid dosarul %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "Deschid rezerva %s"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Şterg dosarul %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Creez dosar nou"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Actualizez dosarul"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Distrug dosarul"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 "Se importă %s.\n"
 "Start %s"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 #, fuzzy
 msgid "Local Folders"
 msgstr "Dosare speciale"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Primesc mesajul %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Primesc mesaje"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvez mesajele"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13800,7 +14706,7 @@ msgstr ""
 "Nu pot crea fişierul de ieşire: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13809,11 +14715,11 @@ msgstr ""
 "Eroare la salvarea mesajului: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Salvez anexa"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13822,21 +14728,25 @@ msgstr ""
 "Nu pot crea fişierul de ieşire: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nu pot scrie data: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Deconectare de la %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Deconectare de la %s"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr ""
@@ -13853,63 +14763,78 @@ msgstr "Găseşte:"
 msgid "Search"
 msgstr "Caută"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Adaugă criteriu"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Excepţii"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Informaţie sursă"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Renunţ..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Tip: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Tip:"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Trimite & Primeşte mailul"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Renunţă"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Actualizez..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Aştept..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Operaţie anulată de utilizator."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Introduceţi parola pentru %s"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 #, fuzzy
 msgid "Enter Password"
 msgstr "Introduceţi parola pentru %s"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 #, fuzzy
 msgid "_Remember this password"
 msgstr "Memorez această parolă"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -13951,27 +14876,32 @@ msgstr "Semnătură HTML:"
 msgid "Name:"
 msgstr "Nume:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mesaj înaintat - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 #, fuzzy
 msgid "Forwarded message"
 msgstr "Mesaje înaintate"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Deschid dosarul %s"
+
+#: mail/mail-vfolder.c:87
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Creez dosar nou"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Scanez dosarele în \"%s\""
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13980,90 +14910,90 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "Dosare V"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 #, fuzzy
 msgid "vFolders"
 msgstr "Dosare"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Editează dosare V"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Dosar V Nou"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Nevăzut"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Văzut"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Răspuns"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Mesaje nevăzute multiple"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Mesaje multiple"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Cea mai scăzută"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Mai scăzută"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Mai mare"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Cea mai mare"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Astăzi %l:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Ieri %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 #, fuzzy
 msgid "Generating message list"
 msgstr "Salvez mesajele"
@@ -14125,11 +15055,11 @@ msgstr "Înaintează"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Răspunde"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Răspunde la toţi"
 
@@ -14188,45 +15118,140 @@ msgstr "Abonează"
 msgid "_Unsubscribe"
 msgstr "Dezabonează"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, fuzzy, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Shell Evolution."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+#, fuzzy
+msgid "Folder Settings"
+msgstr "Setări"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "389"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Redenumeşte acest grup de scurtături"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Comută în timp ce se arată bara folder"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Ascunde bara de scurtături"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "_Prioritate:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "_Prioritate:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Interfaţa de configurare mail"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
 msgstr ""
-"Nu pot şterge dosarul `%s':\n"
-"%s"
 
-#: shell/e-folder-list.c:338
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 #, fuzzy
-msgid "Add a Folder"
-msgstr "Alege dosar"
+msgid "Path to the default contacts folder"
+msgstr "Deschid dosarul %s"
 
-#: shell/e-local-storage.c:179
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
-msgid "Drafts"
-msgstr "Ciornă"
+msgid "Path to the default mail folder"
+msgstr "Deschid dosarul %s"
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Inbox"
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Deschid dosarul %s"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
 
-#: shell/e-local-storage.c:181
+#: shell/apps_evolution_shell.schemas.in.in.h:19
 #, fuzzy
-msgid "Outbox"
-msgstr "mbox"
+msgid "Physical URI to the default tasks folder"
+msgstr "Deschid dosarul %s"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
 
-#: shell/e-local-storage.c:182
+#: shell/apps_evolution_shell.schemas.in.in.h:21
 #, fuzzy
-msgid "Sent"
-msgstr "Văzut"
+msgid "Whether to show the folder bar"
+msgstr "Comută în timp ce se arată bara folder"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Comută în timp ce se arată bara cu scurtături"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "Email"
 
-#: shell/e-setup.c:145
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Nu pot actualiza fişierele corect"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -14237,7 +15262,7 @@ msgstr ""
 "%s\n"
 "Eroare: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -14246,7 +15271,7 @@ msgstr ""
 "A apărut o eroare în timpul copierii fişierului în\n"
 "`%s'."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -14257,7 +15282,7 @@ msgstr ""
 "Vă rog să-l mutaţi pentru a permite instalarea\n"
 "fişierelor utilizator Evolution."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -14364,10 +15389,11 @@ msgstr ""
 "Nu pot şterge dosarul `%s':\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
-#, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
+#, fuzzy, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "Numele dosarului specificat este invalid."
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -14391,20 +15417,15 @@ msgstr ""
 "Nu pot crea dosarulul precizat:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-#, fuzzy
-msgid "Create New Folder"
-msgstr "Creză dosar nou..."
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Fără titlu)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr ""
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -14418,11 +15439,11 @@ msgstr ""
 "Puteţi selecta \"Automat\" dacă nu ştiţi tipul şi Evolution va încerca să-l "
 "determine automat."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -14430,7 +15451,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14439,23 +15460,23 @@ msgstr ""
 "Se importă %s\n"
 "Se importă articol %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 #, fuzzy
 msgid "Select importer"
 msgstr "Alege dosar"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "Dosarul `%s' nu există."
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -14464,11 +15485,11 @@ msgstr ""
 "Nu se reuşeşte importul\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Se importă"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -14477,17 +15498,17 @@ msgstr ""
 "Se importă %s.\n"
 "Start %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Eroare la start %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Eroare la încărcarea %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14496,79 +15517,61 @@ msgstr ""
 "Se importă %s\n"
 "Se importă elementul 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Automat"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Nume fişier:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Selectează un fişier"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Tip fişier:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Import fişiere"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "De la:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Alegeţi dosarul destinaţie pentru importul datelor"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Import"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Închid conexiunile..."
 
-#: shell/e-shell-offline-sync.c:163
-#, fuzzy, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr "Sincronizare dosar"
-
-#: shell/e-shell-offline-sync.c:232
-#, fuzzy
-msgid "Syncing Folder"
-msgstr "Sincronizare dosar"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, fuzzy, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Sincronizare dosar"
-
 #: shell/e-shell-settings-dialog.c:346
 #, fuzzy
 msgid "Evolution Settings"
@@ -14609,7 +15612,7 @@ msgstr ""
 "Nu pot crea dosarulul precizat:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14618,17 +15621,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Asistent"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Nou"
-
 #: shell/e-shell-utils.c:116
 #, fuzzy
 msgid "No folder name specified."
@@ -14692,36 +15689,22 @@ 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:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 #, fuzzy
 msgid "_Work Online"
 msgstr "Lucrează offline"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "Lucrează deconectat"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Lucrează deconectat"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Nici un dosar afişat)"
-
-#: shell/e-shell-view.c:2040
-#, fuzzy, c-format
-msgid "%s (%d)"
-msgstr "%s (...)"
-
-#: shell/e-shell-view.c:2042
-#, fuzzy
-msgid "(None)"
-msgstr "(Fără nume)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
@@ -14729,12 +15712,12 @@ msgstr ""
 "Evolution este actualmente conectat. Daţi clic pe buton pentru a lucra "
 "deconectat."
 
-#: shell/e-shell-view.c:2090
+#: shell/e-shell-window.c:331
 #, fuzzy
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Evolution este în proces de deconectare."
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
@@ -14742,20 +15725,20 @@ msgstr ""
 "Evolution este actualmente deconectat. Daţi clic pe buton pentru a lucra "
 "conectat."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 #, fuzzy
 msgid "Invalid arguments"
 msgstr "Conţinut invalid al mesajului"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Eroare generică"
 
@@ -14876,77 +15859,18 @@ msgstr "Şterge"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Înlătură această scurtătură din bara de scurtături"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Eroare la salvarea scurtăturilor."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Inbox"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Scurtături"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Fără eroare"
-
-#: 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:575
-msgid "The specified folder type is not valid"
-msgstr "Tipul de dosar specificat nu e valid"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "Eroare I/O"
-
-#: 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:581
-msgid "The folder is not empty"
-msgstr ""
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "Dosarul specificat nu a fost găsit"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "Funcţie neimplementată în această stocare"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "Operaţie nesuportată"
-
-#: 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:593
-#, fuzzy
-msgid "The specified folder cannot be modified or removed"
-msgstr "Dosarul specificat nu a fost găsit"
-
-#: 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:597
-#, fuzzy
-msgid "Cannot create a folder with that name"
-msgstr "Nu pot crea dosarul blocat la %s: %s"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr ""
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr ""
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14957,6 +15881,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complet)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Nou"
+
+#: shell/evolution-folder-selector-button.c:128
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "Deschide în %s..."
+
 #: shell/evolution-shell-component-utils.c:124
 #, fuzzy, c-format
 msgid ""
@@ -14983,87 +15918,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1187
-#, fuzzy
-msgid "CORBA error"
-msgstr "Eroare I/O"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1191
-#, fuzzy
-msgid "Invalid argument"
-msgstr "Conţinut invalid al mesajului"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1195
-#, fuzzy
-msgid "No owner"
-msgstr "Nimeni"
-
-#: shell/evolution-shell-component.c:1197
-#, fuzzy
-msgid "Not found"
-msgstr "Nu găsesc fişierul"
-
-#: shell/evolution-shell-component.c:1199
-#, fuzzy
-msgid "Unsupported type"
-msgstr "Verific tipurile suportate"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1203
-#, fuzzy
-msgid "Unsupported operation"
-msgstr "Operaţie anulată de utilizator."
-
-#: shell/evolution-shell-component.c:1205
-#, fuzzy
-msgid "Internal error"
-msgstr "Altă eroare"
-
-#: shell/evolution-shell-component.c:1209
-#, fuzzy
-msgid "Exists"
-msgstr "Există"
-
-#: shell/evolution-shell-component.c:1211
-#, fuzzy
-msgid "Invalid URI"
-msgstr "Invalid"
-
-#: shell/evolution-shell-component.c:1215
-#, fuzzy
-msgid "Has subfolders"
-msgstr "Nu există dosarul %s"
-
-#: shell/evolution-shell-component.c:1217
-#, fuzzy
-msgid "No space left"
-msgstr "Nici un mesaj selectat"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr ""
-
-#: shell/evolution-test-component.c:63
-#, fuzzy
-msgid "Test type"
-msgstr "Tip fişier:"
-
-#: shell/evolution-test-component.c:703
-#, fuzzy
-msgid "Evolution Test Component"
-msgstr "Compozitorul de mailuiri Evolution."
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "Active Connections"
@@ -15097,11 +15951,6 @@ msgstr "Mail"
 msgid "_Tasks:"
 msgstr "Sarcini"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-#, fuzzy
-msgid "Folder _name:"
-msgstr "Nume dosar:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 #, fuzzy
 msgid "Folder _type:"
@@ -15163,25 +16012,6 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Shell Evolution."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-#, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Procesator pentru componenta de mail Evolution."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-#, fuzzy
-msgid "Folder Settings"
-msgstr "Setări"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -15226,7 +16056,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Importatori"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Import"
 
@@ -15243,17 +16073,17 @@ msgstr "Nu mă întreba din nou"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution a găsit următoarea sursă de date:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "Setări Evolution..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -15285,7 +16115,7 @@ msgstr ""
 "Sperăm să vă bucuraţi de rezultatele eforturilor noastre, şi aşteptăm\n"
 "cu nerăbdare contribuţia dumneavostră!\n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -15294,72 +16124,115 @@ msgstr ""
 "Vă mulţumim\n"
 "Echipa Evolution\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Nu mă întreba din nou"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Nu pot accesa shell-ul Evolution."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nu pot accesa shell-ul Evolution."
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "_Data început:"
 
-#: shell/main.c:532
+#: shell/main.c:530
 #, fuzzy
 msgid "Start in online mode"
 msgstr "_Data început:"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 "Trimite ieşirile pentru depanare ale tuturor componentelor într-un fişier."
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Alege dosar"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "ID certificat:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "În desfăşurare"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Expresie"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Adresa email:"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr "ID certificat:"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, fuzzy, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+"Publicist: %s\n"
+"Subiect: %s"
+
+#: smime/gui/e-cert-selector.c:117
+#, fuzzy, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+"Publicist: %s\n"
+"Subiect: %s"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -15415,91 +16288,377 @@ msgid "Backup All"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "ID certificat:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "ID certificat:"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "ID certificat:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Nume comun"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "ID certificat:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "_Editează"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Eşec la verificarea certificatului."
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Expresie"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Organizaţie"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Organizaţie"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Vizualizare"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "ID certificat:"
+
+#: smime/gui/smime-ui.glade.h:42
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "ID certificat:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Import"
+msgid "Certificate already exists"
+msgstr "ID-ul card-ului există deja"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%m/%d/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "lună"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "lună"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "lună"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "lună"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr ", "
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "OK"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "ID certificat:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "ID certificat:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "ID certificat:"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "I"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+#, fuzzy
+msgid "Subject Public Key Info"
+msgstr ""
+"\n"
+"Cheia publică:"
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Subiectul este %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Nu pot procesa dosarul spool"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "ID certificat:"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Eşec la verificarea certificatului."
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Setări"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Nici o informaţie"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "anexă"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "ID certificat:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Tradiţional"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+msgid "Not Critical"
+msgstr ""
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Expresie"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s server %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Fişier semnătură:"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "_Inserează"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Subiectul este %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Fişier semnătură:"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Introduceţi parola pentru %s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "ID certificat:"
 
 #: tools/evolution-launch-composer.c:324
 #, fuzzy
@@ -15554,7 +16713,7 @@ msgstr "Copiază selecţia"
 msgid "Copy to Folder..."
 msgstr "Copiez în folderul..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Decupează selecţia"
 
@@ -15571,7 +16730,7 @@ msgstr "Trimite co_ntact la altcineva..."
 msgid "Move to Folder..."
 msgstr "Mut în folderul..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Lipeşte clipboard-ul"
 
@@ -15579,8 +16738,8 @@ msgstr "Lipeşte clipboard-ul"
 msgid "Previews the contacts to be printed"
 msgstr "Previzualizează contactele ce vor fi tipărite"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Pre_vizualizează tipărire"
@@ -15629,13 +16788,13 @@ msgstr "Opreşte încărcarea"
 msgid "View the current contact"
 msgstr "ora curentă"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "_Acţiuni"
 
@@ -15668,154 +16827,121 @@ msgid "_Send Message to Contact..."
 msgstr "Trimite _mesaj către contact..."
 
 #: ui/evolution-calendar.xml.h:3
-#, fuzzy
-msgid "Create a new all-day event"
-msgstr "Crează o întîlnire nouă"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Crează o întîlnire nouă"
-
-#: ui/evolution-calendar.xml.h:5
 msgid "Create a new calendar"
 msgstr "Crează un calendar nou"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Aceasta e o cerere de întâlnire."
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Crează o sarcină nouă"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Zi"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 #, fuzzy
 msgid "Delete All Occurrences"
 msgstr "Şterge toate apariţiile"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 #, fuzzy
 msgid "Delete the appointment"
 msgstr "Şterge această întâlnire"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "Şterge această apariţie"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "Şterge această apariţie"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Mergi la"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 #, fuzzy
 msgid "Go back"
 msgstr "Mergi înapoi în timp"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 #, fuzzy
 msgid "Go forward"
 msgstr "Mergi înainte în timp"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Mergi la _data"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Mergi la o anumită data"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 #, fuzzy
 msgid "Go to today"
 msgstr "Mergi la ziua de azi"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "List"
 msgstr "Ceaţă"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Luna"
 
-#: ui/evolution-calendar.xml.h:24
-#, fuzzy
-msgid "New _Appointment"
-msgstr "Întâlnire nouă"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Contact nou"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Întâlnire"
-
-#: ui/evolution-calendar.xml.h:27
-#, fuzzy
-msgid "New _Task"
-msgstr "Sarcină nouă"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Previzualizează calendar ce va fi tipărit"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 #, fuzzy
 msgid "Print this calendar"
 msgstr "Tipăreşte acest calendar"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Surse"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 msgid "Purge old appointments and meetings"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Arată detalii"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 #, fuzzy
 msgid "Show one day"
 msgstr "Arată 1 zi"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 #, fuzzy
 msgid "Show one month"
 msgstr "Arată 1 lună"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 #, fuzzy
 msgid "Show one week"
 msgstr "Arată 1 săptămână"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Arată săptămâna de lucru"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Săptămână"
 
@@ -15882,7 +17008,7 @@ msgstr "Salvează acest articol pe disc"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Fişier"
 
@@ -16111,7 +17237,7 @@ msgstr "Marchează tot ca citit"
 msgid "Mark all visible messages as read"
 msgstr "Marchează toate mesajele ca citite"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Paste message(s) from the clipboard"
 msgstr "Lipeşte mesajul la clipboard"
@@ -16170,16 +17296,6 @@ msgstr "_Inversează selecţia"
 msgid "_Threaded Message List"
 msgstr "Listă de mesaje înlănţuite"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Închide această fereastră"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "În_chide"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Addressbook"
@@ -16343,282 +17459,307 @@ msgstr "Înaintează mesajul selectat către cineva ca o anexă"
 msgid "Increase the text size"
 msgstr "Inserează fişier text..."
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Încarcă _imaginile"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 #, fuzzy
 msgid "Mark as I_mportant"
 msgstr "Marchează ca important"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Marchează ca _necitit"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 #, fuzzy
 msgid "Mark as Unimp_ortant"
 msgstr "Marchează ca important"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark the selected message(s) as having been read"
 msgstr "Marchează mesajele selectate ca citite"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark the selected message(s) as important"
 msgstr "Marchează mesajele selectate ca importante"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Marchează mesajele selectate ca importante"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Marchează mesajele selectate ca necitite"
+
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Marchează mesajele selectate ca necitite"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Marchează mesajele selectate ca importante"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "MArchează mesajele selectate pentru ştergere"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Mută"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
 msgid "Move selected message(s) to another folder"
 msgstr "Mută mesajele selectate în alt dosar"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Următorul"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Next _Important Message"
 msgstr "Afişează următorul mesaj important"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Next _Thread"
 msgstr "Selec_tează înlănţuirea"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "Next _Unread Message"
 msgstr "Trimite şi mesajele ciornă"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Nu găsesc fişierul"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Deschde mesajul selectat într-o fereastră nouă"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Deschide mesajul selectat în compositor pentru a-l retrimite"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "P_revious Unread Message"
 msgstr "Afişează mesajul necitit precedent"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Răspunde"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "Verific mesajele noi în toate dosarele"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Afişează mesajul precedent important"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 #, fuzzy
 msgid "Preview the message to be printed"
 msgstr "Previzualizează mesajul ce va fi tipărit"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Precedent"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 #, fuzzy
 msgid "Print this message"
 msgstr "Tipăreşte mesaj"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Înainteaza mesajul selectat către cineva"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "Caută m_esajul"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Salvează mesajul ca un fişier text"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Caută textul în corpul mesajului afişat"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "Set up the page settings for your current printer"
 msgstr "Setări de pagină pentru imprimanta curentă"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Arată sursa mesajului"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Arată toate antetele"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Caută textul în corpul mesajului afişat"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Arată mesajul într-un stil normal"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Arată mesajul cu toate antetele mesajului"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Ataşează sursa primară a mesajului a mesajului"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Recuperează mesajele selectate"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "Dosar V pentru _lista de mail..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "Dosar V pentru expeditor..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "Dosar V pentru destinata_ri..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "Dosar V pentru _subiect..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 #, fuzzy
 msgid "_Attached"
 msgstr "Ataşează"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "Copiază în folder"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "_Crează filtru din mesaj"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "Înaintează mesaj"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 #, fuzzy
 msgid "_Go To"
 msgstr "Mergi la"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 #, fuzzy
 msgid "_Inline"
 msgstr "În linie"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 #, fuzzy
 msgid "_Larger"
 msgstr "Pager"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "Afişează mesaj"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Mută in dosar"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 #, fuzzy
 msgid "_Next Message"
 msgstr "Mesaj"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "Afişare normală"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "Deschide mesajul"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Tipăreşte mesaj"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 #, fuzzy
 msgid "_Quoted"
 msgstr "Cotat"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 #, fuzzy
 msgid "_Resend..."
 msgstr "_Redenumeşte..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "_Unelte"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "Rec_uperează"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Închide această fereastră"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "În_chide"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Ataşează"
@@ -16912,12 +18053,13 @@ msgid "Change Evolution's settings"
 msgstr "Setări Evolution..."
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "Ieşire"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Aceasta e o cerere de întâlnire."
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "Fereastra Evolution"
+msgid "E_xit"
+msgstr "Ieşire"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16929,8 +18071,8 @@ msgstr ""
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "Fereastra Evolution"
+msgid "Open a new window"
+msgstr "Deschide în fereastră nouă"
 
 #: ui/evolution.xml.h:11
 #, fuzzy
@@ -16938,55 +18080,69 @@ msgid "Pi_lot Settings..."
 msgstr "Setări _pilot..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Trimite / Primeşte"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "Trimite mailurile din coadă şi descarcă mailurile noi"
+
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Configurare mail"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 #, fuzzy
 msgid "Show information about Ximian Evolution"
 msgstr "Arată informaţii despre Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Raportează o eroare"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "Raportează o eroare"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Raportează o problemă folosind Bug Buddy"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Comută"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Selectează în timp lucrăm deconectaţi"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "Despre Ximian Evolution..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "Ajutor"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "_Importă..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Nou"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "Trimite / Primeşte"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "Legătura DN:"
+
 #: ui/my-evolution.xml.h:2
 #, fuzzy
 msgid "Print Summary"
@@ -17130,12 +18286,12 @@ msgstr "Defineşte vizualizări"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "LMMJVSD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -17274,7 +18430,7 @@ msgstr "_Caută"
 msgid "_Find Now"
 msgstr "Legătura DN:"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 #, fuzzy
 msgid "_Clear"
 msgstr "Şterge"
@@ -17293,26 +18449,269 @@ msgstr ""
 msgid "Text"
 msgstr "Test"
 
-#: widgets/misc/e-search-bar.c:928
-#, fuzzy
-msgid "Clear"
-msgstr "Şterge"
-
 #: widgets/misc/e-search-bar.c:930
 #, fuzzy
-msgid "Find Now"
+msgid "Find _Now"
 msgstr "Legătura DN:"
 
+#~ msgid "Account Name"
+#~ msgstr "Nume cont"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Renunţă la operaţia de mail curentă"
+#~ msgid "Server Name"
+#~ msgstr "Selecţie nume"
+
+#, fuzzy
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "Semnarea e nesuportată de acest cifru"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Alte contacte"
+
+#, fuzzy
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Interfaţa de selectare nume a agendei Evolution."
+
+#, fuzzy
+#~ msgid "Add LDAP Server"
+#~ msgstr "Server LDAP"
+
+#, fuzzy
+#~ msgid "LDAP Configuration Assistant"
+#~ msgstr "Configurare mail"
+
+#, fuzzy
+#~ msgid "Find contact in"
+#~ msgstr "Găseşte un contact"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Clic aici să adăugaţi un contact *"
+
+#~ msgid "Business Address"
+#~ msgstr "Adresa serviciu"
+
+#~ msgid "Department"
+#~ msgstr "Departament"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "URL liber-ocupat"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Profesie"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#, fuzzy
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Deschid rezerva %s"
+
+#, fuzzy
+#~ msgid "Send anyway?"
+#~ msgstr "Trimite un email"
+
+#, fuzzy
+#~ msgid "Folder _name"
+#~ msgstr "Nume dosar:"
+
+#, fuzzy
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr "Acest mesaj este semnat digital şi este autentic."
+
+#, fuzzy
+#~ msgid "No signature present"
+#~ msgstr "Semnătură HTML:"
+
+#, fuzzy
+#~ msgid "Connecting..."
+#~ msgstr "Conectare la server..."
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Nu pot redenumi dosarul: %s"
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Alegeţi dosarul destinaţie pentru importul datelor"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nu pot şterge dosarul `%s':\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Add a Folder"
+#~ msgstr "Alege dosar"
+
+#, fuzzy
+#~ msgid "Drafts"
+#~ msgstr "Ciornă"
+
+#, fuzzy
+#~ msgid "Outbox"
+#~ msgstr "mbox"
+
+#, fuzzy
+#~ msgid "Sent"
+#~ msgstr "Văzut"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr "Sincronizare dosar"
+
+#, fuzzy
+#~ msgid "Syncing Folder"
+#~ msgstr "Sincronizare dosar"
+
+#, fuzzy
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Sincronizare dosar"
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Nici un dosar afişat)"
+
+#, fuzzy
+#~ msgid "%s (%d)"
+#~ msgstr "%s (...)"
+
+#, fuzzy
+#~ msgid "(None)"
+#~ msgstr "(Fără nume)"
+
+#~ msgid "No error"
+#~ msgstr "Fără eroare"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Există deja un dosar cu acelaşi nume"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Tipul de dosar specificat nu e valid"
+
+#~ msgid "I/O error"
+#~ msgstr "Eroare I/O"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Spaţiu insuficient pentru a crea dosarul"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Dosarul specificat nu a fost găsit"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Funcţie neimplementată în această stocare"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Operaţie nesuportată"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Tipul specificat nu e suportat în acestă stocare"
+
+#, fuzzy
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Dosarul specificat nu a fost găsit"
+
+#, 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/"
+
+#, fuzzy
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Nu pot crea dosarul blocat la %s: %s"
+
+#, fuzzy
+#~ msgid "CORBA error"
+#~ msgstr "Eroare I/O"
+
+#, fuzzy
+#~ msgid "Invalid argument"
+#~ msgstr "Conţinut invalid al mesajului"
+
+#, fuzzy
+#~ msgid "No owner"
+#~ msgstr "Nimeni"
+
+#, fuzzy
+#~ msgid "Unsupported type"
+#~ msgstr "Verific tipurile suportate"
+
+#, fuzzy
+#~ msgid "Unsupported operation"
+#~ msgstr "Operaţie anulată de utilizator."
+
+#, fuzzy
+#~ msgid "Internal error"
+#~ msgstr "Altă eroare"
+
+#, fuzzy
+#~ msgid "Exists"
+#~ msgstr "Există"
+
+#, fuzzy
+#~ msgid "Invalid URI"
+#~ msgstr "Invalid"
+
+#, fuzzy
+#~ msgid "Has subfolders"
+#~ msgstr "Nu există dosarul %s"
+
+#, fuzzy
+#~ msgid "No space left"
+#~ msgstr "Nici un mesaj selectat"
+
+#, fuzzy
+#~ msgid "Test type"
+#~ msgstr "Tip fişier:"
+
+#, fuzzy
+#~ msgid "Evolution Test Component"
+#~ msgstr "Compozitorul de mailuiri Evolution."
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "Import"
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Nume de familie"
+#~ msgid "Create a new all-day event"
+#~ msgstr "Crează o întîlnire nouă"
+
+#, fuzzy
+#~ msgid "New _Appointment"
+#~ msgstr "Întâlnire nouă"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Întâlnire"
+
+#, fuzzy
+#~ msgid "New _Task"
+#~ msgstr "Sarcină nouă"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "Fereastra Evolution"
 
-#~ msgid "Family Name"
-#~ msgstr "Nume de familie"
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "Fereastra Evolution"
+
+#~ msgid "Toggle"
+#~ msgstr "Comută"
+
+#, fuzzy
+#~ msgid "Clear"
+#~ msgstr "Şterge"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Renunţă la operaţia de mail curentă"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -17407,9 +18806,6 @@ msgstr "Legătura DN:"
 #~ msgid "Evolution VCard importer"
 #~ msgstr "Compozitorul de mailuiri Evolution."
 
-#~ msgid "Loading..."
-#~ msgstr "Încarc..."
-
 #~ msgid "Searching..."
 #~ msgstr "Caut..."
 
@@ -17465,10 +18861,6 @@ msgstr "Legătura DN:"
 #~ msgstr "EBook neîncărcat\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "ID-ul card-ului există deja"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Operaţia anulată"
 
@@ -17571,10 +18963,6 @@ msgstr "Legătura DN:"
 #~ msgstr "x"
 
 #, fuzzy
-#~ msgid "Phone"
-#~ msgstr "Inexistent"
-
-#, fuzzy
 #~ msgid "Birth date"
 #~ msgstr "Data naşterii"
 
@@ -17587,10 +18975,6 @@ msgstr "Legătura DN:"
 #~ msgstr "Principal"
 
 #, fuzzy
-#~ msgid "ID"
-#~ msgstr "I"
-
-#, fuzzy
 #~ msgid "Last Use"
 #~ msgstr "Lipeşte"
 
@@ -17604,9 +18988,6 @@ msgstr "Legătura DN:"
 #~ msgid "Folder containing contact information"
 #~ msgstr "Dosar conţinând informaţie de contact"
 
-#~ msgid "LDAP Server"
-#~ msgstr "Server LDAP"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "Server LDAP conţinând informaţie de contact"
 
@@ -17618,20 +18999,6 @@ msgstr "Legătura DN:"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Dosar conţinând informaţie de contact"
 
-#~ msgid "_Contact"
-#~ msgstr "_Contact"
-
-#, fuzzy
-#~ msgid "Create a new contact"
-#~ msgstr "Crează contact nou"
-
-#~ msgid "New Contact List"
-#~ msgstr "Listă contacte nouă"
-
-#, fuzzy
-#~ msgid "Create a new contact list"
-#~ msgstr "Crează listă nouă de contacte"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "URI pe care navigatorul dosarelor îl va afişa"
 
@@ -17649,9 +19016,6 @@ msgstr "Legătura DN:"
 #~ msgid "Is New Card"
 #~ msgstr "Nou"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #, fuzzy
 #~ msgid "No cards"
 #~ msgstr "Nepornit"
@@ -17698,37 +19062,6 @@ msgstr "Legătura DN:"
 #~ msgstr "Dosar V în lista de mail"
 
 #, fuzzy
-#~ msgid "New appointment"
-#~ msgstr "Întâlnire nouă"
-
-#, fuzzy
-#~ msgid "_Appointment"
-#~ msgstr "Întâlnire"
-
-#, fuzzy
-#~ msgid "New meeting"
-#~ msgstr "Întâlnire"
-
-#, fuzzy
-#~ msgid "M_eeting"
-#~ msgstr "Întâlnire"
-
-#, fuzzy
-#~ msgid "New task"
-#~ msgstr "Sarcină nouă"
-
-#~ msgid "_Task"
-#~ msgstr "Sarcină"
-
-#, fuzzy
-#~ msgid "New All Day Appointment"
-#~ msgstr "Întâlnire nouă"
-
-#, fuzzy
-#~ msgid "All _Day Appointment"
-#~ msgstr "Întâlnire nouă"
-
-#, fuzzy
 #~ msgid "Could not update invalid object"
 #~ msgstr "Nu pot actualiza fişierele corect"
 
@@ -17757,10 +19090,6 @@ msgstr "Legătura DN:"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "Deschide calendar"
 
-#, fuzzy
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Deschid dosarul %s"
-
 #~ msgid "Please enter your password for %s"
 #~ msgstr "Vă rog introduceţi parola pentru %s"
 
@@ -17794,10 +19123,6 @@ msgstr "Legătura DN:"
 #~ "Doriţi să le importaţi în Evolution?"
 
 #, fuzzy
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Interfaţa de configurare mail"
-
-#, fuzzy
 #~ msgid "Folder containing mail"
 #~ msgstr "Dosar V în lista de mail"
 
@@ -17818,10 +19143,6 @@ msgstr "Legătura DN:"
 #~ msgstr "Dosare virtuale"
 
 #, fuzzy
-#~ msgid "Properties..."
-#~ msgstr "_Proprietăţi..."
-
-#, fuzzy
 #~ msgid "Change this folder's properties"
 #~ msgstr "Modifică proprietăţile fişierului"
 
@@ -17829,17 +19150,6 @@ msgstr "Legătura DN:"
 #~ msgstr "Nu aţi setat o metodă de transport a mailului"
 
 #, fuzzy
-#~ msgid "New Mail Message"
-#~ msgstr "Mesaj _mail"
-
-#~ msgid "_Mail Message"
-#~ msgstr "Mesaj _mail"
-
-#, fuzzy
-#~ msgid "Compose a new mail message"
-#~ msgstr "Compune un mesaj"
-
-#, fuzzy
 #~ msgid "New Message Post"
 #~ msgstr "Mesaj"
 
@@ -21139,10 +22449,6 @@ msgstr "Legătura DN:"
 #~ msgstr "Întâlnire încheiată:"
 
 #, fuzzy
-#~ msgid "Stauning"
-#~ msgstr "Setări"
-
-#, fuzzy
 #~ msgid "Staverton"
 #~ msgstr "Setări"
 
@@ -21411,10 +22717,6 @@ msgstr "Legătura DN:"
 #~ msgstr "(Mesaj fără titlu)"
 
 #, fuzzy
-#~ msgid "Unst"
-#~ msgstr "Nevăzut"
-
-#, fuzzy
 #~ msgid "Uruapan"
 #~ msgstr "Japonez"
 
@@ -21471,10 +22773,6 @@ msgstr "Legătura DN:"
 #~ msgstr "Unicod"
 
 #, fuzzy
-#~ msgid "Vermont"
-#~ msgstr "lună"
-
-#, fuzzy
 #~ msgid "Vernal"
 #~ msgstr "General"
 
@@ -21719,10 +23017,6 @@ msgstr "Legătura DN:"
 #~ msgstr ", "
 
 #, fuzzy
-#~ msgid " C"
-#~ msgstr ", "
-
-#, fuzzy
 #~ msgid "knots"
 #~ msgstr "Fonturi"
 
@@ -22202,10 +23496,6 @@ msgstr "Legătura DN:"
 #~ msgstr "Cap"
 
 #, fuzzy
-#~ msgid "Spray"
-#~ msgstr "zile"
-
-#, fuzzy
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Grindină în împrejurimi"
 
@@ -22360,19 +23650,6 @@ msgstr "Legătura DN:"
 #~ msgid "Remove a folder added with \"Open Other User's Folder\""
 #~ msgstr "Creză dosar nou..."
 
-#~ msgid "Send / Receive"
-#~ msgstr "Trimite / Primeşte"
-
-#, fuzzy
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Trimite mailurile din coadă şi descarcă mailurile noi"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Comută în timp ce se arată bara folder"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Comută în timp ce se arată bara cu scurtături"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Vizualizează dosarul selectat"
 
@@ -22402,9 +23679,6 @@ msgstr "Legătura DN:"
 #~ msgid "_Rename..."
 #~ msgstr "_Redenumeşte..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "Trimite / Primeşte"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "Bara cu _scurtături"
 
@@ -22454,10 +23728,6 @@ msgstr "Legătura DN:"
 #~ msgstr "Modifică preferinţe"
 
 #, fuzzy
-#~ msgid "Automatically _detect links"
-#~ msgstr "Verifică automat dacă sunt mailuri noi la fiecare"
-
-#, fuzzy
 #~ msgid "Emacs"
 #~ msgstr "Est"
 
@@ -22580,18 +23850,10 @@ msgstr "Legătura DN:"
 #~ msgstr "123"
 
 #, fuzzy
-#~ msgid "380"
-#~ msgstr "389"
-
-#, fuzzy
 #~ msgid "<- _Remove"
 #~ msgstr "Şte_rge"
 
 #, fuzzy
-#~ msgid "<< Fewer Options"
-#~ msgstr "Opţiuni"
-
-#, fuzzy
 #~ msgid "DN Customization"
 #~ msgstr "Personalizează"
 
@@ -23178,13 +24440,6 @@ msgstr "Legătura DN:"
 #~ msgid "_Delete this Appointment"
 #~ msgstr "Şterge această întâlnire"
 
-#~ msgid ""
-#~ "Issuer: %s\n"
-#~ "Subject: %s"
-#~ msgstr ""
-#~ "Publicist: %s\n"
-#~ "Subiect: %s"
-
 #, fuzzy
 #~ msgid "I/O Error: %s"
 #~ msgstr "Eroare I/O"
@@ -23231,9 +24486,6 @@ msgstr "Legătura DN:"
 #~ msgid "News Servers"
 #~ msgstr "Dosar _nou"
 
-#~ msgid "Source Information"
-#~ msgstr "Informaţie sursă"
-
 #~ msgid "newswindow1"
 #~ msgstr "fereastra-ştiri1"
 
@@ -23255,10 +24507,6 @@ msgstr "Legătura DN:"
 #~ "operaţia cerută."
 
 #, fuzzy
-#~ msgid "_Contact List"
-#~ msgstr "_Contact"
-
-#, fuzzy
 #~ msgid "Inline Text _File..."
 #~ msgstr "Inserează fişier text..."
 
@@ -23274,17 +24522,10 @@ msgstr "Legătura DN:"
 #~ msgid "Send _later"
 #~ msgstr "Trimite mai târziu"
 
-#~ msgid "Send the message later"
-#~ msgstr "Trimite mesajul mai târziu"
-
 #~ msgid "_Pilot Settings..."
 #~ msgstr "Setări _pilot..."
 
 #, fuzzy
-#~ msgid "Addressbook Settings"
-#~ msgstr "Surse agendă"
-
-#, fuzzy
 #~ msgid "Configuration control for the Evolution Addressbook."
 #~ msgstr "Procesator pentru componentele agendei Evolution."
 
@@ -23634,13 +24875,6 @@ msgstr "Legătura DN:"
 #~ "\n"
 #~ "Şir unic:      "
 
-#~ msgid ""
-#~ "\n"
-#~ "Public Key: "
-#~ msgstr ""
-#~ "\n"
-#~ "Cheia publică:"
-
 #~ msgid "Waiting for connection to LDAP server..."
 #~ msgstr "Aştept conectarea la serverul LDAP..."
 
@@ -23666,10 +24900,6 @@ msgstr "Legătura DN:"
 #~ msgstr "_Fax serviciu"
 
 #, fuzzy
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "Crează o întîlnire nouă"
-
-#, fuzzy
 #~ msgid "First day of wee_k:"
 #~ msgstr "Prima zi a săptăminii:"
 
@@ -23791,10 +25021,6 @@ msgstr "Legătura DN:"
 #~ msgid "Composer"
 #~ msgstr "Compozitor"
 
-#, fuzzy
-#~ msgid "Default Forward style is: "
-#~ msgstr "Stilul implicit pentru \"Înaintează\" este: "
-
 #~ msgid "Edit..."
 #~ msgstr "Editează..."
 
@@ -23811,10 +25037,6 @@ msgstr "Legătura DN:"
 #~ msgstr "Organizaţie:"
 
 #, fuzzy
-#~ msgid "_Send mail in HTML format by default."
-#~ msgstr "Trimite implicit mail în format HTML."
-
-#, fuzzy
 #~ msgid "_Server Type: "
 #~ msgstr "Tip server:"
 
@@ -23999,9 +25221,6 @@ msgstr "Legătura DN:"
 #~ msgid "Encrypted message not displayed"
 #~ msgstr "Mesaj criptat neafişat"
 
-#~ msgid "Encrypted message"
-#~ msgstr "Mesaj criptat"
-
 #~ msgid "Click icon to decrypt."
 #~ msgstr "Clic pe icon pentru decriptare."
 
@@ -24126,9 +25345,6 @@ msgstr "Legătura DN:"
 #~ msgid "r"
 #~ msgstr "r"
 
-#~ msgid "s"
-#~ msgstr "s"
-
 #~ msgid "t"
 #~ msgstr "t"
 
@@ -24229,10 +25445,6 @@ msgstr "Legătura DN:"
 #~ "sisteme de email proprietare."
 
 #, fuzzy
-#~ msgid "%d/%m/%Y"
-#~ msgstr "%m/%d/%Y"
-
-#, fuzzy
 #~ msgid "%Y/%m/%d"
 #~ msgstr "%a %m/%d/%Y"
 
@@ -24526,9 +25738,6 @@ msgstr "Legătura DN:"
 #~ msgid "[%s] (forwarded message)"
 #~ msgstr "[%s] (mesaj înaintat)"
 
-#~ msgid "Forwarded message (no subject)"
-#~ msgstr "Mesaj înaintat (fără subiect)"
-
 #~ msgid ""
 #~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
 #~ "s<br><b>Subject:</b> %s<br>"
@@ -24572,9 +25781,6 @@ msgstr "Legătura DN:"
 #~ msgid "TasksPreferences"
 #~ msgstr "Preferinţe task"
 
-#~ msgid "_Company:"
-#~ msgstr "_Compania:"
-
 #~ msgid "As _Minicards"
 #~ msgstr "Ca _mini-cărţi"
 
diff --git a/po/ru.po b/po/ru.po
index 2bdd3c9c10..cb29cd41f1 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-05-30 09:33+0400\n"
 "Last-Translator: Dmitry G. Mastrukov <dmitry@taurussoft.org>\n"
 "Language-Team:  <ru@li.org>\n"
@@ -31,51 +31,189 @@ msgstr "Не удается загрузить %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Не удается прочитать блок приложения адресов Пилота"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Папки автозаполнения"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "ID _сертификата:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Настройте тут учётные записи почты"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Контакты"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
+msgstr "Адресная книга Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Фабрика для всплывающего окна адреса из адресной книги"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Компонент Evolution для просмотра миникарточек адресной книги"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Компонент Evolution для просмотра миникарточек адресной книги"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Компонент Evolution для просмотра миникарточек адресной книги"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Компонент Evolution для просмотра миникарточек адресной книги"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Компонент Executive Summary программы Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Адресная книга"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Свойства..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Удалить"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "Переименовать"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Новый контакт:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "Контакт"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "Создание нового контакта"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Создать список контактов"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "Создать список контактов"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "Создание нового списка контактов"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Личное"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Служебное"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "Сервер LDAP"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Не удается создать каталог %s: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "Не удается подключиться к серверу LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "Сбой аутентификации на сервере LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "Не удается выполнить запрос в корневом DSE"
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "Сервер отвечает без поддержки баз поиска"
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Этот сервер не поддерживает информацию LDAPv3 schema"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "Ошибка при загрузке информации schema"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr "Сервер не отвечает корректной информацией schema"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Имя учетной записи"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Имя сервера"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "В этой сборке Evolution LDAP не поддерживается"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Другие контакты"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -83,7 +221,7 @@ msgstr ""
 "Не удается открыть эту адресную книгу. Проверьте, что путь существует\n"
 "и что у вас имеются необходимые права доступа."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -93,7 +231,7 @@ msgstr ""
 "что либо введен неверный URI, либо сервер LDAP\n"
 "недоступен."
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -106,7 +244,7 @@ msgstr ""
 "установки OpenLDAP; получить его можно по приведенной\n"
 "ниже ссылке.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -120,44 +258,43 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Не удается открыть адресную книгу"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "Анонимное подключение к серверу LDAP"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "Ошибка проверки подлинности.\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sВведите пароль для %s (пользователь %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "Имя начинается с"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "Почтовый адрес начинается с"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Категории "
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Любое поле содержит"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Дополнительно..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -170,7 +307,7 @@ msgstr ""
 "поднимите ограничения для выдачи результатов в\n"
 "настройках сервера каталога для этой адресной книги."
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -183,96 +320,43 @@ msgstr ""
 "поднимите ограничения времени в настройках сервера\n"
 "каталога для этой адресной книги."
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "База данных для этой адресной книги не смогла обработать текущий запрос."
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "База данных для этой адресной книги отказалась обрабатывать текущий запрос."
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "Этот запрос завершился с ошибкой."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Любая категория"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "URI, показываемый календарем"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "ID _сертификата:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "Настройте здесь доступ к серверу каталогов LDAP"
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Контакты"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "Серверы каталогов"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Адресная книга Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Интерфейс выбора имени в адресной книге Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Фабрика для всплывающего окна адреса из адресной книги"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Компонент Evolution для просмотра миникарточек адресной книги"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Компонент Evolution для просмотра миникарточек адресной книги"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Компонент Evolution для просмотра миникарточек адресной книги"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Компонент Evolution для просмотра миникарточек адресной книги"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Компонент Executive Summary программы Evolution."
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -295,6 +379,7 @@ msgstr "  _Показывать поддерживаемые типы "
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -328,8 +413,9 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "Добавить сервер LDAP"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "Помощник по настройке LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -345,9 +431,9 @@ msgid "Anonymously"
 msgstr "Анонимно"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -357,49 +443,50 @@ msgstr ""
 "\n"
 "Нажмите кнопку \"Готово\", чтобы сохранить изменения."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "Подключение"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "Отличительное _имя (DN):"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr "Изменить сервер LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
 msgstr "Электронная почта:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 "Evolution будет использовать это значение DN для проверки вашей подлинности "
 "на сервере"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr "Этот адрес будет использоваться для идентификации вас на сервере"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "Готово"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Общие"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "Помощник по настройке LDAP"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "Группа"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Никогда"
 
@@ -427,8 +514,8 @@ msgid "S_earch scope: "
 msgstr "_Диапазон поиска: "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Поиск"
 
@@ -484,28 +571,32 @@ msgstr ""
 "для поисков LDAP и для создания и редактирования контактов."
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 "Указание отображаемого имени является последним шагом в настройке сервера "
 "LDAP."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "Шаг 1: Сведения о сервере"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "Шаг 2: Подключение к серверу"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "Шаг 1: Сведения о сервере"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "Шаг 3: Поиск в каталоге"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Шаг 2: Подключение к серверу"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "Шаг 4: Отображаемое имя"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Шаг 3: Поиск в каталоге"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -517,17 +608,6 @@ msgstr "Поддерживаемые базы поиска"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"Первым шагом в настройке сервера LDAP является указание его имени\n"
-"и вашей регистрационной информации. Если вы не уверены, что точно\n"
-"знаете все подробности, то узнайте их у вашего системного администратора."
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -538,7 +618,7 @@ msgstr ""
 "в ваших поисках, и как долго должен выполняться запрос. Спросите у \n"
 "вашего системного администратора, нужно ли вам изменять эти опции."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -549,7 +629,7 @@ msgstr ""
 "откуда начнется ваш поиск. Если вы оставите это поле пустым,\n"
 "то поиск начнется с корня дерева каталогов."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -563,14 +643,14 @@ msgstr ""
 "под каталогом начала поиска. Глубина поиска \"one\" включает в себя\n"
 "элементы на один уровень ниже каталога начала поиска.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
+#, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "Этот диалог поможет вам получить доступ по сети к сервисам\n"
 "каталогов, используя сервера LDAP (Lightweight Directory Access Protocol).\n"
@@ -579,13 +659,13 @@ msgstr ""
 "информации о нем. Если вы точно не знаете всех данных, то\n"
 "узнайте их у вашего системного администратора."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Полное имя вашего сервера LDAP. Например: \"ldap.mycompany.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -594,7 +674,7 @@ msgstr ""
 "Максимальное число элементов для загрузки. Установка очень большого\n"
 "значения может серьезно замедлить работу вашей адресной книги."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -604,7 +684,7 @@ msgstr ""
 "что установка этого параметра в \"Адрес эл. почты\" требует анонимного "
 "доступа к вашему серверу LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -613,6 +693,15 @@ msgstr ""
 "Это имя сервера будет появляться в списке каталогов Evolution.\n"
 "Оно используется только для отображения."
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Это имя сервера будет появляться в списке каталогов Evolution.\n"
+"Оно используется только для отображения."
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -641,21 +730,33 @@ msgid "Using email address"
 msgstr "По почтовому адресу"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Когда это возможно"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+"Первым шагом в настройке сервера LDAP является указание его имени\n"
+"и вашей регистрационной информации. Если вы не уверены, что точно\n"
+"знаете все подробности, то узнайте их у вашего системного администратора."
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "Показать имя:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "Ограничение загрузки:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -663,54 +764,52 @@ msgstr "Ограничение загрузки:"
 msgid "_Edit"
 msgstr "_Правка"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "_Метод подключения:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "_Номер порта:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "_База поиска:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "Имя _сервера:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "_Задержка (минут):"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "карточек"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr "вкладка соединения"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr "общая вкладка"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr "вкладка поиска"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Имя"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Интерфейс выбора имени в адресной книге Evolution"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Удалить все"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Удалить"
@@ -737,23 +836,21 @@ msgstr "Добавить к контактам"
 msgid "Unnamed Contact"
 msgstr "Безымянный контакт"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Имя"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Источник"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Выбрать контакты из адресной книги"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "Найти контакт в"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Интерфейс выбора имени в адресной книге Evolution"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Найти"
@@ -828,7 +925,8 @@ msgid "D_epartment:"
 msgstr "Отдел:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Сведения"
 
@@ -898,12 +996,12 @@ msgid "_Categories..."
 msgstr "_Категории..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Удалить"
@@ -2029,7 +2127,7 @@ msgid "Esq."
 msgstr "Эскв."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Полное имя"
 
@@ -2123,11 +2221,27 @@ msgstr "Редактор списка контактов"
 msgid "Save List as VCard"
 msgstr "Сохранить список как VCard"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Изменённый контакт:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Конфликтующий контакт:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Обнаружено дублирование контактов"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Изменённый эл.адрес или имя этого контактного лица уже\n"
+"существуют в этой папке. Всё равно хотите добавить?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Новый контакт:"
@@ -2144,22 +2258,6 @@ msgstr ""
 "Имя или эл.адрес этого контактного лица уже существуют\n"
 "в этой папке. Всё равно хотите добавить?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Изменённый контакт:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Конфликтующий контакт:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"Изменённый эл.адрес или имя этого контактного лица уже\n"
-"существуют в этой папке. Всё равно хотите добавить?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2258,9 +2356,9 @@ msgstr "Переслать контакт"
 msgid "Send Message to Contact"
 msgstr "Отправить сообщение к контакту"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Напечатать"
@@ -2282,9 +2380,12 @@ msgstr "Переместить в папку..."
 msgid "Cut"
 msgstr "Вырезать"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Скопировать"
 
@@ -2293,16 +2394,8 @@ msgstr "Скопировать"
 msgid "Paste"
 msgstr "Вставить"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Удалить"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "Текущий вид"
 
@@ -2318,166 +2411,170 @@ msgstr ""
 "Необходимо перезапустить Evolution."
 
 #: 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:2
 msgid "Assistant"
 msgstr "Помощник"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Рабочий факс"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Служебный телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Служебный телефон 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Телефон для обратного звонка"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Телефон в машине"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Категории"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Телефон компании"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Отдел"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "Электронная почта"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "Эл.адрес 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "Эл.адрес 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Фамилия"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Подшить как"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "URL занятости"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Домашний адрес"
+#, fuzzy
+msgid "Given Name"
+msgstr "Имя поля"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Домашний Факс"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Домашний телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Домашний телефон 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Иордания"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Мeнеджер"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Мобильный телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Псевдоним"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Заметка"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Офис"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Организация"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Другие адреса"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Другой факс"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Другие телефоны"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Пейджер"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Основной телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Профессия"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Радио"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Должность"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Супруг(а)"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Телекс"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Заголовок"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Анст"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Веб-сайт"
 
@@ -2571,11 +2668,19 @@ msgstr "Члены"
 msgid "Job Title"
 msgstr "Должность:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Домашний адрес"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Домашний адрес"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Другие адреса"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2588,113 +2693,110 @@ msgstr "Домашний Факс"
 msgid "Blog"
 msgstr "Болонья"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Успешно"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Репозиторий вне сети"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Отказ в доступе"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Карточка не найдена"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Идентификатор карточки уже существует"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Протокол не поддерживается"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Отменено"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "Сбой проверки подлинности"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "Требуется проверка подлинности"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS недоступен"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "Адресная книга не существует"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Иная ошибка"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Хотите сохранить изменения?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 #, fuzzy
 msgid "_Discard"
 msgstr "Dinard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Ошибка при добавлении списка"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Ошибка при добавлении карточки"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Ошибка при изменении списка"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Ошибка при изменении карточки"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Ошибка при удалении списка"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Ошибка при удалении карточки"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2703,7 +2805,7 @@ msgstr ""
 "Открытие %d карточек также откроет %d новых окон.\n"
 "Вы действительно хотите показать все эти карточки?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2712,49 +2814,49 @@ msgstr ""
 "%s уже существует\n"
 "Хотите переписать?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "Перезаписать"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Ошибка сохранения %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "список"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Переместить карточку в"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Скопировать карточку в"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Переместить карточки в"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Скопировать карточки в"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Множество VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard для %s"
@@ -2950,7 +3052,7 @@ msgstr "Поля"
 msgid "Number of columns:"
 msgstr "Число столбцов:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Параметры"
 
@@ -3137,18 +3239,18 @@ msgstr "Безымянный список"
 msgid "Split Multi-Day Events:"
 msgstr "Разделить многодневные события:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Не удается запустить сервер wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Не удается запустить wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Не удается прочитать блок приложения календарь Пилота"
 
@@ -3156,24 +3258,88 @@ msgstr "Не удается прочитать блок приложения к�
 msgid "Default Priority:"
 msgstr "Приоритет по умолчанию:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Не удается прочитать блок приложения заданий Пилота"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Календарь и задачи"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Календарь"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Здесь можно настроить вашу временную зону, календарь и список задач"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Календарь и задачи Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Компонент Executive Summary календаря программы Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Компонент для просмотра календаря iTip/iMip календаря Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Компонент для просмотра календаря iTip/iMip календаря Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Редактор новостей Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Просмотр задач Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Компонент Executive Summary календаря программы Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Компонент редактора писем Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Задачи"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Фабрика для сервиса уведомления о сигнале"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Начинается:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Завершается:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Будильник Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Сигнал в %s"
@@ -3248,44 +3414,172 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Не задавать больше этот вопрос."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Фабрика для сервиса уведомления о сигнале"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Не удается инициализировать Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Не удается инициализировать gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Не удается создать фабрику сервиса уведомления о сигнале"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "неправильное время"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "Ошибка iCalendar"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Цвет для задач на сегодня"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Цвет для задач на сегодня"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "_Показывать время окончания встреч в обзоре недели и месяца"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Посмотреть на вид календаря на печати"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "Запрашивать подтверждение при удалении элементов"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "Запрашивать подтверждение при удалении элементов"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Удалить выполненные задачи"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Показывать номера недель в навигаторе по датам"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "\"Коротко\" содержит"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Описание содержит"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Комментарий содержит"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Прочее"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3297,81 +3591,110 @@ msgstr ""
 "\n"
 "Действительно уничтожить эти задания?"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "возвращает меньше чем"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "дни"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A, %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a, %d %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a, %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Напечатать этот календарь"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Новая Каледония"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "Новая встреча"
+
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "_Встреча"
+
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Создать новую встречу"
+
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "Новое собрание"
+
+#: calendar/gui/calendar-component.c:640
+msgid "M_eeting"
+msgstr "_Собрание"
+
+#: calendar/gui/calendar-component.c:641
 #, fuzzy
-msgid "Rename"
-msgstr "Переименовать"
+msgid "Create a new meeting request"
+msgstr "Создать новое приглашение на собрание"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Новая ежедневная встреча"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Личное"
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr "Еже_дневная встреча"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Служебное"
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Создать новую встречу"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3493,7 +3816,7 @@ msgstr "Отправить"
 msgid "With these arguments:"
 msgstr "С аргументами:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -3509,6 +3832,10 @@ msgstr "часов"
 msgid "minutes"
 msgstr "минут"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3542,8 +3869,8 @@ msgstr "Отправить почту"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Тема:"
 
@@ -3572,7 +3899,7 @@ msgstr "завершение встречи"
 msgid "hour(s)"
 msgstr "часов"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "минут"
 
@@ -3626,7 +3953,7 @@ msgstr "Дней"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Пятница"
 
@@ -3640,7 +3967,7 @@ msgstr "Минут"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Понедельник"
 
@@ -3650,7 +3977,7 @@ msgstr "Вск"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Суббота"
 
@@ -3664,7 +3991,7 @@ msgstr "Показывать номера недель в навигаторе �
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Воскресенье"
 
@@ -3682,7 +4009,7 @@ msgstr "Список задач"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Четверг"
 
@@ -3700,7 +4027,7 @@ msgstr "Формат времени:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Вторник"
 
@@ -3710,12 +4037,12 @@ msgstr "Начало недели:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Среда"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Рабочая неделя"
 
@@ -3752,7 +4079,7 @@ msgid "_Fri"
 msgstr "Пят"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Общие"
 
@@ -3792,18 +4119,18 @@ msgstr "Срд"
 msgid "before every appointment"
 msgstr "перед каждой встречей"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 "Удаляемое событие является собранием, хотите отправить уведомление об отмене?"
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Вы действительно хотите отменить и удалить это собрание?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
@@ -3811,11 +4138,11 @@ msgstr ""
 "Удаляемое событие является назначенной задачей, хотите отправить уведомление "
 "об отмене?"
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Вы действительно хотите отменить и удалить эту задачу?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -3823,50 +4150,50 @@ msgstr ""
 "Удаляемое событие является опубликованной записью в журнале,хотите отправить "
 "уведомление об отмене?"
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Вы действительно хотите отменить и удалить эту запись в журнале?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Это событие было удалено."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Эта задача была удалена."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Эта запись в журнале была удалена."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Вы сделали изменения. Отменить их и закрыть редактор?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Вы ничего не изменили. Закрыть редактор?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Это событие было изменено."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Эта задача была изменена."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Эта запись в журнале была изменена."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s Вы сделали изменения. Отменить их?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Вы ничего не изменили. Обновить редактор?"
@@ -3876,169 +4203,174 @@ msgstr "%s Вы ничего не изменили. Обновить редак�
 msgid "Validation error: %s"
 msgstr "Ошибка проверки: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " к "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Выполнено "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Выполнено "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (к дате"
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "К дате"
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "Не удается обновить объект"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Изменить встречу"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Встреча - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Задача - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Запись в журнале - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Нет Краткого описания"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Сохранить как..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 #, fuzzy
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Изменения этого элемента будут отвергнуты, если по эл. почте придет "
 "обновление."
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Не удается применить текущую версию!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Выберите папку назначения для импорта этих данных"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Вы действительно хотите удалить встречу \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Вы действительно хотите удалить эту неозаглавленную встречу?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Вы действительно хотите удалить задачу \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Вы действительно хотите удалить эту неозаглавленную задачу?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Вы действительно хотите удалить запись в журнале \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Вы действительно хотите удалить эту неозаглавленную запись в журнале?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Вы действительно хотите удалить %d встреч?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Вы действительно хотите удалить %d задач?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Вы действительно хотите удалить %d записей в журнале?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "Это событие не может быть удалено из-за ошибки corba"
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "Эта задача не может быть удалена из-за ошибки corba"
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Эта запись в журнале не может быть удалена из-за ошибки corba"
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Этот элемент не может быть удален из-за ошибки corba"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "Это событие не может быть удалено: нет доступа"
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 #, fuzzy
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 "Статус участника не может быть обновлён из-за неверного текущего статуса!\n"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "Этот элемент не может быть удален: нет доступа"
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Это событие не может быть удалено из-за ошибки corba"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Эта задача не может быть удалена из-за ошибки corba"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Эта запись в журнале не может быть удалена из-за ошибки corba"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Этот элемент не может быть удален из-за ошибки corba"
@@ -4055,43 +4387,43 @@ msgstr "Поручить:"
 msgid "Enter Delegate"
 msgstr "Ввести представителя"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Встреча"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Напоминание"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Повторение"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Планировка"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Собрание"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "Дата начала неверна"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "Неверная дата завершения"
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "Неверное время начала"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "Неверное время завершения"
 
@@ -4161,31 +4493,31 @@ msgid "_Start time:"
 msgstr "Нача_ло:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Нет"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "Требуется организатор."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "Требуется как минимум один участник"
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "Доверить..."
 
@@ -4226,21 +4558,15 @@ msgid "Member"
 msgstr "Участник"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Заинтересованное лицо"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Должность"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Состояние"
@@ -4260,6 +4586,7 @@ msgid "_Invite Others..."
 msgstr "Пригласить других..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4292,6 +4619,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Не удается создать каталог %s: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "Организатор должен быть назначен."
@@ -4321,34 +4649,59 @@ msgstr "Информация календаря"
 msgid "Calendar Name"
 msgstr "Календарь"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Не удается создать каталог %s: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Информация календаря"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Список задач"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Список задач"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Список задач"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Острова Вэлис и Футуна"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 #, fuzzy
 msgid "This and Future Instances"
 msgstr "Острова Вэлис и Футуна"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 #, fuzzy
 msgid "All Instances"
 msgstr "Все станции:"
@@ -4398,10 +4751,15 @@ msgstr "день"
 msgid "on the"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "случаи"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Дата/Время:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "Добавить"
@@ -4466,7 +4824,7 @@ msgstr "неделя"
 msgid "year(s)"
 msgstr "год(лет)"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
@@ -4476,32 +4834,32 @@ msgstr ""
 "\n"
 "Сохранить изменения?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 msgid "Save Event"
 msgstr "Сохранить событие"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Была создана информация о собрании. Отправить ее?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Информация о собрании была изменена. Отправить обновлённую версию?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr ""
 "Информация о назначении задачи была изменена. Отправить обновлённую версию?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "Информация о задаче была изменена. Отправить обновлённую версию?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Дата выполнения некорректна"
 
@@ -4511,43 +4869,43 @@ msgid "% _Complete"
 msgstr "% Выполнено"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Выполнено"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Высокий"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "В процессе"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Низкий"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Нормальный"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Не начато"
 
@@ -4556,7 +4914,7 @@ msgid "Progress"
 msgstr "Продвижение"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Неопределено"
 
@@ -4578,21 +4936,21 @@ msgstr "Состояние:"
 msgid "_Web Page:"
 msgstr "Адрес веб-страницы:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Основные"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Назначение"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "Дата выполнения некорректна"
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4600,9 +4958,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "Конфиденциально"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Описание:"
 
@@ -4707,26 +5065,21 @@ msgstr "%s на %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s для неизвестного типа переключателя"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Общее"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Личное"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Конфиденциальное"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Категории"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4739,28 +5092,26 @@ msgid "Start Date"
 msgstr "Дата начала"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Сводка"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "цвет"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Встреча"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Свободен"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Занят"
 
@@ -4772,7 +5123,7 @@ msgstr "С"
 msgid "S"
 msgstr "Ю"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "В"
 
@@ -4780,7 +5131,7 @@ msgstr "В"
 msgid "W"
 msgstr "З"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4790,7 +5141,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4798,7 +5149,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Да"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4806,17 +5157,17 @@ msgstr "Нет"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Неизвестно"
 
@@ -4828,181 +5179,179 @@ msgstr "Повторение"
 msgid "Assigned"
 msgstr "Назначено"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Обновление объектов"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Удаление выделенных объектов"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Обновление объектов"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Новая _встреча..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Новое ежедневное событие"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "Новое собрание"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Новая задача"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "На_печатать..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "Вст_авить"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Перейти к сег_одняшнему дню"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "Пере_йти к дате..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "Опубликовать информацию о занятости"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "_Изменить настройки..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Открыть"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Со_хранить как..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "С_копировать"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "_Назначить собрание..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "_Переслать как iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Удалить это вхождение"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Удалить все вхождения"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "_Изменить настройки..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Открыть сообщение"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "_Назначить задачу"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "_Переслать как iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "По_метить как выполненное"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "По_метить выбранную задачу как выполненную"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "У_далить выделенные задачи"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Щёлкните здесь, чтобы добавить задачу"
@@ -5016,8 +5365,8 @@ msgstr "% Выполнено"
 msgid "Alarms"
 msgstr "Сигналы"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Выполнено"
 
@@ -5046,18 +5395,18 @@ msgid "URL"
 msgstr "Ссылка (URL)"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a, %d.%m.%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5076,7 +5425,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A, %d %B"
 
@@ -5089,125 +5438,125 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr "Да. (Сложное повторение)"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "Каждый день"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "Каждые %d дня(дней)"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "Каждую неделю"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "Каждые %d недели(недель)"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr "Каждую неделю в "
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Каждые %d недели(недель) в "
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " и "
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr "%s дней "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s "
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "каждый месяц"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr "каждые %d месяца(ев)"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "Каждый год"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "Каждые %d года(лет)"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr " всего %d раз"
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ", заканчивается на"
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>Начинается:</b> "
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Заканчивается:</b>"
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>Выполнено:</b>"
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>К:</b> "
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "Сведения iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "Ошибка iCalendar"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Неизвестное лицо"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5215,322 +5564,321 @@ msgstr ""
 "<b> Пересмотрите следующую информацию и выберите действие из расположенного "
 "ниже меню."
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Нет</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "Расположение:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Состояние:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Принято"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Экспериментально принятый"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Отклонено"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Выберите действие:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Обновить"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Ок"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Принять"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Принять экспериментально"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Отклонить"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Отправить информацию о занятости"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Обновить состояние"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Отправить последнюю информацию"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Отменить"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> опубликовал последнюю информацию о собрании."
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Информация о собрании"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> запрашивает присутствие %s на собрании."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> запрашивает ваше присутствие на собрании."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Предложение собрания"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> желает добавить к существующему собранию."
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Обновление собрания"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> желает получить последнюю информацию о собрании."
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Запрос обновления собрания"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ответил на приглашение на собрание."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Ответ собрания"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> отменил собрание."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Отмена собрания"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> отправил невразумительное сообщение."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Неверное сообщение собрания"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> опубликовал информацию о задаче"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Информация о задаче"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> запрашивает %s для выполнения задачи."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> запрашивает, чтобы вы выполнили задачу."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Предложение задачи"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> желает добавить к существующей задаче."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Обновление задачи"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> желает получить последнюю информацию о задаче."
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Запрос обновления задачи"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> ответил на назначение задачи."
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Ответ собрания"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> отменил задачу."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Отмена задачи"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Сообщение календаря"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> опубликовал информацию о занятости."
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Информация о занятости"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> запрашивает информацию о вашей занятости."
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Запрос информации о занятости"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> ответил на запрос информации о занятости."
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Ответ занятости"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Неверное сообщение о занятости"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr "Похоже что сообщение не было правильно сформировано"
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "Это сообщение содержит только неподдерживаемые запросы"
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Вложение не содержит правильного сообщения календаря."
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr "Вложение не содержит пригодных для просмотра элементов календаря."
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "Файл календаря не может быть обновлён!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Обновление закончено\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Статус участника не может быть обновлён, потому что элемент больше не "
 "существует"
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Объект некорректен и не может быть обновлен\n"
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Этот ответ пришел не от текущего участника.  Добавить его, как участника?"
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Статус участника не может быть обновлён из-за неверного текущего статуса!\n"
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr "В системе CORBA произошла ошибка\n"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr "Объект не может быть найден!\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "У вас нет соответствующих прав для обновления календаря\n"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Статус участника обновлён!\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "Статус участника не может быть обновлён!\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Удаление завершено"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Элемент отправлен!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Элемент не может быть послан!\n"
 
@@ -5690,7 +6038,7 @@ msgstr "%a, %d.%m.%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
@@ -5754,49 +6102,44 @@ msgstr "Время _начала собрания:"
 msgid "Meeting _end time:"
 msgstr "Время _завершения собрания:"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "Дата начала:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "Дата выполнения:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "Приоритет:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Страница"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Открытие задач %s"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Не удается загрузить задачи в \"%s\""
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Не поддерживается метод, необходимый для загрузки \"%s\""
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "У вас нет прав на открытие папки в \"%s\""
 
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5805,48 +6148,39 @@ msgstr ""
 "Ошибка в \"%s\":\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "Завершение выполнения задач..."
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "Удаление выделенных объектов..."
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "Очистка папки"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Задачи"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Календарь"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Не удается открыть папку \"%s\""
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Метод, необходимый для открытия \"%s\", не поддерживается"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Добавление сигналов для %s"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5857,7 +6191,7 @@ msgstr ""
 "%s.\n"
 "Необходимо перезапустить Evolution."
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5868,62 +6202,11 @@ msgstr ""
 "%s.\n"
 "Необходимо перезапустить Evolution."
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Турин"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Календарь и задачи"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Календарь"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Здесь можно настроить вашу временную зону, календарь и список задач"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Календарь и задачи Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Компонент Executive Summary календаря программы Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Компонент для просмотра календаря iTip/iMip календаря Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Компонент для просмотра календаря iTip/iMip календаря Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Редактор новостей Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Просмотр задач Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Компонент Executive Summary календаря программы Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Компонент редактора писем Evolution."
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Апрель"
@@ -5980,296 +6263,332 @@ msgstr "Октябрь"
 msgid "September"
 msgstr "Сентябрь"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Организатор должен быть назначен."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Необходим как минимум один участник"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Информация о событии"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Информация о задаче"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Информация дневника"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Информация о занятости"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Информация календаря"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Обновлено"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Обновить"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "Контр-предложение"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Информация о занятости (%s в %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "Информация iCalendar"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Вы должны быть участником события."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1-ое"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2-ое"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3-ье"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4-ое"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5-ое"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6-ое"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7-ое"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8-ое"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9-ое"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10-ое"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11-ое"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12-ое"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13-ое"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14-ое"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15-ое"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16-ое"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17-ое"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18-ое"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19-ое"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20-ое"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21-ое"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22-ое"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23-ье"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24-ое"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25-ое"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26-ое"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27-ое"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28-ое"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29-ое"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30-ое"
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31-ое"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Вс"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Пн"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Вт"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Ср"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Чт"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Пт"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Cб"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Выбранный день (%a, %b %d %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a, %b %d"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a, %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a, %b %d %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Выбранная неделя (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Выбранный месяц (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Выбранный год (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Задание"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Состояние: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Приоритет: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Завершено процентов: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Категории: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Контакты: "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Предварительный просмотр"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Напечатать элемент"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Настройка печати"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Переименовать этот ярлык"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Список задач"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Новая задача"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Задача"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Создать новую задачу"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "Показываемый URI папки задач"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6281,11 +6600,11 @@ msgstr ""
 "\n"
 "Действительно уничтожить эти задания?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Не задавать больше этот вопрос."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "Напечатать Задания"
 
@@ -6316,15 +6635,15 @@ msgstr "Файлы iCalendar (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "Файлы vCalendar (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "Напоминание!!"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "События календаря"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6332,7 +6651,7 @@ msgstr ""
 "Evolution обнаружены файлы календаря Gnome.\n"
 "Хотите импортировать их в Evolution?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Календарь Gnome"
 
@@ -7865,27 +8184,27 @@ msgstr "Pacific/Wallis"
 msgid "Pacific/Yap"
 msgstr "Тихий океан/о-в Яп"
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "Подпись не поддерживается этим шифром"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "Проверка не поддерживается этим шифром"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Шифрование не поддерживается этим шифром"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Расшифровка не поддерживается этим шифром"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr "Импорт ключей не поддерживается этим шифром"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr "Экспорт ключей не поддерживается этим шифром"
 
@@ -7937,86 +8256,86 @@ msgstr "Подготовка папки \"%s\" для автономной ра�
 msgid "You must be working online to complete this operation"
 msgstr "Для завершения данной операции необходимо подключение к сети"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Сбой при создании канала к \"%s\": %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Сбой при создании дочернего процесса '%s': %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Не удается считать приветствие из %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Синхронизация папок"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Не удается разобрать фильтр: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Ошибка выполнения фильтра: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Не удается открыть папку спула"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Не удается обработать папку спула"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Получение сообщения %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Не удается открыть сообщение"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Сбой на сообщении %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Синхронизация папки"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Получение сообщения %d из %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Сбой на сообщении %d из %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Сбой при получении сообщения"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr "Недопустимые аргументы для system-flag"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr "Недопустимые аргументы для user-tag"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Ошибка выполнения поиска фильтра: %s: %s"
@@ -8048,36 +8367,36 @@ msgstr "(совпадает все) требует единственного л
 msgid "Performing query on unknown header: %s"
 msgstr "Запрашивается неизвестный заголовок: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Неподдерживаемая операция: добавить сообщение: для %s"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Неподдерживаемая операция: поиск выражения: для %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Неподдерживаемая операция: поиск по идентификатору пользователя: для %s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Перемещение сообщений"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr "Копирование сообщений"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Получение %d сообщений"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8088,15 +8407,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr "Ошибка при обработке подсказки gpg userid."
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr "Ошибка при обработке запроса парольной фразы gpg."
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8105,33 +8424,33 @@ msgstr ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Отменено."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Сбой при разблокировании секретного ключа: указано 3 некорректных парольных "
 "фразы."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Неожиданный ответ от GnuPG: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr "Нет данных"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 "Не удается зашифровать это сообщение: Не определены корректные получатели"
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8142,50 +8461,63 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Сбой при кодировании GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Не удается записать данные: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Сбой при исполнении gpg: %s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr "Сбой при исполнении gpg."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "Эта часть сообщения подписана цифровой подписью"
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr ""
+"Не удается проверить подпись сообщения: не удается создать временный файл: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Не удается проверить подпись сообщения: не удается создать временный файл: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Не удается записать данные: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Эта часть сообщения подписана цифровой подписью"
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "тело индекса содержит"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Не удается получить сообщение из редактора"
@@ -8286,15 +8618,15 @@ msgstr "Ошибка сохранения временного почтовог�
 msgid "Error copying mail temp file: %s"
 msgstr "Ошибка копирования временного почтового файла: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Сбой при декодировании части MIME: ошибка протокола"
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "Сбой при декодировании части MIME: некорректная структура"
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "Ошибка обработки"
 
@@ -8611,12 +8943,12 @@ msgstr "Провайдер виртуальных папок электронн�
 msgid "For reading mail as a query of another set of folders"
 msgstr "Для чтения почты по запросу к другому набору папок"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Провайдер для протокола \"%s\" не доступен"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8625,71 +8957,82 @@ msgstr ""
 "Не удается создать каталог %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Введите пароль для %s"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Неопределено"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Редактирование подписи"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Редактирование подписи"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Самоподписанный сертификат в цепочке"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "Недоверительный сертификат"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Сохранить подпись"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Ошибка обработки"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Сервер: %s, Тип: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Не удается получить папку: недопустимая операция в этом хранилище"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Не удается создать папку: недопустимая операция в этом хранилище"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Корзина"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "Июнь"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "Не удается получить сертификат поставщика"
@@ -8897,7 +9240,7 @@ msgstr ""
 "Истек срок действия списка аннулированных сертификатов: %s\n"
 "Поставщик: %s"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Не удается разобрать URL \"%s\""
@@ -8916,22 +9259,22 @@ msgstr "Нет сообщения %s в %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Не удается скопировать или переместить сообщения в виртуальную папку"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Не удается удалить папку: %s: недопустимая операция"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Не удается удалить папку: %s: нет такой папки"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Не удается переименовать папку: %s: недопустимая операция"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Не удается переименовать папку: %s: нет такой папки"
@@ -9011,7 +9354,7 @@ msgstr "Не удается получить сообщение: %s"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9025,7 +9368,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Нет такого сообщения"
@@ -9063,55 +9406,70 @@ msgid "Failed to cache %s: %s"
 msgstr "Сбой при кэшировании %s: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Подключение к серверу..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Не удается подключиться к серверу LDAP"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "Компания"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Проверка новой почты"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Check for new messages in all folders"
 msgstr "Проверять новую почту во всех папках"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Папки"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Показывать только те папки, на которые вы подписаны"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "Переопределять предлагаемое сервером пространство имён для папок"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Пространство имен"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 "Применить фильтры к новым сообщениям в папке \"Входящие\" на этом сервере"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Автоматически проверять новую почту каждые"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Для чтения и хранения почты на серверах IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Пароль"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9365,7 +9723,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Не удается переименовать папку %s в %s: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Не удается переименовать \"%s\": %s"
@@ -9480,29 +9838,29 @@ msgstr "Проверка новых сообщений"
 msgid "Storing folder"
 msgstr "Сохранение папки"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Не удается заблокировать папку %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Не удается открыть почтовый ящик: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "Добавление почты отменено"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Не удается добавить сообщение к файлу mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9511,11 +9869,11 @@ msgstr ""
 "Не удается получить сообщение: %s из папки %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Видимо, папка невостановимо испорчена."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Сбой при создании сообщения: почтовый ящик поврежден?"
 
@@ -9583,12 +9941,17 @@ msgstr "Не удается создать каталог %s: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "Не удается получить папку: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "Идентификатор карточки уже существует"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Не удается переименовать папку %s в %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Указанное имя папки не допустимо: %s"
@@ -9632,7 +9995,7 @@ msgstr "Не удается закрыть исходную папку %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Не удается закрыть временную папку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Не удается переименовать папку: %s"
@@ -9920,7 +10283,7 @@ msgstr "Удалять через %s дней"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -10010,7 +10373,7 @@ msgid "No such folder `%s'."
 msgstr "Нет такой папки \"%s\""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10062,7 +10425,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Доставка почты через программу sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10232,7 +10595,7 @@ msgstr "Доставка SMTP почты через %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Не удается отправить сообщение: неверный адрес отправителя."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Отправка сообщения"
 
@@ -10356,7 +10719,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "вложение"
 
@@ -10400,14 +10763,14 @@ msgstr "Тип MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Предполагать автоматическое отображение вложения"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Вы должны настроить пользователя\n"
 "до того, как сможете отправлять почту."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Щёлкните здесь, чтобы создать адресную книгу"
 
@@ -10418,45 +10781,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Обратный адрес:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "От:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Тема:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Кому:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Перечислите получателей сообщения"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Копия:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Введите адреса, получающие копию сообщения"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Скр.копия:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10467,14 +10830,19 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Отправить на:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr "Назначение:"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Вложить файл в сообщение"
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Вложить файл(ы)"
@@ -10509,21 +10877,21 @@ msgstr "Файл существует, перезаписать?"
 msgid "Error saving file: %s"
 msgstr "Ошибка сохранения файла: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Ошибка при загрузке файла: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Ошибка доступа к файлу: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Не удается получить сообщение из редактора"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10532,7 +10900,7 @@ msgstr ""
 "Не удается переместиться по файлу: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10541,7 +10909,7 @@ msgstr ""
 "Не удается обрезать файл: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10550,7 +10918,7 @@ msgstr ""
 "Не удается переместиться по файлу: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10559,7 +10927,7 @@ msgstr ""
 "Ошибка при автосохранении сообщения: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10567,7 +10935,7 @@ msgstr ""
 "Обнаружены несохранённые файлы предыдущей сессии.\n"
 "Произвести попытку восстановления?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10578,28 +10946,28 @@ msgstr ""
 "\n"
 "Сохранить изменения?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Внимание: Изменено сообщение"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Открыть файл"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "Подпись:"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "Создана автоматически"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Новое сообщение"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10607,7 +10975,7 @@ msgstr ""
 "Не удается создать окно редактора:\n"
 "Не удается активировать управляющий элемент выбора адреса."
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10619,7 +10987,7 @@ msgstr ""
 "Убедитесь, что у вас установлены необходимые\n"
 "версии пакетов gtkhtml и libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10627,7 +10995,7 @@ msgstr ""
 "Не удается создать окно редактора:\n"
 "Не удается активировать компонент редактора HTML."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10636,11 +11004,13 @@ msgstr ""
 "корректироваться.)<b>"
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Набор приложений групповой работы Evolution"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10886,13 +11256,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11016,7 +11386,7 @@ msgstr "Тогда"
 msgid "You must specify a folder."
 msgstr "Необходимо указать папку."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Выбрать папку"
@@ -11030,24 +11400,24 @@ msgstr ""
 "Ошибка в регулярном выражении \"%s\":\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Важное"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "Выполнить"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Позже"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Проверка"
 
@@ -11147,7 +11517,7 @@ msgstr "назад"
 msgid "months"
 msgstr "месяцы"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "секунд"
 
@@ -11244,7 +11614,7 @@ msgstr "Выражение"
 msgid "Follow Up"
 msgstr "К исполнению"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "Надпись"
 
@@ -11314,112 +11684,118 @@ msgid "Source Account"
 msgstr "Исходная учетная запись"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Брызги дождя"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Специфичный заголовок"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Остановить обработку"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Тема"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "Снять состояние"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "содержит"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "не содержит"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "не заканчивается на"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "не существует."
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "does not return"
 msgstr "не возвращает"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "звучит не как"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "не начинается с"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "заканчивается на"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "cуществуют"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr "отмечено"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr "после"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "is before"
 msgstr "до"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "больше чем"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "меньше чем"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr "не отмечено"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "не является"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "является"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr "возвращает больше чем"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr "возвращает меньше чем"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr "возвращает"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "звучит как"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "начинается с"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, fuzzy, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Имя правила \"%s\" не уникально, выберите другое"
@@ -11445,20 +11821,88 @@ msgstr "Имя фильтра: "
 msgid "Score Rules"
 msgstr "Правила назначения весов"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Укажите имя этой виртуальной папки."
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 #, fuzzy
 msgid "You need to to specify at least one folder as a source."
 msgstr "Необходимо указать хотя бы одну папку в качестве источника."
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 #, fuzzy
 msgid "VFolder source"
 msgstr "Источники виртуальных папок"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Настройка редактора"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Тут настраиваются параметры почты, включая безопасность и отображение "
+"сообщений"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Тут настраиваются проверка правописания, подписи и создание сообщений"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Настройте тут учётные записи почты"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Редактор учётных записей Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Компонент редактора писем Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Компонент редактора писем Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Компонент редактора писем Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Компонент отображения почтовой папки программы Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Компонент Executive Summary программы Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Почта"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Учётные записи"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "Настройка почты"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Вы действительно хотите удалить эту учётную запись?"
@@ -11500,7 +11944,7 @@ msgid "Protocol"
 msgstr "Протокол"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr "Без названия"
 
@@ -11527,20 +11971,17 @@ msgstr "Добавить подпись скрипта"
 msgid "Signature(s)"
 msgstr "_Подписи"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "Вы посылаете сообщение в формате HTML, но следующие получатели\n"
 "не хотят получать почту в формате HTML:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Всё же отправить?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11548,7 +11989,7 @@ msgstr ""
 "Это сообщение не имеет темы.\n"
 "Отправить его?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11556,11 +11997,11 @@ msgstr ""
 "Так как список получателей сконфигурирован на сокрытие адресов из списка, "
 "это сообщение будет содержать только получателей скрытой копии."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Это сообщение содержит только получателей скрытой копии."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11570,11 +12011,11 @@ msgstr ""
 "добавления Apparently-To заголовка.\n"
 "Всё равно отправить?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Вы должны указать получателей, чтобы отправить это сообщение."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11586,189 +12027,405 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Создать _виртуальную папку результатов поиска..."
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "Почта"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<щёлкните здесь, чтобы выбрать папку>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" в \"%s\""
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Создать новую папку"
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Указать где создать папку:"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
-msgid "Folder _name"
+msgid "Folder _name:"
 msgstr "Имя папки:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Не удается создать временный каталог: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Не удается создать временный каталог: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Не удается создать временный файл '%s': %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Не удается закрыть временную папку: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Загрузка..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Выбрать папку"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Создать новую папку"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Не удается удалить папку \"%s\": %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Действительно удалить папку \"%s\"?"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Удалить \"%s\""
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Переименовать папку \"%s\" в:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+#, fuzzy
+msgid "Rename Folder"
+msgstr "Переименовать папку"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Свойства шрифтов"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Свойства"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "Имя _папки:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Вид"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Открыть в новом окне"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Переместить"
+
+#: mail/em-folder-tree.c:1500
+msgid "_New Folder..."
+msgstr "_Создать папку..."
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "Переименовать"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "Свойства..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "Править как новое сообщение..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "Напечатать"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "Ответить отправителю"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Ответить в список"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Ответить всем"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "Пе_реслать"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr "Последовать вверх"
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr "Выполнен флаг"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "Очистить флаг"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "По_метить как прочитанные"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "Пометит_ь как непрочитанные"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Пометить как важное"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "Пометить как неважное"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Пометит_ь как непрочитанные"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Пометить как важное"
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "Восстановить"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "Переместить в папку..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "С_копировать в папку..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "Доб_авить отправителя в адресную книгу"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "Применить _фильтры"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "Создать правило из сообщения"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "Виртуальная папка по теме"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "Виртуальная папка по отправителю"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "Виртуальная папка по получателю"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "Виртуальная папка по списку рассылки"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "Виртуальная папка по отправителю"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Фильтр по теме"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Фильтр по отправителю"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Фильтр по получателям"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Фильтр по списку рассылки"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Фильтр по отправителю"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "По умолчанию"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Напечатать сообщение"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Скопировать ссылку"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Совпадения:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Назначено"
+
+#: mail/em-format-html-display.c:597
+#, fuzzy
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr ""
+"Это сообщение подписано цифровой подписью, но его аутентичность не может "
+"быть подтверждена."
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Редактирование подписи"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Редактирование подписи"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+#, fuzzy
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
 msgstr ""
-"Это сообщение подписано цифровой подписью. Для получения дополнительной "
-"информации нажмите на изображение замка."
+"input_token содержит неверную подпись, или подпись, которая не может быть "
+"проверена."
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Прервано"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "Зашифровать с помощью PGP"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Не удается разобрать сообщение MIME. Отображается как есть."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Неподдерживаемая схема"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Не удается проверить листовую подпись"
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Встроенный просмотр"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Скрыть"
@@ -11778,186 +12435,209 @@ msgstr "Скрыть"
 msgid "Page %d of %d"
 msgstr "Страница %d из %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Получение сообщения %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Часть external-body неверно сформирована"
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Указатель на FTP сайт (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Указатель на локальный файл (%s), доступный на сайте \"%s\""
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Указатель на локальный файл (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Указатель на удалённые данные (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Указатель на неизвестные внешние данные (типа \"%s\")"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-"Это сообщение подписано цифровой подписью, но его аутентичность не может "
-"быть подтверждена."
-
-#: mail/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-"Это сообщение подписано цифровой подписью и его аутентичность подтверждена."
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-msgid "No signature present"
-msgstr ""
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Не удается инициализировать Bonobo"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Неподдерживаемая схема"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Не удается разобрать сообщение MIME. Отображается как есть."
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Перемещение сообщений"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "От"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Обратный адрес"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Кому"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Копия"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Скр.копия:"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "Почтовый клиент"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Дата"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "вложение %s"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Не удается разобрать сообщение MIME. Отображается как есть."
+msgid "Session not initialised"
+msgstr "Не удается инициализировать Bonobo"
 
-#: mail/em-popup.c:593
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+"Это сообщение подписано цифровой подписью и его аутентичность подтверждена."
+
+#: mail/em-format.c:1212
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"Это сообщение подписано цифровой подписью, но его аутентичность не может "
+"быть подтверждена."
+
+#: mail/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Ожидание..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Ping на %s"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Сбой при кэшировании %s: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Сбой при создании канала к \"%s\": %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Ошибка при определении узла '%s': %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Сохранить как..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Ответить отправителю"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Открыть ссылку в браузере"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Отправить сообщение в список..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Добавить отправителя в адресную книгу"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Открыть в %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "Этот сервер не поддерживает информацию LDAPv3 schema"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Подписаться"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "П_апка"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Пожалуйста, выберите сервер."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Не был выбран сервер"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Не показывать это сообщение снова."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11966,27 +12646,27 @@ msgstr ""
 "Ошибка при загрузке информации фильтра:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Настройки фильтров"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Пересланное сообщение"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "неизвестный отправитель"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "В %a, %d.%m.%Y, в %H:%M, %%s пишет:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -11995,7 +12675,7 @@ msgstr ""
 "Не удается получить сообщение: %s\n"
 "  %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12004,26 +12684,39 @@ msgstr ""
 "Файл %s уже существует.\n"
 "Перезаписать его?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Сообщение"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Сохранить сообщение как..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Не удается создать временный каталог: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Адрес"
+
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
+msgid ""
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Эта операция уничтожит все сообщения, помеченные как удалённые. Если вы "
+"продолжите, вы не сможете больше восстановить эти сообщения.\n"
+"\n"
+"Уничтожить эти сообщения?"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2288
 #, fuzzy
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12032,105 +12725,389 @@ msgstr ""
 "\n"
 "Уничтожить эти сообщения?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Настройка редактора"
+#: mail/evolution-mail.schemas.in.in.h:1
+#, fuzzy
+msgid "Automatic link recognition"
+msgstr "Автоматически _распознавать гиперссылки"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "Автоматически _распознавать гиперссылки"
+
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
 msgstr ""
-"Тут настраиваются параметры почты, включая безопасность и отображение "
-"сообщений"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Тут настраиваются проверка правописания, подписи и создание сообщений"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Настройте тут учётные записи почты"
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/evolution-mail.schemas.in.in.h:6
 #, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
+msgid "Default charset in which to compose messages"
+msgstr "Тема сообщения по умолчанию."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:7
 #, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Редактор учётных записей Evolution"
+msgid "Default charset in which to compose messages."
+msgstr "Тема сообщения по умолчанию."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
-msgid "Evolution Mail component"
-msgstr "Компонент редактора писем Evolution."
+msgid "Default charset in which to display messages"
+msgstr "Поиск в тексте отображаемого сообщения"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Компонент редактора писем Evolution."
+msgid "Default charset in which to display messages."
+msgstr "Поиск в тексте отображаемого сообщения"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Компонент редактора писем Evolution."
+msgid "Default forward style"
+msgstr "Стиль _пересылки:"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Компонент отображения почтовой папки программы Evolution."
+msgid "Default reply style"
+msgstr "Стиль _ответа:"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Компонент Executive Summary программы Evolution."
+msgid "Empty Trash folders on exit"
+msgstr "_Очищать корзину при выходе"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "_Очищать корзину при выходе"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "Учётные записи"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "Настройка почты"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
 
-#: mail/importers/elm-importer.c:105
-msgid "Evolution is importing your old Elm mail"
-msgstr "Импорт вашей почты из Elm"
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
-msgid "Importing..."
-msgstr "Импорт..."
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
-msgid "Please wait"
-msgstr "Подождите пожалуйста"
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Импорт %s в качестве %s"
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
 
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Сканирование %s"
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "Выполнить действия"
 
-#: mail/importers/elm-importer.c:547
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Уведомление о новой почте"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Уведомление о новой почте"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
-"Обнаружены почтовые файлы Elm.\n"
-"Хотите импортировать их в Evolution?"
 
-#: mail/importers/elm-importer.c:568
-msgid "Elm"
-msgstr "Elm"
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+"_Предупреждать при отправке сообщений в формате HTML тем, кто не желает этого"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr ""
+"Пр_едупреждать при отправке сообщений, в которых определены только "
+"получатели скрытой копии."
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "Отправлять почту в формате HTML?"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "Отправлять почту в формате HTML?"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "_Показывать анимированные изображения "
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "_Показывать анимированные изображения "
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Показывать сообщение в обычном стиле"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "Панель предварительного просмотра"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "_Воспроизводить звуковой файл при приходе новой почты"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "Проверка _орфографии"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "Шрифт _терминала:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "Выберите шрифт HTML переменной ширины для печати"
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Показывать подшитые по теме сообщения в списке сообщений"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Показывать подшитые по теме сообщения в списке сообщений"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "_Сделать основной учётной записью"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "_Переменной ширины:"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 #, fuzzy
@@ -12164,6 +13141,44 @@ msgstr ""
 msgid "Evolution Pine importer"
 msgstr "Компонент редактора писем Evolution."
 
+#: mail/importers/elm-importer.c:105
+msgid "Evolution is importing your old Elm mail"
+msgstr "Импорт вашей почты из Elm"
+
+#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
+#: mail/importers/pine-importer.c:115
+msgid "Importing..."
+msgstr "Импорт..."
+
+#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
+#: mail/importers/pine-importer.c:117
+msgid "Please wait"
+msgstr "Подождите пожалуйста"
+
+#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
+#: mail/importers/pine-importer.c:288
+#, c-format
+msgid "Importing %s as %s"
+msgstr "Импорт %s в качестве %s"
+
+#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
+#: mail/importers/pine-importer.c:425
+#, c-format
+msgid "Scanning %s"
+msgstr "Сканирование %s"
+
+#: mail/importers/elm-importer.c:547
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Обнаружены почтовые файлы Elm.\n"
+"Хотите импортировать их в Evolution?"
+
+#: mail/importers/elm-importer.c:568
+msgid "Elm"
+msgstr "Elm"
+
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -12223,12 +13238,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Импорт информации из Netscape"
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Корзина"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Сканирование почтовых фильтров"
@@ -12237,7 +13246,7 @@ msgstr "Сканирование почтовых фильтров"
 msgid "Scanning directory"
 msgstr "Сканирование каталога"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Начало импортирования"
 
@@ -12312,23 +13321,23 @@ msgid "You have not filled in all of the required information."
 msgstr "Вы не ввели всю необходимую информацию."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Редактор учётных записей Evolution"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "Сервер:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "_Имя пользователя:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "Путь:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Вы не можете создать две учётные записи с одинаковым именем."
 
@@ -12337,35 +13346,35 @@ msgstr "Вы не можете создать две учётные записи
 msgid "Mail to %s"
 msgstr "Почта к %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Тема %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Почта от %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "список рассылки %s"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "В ответ на"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Добавить правило фильтра"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "Следующие правила фильтра(ов):\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12376,144 +13385,30 @@ msgstr ""
 "    '%s'\n"
 "И были обновлены."
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "Устанавливается соединение..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Эта папка не может содержать сообщения."
-
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Не удается открыть общую папку: %s."
-
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Не удается создать временный каталог: %s"
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Новое почтовое сообщение"
 
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Не удается создать временный файл '%s': %s"
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "Почтовое сообщение..."
 
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Не удается закрыть временную папку: %s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "Создать новое сообщение"
 
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Выберите папку назначения для импорта этих данных"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Выберите папку назначения для импорта этих данных"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Создать новую папку"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Указать где создать папку:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Не удается удалить папку \"%s\": %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Действительно удалить папку \"%s\"?"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Удалить \"%s\""
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Переименовать папку \"%s\" в:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-#, fuzzy
-msgid "Rename Folder"
-msgstr "Переименовать папку"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Указанное имя папки не допустимо: %s"
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Свойства шрифтов"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Свойства"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "Имя _папки:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Вид"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Открыть в новом окне"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Переместить"
-
-#: mail/mail-component.c:2087
-msgid "_New Folder..."
-msgstr "_Создать папку..."
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "Переименовать"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "Свойства..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Подлинность"
 
@@ -12575,11 +13470,11 @@ msgstr ""
 "учётной записи в строке ниже. Это имя будет использовано только для "
 "отображения."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Проверка сервиса"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Подключение к серверу..."
 
@@ -12661,26 +13556,35 @@ msgid "C_olors"
 msgstr "_Цвета"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Проверка новой почты"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "Проверять орфографию в процессе ввода _текста"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Проверка новой почты"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "Цвет для ошибочных слов:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Создание сообщений"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Настройка"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -12697,133 +13601,138 @@ msgstr ""
 "\n"
 "Нажмите \"Завершить\", чтобы сохранить ваши настройки."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "Сделать основной"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Поведение по умолчанию"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "_Кодировка символов по умолчанию:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Удаление почты"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Всегда подписывать сообщения, когда используется эта учётная запись"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "Не цитировать исходное сообщение"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Не подписывать приглашения (для совместимости с Outlook)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Готово"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "Папка _черновиков:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "_Включить"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "Учётные записи электронной почты"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "_Электронная почта:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "_Очищать корзину при выходе"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "ID _сертификата:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Помощник по учётным записям Evolution"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Выполнить команду..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "Фиксированная ширина:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "Настройки фильтров"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "Свойства шрифтов"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "Форматировать сообщения в _HTML"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "Выделять _цитирование:"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Встроенное"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Ярлыки и цвета"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Загрузка изображений"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Настройка почты"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Расположение почтового ящика"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Составление сообщения"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Отображение сообщений"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 msgid "Message Fonts"
 msgstr "Шрифты сообщений"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Уведомление о новой почте"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -12831,142 +13740,142 @@ msgstr ""
 "Примечание: вам не будет предложено ввести пароль до первого подключения к "
 "серверу"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Дополнительная информация"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "О_рганизация:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "Идентификатор ключа PGP/GPG:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Выбрать цвет"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Пр_едупреждать при отправке сообщений, в которых определены только "
 "получатели скрытой копии."
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Шрифты для печати"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Почтовый каталог Qmail "
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "Цитировать исходное сообщение"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Процитировано"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "Запомнить этот пароль"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "_Обратный адрес:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Получение почты"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "П_араметры получения"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "Запомнить этот _пароль"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Необходимая информация"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "Восстановить значения по умолчанию"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "_Безопасность"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "Безопасный MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr "Выберите шрифт HTML фиксированной ширины"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr "Выберите шрифт HTML фиксированной ширины для печати"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr "Выберите шрифт HTML переменной ширины"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr "Выберите шрифт HTML переменной ширины для печати"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Отправка эл.почты"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Папка отправленных сообщений:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Отправленные сообщения и черновики"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Т_ребуется проверка подлинности"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Настройка сервера"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Тип сервера:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Самоподписанный сертификат в цепочке"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "Имя _файла:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "Проверка _орфографии"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Стандартный файл Unix mbox"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12976,7 +13885,7 @@ msgstr ""
 "в качестве вашей подписи. Имя, указанное вами,\n"
 "будет использоваться только для отображения. "
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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 "
@@ -12986,7 +13895,7 @@ msgstr ""
 "орфографии. В списке языков отображены те, для которых у вас установлены "
 "словари."
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12994,11 +13903,15 @@ msgstr ""
 "Укажите имя, используемое для дальнейших обращений к этой \n"
 "учетной записи. Например, \"Служебная\" или \"Личная\""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "_Переменной ширины:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -13009,170 +13922,179 @@ msgstr ""
 "\n"
 "Нажмите \"Далее\" для начала."
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "Добавить подпись"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "Всегда загружать изображения"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Всегда подписывать сообщения, когда используется эта учётная запись"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "_Тип проверки подлинности: "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "_Тип проверки подлинности: "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr "_Автоматически проверять новую почту каждые"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "_Автоматически вставлять изображение эмоций"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "_Звуковой сигнал при приходе новой почты"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "_Запрашивать подтверждение очистки папки от удаленных сообщений"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "Подпись по _умолчанию:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "По _умолчанию"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Не уведомлять о приходе новой почты"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "_Включить"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "Стиль _пересылки:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "_Полное имя:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "Почта _HTML"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "_Идентификация"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Июнь"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "Загружать изображения, если отправитель есть в адресной книге"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "_Сделать основной учётной записью"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "По_мечать сообщения как \"Прочитанные\" через:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Имя:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "Никогда не загружать изображения"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "_Воспроизводить звуковой файл при приходе новой почты"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "_Предупреждать при отправке сообщений в формате HTML тем, кто не желает этого"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Предупреждать при отправке сообщений с пустой темой"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "_Получение почты"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "Стиль _ответа:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "Восстановить настройки по умолчанию"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Скрипт:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Удалить..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "_Отправка почты"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "_Показывать анимированные изображения "
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Подписи"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr "_Стандартный шрифт:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr "Шрифт _терминала:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "Использовать _защищенное соединение (SSL)"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr "_Использовать такие же шрифты, как и прочие приложения"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "описание"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping на %s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13181,7 +14103,7 @@ msgstr ""
 "Ошибка при \"%s\":\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13190,7 +14112,7 @@ msgstr ""
 "Ошибка при выполнении операции:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Обработка"
 
@@ -13202,118 +14124,118 @@ msgstr "Фильтрация папки"
 msgid "Fetching Mail"
 msgstr "Получение эл.почты"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Сбой при сохранении почты во временном файле %s: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Сбой при сохранении почты во временном файле %s: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Отправка \"%s\""
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Отправка сообщения %d из %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Сбой на сообщении %d из %d"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Выполнено."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Сохранение сообщения в папке"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Перемещение сообщений в %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копирование сообщений в %s"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканирование папок на \"%s\""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Пересланные сообщения"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Открытие папки \"%s\""
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "Открытие хранилища %s"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Удаление папки \"%s\""
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Сохранение папки \"%s\""
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Обновление папки"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Очистка папки"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Импорт %s в качестве %s"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Локальные папки"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Получение сообщения %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Получение %d сообщений"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Сохранение %d сообщений"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13322,7 +14244,7 @@ msgstr ""
 "Не удается создать файл вывода: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13331,11 +14253,11 @@ msgstr ""
 "Ошибка сохранения сообщений в: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Сохранение вложения"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13344,21 +14266,25 @@ msgstr ""
 "Не удается создать файл вывода: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Не удается записать данные: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Отключение от %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Переподключение к %s"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Учитывать регистр"
@@ -13375,60 +14301,75 @@ msgstr "Поиск:"
 msgid "Search"
 msgstr "Найти"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Редактирование подписи"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Исключения"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Информация об учётной записи"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Отмена..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Сервер: %s, Тип: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Путь: %s, Тип: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Получение и отправка почты"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Отменить все"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Обновление..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Ожидание..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Операция отменена пользователем."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Введите пароль для %s"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Ввод пароля"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "_Запомнить этот пароль"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Запомнить этот пароль до завершения этого сеанса"
 
@@ -13467,26 +14408,31 @@ msgstr "Введите имя для этой подписи."
 msgid "Name:"
 msgstr "Имя:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Пересланное сообщение - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Пересланные сообщения"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Открытие папки \"%s\""
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Настройка виртуальной папки: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Обновление виртуальных папок для uri: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13499,88 +14445,88 @@ msgstr ""
 "    '%s'\n"
 "и была обновлена."
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "vFolders"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Править виртуальную папку"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Попытка редактирования несуществующей виртуальной папки \"%s\"."
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Новая виртуальная папка"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Непрочитано"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Прочитано"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Отвечено"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Множество непрочитанных сообщений"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Множество сообщений"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Самый низкий"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Низкий"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Высокий"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Самый высокий"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Сегодня %I:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Вчера %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Создание списка сообщений"
 
@@ -13636,11 +14582,11 @@ msgstr "Переслать"
 msgid "No Response Necessary"
 msgstr "Можно не отвечать"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Ответить"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Ответить всем"
 
@@ -13695,41 +14641,143 @@ msgstr "Подписаться"
 msgid "_Unsubscribe"
 msgstr "Отказаться от подписки"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+"Здесь можно настроить поведение специальных папок и папок для автономной "
+"работы"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Оболочка Evolution."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Параметры папок"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "80%"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Переименовать эту группу ярлыков"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Переключить отображение панели папок"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Скрыть панель ярлыков"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Приоритет по умолчанию:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Приоритет по умолчанию:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Интерфейс настройки почты"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+#, fuzzy
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+"Пометить вложение, чтобы оно отображалось в теле сообщения по умолчанию."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
 msgstr ""
-"Не удается переместить папку:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Добавить папку"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Черновики"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Входящие"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Исходящие"
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "Открытие папки заданий по умолчанию"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Открытие папки заданий по умолчанию"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Открытие папки заданий по умолчанию"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Отправленные"
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Открытие папки заданий по умолчанию"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Переключить отображение панели папок"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Переключить отображение панели ярлыков"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "Электронная почта"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Не удается обновить файлы корректно"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13740,7 +14788,7 @@ msgstr ""
 "%s\n"
 "Ошибка: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13749,7 +14797,7 @@ msgstr ""
 "При копировании файлов в \"%s\"\n"
 "возникла ошибка."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13760,7 +14808,7 @@ msgstr ""
 "Пожалуйста, переместите его, чтобы позволить\n"
 "установить файлы пользователя Evolution."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13860,10 +14908,11 @@ msgstr ""
 "Не удается удалить папку:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+msgid "The specified folder name is not valid: %s"
+msgstr "Указанное имя папки не допустимо: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -13887,19 +14936,15 @@ msgstr ""
 "Не удается создать указанную папку:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Создать новую папку"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Без заголовка)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Выберите тип импортёра для запуска:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13913,11 +14958,11 @@ msgstr ""
 "Вы можете выбрать \"Автоматический\" если вы не знаете его, а Evolution "
 "попытается распознать его самостоятельно."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Пожалуйста, укажите, какую информацию вы хотите импортировать:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13925,7 +14970,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13934,21 +14979,21 @@ msgstr ""
 "Импорт %s\n"
 "Импорт элемента %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "Выбрать импортер"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "Файл \"%s\" не существует."
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Ошибка Evolution"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -13957,11 +15002,11 @@ msgstr ""
 "Нет импортера, способного обработать\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Импорт"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -13970,17 +15015,17 @@ msgstr ""
 "Импорт %s.\n"
 "Начато %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Ошибка при загрузке %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Ошибка при загрузке %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13989,35 +15034,35 @@ msgstr ""
 "Импорт %s\n"
 "Импорт элемента 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Автоматическое"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Имя файла:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Выбрать файл"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Тип файла:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Импорт данных и настроек из старых программ"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Импорт одного файла"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -14025,47 +15070,28 @@ msgstr ""
 "Пожалуйста подождите...\n"
 "Сканирование существующих настроек"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Запуск интеллектуального импортёра"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "Из %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Выберите папку назначения для импорта этих данных"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Импорт"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Закрытие соединений..."
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Ошибка синхронизации \"%s\":\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "Синхронизация папки"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Синхронизация \"%s\" (%d из %d) ..."
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Параметры Evolution"
@@ -14101,7 +15127,7 @@ msgstr "Не удается открыть общую папку: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Не удается найти указанную общую папку."
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14110,17 +15136,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Помощник"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Создать"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Не указано имя папки."
@@ -14181,64 +15201,51 @@ msgstr "Создать новый ярлык"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Выберите папку, на которую ярлык будет указывать:"
 
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "Перейти в сетевой режим"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "Ав_тономная работа"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Перейти в режим работы вне сети"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Папки не показаны)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(нет)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution сейчас в сетевом режиме работы. Нажмите на эту кнопку для "
 "перехода в режим работы вне сети."
 
-#: shell/e-shell-view.c:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution в процессе перехода в режим работы вне сети."
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution сейчас в автономном режиме работы. Нажмите на эту кнопку "
 "для перехода в режим работы в сети."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Недопустимые аргументы"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Не удается зарегистрировать в OAF"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "База данных настроек не найдена"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Обычная ошибка"
 
@@ -14356,74 +15363,18 @@ msgstr "Удалить"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Удалить этот ярлык из панели ярлыков"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Ошибка сохранения ярлыков."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Входящие"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Ярлыки"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Нет ошибки"
-
-#: shell/e-storage.c:573
-msgid "A folder with the same name already exists"
-msgstr "Папка с таким именем уже существует"
-
-#: shell/e-storage.c:575
-msgid "The specified folder type is not valid"
-msgstr "Указанный тип папки не допустим"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "Ошибка ввода/вывода"
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr "Недостаточно места для создания папки"
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr "Папка не пуста"
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "Указанная папка не найдена"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "Функция не реализована для этого носителя"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "Операция не поддерживается"
-
-#: shell/e-storage.c:591
-msgid "The specified type is not supported in this storage"
-msgstr "Указанный тип не поддерживается для этого носителя"
-
-#: shell/e-storage.c:593
-msgid "The specified folder cannot be modified or removed"
-msgstr "Указанная папка не может быть изменена или удалена"
-
-#: shell/e-storage.c:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "Не удается сделать папку подпапкой собственной подпапки"
-
-#: shell/e-storage.c:597
-msgid "Cannot create a folder with that name"
-msgstr "Не удается создать папку с таким именем"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Это действие не может быть выполнено в автономном режиме"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Флажок"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14434,6 +15385,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% выполнено)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Создать"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "\"%s\" в \"%s\""
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14471,75 +15433,6 @@ msgstr ""
 "Ошибка системы активации:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "Ошибка CORBA"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Прервано"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Недопустимый аргумент"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Уже имеет владельца"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Нет владельца"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Не найдено"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Неподдерживаемый тип"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Неподдерживаемая схема"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Неподдерживаемая операция"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Внутренняя ошибка"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Существует"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "Недопустимый URI"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Имеет вложенные папки"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Нет места"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "Старый владелец завершил работу"
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Тип проверки"
-
-#: shell/evolution-test-component.c:703
-#, fuzzy
-msgid "Evolution Test Component"
-msgstr "Компонент редактора писем Evolution."
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "Active Connections"
@@ -14569,11 +15462,6 @@ msgstr "_Почта:"
 msgid "_Tasks:"
 msgstr "_Задачи:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-#, fuzzy
-msgid "Folder _name:"
-msgstr "Имя папки:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 #, fuzzy
 msgid "Folder _type:"
@@ -14639,25 +15527,6 @@ msgstr ""
 "\n"
 "Нажмите кнопку \"Готово\" для сохранения настроек. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-"Здесь можно настроить поведение специальных папок и папок для автономной "
-"работы"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Оболочка Evolution."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Параметры папок"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -14697,7 +15566,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Импортёры"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Импорт"
 
@@ -14713,16 +15582,16 @@ msgstr "Не задавать больше этот вопрос"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution может импортировать данные из следующих файлов:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Выход из Evolution..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14742,44 +15611,56 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:289
+#: shell/main.c:294
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Ximian Evolution"
 
-#: shell/main.c:297
+#: shell/main.c:302
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Не задавать больше этот вопрос"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Нет доступа к оболочке Ximian Evolution."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Не удается инициализировать оболочку Evolution: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Запуск в автономном режиме"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Запуск в режиме подключения к интернет"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Записывать отладочный вывод всех компонентов в файл."
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14788,31 +15669,60 @@ msgstr ""
 "%s: --online и --offline не могут использоваться одновременно.\n"
 "Используйте %s --help для получения более подробной информации.\n"
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Выбрать импортер"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "ID _сертификата:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "Продвижение"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Выражение"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Электронная почта:"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"Истек срок действия сертификата: %s\n"
+"Поставщик: %s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14870,91 +15780,376 @@ msgid "Backup All"
 msgstr "Блэкпул"
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "ID _сертификата:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Недоверительный сертификат"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "ID _сертификата:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Общее имя"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "ID _сертификата:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "_Правка"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Не удается проверить сертификаты."
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Выражение"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Организация"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Подразделение организации"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Вид"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "ID _сертификата:"
+
+#: smime/gui/smime-ui.glade.h:42
+#, fuzzy
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr "Некорректная авторизация сертификата (CA)"
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "ID _сертификата:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Импорт"
+msgid "Certificate already exists"
+msgstr "Идентификатор карточки уже существует"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d.%m.%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Вермонт"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Вермилион"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Вермилион"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Вермилион"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "С"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "Ок"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "С"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "ID _сертификата:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "ID _сертификата:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "Недоверительный сертификат"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "I"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Тема %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Не удается обработать папку спула"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "Некорректная авторизация сертификата (CA)"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Некорректная авторизация сертификата (CA)"
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Нет информации"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "вложение"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "ID _сертификата:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Куритиба"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "Северная Каролина"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Выражение"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s на %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Ошибка в подписи сертификата"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "_Вставить"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Тема %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Ошибка в подписи сертификата"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Введите пароль для %s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "ID _сертификата:"
 
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
@@ -15006,7 +16201,7 @@ msgstr "Скопировать выделение"
 msgid "Copy to Folder..."
 msgstr "Скопировать в папку..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Вырезать выделение"
 
@@ -15022,7 +16217,7 @@ msgstr "Переместить контакт(ы) в другую папку..."
 msgid "Move to Folder..."
 msgstr "Переместить в папку..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Вставить выделение"
 
@@ -15030,8 +16225,8 @@ msgstr "Вставить выделение"
 msgid "Previews the contacts to be printed"
 msgstr "Посмотреть на вид контактов на печати"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Пред_варительный просмотр"
@@ -15076,13 +16271,13 @@ msgstr "Остановить загрузку"
 msgid "View the current contact"
 msgstr "Просмотреть текущий контакт"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "_Действия"
 
@@ -15112,145 +16307,113 @@ msgstr "Отправить _сообщение к контакту..."
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "Создать новую ежедневную встречу"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Создать новую встречу"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "Создать новую папку"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Создать новое приглашение на собрание"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Создать новую задачу"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "День"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 #, fuzzy
 msgid "Delete All Occurrences"
 msgstr "Удалить все вхождения"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Удалить эту встречу"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "Удалить это вхождение"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "Удалить это вхождение"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Перейти к"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Перейти в прошлое"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Перейти в будущее"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Перейти к дате"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Перейти к указанной дате"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Перейти к сегодняшнему дню"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "Список"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Месяц"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Новая _встреча"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Новая Каледония"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Новое собрание"
-
-#: ui/evolution-calendar.xml.h:27
-#, fuzzy
-msgid "New _Task"
-msgstr "Новая задача"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Посмотреть на вид календаря на печати"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Напечатать этот календарь"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Опубликовать информацию о занятости для этого календаря"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Bourges"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Публичная папка, содержащая встречи и события"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Показывать подробности"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Показать 1 день"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Показать 1 месяц"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Показать 1 неделю"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Показать рабочую неделю"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Неделя"
 
@@ -15315,7 +16478,7 @@ msgstr "Сохранить этот элемент на диске"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Файл"
 
@@ -15536,7 +16699,7 @@ msgstr "Пометить все как прочитанное"
 msgid "Mark all visible messages as read"
 msgstr "Пометить все видимые сообщения как прочитанные"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "Вставить сообщения из буфера обмена"
 
@@ -15592,16 +16755,6 @@ msgstr "Обратить выделение"
 msgid "_Threaded Message List"
 msgstr "Показывать подшивки в списке сообщений"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Закрыть это окно"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "_Закрыть"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "_Добавить отправителя в адресную книгу"
@@ -15759,257 +16912,282 @@ msgstr "Переслать выбранное сообщение кому-либ
 msgid "Increase the text size"
 msgstr "Увеличить размер текста"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Загрузить изображения"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Пометить как важное"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Пометит_ь как непрочтенные"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Пометить как неважное"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "Пометить выбранные сообщения как уже прочитанные"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "Пометить выбранные сообщения как важные"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Пометить выбранные сообщения как неважные"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Пометить выбранные сообщения как ещё не прочитанные"
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Пометить выбранные сообщения как ещё не прочитанные"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Пометить выбранные сообщения как неважные"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Пометить выбранные сообщения для удаления"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Переместить"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "Переместить выбранные сообщения в другую папку"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "След."
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "Следующему важному сообщению"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "Следующей подшивке"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "Следующему непрочитанному сообщению"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Не найдено"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Отправить выбранное сообщение в новом окне"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Открыть выбранные сообщения в редакторе, чтобы вновь отправить их"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Исходный размер"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "Предыдущему непрочитанному сообщению"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Поместить ответ"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr "Поместить ответ на сообщение в публичной папке"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "Предыдущему важному сообщению"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Посмотреть вид сообщения на печати"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Пред."
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Напечатать это сообщение"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "Пе_ренаправить"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Переслать выбранное сообщение кому-либо от своего имени"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Установить размер текста в исходный"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "_Поиск сообщения..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "Меньше"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Сохранить сообщение в текстовом файле"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Поиск в тексте отображаемого сообщения"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr "Настроить параметры страницы для вашего текущего принтера"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Показывать как есть"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Показывать все заголовки"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Поиск в тексте отображаемого сообщения"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Показывать сообщение в обычном стиле"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Показывать сообщение со всеми заголовками"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Показывать полный исходный текст сообщения"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "Размер текста"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Восстановить выделенные сообщения"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "Виртуальную папку по списку рассылки..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "Виртуальную папку по отправителю..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "Виртуальную папку по получателям..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "Виртуальную папку по теме..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "Как _вложение"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "Скопировать в папку"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "Создать фильтр из сообщения"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "Переслать сообщение"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "Перейти к"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "Как вс_троенный текст"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "Больше"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "Отображение сообщения"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "Переместить в папку"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "Следующему сообщению"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "Нормальное отображение"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "_Открыть сообщение"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "Предыдущему сообщению"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "Как _цитирование"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "_Переслать..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "С_ервис"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "Восстановить"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Закрыть это окно"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "_Закрыть"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Вложить"
@@ -16288,12 +17466,13 @@ msgid "Change Evolution's settings"
 msgstr "Изменить настройки Evolution"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "В_ыйти"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Создать новое приглашение на собрание"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "Окно Evolution"
+msgid "E_xit"
+msgstr "В_ыйти"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16305,61 +17484,74 @@ msgstr "Импортировать данные из других програм
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "Окно Evolution"
+msgid "Open a new window"
+msgstr "Открыть в новом окне"
 
 #: ui/evolution.xml.h:11
 msgid "Pi_lot Settings..."
 msgstr "Изменить настройки утилиты _Pilot..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Отправить/получить"
+
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr "Отправить элементы из очереди и получить новые элементы"
+
+#: ui/evolution.xml.h:14
 msgid "Set up Pilot configuration"
 msgstr "Настроить утилиту Pilot"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Показать информацию о программе Ximian Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Отправить сообщение об ошибке"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "Отправить сообщение об оши_бке"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Отправить сообщение об ошибке, используя программу \"Баг Бадди\""
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Переключить"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Переключить работу в/вне сети."
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "Часто задаваемые вопросы по Evolution"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "_О программе Ximian Evolution..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "_Справка"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "_Импортировать..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Создать"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Получить и отправить"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "_Найти"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Напечатать Сводку"
@@ -16491,12 +17683,12 @@ msgstr "Режимы просмотра..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "ПВСЧПСВ"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -16629,7 +17821,7 @@ msgstr "П_оиск"
 msgid "_Find Now"
 msgstr "_Найти"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "О_чистить"
 
@@ -16646,24 +17838,261 @@ msgstr ""
 msgid "Text"
 msgstr "Проверка"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Очистить"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Найти"
 
+#~ msgid "Account Name"
+#~ msgstr "Имя учетной записи"
+
+#~ msgid "Server Name"
+#~ msgstr "Имя сервера"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "В этой сборке Evolution LDAP не поддерживается"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Другие контакты"
+
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "Настройте здесь доступ к серверу каталогов LDAP"
+
+#~ msgid "Directory Servers"
+#~ msgstr "Серверы каталогов"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Отменить текущую почтовую операцию"
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Интерфейс выбора имени в адресной книге Evolution."
+
+#~ msgid "Add LDAP Server"
+#~ msgstr "Добавить сервер LDAP"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Шаг 4: Отображаемое имя"
+
+#~ msgid "Find contact in"
+#~ msgstr "Найти контакт в"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Щёлкните здесь, чтобы добавить контакт *"
+
+#~ msgid "Business Address"
+#~ msgstr "Служебный адрес"
+
+#~ msgid "Department"
+#~ msgstr "Отдел"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "URL занятости"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Профессия"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Открытие задач %s"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Всё же отправить?"
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Имя поля"
+#~ msgid "Folder _name"
+#~ msgstr "Имя папки:"
 
-#~ msgid "Family Name"
-#~ msgstr "Фамилия"
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "Это сообщение подписано цифровой подписью. Для получения дополнительной "
+#~ "информации нажмите на изображение замка."
+
+#~ msgid "Connecting..."
+#~ msgstr "Устанавливается соединение..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Эта папка не может содержать сообщения."
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Не удается открыть общую папку: %s."
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Выберите папку назначения для импорта этих данных"
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не удается переместить папку:\n"
+#~ "%s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "Добавить папку"
+
+#~ msgid "Drafts"
+#~ msgstr "Черновики"
+
+#~ msgid "Outbox"
+#~ msgstr "Исходящие"
+
+#~ msgid "Sent"
+#~ msgstr "Отправленные"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ошибка синхронизации \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "Синхронизация папки"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Синхронизация \"%s\" (%d из %d) ..."
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Папки не показаны)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(нет)"
+
+#~ msgid "No error"
+#~ msgstr "Нет ошибки"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Папка с таким именем уже существует"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Указанный тип папки не допустим"
+
+#~ msgid "I/O error"
+#~ msgstr "Ошибка ввода/вывода"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Недостаточно места для создания папки"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Папка не пуста"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Указанная папка не найдена"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Функция не реализована для этого носителя"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Операция не поддерживается"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Указанный тип не поддерживается для этого носителя"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Указанная папка не может быть изменена или удалена"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "Не удается сделать папку подпапкой собственной подпапки"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Не удается создать папку с таким именем"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Это действие не может быть выполнено в автономном режиме"
+
+#~ msgid "Checkbox"
+#~ msgstr "Флажок"
+
+#~ msgid "CORBA error"
+#~ msgstr "Ошибка CORBA"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Недопустимый аргумент"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Уже имеет владельца"
+
+#~ msgid "No owner"
+#~ msgstr "Нет владельца"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Неподдерживаемый тип"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Неподдерживаемая схема"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Неподдерживаемая операция"
+
+#~ msgid "Internal error"
+#~ msgstr "Внутренняя ошибка"
+
+#~ msgid "Exists"
+#~ msgstr "Существует"
+
+#~ msgid "Invalid URI"
+#~ msgstr "Недопустимый URI"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Имеет вложенные папки"
+
+#~ msgid "No space left"
+#~ msgstr "Нет места"
+
+#~ msgid "Old owner has died"
+#~ msgstr "Старый владелец завершил работу"
+
+#~ msgid "Test type"
+#~ msgstr "Тип проверки"
+
+#, fuzzy
+#~ msgid "Evolution Test Component"
+#~ msgstr "Компонент редактора писем Evolution."
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "Импорт"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Создать новую ежедневную встречу"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Новая _встреча"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Новое собрание"
+
+#, fuzzy
+#~ msgid "New _Task"
+#~ msgstr "Новая задача"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "Окно Evolution"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "Окно Evolution"
+
+#~ msgid "Toggle"
+#~ msgstr "Переключить"
+
+#~ msgid "Clear"
+#~ msgstr "Очистить"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Отменить текущую почтовую операцию"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -16757,9 +18186,6 @@ msgstr "Найти"
 #~ msgid "VCard (.vcf, .gcrd)"
 #~ msgstr "Данные VCard (.vcf, .grcd)"
 
-#~ msgid "Loading..."
-#~ msgstr "Загрузка..."
-
 #~ msgid "Searching..."
 #~ msgstr "Поиск..."
 
@@ -16811,10 +18237,6 @@ msgstr "Найти"
 #~ msgstr "EBook не загружена\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "Идентификатор карточки уже существует"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Операция отменена"
 
@@ -16965,9 +18387,6 @@ msgstr "Найти"
 #~ msgid "Callback"
 #~ msgstr "Обратный звонок"
 
-#~ msgid "Company"
-#~ msgstr "Компания"
-
 #~ msgid "Comp"
 #~ msgstr "Комп."
 
@@ -17034,9 +18453,6 @@ msgstr "Найти"
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#~ msgid "Phone"
-#~ msgstr "Телефон"
-
 #~ msgid "Birth date"
 #~ msgstr "Дата рождения"
 
@@ -17048,10 +18464,6 @@ msgstr "Найти"
 #~ msgstr "Амритсар"
 
 #, fuzzy
-#~ msgid "ID"
-#~ msgstr "I"
-
-#, fuzzy
 #~ msgid "Last Use"
 #~ msgstr "Вставить"
 
@@ -17065,9 +18477,6 @@ msgstr "Найти"
 #~ msgid "Folder containing contact information"
 #~ msgstr "Папка, содержащая контактную информацию"
 
-#~ msgid "LDAP Server"
-#~ msgstr "Сервер LDAP"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "Сервер LDAP, содержащий контактную информацию"
 
@@ -17077,18 +18486,6 @@ msgstr "Найти"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Публичная папка, содержащая контактную информацию"
 
-#~ msgid "_Contact"
-#~ msgstr "Контакт"
-
-#~ msgid "Create a new contact"
-#~ msgstr "Создание нового контакта"
-
-#~ msgid "New Contact List"
-#~ msgstr "Создать список контактов"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "Создание нового списка контактов"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "URI, отображаемый программой просмотра папок"
 
@@ -17102,9 +18499,6 @@ msgstr "Найти"
 #~ msgid "Card"
 #~ msgstr "Автомобиль"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "Нет карточек"
 
@@ -17151,30 +18545,6 @@ msgstr "Найти"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "Общая папка, содержащая элементы для выполнения"
 
-#~ msgid "New appointment"
-#~ msgstr "Новая встреча"
-
-#~ msgid "_Appointment"
-#~ msgstr "_Встреча"
-
-#~ msgid "New meeting"
-#~ msgstr "Новое собрание"
-
-#~ msgid "M_eeting"
-#~ msgstr "_Собрание"
-
-#~ msgid "New task"
-#~ msgstr "Новая задача"
-
-#~ msgid "_Task"
-#~ msgstr "_Задача"
-
-#~ msgid "New All Day Appointment"
-#~ msgstr "Новая ежедневная встреча"
-
-#~ msgid "All _Day Appointment"
-#~ msgstr "Еже_дневная встреча"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "Не удается обновить неверный объект"
 
@@ -17232,9 +18602,6 @@ msgstr "Найти"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "Открытие календаря %s"
 
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Открытие папки заданий по умолчанию"
-
 #~ msgid "Evaluation of the search expression did not yield a boolean value"
 #~ msgstr "Выполнение выражения поиска не выдало логического значения"
 
@@ -17272,10 +18639,6 @@ msgstr "Найти"
 #~ "Обнаружены файлы GnomeCard.\n"
 #~ "Хотите импортировать их в Evolution?"
 
-#, fuzzy
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Интерфейс настройки почты"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "Папка, содержащая почту"
 
@@ -17291,9 +18654,6 @@ msgstr "Найти"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Папка виртуальной мусорной корзины"
 
-#~ msgid "Properties..."
-#~ msgstr "Свойства..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Изменить свойства этой папки"
 
@@ -17303,15 +18663,6 @@ msgstr "Найти"
 #~ msgid "You have unsent messages, do you wish to quit anyway?"
 #~ msgstr "Имеются неотправленные сообщения! Вы хотите завершить работу?"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Новое почтовое сообщение"
-
-#~ msgid "_Mail Message"
-#~ msgstr "Почтовое сообщение..."
-
-#~ msgid "Compose a new mail message"
-#~ msgstr "Создать новое сообщение"
-
 #~ msgid "New Message Post"
 #~ msgstr "Отправка нового сообщения"
 
@@ -19119,9 +20470,6 @@ msgstr "Найти"
 #~ msgid "Cumberland"
 #~ msgstr "Камберленд"
 
-#~ msgid "Curitiba"
-#~ msgstr "Куритиба"
-
 #~ msgid "Curitiba Apt"
 #~ msgstr "Аэропорт Куритиба"
 
@@ -22113,9 +23461,6 @@ msgstr "Найти"
 #~ msgid "North Bend"
 #~ msgstr "North Bend"
 
-#~ msgid "North Carolina"
-#~ msgstr "Северная Каролина"
-
 #~ msgid "North Conway"
 #~ msgstr "Норт-Конуэй"
 
@@ -23727,9 +25072,6 @@ msgstr "Найти"
 #~ msgid "State College"
 #~ msgstr "State College"
 
-#~ msgid "Stauning"
-#~ msgstr "Stauning"
-
 #~ msgid "Staunton"
 #~ msgstr "Стоутон"
 
@@ -24318,9 +25660,6 @@ msgstr "Найти"
 #~ msgid "United Arab Emirates "
 #~ msgstr "Объединённые Арабские Эмираты"
 
-#~ msgid "Unst"
-#~ msgstr "Анст"
-
 #~ msgid "Upington"
 #~ msgstr "Upington"
 
@@ -24429,12 +25768,6 @@ msgstr "Найти"
 #~ msgid "Veracruz"
 #~ msgstr "Веракрус"
 
-#~ msgid "Vermillion"
-#~ msgstr "Вермилион"
-
-#~ msgid "Vermont"
-#~ msgstr "Вермонт"
-
 #~ msgid "Vernal"
 #~ msgstr "Vernal"
 
@@ -24967,9 +26300,6 @@ msgstr "Найти"
 #~ msgid " F"
 #~ msgstr " F"
 
-#~ msgid " C"
-#~ msgstr " C"
-
 #~ msgid "knots"
 #~ msgstr "узл (1.87 км/ч)"
 
@@ -25588,9 +26918,6 @@ msgstr "Найти"
 #~ msgid "Freezing haze"
 #~ msgstr "Пыльная мгла"
 
-#~ msgid "Spray"
-#~ msgstr "Брызги дождя"
-
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Брызги дождя"
 
@@ -25959,18 +27286,6 @@ msgstr "Найти"
 #~ "Удаление папки, добавленной с помощью \"Открыть папку другого пользователя"
 #~ "\""
 
-#~ msgid "Send / Receive"
-#~ msgstr "Отправить/получить"
-
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Отправить элементы из очереди и получить новые элементы"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Переключить отображение панели папок"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Переключить отображение панели ярлыков"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Показать выбранную папку"
 
@@ -25998,9 +27313,6 @@ msgstr "Найти"
 #~ msgid "_Rename..."
 #~ msgstr "Переи_меновать..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Получить и отправить"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "Панель _ярлыков"
 
@@ -26032,9 +27344,6 @@ msgstr "Найти"
 #~ msgid "Change Anyway"
 #~ msgstr "Изменить в любом случае"
 
-#~ msgid "Automatically _detect links"
-#~ msgstr "Автоматически _распознавать гиперссылки"
-
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 
diff --git a/po/sk.po b/po/sk.po
index b40b96fc0f..e04de9b454 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.evolution-1-4-branch.sk\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-09-26 13:48+0200\n"
 "Last-Translator: Stanislav Visnovsky <visnovsky@kde.org>\n"
 "Language-Team: Slovak <sk-i18n@linux.sk>\n"
@@ -34,51 +34,184 @@ msgstr "Nie je možné načítať %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Nie je možné prečítať blok aplikácie Adresa z pilota"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Priečinky automatického dopĺňania"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "ID _certifikátu:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Nastavenie emailových účtov"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Kontakty"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
+msgstr "Adresár Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address pop-up"
+msgstr "Okno adries adresára Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address viewer"
+msgstr "Prehliadač adries adresára Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook card viewer"
+msgstr "Prehliadač kariet adresára Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook component"
+msgstr "Komponent Adresár Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook folder viewer"
+msgstr "Prehliadač priečinku adresára Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Ovládací prvok nastavenia pošty Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Ovládací prvok pre priečinok nastavenia Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Adresár"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Vlastnosti..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Odstrániť"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "_Premenovať"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Nový kontakt:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "Vytvoriť nový kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Nový zoznam kontaktov"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "Nový zoznam kontaktov"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "Vytvoriť nový zoznam kontaktov"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Osobný"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Zamestnanie"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "LDAP Server"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Nie je možné vytvoriť priečinok %s: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "Nepodarilo sa pripojiť k serveru LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "Nepodarilo sa prihlásiť na IMAP serveri"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "Nepodarilo sa vykonať dotaz na koreňovom DSE"
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "Server odpovedal nepodporovanými databázami hľadania"
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Tento server nepodporuje informácie schém LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "Chyba pri načítavaní informácie zo schémy"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr "Server neodpovedal platnou informáciou o schéme"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Meno účtu"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Meno serveru"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP nie je v tejto verzii Evolution povolený"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Iné kontakty"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -86,7 +219,7 @@ msgstr ""
 "Nebolo možné otvoriť tento adresár. Prosím, overte, že cesta\n"
 "existuje a že máte dostatočné práva."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -95,7 +228,7 @@ msgstr ""
 "Nebolo možné otvoriť tento adresár. To buď znamená, že ste\n"
 "zadali neplatné URI, alebo LDAP server nefunguje."
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -106,7 +239,7 @@ msgstr ""
 "Ak chcete LDAP v Evolution používať, musíte ho prekompilovať\n"
 "z CVS po získaní OpenLDAP z tohto odkazu.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -119,44 +252,43 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Nie je možné otvoriť adresár"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "Používam server LDAP anonymne"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "Nepodarilo sa prihlásiť.\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sZadajte heslo pre %s (používateľ %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "Meno začína na"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "E-mail končí na"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Kategória je"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Ľubovoľné pole obsahuje"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Pokročilé..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -168,7 +300,7 @@ msgstr ""
 "dotaz alebo zvýšte obmedzenie v nastavení adresárového\n"
 "serveru pre tento adresár."
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -179,88 +311,41 @@ msgstr ""
 "alebo pre tento adresár. Prosím, upresnite hľadanie alebo zvýšte\n"
 "časový limit v nastavení adresárového serveru pre tento adresár."
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Podpora tohto adresára nedokázala spracovať tento dotaz."
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Podpora tohto adresára odmietla vykonať tento dotaz."
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "Tento dotaz nebol dokončený úspešne."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Ľubovoľná kategória"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "URI, ktoré bude kalendár zobrazovať"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "ID _certifikátu:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "Nastavenie prístupu k adresárovým serverom LDAP"
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Kontakty"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "Adresárové servery"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Adresár Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Rozhranie pre konfiguráciu LDAP adresára Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "Okno adries adresára Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "Prehliadač adries adresára Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Prehliadač kariet adresára Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr "Komponent Adresár Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook folder viewer"
-msgstr "Prehliadač priečinku adresára Evolution"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Ovládací prvok nastavenia pošty Evolution"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -283,6 +368,7 @@ msgstr "Zobraziť _podporované základy"
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -316,8 +402,9 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "Pridať LDAP Server"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "Asistent nastavenia LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -333,9 +420,9 @@ msgid "Anonymously"
 msgstr "Anonymne"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -345,47 +432,48 @@ msgstr ""
 "\n"
 "Prosím, stlačte \"Dokončiť\", aby sa nastavenie uložilo."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "Pripojenie"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "_Známe meno:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr "Upraviť LDAP Server"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
 msgstr "Emailová adresa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution použije tento DN pre prihlásenie na váš server"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr "Evolution použije túto e-mailovú adresu pre prihlásenie na váš server"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "Dokončené"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Všeobecné"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "Asistent nastavenia LDAP"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "Skupina"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Nikdy"
 
@@ -412,8 +500,8 @@ msgid "S_earch scope: "
 msgstr "_Rozsah hľadania:"
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Hľadám"
 
@@ -466,27 +554,31 @@ msgstr ""
 "pre hľadanie pomocou LDAP a pre vytváranie a úpravu kontaktov."
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 "Zadanie mena displeja je rýchly požadovaný krok v nastavení serveru LDAP."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "Krok 1. Informácie o serveri"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "Krok 2. Pripojenie k serveru"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "Krok 1. Informácie o serveri"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "Krok 3. Hľadanie v adresári"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Krok 2. Pripojenie k serveru"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "Krok 4. Meno displeja"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Krok 3. Hľadanie v adresári"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -498,17 +590,6 @@ msgstr "Podporované databáze hľadania"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"Prvým krokom v nastavení serveru LDAP je zadanie jeho mena\n"
-"a informácií pre prihlásenie. Ak ich nepoznáte, kontaktujte vášho\n"
-"systémového administrátora."
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -519,7 +600,7 @@ msgstr ""
 "vašich hľadaní a ako dlho môže hľadanie trvať. Váš administrátor\n"
 "by vám mal povedať, či potrebujete tieto hodnoty zmeniť."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -530,7 +611,7 @@ msgstr ""
 "položky, kde hľadanie začne. Ak ho necháte prázdne, bude sa\n"
 "hľadať v celom adresárovom strome."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -545,14 +626,14 @@ msgstr ""
 "Rozsah hľadania \"jedna\" zahrnie iba položky, ktoré sú jednu úroveň\n"
 "pod vašim základnom hľadania.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
+#, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "Tento sprievodca vám zjednoduší prístup k on-line adresárovým službám\n"
 "pomocou serverov LDAP (Lightweight Directory Access Protocol).\n"
@@ -560,13 +641,13 @@ msgstr ""
 "Pridanie nového serveru vyžaduje niektoré špeciálne informácie,\n"
 "ktoré by vám mal poskytnúť administrátor vášho systému."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Toto je plné meno vášho serveru LDAP. Napríklad \"ldap.mojafirma.sk\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -575,7 +656,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:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -584,7 +665,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:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -594,6 +675,16 @@ msgstr ""
 "Evolution.\n"
 "Používa sa iba na zobrazovanie."
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Toto meno sa bude identifikovať tento server v zozname priečinkov "
+"Evolution.\n"
+"Používa sa iba na zobrazovanie."
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -622,21 +713,33 @@ msgid "Using email address"
 msgstr "Použiť e-mailovú adresu"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Ak je to možné"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+"Prvým krokom v nastavení serveru LDAP je zadanie jeho mena\n"
+"a informácií pre prihlásenie. Ak ich nepoznáte, kontaktujte vášho\n"
+"systémového administrátora."
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "Meno pre zo_brazenie:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "Obmedzenie _sťahovania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -644,54 +747,52 @@ msgstr "Obmedzenie _sťahovania:"
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "Spôsob _prihlásenia:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "_Oblasť hľadania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "_Meno serveru:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "Ča_kanie (minúty):"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "karty"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr "searching-tab"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Meno"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Rozhranie pre výber mena adresára Evolution"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Odstrániť všetky"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Odstrániť"
@@ -718,23 +819,21 @@ msgstr "Pridať do kontaktov"
 msgid "Unnamed Contact"
 msgstr "Kontakt bez mena"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Meno"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Zdroj"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Vyberte kontakty z adresára"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "Nájsť kontakt v"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Rozhranie pre výber mena adresára Evolution"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Nájsť"
@@ -811,7 +910,8 @@ msgid "D_epartment:"
 msgstr "O_ddelenie:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detaily"
 
@@ -877,12 +977,12 @@ msgid "_Categories..."
 msgstr "Ka_tegórie..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Odstrániť"
@@ -2003,7 +2103,7 @@ msgid "Esq."
 msgstr "Esq."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Celé meno"
 
@@ -2096,11 +2196,27 @@ msgstr "Editor zoznamu kontaktov"
 msgid "Save List as VCard"
 msgstr "Uložiť zoznam ako VCard"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Zmenený kontakt:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Konflikt v kontakte:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Nájdený duplikát kontaktu"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Zmenený e-mail alebo meno pre tento kontakt už v tomto\n"
+"priečinku existuje. Chcete ho aj tak pridať?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Nový kontakt:"
@@ -2117,22 +2233,6 @@ msgstr ""
 "Meno alebo e-mail pre tento kontakt už v tomto priečinku\n"
 "existuje. Chcete ho aj tak pridať?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Zmenený kontakt:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Konflikt v kontakte:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"Zmenený e-mail alebo meno pre tento kontakt už v tomto\n"
-"priečinku existuje. Chcete ho aj tak pridať?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2231,9 +2331,9 @@ msgstr "Predať ďalej kontakt"
 msgid "Send Message to Contact"
 msgstr "Poslať správu kontaktu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Tlačiť"
@@ -2255,9 +2355,12 @@ msgstr "Presunúť do priečinka..."
 msgid "Cut"
 msgstr "Vystrihnúť"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopírovať"
 
@@ -2266,16 +2369,8 @@ msgstr "Kopírovať"
 msgid "Paste"
 msgstr "Vložiť"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Odstrániť"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "Aktuálny pohľad"
 
@@ -2291,166 +2386,170 @@ msgstr ""
 "spadlo. Aby ste ho mohli znovu použiť, musíte Evolution reštartovať."
 
 #: 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:2
 msgid "Assistant"
 msgstr "Asistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Pracovný fax"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Telefón do zamestania"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Telefón do zamestnania 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Spätné volanie"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Telefón v aute"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategórie"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Firemný felefón"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Oddelenie"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "E-mail 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "E-mail 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Priezvisko"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Uložiť ako"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "Voľno/zaneprázdnený URL"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Adresa domov"
+#, fuzzy
+msgid "Given Name"
+msgstr "Meno poľa"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Domáci fax"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Telefón domov"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Telefón domov 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Telefón"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Jordánsko"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Vedúci"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobil"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Prezývka"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Poznámka"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Pracovisko"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organizácia"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Iná adresa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Ďalší fax"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Iný telefón"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Primárny telefón"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Povolanie"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Rádio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Rola"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Manžel(ka)"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Titul"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Unst"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "WWW stránka"
 
@@ -2543,11 +2642,19 @@ msgstr "Členovia"
 msgid "Job Title"
 msgstr "Činnosť/po_zícia:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Adresa domov"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Adresa domov"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Iná adresa"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2560,112 +2667,109 @@ msgstr "Domáci fax"
 msgid "Blog"
 msgstr "Boloňa"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Úspech"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Neznáma chyba"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Sklad off-line"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Prístup zamietnutý"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Karta nenájdená"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "ID karty už existuje"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Protokol nepodporovaný"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Zrušený"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "Overenie zlyhalo"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "Vyžadované overenie"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS nie je k dispozícii"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "Adresár neexistuje"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Iná chyba"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Chcete uložiť zmeny?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr "_Zahodiť"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Chyba pri pridávaní zoznamu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Chyba pri pridávaní karty"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Chyba pri zmene zoznamu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Chyba pri zmene karty"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Chyba pri odstraňovaní zoznamu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Chyba pri odstraňovaní karty"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2674,7 +2778,7 @@ msgstr ""
 "Požadujete, aby sa %d kariet otvorilo v %d nových oknách.\n"
 "Naozaj chcete zobraziť všetky tieto karty?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2683,49 +2787,49 @@ msgstr ""
 "%s už existuje.\n"
 "Chcete ho prepísať?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "Prepísať"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Chyba pri ukladaní %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "zoznam"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Presunúť kartu do"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kopírovať kartu do"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Presunúť karty do"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kopírovať karty do"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Viacero VKariet"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "VKartapre %s"
@@ -2920,7 +3024,7 @@ msgstr "Okraje"
 msgid "Number of columns:"
 msgstr "Počet stĺpcov:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Nastavenie"
 
@@ -3107,18 +3211,18 @@ msgstr "Zoznam bez mena"
 msgid "Split Multi-Day Events:"
 msgstr "Rozdeliť viacdňové udalosti:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Nie je možné spustiť server wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Nie je možné spustiť wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nie je možné prečítať blok aplikácie Calendar pilota"
 
@@ -3126,24 +3230,83 @@ msgstr "Nie je možné prečítať blok aplikácie Calendar pilota"
 msgid "Default Priority:"
 msgstr "Štandardná priorita:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nie je možné prečítať blok aplikácie ToDo pilota"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Kalendár a úlohy"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Kalendár"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Nastavenie časovej zóny, kalendára a zoznamu úloh"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Kalendár a úlohy Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Ovládací prvok pre nastavenie kalendára Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Prehliadač plánovacích správ kalendára Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Prehliadač kalendára Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Kalendár Evolution/Editor úloh"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Prehliadač úloh Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Komponent kalendára a úloh Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Testovací komponent Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Úlohy"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Služba upozornenia kalendára Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Od:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Do:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Alarm Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Upozornenie na %s"
@@ -3217,43 +3380,172 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Pre tento program túto správu už nezobrazovať."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Služba upozornenia kalendára Evolution"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Nie je možné inicializovať Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Nie je možné inicializovať gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Nie je možné vytvoriť vytváracie rozhranie pre službu upozorňovania"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "neplatný čas"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "Chyba iCalendar"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Farba pre úlohy do dnešného dňa"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Farba pre úlohy do dnešného dňa"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "Zobraziť _koncové časy schôdzok v týždennom a mesačnom pohľade"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Ukážka kalendára pred tlačou"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "_Pýtať sa na potvrdenie pri odstraňovaní"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "_Pýtať sa na potvrdenie pri odstraňovaní"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Odstrániť dokončené úlohy"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Zobraziť čí_sla týždňov v navigárovi dátumov"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Súhrn obsahuje"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Popis obsahuje"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Komentár obsahuje"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Nenájdené"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3265,81 +3557,110 @@ msgstr ""
 "\n"
 "Naozaj odstrániť tieto úlohy?"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "vráti menej než"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "dní"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A, %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Vytlačí tento kalendár"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Nová Kaledónia"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "Nová schôdzka"
+
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "S_chôdzka"
+
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Vytvoriť novú schôdzku"
+
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "Nové stretnutie"
+
+#: calendar/gui/calendar-component.c:640
+msgid "M_eeting"
+msgstr "_Stretnutie"
+
+#: calendar/gui/calendar-component.c:641
 #, fuzzy
-msgid "Rename"
-msgstr "_Premenovať"
+msgid "Create a new meeting request"
+msgstr "Vytvorí novú požiadavku na stretnutie"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Nová celodenná schôdzka"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Osobný"
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr "_Celodenná Schôdzka"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Zamestnanie"
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Vytvoriť novú schôdzku"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3456,7 +3777,7 @@ msgstr "Adresát:"
 msgid "With these arguments:"
 msgstr "S týmito argumentami:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -3472,6 +3793,10 @@ msgstr "hodín"
 msgid "minutes"
 msgstr "minút"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3504,8 +3829,8 @@ msgstr "Poslať e-mail"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Súhrn:"
 
@@ -3534,7 +3859,7 @@ msgstr "koniec schôdzky"
 msgid "hour(s)"
 msgstr "hodín"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minút"
 
@@ -3588,7 +3913,7 @@ msgstr "Dni"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Piatok"
 
@@ -3602,7 +3927,7 @@ msgstr "Minúty"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Pondelok"
 
@@ -3612,7 +3937,7 @@ msgstr "_Ne"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Sobota"
 
@@ -3626,7 +3951,7 @@ 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:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Nedeľa"
 
@@ -3644,7 +3969,7 @@ msgstr "Zoznam úloh"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Štvrtok"
 
@@ -3662,7 +3987,7 @@ msgstr "Formát času:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Utorok"
 
@@ -3672,12 +3997,12 @@ msgstr "_Týždeň začína:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Streda"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Pracovný týždeň"
 
@@ -3714,7 +4039,7 @@ msgid "_Fri"
 msgstr "P_ia"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Všeobecné"
 
@@ -3754,29 +4079,29 @@ msgstr "_Str"
 msgid "before every appointment"
 msgstr "pred každou schôdzkou"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 "Odstraňovaná udalosť je schôdzka. Chcete poslať oznámenie o jej zrušení?"
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Naozaj chcete zrušiť a odstrániť toto stretnutie?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 "Odstraňovaná úloha je priradená. Chcete poslať oznámenie o jej zrušení?"
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Naozaj chcete zrušiť a odstrániť túto úlohu?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -3784,50 +4109,50 @@ msgstr ""
 "Odstraňovaný záznam žurnálu je publikovaný. Chcete poslať oznámenie o jeho "
 "zrušení?"
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Naozaj chcete zrušiť a odstrániť túto položku denníka?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Táto udalosť bola odstránená."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Táto úloha bola odstránená."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Táto položka denníka bola odstránená."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Urobili ste zmeny. Zahodiť ich a zatvoriť editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Neurobili ste žiadne zmeny, zatvoriť editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Táto udalosť bola zmenená."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Táto úloha bola zmenená."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Táto položka denníka bola zmenená."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Urobili ste zmeny. Zahodiť ich a aktualizovať editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Neurobili ste žiadne zmeny. Aktualizovať editor?"
@@ -3837,164 +4162,169 @@ msgstr "%s  Neurobili ste žiadne zmeny. Aktualizovať editor?"
 msgid "Validation error: %s"
 msgstr "Chyba validácie: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr "u do "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Dokončený "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Dokončený "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Termín do "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Termín do "
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "Nepodarilo sa aktualizovať objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Upraviť schôdzku"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Schôdzka - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Úloha - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Položka denníka - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Žiadny súhrn"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Uložiť ako..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Zmeny tejto položky môžu byť zahodné v prípade, že príde aktualizácia"
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Nepodarilo sa získať aktuálnu verziu!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Vyberte cieľový priečinok pre import týchro dát"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Naozaj chcete odstrániť schôdzku `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Naozaj chcete odstrániť túto schôdzku bez mena?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Naozaj chcete odstrániť úlohu `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Naozaj chcete odstrániť úlohu bez mena?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Naozaj chcete odstrániť položku denníka `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Naozaj chcete odstrániť položku denníka bez mena?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Naozaj chcete odstrániť %d schôdzok?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Naozaj chcete odstrániť %d úloh?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Naozaj chcete odstrániť %d položiek denníka?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "Udalosť nie je možné odstrániť kvôli chybe systému CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "Úlohu nie je možné odstrániť kvôli chybe systému CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Položku žurnálu nie je možné odstrániť kvôli chybe systému CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Položku nie je možné odstrániť kvôli chybe systému CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "Udalosť nie je možné odstrániť kvôli nedostatočným právam"
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "Úlohu nie je možné odstrániť kvôli nedostatočným právam"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Položku žurnálu nie je možné odstrániť kvôli nedostatočným právam"
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "Položku nie je možné odstrániť kvôli nedostatočným právam"
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Udalosť nie je možné odstrániť kvôli chybe systému CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Úlohu nie je možné odstrániť kvôli chybe systému CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Položku žurnálu nie je možné odstrániť kvôli chybe systému CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Položku nie je možné odstrániť kvôli chybe systému CORBA"
@@ -4011,43 +4341,43 @@ msgstr "Delegovať na:"
 msgid "Enter Delegate"
 msgstr "Zadajte na koho delegovať"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Schôdzka"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Pripomenutie"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Opakovanie"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Plánovanie"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Stretnutie"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "Dátum začiatku je neplatný"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "Dátum konca je neplatný"
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "Čas začiatku je neplatný"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "Čas konca je neplatný"
 
@@ -4116,31 +4446,31 @@ msgid "_Start time:"
 msgstr "Čas _začiatku:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Žiadna"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr "Vybraný organizér už nemá účet."
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "Organizátor je vyžadovaný."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "Nutný je aspoň jeden účastník."
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Delegovať na..."
 
@@ -4181,21 +4511,15 @@ msgid "Member"
 msgstr "Člen"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Rola"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stav"
@@ -4215,6 +4539,7 @@ msgid "_Invite Others..."
 msgstr "_Pozvať ostatných..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4247,6 +4572,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Nie je možné vytvoriť priečinok %s: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "Organizátor musí byť nastavený."
@@ -4276,33 +4602,58 @@ msgstr "Informácie o kalendári"
 msgid "Calendar Name"
 msgstr "Kalendár"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Nie je možné vytvoriť priečinok %s: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Informácie o kalendári"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Zoznam úloh"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Zoznam úloh"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Zoznam úloh"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr "Upravujete opakujúcu sa udalosť. Čo chcete zmeniť?"
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Upravujete opakujúcu sa úlohu. Čo chcete zmeniť?"
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr "Upravujete opakujúcu sa položku žurnálu. Čo chcete zmeniť?"
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr "Iba tento výskyt"
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Tento a budúce výskyty"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr "Tento a budúce výskyty"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr "Všetky výskyty"
 
@@ -4350,10 +4701,15 @@ msgstr "deň"
 msgid "on the"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "výskytov"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Dátum a čas:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "_Pridať"
@@ -4418,7 +4774,7 @@ msgstr "týždňov"
 msgid "year(s)"
 msgstr "rokov"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
@@ -4428,31 +4784,31 @@ msgstr ""
 "\n"
 "Chcete uložiť zmeny?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "_Zahodiť zmeny"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 msgid "Save Event"
 msgstr "Uložiť udalosť"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Informácia o schôdzke bola vytvorená. Chcete ju poslať?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Informácia o schôdzke sa zmenila. Chcete poslať upravenú verziu?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "Informácia o priradení úlohy bola vytvorená. Chcete ju poslať?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "Informácia o úlohe sa zmenila. Chcete poslať upravenú verziu?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Dátum dokončenia je neplatný"
 
@@ -4462,43 +4818,43 @@ msgid "% _Complete"
 msgstr "% hotových"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Dokončený"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Vysoká"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "Prebieha"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Nízka"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Normálny"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Nezačal"
 
@@ -4507,7 +4863,7 @@ msgid "Progress"
 msgstr "Priebeh"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Nedefinovaná"
 
@@ -4529,21 +4885,21 @@ msgstr "_Stav:"
 msgid "_Web Page:"
 msgstr "Adresa _WWW stránky:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Základné"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Priradenie"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "Termín je neplatný"
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr "Koncový dátum je pred dátumom začiatku."
 
@@ -4551,9 +4907,9 @@ msgstr "Koncový dátum je pred dátumom začiatku."
 msgid "Con_fidential"
 msgstr "_Tajné"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Popis:"
 
@@ -4658,26 +5014,21 @@ msgstr "%s o %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s pre neznámy typ spustenia"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Verejný"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Súkromný"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Tajný"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategórie"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4690,28 +5041,26 @@ msgid "Start Date"
 msgstr "Dátum štartu"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Súhrn"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "farba"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Schôdzka"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Voľný"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Zaneprázdnený"
 
@@ -4723,7 +5072,7 @@ msgstr "S"
 msgid "S"
 msgstr "J"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "V"
 
@@ -4731,7 +5080,7 @@ msgstr "V"
 msgid "W"
 msgstr "Z"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4741,7 +5090,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4749,7 +5098,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Áno"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4757,17 +5106,17 @@ msgstr "Nie"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Neznámy"
 
@@ -4779,181 +5128,179 @@ msgstr "Opakovanie"
 msgid "Assigned"
 msgstr "Priradené"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Aktualizujem objekty"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Odstráňujem vybrané objekty"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Aktualizujem objekty"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Nová _schôdzka..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Nová celodenná _udalosť"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "Nové stretnutie"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Nová úloha"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Tlačiť..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Vložiť"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Prejsť na d_nešný dátum"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "_Prejsť na dátum..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Publikovať informácie o voľnom čase"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "Nas_tavenie..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Otvoriť"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Uložiť _ako..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Kopírovať"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "Naplánovať _stretnutie..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "Poslať ďalej ako i_Calendar..."
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Odstrániť tento vý_skyt"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Odstrániť _všetky výskyty"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "Nas_tavenie..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Otvoriť správu"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "_Priradiť úlohu"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "Poslať ďalej ako i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "_Označiť ako dokončenú"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Označiť úlohy ako dokončené"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "O_dstrániť vybrané úlohy"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Kliknutím pridáte úlohu"
@@ -4967,8 +5314,8 @@ msgstr "% hotových"
 msgid "Alarms"
 msgstr "Alarmy"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Hotovo"
 
@@ -4997,18 +5344,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5027,7 +5374,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5040,445 +5387,444 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "dopoludnia"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "popoludní"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr "Áno. (Úplné opakovanie)"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "Každý deň"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "Každých %d dní"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "Každý týždeň"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "Každých %d týždňov"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr "Každý týždeň "
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Každých %d týždňov "
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " a "
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr "%s deň z "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s z "
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "každý mesiac"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr "každých %d mesiacov"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "Každý rok"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "Každých %d rokov"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr " celkom %d-krát"
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ", končiace na "
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>Začína:</b> "
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Končí:</b> "
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>Dokončený:</b> "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>Termín:</b> "
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "Informácie o iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "Chyba iCalendar"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Neznáma osoba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 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:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Žiadna</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "Umiestnenie:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Stav:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Akceptované"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Predbežne akceptové"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Odmietnuté"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Vyberte akciu:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Aktualizovať"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Akceptovať"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Predbežne akceptovať"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Odmietnuť"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Poslať informácie o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Aktualizovať stav respondenta"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Poslať najnovšie informácie"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, 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:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Informácie o stretnutí"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> požaduje účasť %s na stretnutí."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Návrh na stretnutie"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Aktualizácia stretnutia"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Požiadavka na aktualizáciu stretnutia"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, 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:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Odpoveď pre stretnutie"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> zrušil stretnutie."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Zrušenie stretnutia"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, 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:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Neplatná správa o stretnutí"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Informácia o úlohe"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> požaduje, aby %s vykonal úlohu."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, 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:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Návrh úlohy"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, 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:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Aktualizácia úlohy"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, 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:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Požiadavka na aktualizáciu úlohy"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, 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:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Odpoveď pre úlohu"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> zrušil úlohu."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Zrušenie úlohy"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Neplatná správa úlohy"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, 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:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Informácie o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, 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:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Požiadavka na informácie o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, 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:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Odpoveď s informácio o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Neplatná správa o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr "Správa asi nie je správne formátovaná"
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "Táto správa obsahuje iba nepodporované požiadavky."
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 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:1614
+#: calendar/gui/e-itip-control.c:1612
 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:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "Súbor kalendára nie je aktualizovať!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Aktualizácia dokončená\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 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:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekt nie je platný a nie je možné ho aktualizovať\n"
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Táto odpoveď nie je od účastníka. Chcete ho ako účastníka pridať?"
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 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:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr "Nastala chyba v systéme CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr "Objekt sa nepodarilo nájsť\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Nemáte práva pre aktualizáciu kalendára\n"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Stav účastníka bol aktualizovaný\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "Stav účastníka nie je možné aktualizovať!\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Odstránenie dokončené"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Položka poslaná!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Položku nie je možné poslať!\n"
 
@@ -5638,7 +5984,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -5702,49 +6048,44 @@ msgstr "_Začiatok stretnutia:"
 msgid "Meeting _end time:"
 msgstr "_Koniec stretnutia:"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "_Počiatočný dátum:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "_Termín:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "_Priorita:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Strana"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Otváram úlohy na %s"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nepodarilo sa načítať úlohy v `%s'"
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metódy potrebná pre načítanie `%s' nie je podporovaná"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Nemáte právo otvoriť priečinok v %s"
 
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5753,48 +6094,39 @@ msgstr ""
 "Chyba pre %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "Dokončujem úlohy..."
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "Odstráňujem vybrané objekty..."
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "Čistím"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Úlohy"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Kalendár"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, 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:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metóda nutná k otvoreniu `%s' nie je podporovaná"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Pridávam alarmy pre %s"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5805,7 +6137,7 @@ msgstr ""
 "%s\n"
 "spadol. Aby ste ho mohli znovu používať, musíte Evolution reštartovať."
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5816,58 +6148,11 @@ msgstr ""
 "%s\n"
 "spadol. Aby ste ho mohli znovu používať, musíte Evolution reštartovať."
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Turín"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalendár a úlohy"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Kalendár"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Nastavenie časovej zóny, kalendára a zoznamu úloh"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Kalendár a úlohy Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Ovládací prvok pre nastavenie kalendára Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Prehliadač plánovacích správ kalendára Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Prehliadač kalendára Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Kalendár Evolution/Editor úloh"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Prehliadač úloh Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Komponent kalendára a úloh Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Testovací komponent Evolution"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Apríl"
@@ -5924,296 +6209,332 @@ msgstr "Október"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Organizátor musí byť nastavený."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Nutný je aspoň jeden účastník"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "informácie o udalosti"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Informácie o úlohe"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Informácie o denníku"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Informácie o voľnom čase"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Informácie o kalendári"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Aktualizované"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Aktualizovať"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "Protinávrh"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informácie o voľnom čase (%s do %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "Informácie iCalendar"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Musíte byť účastníkom stretnutia."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Ne"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Po"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Ut"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "St"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Št"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Pi"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "So"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Vybraný deň (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Vybraný týždeň (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Vybraný mesiac (%b - %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Vybraný rok (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Úloha"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Stav: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorita: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Dokončených percent: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategórie: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Kontakty: "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Ukážka pred tlačou"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Tlačiť položku"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Nastavenie tlačiarne"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Premenuje túto skratku"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Zoznam úloh"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Nová úloha"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "Ú_loha"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Vytvorí novú úlohu"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "URI, ktoré bude zobrazovať priečinok úloh"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6225,11 +6546,11 @@ msgstr ""
 "\n"
 "Naozaj odstrániť tieto úlohy?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Túto správu už nezobrazovať."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "Tlačiť úlohy"
 
@@ -6257,15 +6578,15 @@ msgstr "Súbory iCalendar (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "Súbory vCalendar (.ics)"
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "Pripomenutie!"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "Udalosti kalendára"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6273,7 +6594,7 @@ msgstr ""
 "Evolution našiel súbory kalendára GNOME.\n"
 "Chcete ich naimportovať do Evolution?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Kalendár GNOME"
 
@@ -7806,27 +8127,27 @@ msgstr "Tichý oceán/Wallis"
 msgid "Pacific/Yap"
 msgstr "Tichý oceán/Yap"
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "Digitálny podpis nie je podporovaný touto šifrou"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "Overenie podpisu nie je podporované touto šifrou"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Šifrovanie nie je podporované touto šifrou"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Dešifrovanie nie je podporované touto šifrou"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr "Touto šifrou nemôžete importovať kľúče"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr "Touto šifrou nemôžete exportovať kľúče"
 
@@ -7878,86 +8199,86 @@ msgstr "Pripravujem priečinok '%s' pre prácu off-line"
 msgid "You must be working online to complete this operation"
 msgstr "Pre dokončenie tejto operácie musíte pracovať on-line"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Nepodarilo sa vytvoriť rúru do '%s': %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Nepodarilo sa vytvoriť proces potomka '%s': %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Prijatý neplatný tok správy %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Synchronizujem priečinky"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Chyba pri spracovávaní filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Chyba pri vykonávaní filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Nie je možné otvoriť priečinok fronty"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Nie je možné spracovať priečinok fronty"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Získavam správu %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Nie je možné otvoriť správu"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Zlyhala správa %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Synchronizujem priečinok"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Získavam správu %d z %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Zlyhanie na správe %d z %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Nepodarilo sa prijať správu"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr "Neplatné argumenty pre (systémové príznaky)"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr "Neplatné argumenty pre (používateľské značky)"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Chyba pri vykonávaní hľadania filtra: %s: %s"
@@ -7989,35 +8310,35 @@ msgstr "(odpovedá všetkému) vyžaduje jeden pravdivostný výsledok"
 msgid "Performing query on unknown header: %s"
 msgstr "Vykonanie otázky na neznámej hlavičke: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nepodporovaná operácia: pridať správu: pre %s"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nepodporovaná operácia: hľadanie výrazom: %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nepodporovaná operácia: hľadanie pomocou uid: %s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Presúvam správy"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr "Kopírujem správy"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Získavam %d správ"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8028,15 +8349,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr "Nepodarilo sa spracovať radu gpg userid."
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr "Nepodarilo sa spracovať požiadavku na heslo gpg."
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8045,30 +8366,30 @@ msgstr ""
 "Musíte zadať heslo pre odomkntie kľúča\n"
 "pre používateľa: \"%s\""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Zrušené."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Nepodarilo sa odomknúť tajný kľúč: zadané 3 neplatné heslá."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Neočakávaná odpoveď od GnuPG: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr "Nezadané žiadne dáta"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nie je možné zašiftovať správu: nezadaní žiadni platní adresáti."
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8079,49 +8400,61 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Nepodarilo sa použiť GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Nie je možné zapísať dáta: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nepodarilo sa spustiť gpg: %s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr "Nepodarilo sa spustiť gpg."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "Toto je digitálne podpísaná časť správy"
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr "Nie je možné overiť správu: nie je možné vytvoriť dočasný súbor: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, 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"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nie je možné zapísať dáta: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Toto je digitálne podpísaná časť správy"
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Vytvoriť index obsahu správ"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Nie je možné získať správu z editora"
@@ -8220,15 +8553,15 @@ msgstr "Chyba pri zápise pošty do dočasného súboru: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Chyba kopírovaní dočasného súboru: pošty %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Nepodarilo sa dešifrovať časť MIME: chyba protokolu"
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "Nepodarilo sa dešifrovať časť MIME: neplatná štruktúra"
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "chyba spracovania"
 
@@ -8548,12 +8881,12 @@ msgstr "Poskytovateľ pošty pre virtuálny priečinok"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Pre čítanie pošty ako otázky na inú množinu priečinkov"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Pre protokol `%s' nie je k dispozícii poskytovateľ"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8562,71 +8895,82 @@ msgstr ""
 "Nie je možné vytvoriť priečinok %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Zadajte vaše heslo pre %s"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Nedefinovaná"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Upraviť podpis"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Upraviť podpis"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Samopodpísaný certifikát v reťazci"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "Nedôveryhodný certifikát"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Uložiť podpis"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Chyba pri spracovaní"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Server: %s, Typ: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Nie je možné získať priečinok: Neplatná operácia pre tento sklad"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nie je možné vytvoriť priečinok: Neplatná operácia pre tento sklad"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Odpadky"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "Jún"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "Nepodarilo sa získať certifikát vydávateľa"
@@ -8835,7 +9179,7 @@ msgstr ""
 "Vypršala platnosť zoznamu zrušených certifikátov: %s\n"
 "Vydal: %s"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Nie je možné spracovať URL `%s'"
@@ -8855,22 +9199,22 @@ msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 "Nepodarilo sa skopírovať alebo presunúť správu do virtuálneho priečinku"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nie je možné odstrániť priečinok: %s: Neplatná operácia"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nie je možné odstrániť priečinok: %s: Priečinok neexistuje"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nie je možné premenovať priečinok: %s: Neplatná operácia"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nie je možné premenovať priečinok: %s: Priečinok neexistuje"
@@ -8950,7 +9294,7 @@ msgstr "Nepodarilo sa prijať správu: %s"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -8964,7 +9308,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Taká správa neexistuje"
@@ -9002,55 +9346,70 @@ msgid "Failed to cache %s: %s"
 msgstr "Nepodarilo sa uložiť správu do vyrovnávacej pamäti %s: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Pripájam sa na server..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Nepodarilo sa pripojiť k serveru LDAP"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "Firma"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Kontrolujem novú poštu"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 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:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Priečinky"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Zobraziť iba prihlásené priečinky"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "Predefinovať mená priečinkov zo serveru"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Priestor mien"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 "Aplikovať filtre na nové správy v priečinku novej pošty na tomto serveri"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Automaticky kontrolovať novú poštu každých"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Pre čítanie a ukladanie pošty na IMAP serveroch."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Heslo"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9303,7 +9662,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Nie je možné premenovať priečinok %s na %s: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nie je možné premenovať \"%s\": %s"
@@ -9418,29 +9777,29 @@ msgstr "Kontrolujem nové správy"
 msgid "Storing folder"
 msgstr "Ukladám priečinok"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Nie je možné získať zámok na priečinok %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Nie je možné otvoriť poštovú schránku: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "Pridanie pošty zrušené"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nie je možné pridať správu do súboru mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9449,11 +9808,11 @@ msgstr ""
 "Nie je možné získať správu: %s z priečinku %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Priečinok vyzerá ako nenapraviteľne poškodený."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Vytvorenie správy zlyhalo: Poškodená poštová schránka?"
 
@@ -9521,12 +9880,17 @@ msgstr "Nie je možné vytvoriť priečinok %s: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "Nie je možné získať priečinok: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "ID karty už existuje"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Nie je možné premenovať priečinok %s na %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Zadané meno priečinku nie je platné: %s"
@@ -9570,7 +9934,7 @@ msgstr "Nie je možné zatvoriť zdrojový priečinok: %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Nie je možné zatvoriť dočasný priečinok: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nie je možné premenovať priečinok: %s"
@@ -9857,7 +10221,7 @@ msgstr "Odstrániť po %s dňoch"
 msgid "Disable support for all POP3 extensions"
 msgstr "Zakázať podporu pre všetky rozšírenia POP3"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -9946,7 +10310,7 @@ msgid "No such folder `%s'."
 msgstr "Priečinok `%s' neexistuje."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9998,7 +10362,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Prenos pošty pomocou programu sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10165,7 +10529,7 @@ msgstr "Doručenie pošty SMTP pomocou %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Nie je možné poslať správu: adresa odosielateľa nie je platná."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Posielam správu"
 
@@ -10286,7 +10650,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "príloha"
 
@@ -10330,11 +10694,11 @@ msgstr "Typ MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Navrhnúť automatické zobrazovanie príloh"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 msgid "You need to configure an account before you can compose mail."
 msgstr "Predtým, ako začnete písať správu, musíte nastaviť účet."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Kliknutím zobrazíte adresár"
 
@@ -10345,45 +10709,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Odpovedať komu:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Predmet:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Komu:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Zadajte adresátov správy"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Zadajte adresy, ktoré dostanú kópiu správy"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10394,14 +10758,19 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Poslať do:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr "Cieľ posielania"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Priloží súbor k správe"
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Priložiť súbor"
@@ -10436,21 +10805,21 @@ msgstr "Súbor existuje, prepísať ho?"
 msgid "Error saving file: %s"
 msgstr "Chyba pri ukladaní súboru: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Chyba pri načítavaní súboru: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Chyba pri prístupe k súboru: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Nie je možné získať správu z editora"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10459,7 +10828,7 @@ msgstr ""
 "Nepodarilo sa hľadať v súbore: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10468,7 +10837,7 @@ msgstr ""
 "Nepodarilo sa skrátiť súbor: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10477,7 +10846,7 @@ msgstr ""
 "Nepodarilo sa skopírovať deskriptor súboru: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10486,7 +10855,7 @@ msgstr ""
 "Chyba pri automatickom ukladaní správ: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10494,7 +10863,7 @@ msgstr ""
 "Ximian Evolution našiel neuložené súbory z predchádzajúceho sedenia.\n"
 "Chcete sa pokúsiť o ich záchranu?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10505,28 +10874,28 @@ msgstr ""
 "\n"
 "Chcete uložiť zmeny?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Varovanie: Zmenená správa"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Otvoriť súbor"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "Podpis:"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "Automaticky generované"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Napísať správu"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10534,7 +10903,7 @@ msgstr ""
 "Nepodarilo sa vytvoriť okno pre písanie správ:\n"
 "Nepodarilo sa aktivovať ovládací prvok pre výber adresy."
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10546,7 +10915,7 @@ msgstr ""
 "Overte, že máte nainštalovanú správnu verziu\n"
 "gtkhtml a libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10554,7 +10923,7 @@ msgstr ""
 "Nepodarilo sa vytvoriť okno pre písanie správ:\n"
 "Nepodarilo sa aktivovať komponent HTML editor."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10563,11 +10932,13 @@ msgstr ""
 "<b>"
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Sada groupvérových nástrojov Evolution"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10819,13 +11190,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -10944,7 +11315,7 @@ msgstr "Potom"
 msgid "You must specify a folder."
 msgstr "Musíte zadať meno priečinku."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Vybrať priečinok"
@@ -10958,24 +11329,24 @@ msgstr ""
 "Chyba v regulárnom výraze '%s':\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Dôležité"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "Urobiť"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Neskôr"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Test"
 
@@ -11076,7 +11447,7 @@ msgstr "späť"
 msgid "months"
 msgstr "mesiacov"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "sekúnd"
 
@@ -11173,7 +11544,7 @@ msgstr "Výraz"
 msgid "Follow Up"
 msgstr "Follow Up"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "Popis"
 
@@ -11243,112 +11614,118 @@ msgid "Source Account"
 msgstr "Zdrojový účet"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Sprej"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Špecifická hlavička"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Zastaviť spracovanie"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Predmet"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "Zrušiť nastavenie stavu"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "obsahuje"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "neobsahuje"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "nekončí na"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "neexistuje"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "does not return"
 msgstr "nevrátiť"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "nevyzerá ako"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "nezačína na"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "končí na"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "existuje"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr "je označený"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr "je po"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "is before"
 msgstr "bolo pred"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "je viac než"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "je menej než"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr "nie je označený"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "nie je"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "je"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr "vráti viac než"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr "vráti menej než"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr "vráti"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "vyzerá ako"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "začína na"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Meno pravidla \"%s\" nie je unikátne. Vyberte iné."
@@ -11373,18 +11750,77 @@ msgstr "Meno pravidla"
 msgid "Score Rules"
 msgstr "Pravidlá skóre"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Musíte tento vpriečinok pomenovať."
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr "Musíte zadať aspoň jeden priečinok ako zdrojový."
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 msgid "VFolder source"
 msgstr "Zdroj vPriečinku"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Nastavenie editora správ"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "Nastavenie pošty vrátane zabezpečenia a zobrazovania správ"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Nastavenie kontroly pravopisu, podpisov a editora správ"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Nastavenie emailových účtov"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Pošta Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Ovládací prvok pre nastavenie poštových účtov Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Poštový komponent Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Editor správ Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Ovládací prvok pre nastavenie editora správ Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail folder viewer"
+msgstr "Zobrazenie poštového priečinku Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Ovládací prvok nastavenia pošty Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Pošta"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Poštové účty"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "Nastavenie pošty"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Naozaj chcete odstrániť tento účet?"
@@ -11426,7 +11862,7 @@ msgid "Protocol"
 msgstr "Protokol"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr "Bezmena"
 
@@ -11450,20 +11886,17 @@ msgstr "Pridať skript pre podpis"
 msgid "Signature(s)"
 msgstr "Podpisy"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "Posielate správu formátovanú ako HTML, ale nasledujúci adresáti nechcú\n"
 "dostávať takto formátovanú poštu:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Poslať aj tak?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11471,7 +11904,7 @@ msgstr ""
 "Táto správa nemá predmet.\n"
 "Naozaj ju chcete poslať?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11479,11 +11912,11 @@ msgstr ""
 "Kedže je zoznam kontaktov, ktorý posielate, nastavený tak, aby skryl adresy, "
 "táto správa bude obsahovať iba adresátov Bcc."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Táto správa obsahuje iba adresátov Bcc."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11493,11 +11926,11 @@ msgstr ""
 "Apparently-To.\n"
 "Poslať aj tak?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Musíte zadať adresátov pre poslanie tejto správy."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11509,189 +11942,399 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Vytvoriť _virtuálny priečinok z hľadania..."
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "Pošta"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<kliknutím vyberiete priečinok>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" v \"%s\""
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Vytvoriť nový priečinok"
 
-#: mail/em-folder-selector.c:267
-#, fuzzy
-msgid "Folder _name"
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Zadajte, kde vytvoriť priečinok"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
 msgstr "_Meno priečinku:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Nie je možné vytvoriť dočasný priečinok: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Nie je možné vytvoriť dočasný priečinok: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Nie je možné vytvoriť dočasný súbor '%s': %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Nie je možné zatvoriť dočasný priečinok: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Načítavam..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Vybrať priečinok"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Vytvoriť nový priečinok"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Nie je možné odstrániť priečinok `%s': %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Naozaj odstrániť priečinok \"%s\"?"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Odstrániť \"%s\""
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Premenovať priečinok \"%s\" na:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+msgid "Rename Folder"
+msgstr "Premenovať priečinok"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr "Priečinok \"%s\" už existuje. Prosím, zadajte iné meno."
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Vlastnosti písma"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Vlastnosti"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "_Meno priečinku:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Pohľad"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Otvoriť v novom okne"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Presunúť"
+
+#: mail/em-folder-tree.c:1500
+msgid "_New Folder..."
+msgstr "Nový _priečinok..."
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "_Premenovať"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "_Vlastnosti..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "_Upraviť ako novú správu..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "_Tlačiť"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Odpovedať odosielateľovi"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Odpovedať _zoznamu"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Odpovedať _všetkým"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "Poslať ď_alej"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr "_Odpoveď..."
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr "Označiť ako _Dokončený"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "Vyčistiť _značku"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Označiť ako _prečítanú"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "Označiť ako _neprečítanú"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Označiť ako _dôležitú"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "Označiť ako nedô_ležitú"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Označiť ako _neprečítanú"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Označiť ako _dôležitú"
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "Obnoviť _zmazané"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "Pre_sunúť do priečinka..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kopírovať do priečinku..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "Pridať odosielateľa do _adresára"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "_Použiť filtre"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "Vytvoriť pra_vidlo zo správy"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "Vpriečinok na _predmet"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "Vpriečinok na _odosielateľa"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "Vpriečinok na _adresátov"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "VPriečinok na _konferenciu"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "Vpriečinok na _odosielateľa"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Filter na _predmet"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Filter na o_dosielateľovi"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Filter na _adresátoch"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Filter na _konferenciu"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filter na o_dosielateľovi"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Štandard"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Tlačiť správu"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopírovať umiestnenie odkazu"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Odpovedá:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Priradené"
+
+#: mail/em-format-html-display.c:597
+#, fuzzy
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr "Táto správa je digitálne podpísaná ale podpis nie je platný."
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Upraviť podpis"
+
+#: mail/em-format-html-display.c:598
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
 msgstr ""
-"Táto správa je digitálne podpísaná. Kliknutím na ikonu zámku získate "
-"podrobnosti."
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Upraviť podpis"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+#, fuzzy
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr "input_token obsahuje neplatný podpis alebo podpis nie je možné overiť."
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Prerušené"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "Šifrovanie PGP"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Nie je možné spracovať správu MIME. Zobrazujem ako zdrojový kód."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Nepodporovaná schéma"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Nepodarilo sa overiť listový podpis"
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Zobraziť v texte"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Skryť"
@@ -11701,184 +12344,207 @@ msgstr "Skryť"
 msgid "Page %d of %d"
 msgstr "Stránka %d z %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Získavam správu %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Nesprávna časť externého tela."
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Odkaz na FTP server (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, 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/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Odkaz na lokálny súbor (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Odkaz na vzdialené dáta (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Odkaz na neznáme externé dáta (typ \"%s\")"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-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/em-format-html.c:906 mail/em-format.c:1217
-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/em-format-html.c:930 mail/em-format.c:1190
-msgid "No signature present"
-msgstr ""
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Nie je možné inicializovať Bonobo"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Nepodporovaná schéma"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nie je možné spracovať správu MIME. Zobrazujem ako zdrojový kód."
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Presúvam správy"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Od"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Komu"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "Poštový klient"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dátum"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "%s príloha"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Nie je možné spracovať správu MIME. Zobrazujem ako zdrojový kód."
+msgid "Session not initialised"
+msgstr "Nie je možné inicializovať Bonobo"
+
+#: mail/em-format.c:1210
+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/em-format.c:1212
+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/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Čakám..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Prehľadávam %s"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Nepodarilo sa uložiť správu do vyrovnávacej pamäti %s: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Nepodarilo sa vytvoriť rúru do '%s': %s"
 
-#: mail/em-popup.c:593
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Nepodarilo sa nájsť meno hostiteľa '%s': %s"
+
+#: mail/em-popup.c:599
 #, fuzzy
 msgid "Save As..."
 msgstr "Uložiť _ako..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Odpovedať odosielateľovi"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Otvoriť odkaz v prehliadači"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Poslať _správu zoznamu..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Pridať odosielateľa do adresára"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Otvoriť v %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "Tento server nepodporuje informácie schém LDAPv3"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Prihlásiť si"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Priečinok"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Prosím, vyberte server."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Nebol vybraný žiadny server"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Túto správu už nezobrazovať."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11887,27 +12553,27 @@ msgstr ""
 "Chyba pri načítavaní informácie o filtroch:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Predaná správa"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "neznámy odosielateľ"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Dňa %a, %Y-%m-%d at %H:%M, %%s napísal:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -11916,7 +12582,7 @@ msgstr ""
 "Nie je možné uložiť do %s\n"
 "  %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -11925,25 +12591,26 @@ msgstr ""
 "'%s' už existuje.\n"
 "Prepísať ho?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Správa"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Uložiť správu ako..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Nie je možné vytvoriť dočasný priečinok: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Adresa"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -11952,58 +12619,426 @@ msgstr ""
 "\n"
 "Naozaj odstrániť tieto správy?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Nastavenie editora správ"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/em-utils.c:2288
+#, fuzzy
 msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "Nastavenie pošty vrátane zabezpečenia a zobrazovania správ"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Táto operácia natrvalo odstráni všetky správy označené ako zmazané. Ak "
+"budete pokračovať, nebude už možné tieto správy obnoviť.\n"
+"\n"
+"Naozaj odstrániť tieto správy?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Nastavenie kontroly pravopisu, podpisov a editora správ"
+#: mail/evolution-mail.schemas.in.in.h:1
+msgid "Automatic link recognition"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Nastavenie emailových účtov"
+#: mail/evolution-mail.schemas.in.in.h:2
+msgid "Automatic smiley recognition"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Pošta Evolution"
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Ovládací prvok pre nastavenie poštových účtov Evolution"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Poštový komponent Evolution"
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Editor správ Evolution"
+#: mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
+msgid "Default charset in which to compose messages"
+msgstr "Štandardný predmet pre správu."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Ovládací prvok pre nastavenie editora správ Evolution"
+#: mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
+msgid "Default charset in which to compose messages."
+msgstr "Štandardný predmet pre správu."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Zobrazenie poštového priečinku Evolution"
+#: mail/evolution-mail.schemas.in.in.h:8
+#, fuzzy
+msgid "Default charset in which to display messages"
+msgstr "Hľadá v texte zobrazenej správy"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Ovládací prvok nastavenia pošty Evolution"
+#: mail/evolution-mail.schemas.in.in.h:9
+#, fuzzy
+msgid "Default charset in which to display messages."
+msgstr "Hľadá v texte zobrazenej správy"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/evolution-mail.schemas.in.in.h:10
+#, fuzzy
+msgid "Default forward style"
+msgstr "Štýl _preposielania:"
+
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default reply style"
+msgstr "Š_týl odpovede:"
+
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Empty Trash folders on exit"
+msgstr "Vyprázdniť O_dpadky pri ukončení"
+
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Vyprázdniť O_dpadky pri ukončení"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "Poštové účty"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "Nastavenie pošty"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "Spustiť akcie"
+
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Upozornenie na novú poštu"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Upozornenie na novú poštu"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+"_Pýtať sa pri posielaní HTML správ kontaktom, ktoré nechcú tento formát"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "Pýtať sa pri posielaní správ s adresátmi iba v _Bcc"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "Poslať poštu HTML?"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "Poslať poštu HTML?"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "Zobraziť _animované obrázky"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "Zobraziť _animované obrázky"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Zobraziť správu normálne"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "_Náhľad"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "_Zahrať zvuk pri príchode novej správy"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "Kontrola _pravopisu"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "Písmo _terminálu:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "Vyberte písmo premenlivej šírky pre tlač HTML"
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Zoznam vlákien"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Zoznam vlákien"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "Použiť ako š_tandardný účet"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "_Premenlivá šírka:"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Import Elm pre Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+msgid "Evolution mbox importer"
+msgstr "Import formátu mbox pre Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Netscape Mail importer"
+msgstr "Import Netscape Mail pre Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Import Outlook Express 4 pre Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Pine importer"
+msgstr "Import z Pine pre Evolution"
 
 #: mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
@@ -12043,34 +13078,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Import Elm pre Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Import formátu mbox pre Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Netscape Mail importer"
-msgstr "Import Netscape Mail pre Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Import Outlook Express 4 pre Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Pine importer"
-msgstr "Import z Pine pre Evolution"
-
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -12128,12 +13135,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importuje vaše staré dáta Netscape"
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Odpadky"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Hľadám filtre pošty"
@@ -12142,7 +13143,7 @@ msgstr "Hľadám filtre pošty"
 msgid "Scanning directory"
 msgstr "Prehľadávam priečinok"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Spúšťam import"
 
@@ -12217,23 +13218,23 @@ msgid "You have not filled in all of the required information."
 msgstr "Nevyplnili ste všetky povinné informácie."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Editor účtov Evolution"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Hostiteľ:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "Po_užívateľ:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Cesta:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Nemôžete vytvoriť dva účty s rovnakým menom."
 
@@ -12242,35 +13243,35 @@ msgstr "Nemôžete vytvoriť dva účty s rovnakým menom."
 msgid "Mail to %s"
 msgstr "Pošta pre %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Predmet je %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s konferencia"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Odpovedaná"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Pridať pravidlo filtra"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "Nasledujúce pravidlá filtra:\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12281,143 +13282,30 @@ msgstr ""
 "    '%s'\n"
 "A boli aktualizované."
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "Pripájam sa na server..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Tento priečinok nemôže obsahovať správy."
-
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Nie je možné otvoriť zdieľaný priečinok: %s."
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Nová správa"
 
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Nie je možné vytvoriť dočasný priečinok: %s"
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "_Poslať správu"
 
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Nie je možné vytvoriť dočasný súbor '%s': %s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "Napísať novú správu"
 
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Nie je možné zatvoriť dočasný priečinok: %s"
-
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Vyberte cieľový priečinok pre import týchro dát"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Vyberte cieľový priečinok pre import týchro dát"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Vytvoriť nový priečinok"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Zadajte, kde vytvoriť priečinok"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Nie je možné odstrániť priečinok `%s': %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Naozaj odstrániť priečinok \"%s\"?"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Odstrániť \"%s\""
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Premenovať priečinok \"%s\" na:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-msgid "Rename Folder"
-msgstr "Premenovať priečinok"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Zadané meno priečinku nie je platné: %s"
-
-#: mail/mail-component.c:1860
-#, fuzzy, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr "Priečinok \"%s\" už existuje. Prosím, zadajte iné meno."
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Vlastnosti písma"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Vlastnosti"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "_Meno priečinku:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Pohľad"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Otvoriť v novom okne"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Presunúť"
-
-#: mail/mail-component.c:2087
-msgid "_New Folder..."
-msgstr "Nový _priečinok..."
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "_Premenovať"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Vlastnosti..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Identita"
 
@@ -12477,11 +13365,11 @@ msgstr ""
 "Prosím, zadajte meno pre tento účet. Toto meno bude používané iba pre "
 "zobrazenie."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Kontrolujem službu"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Pripájam sa na server..."
 
@@ -12563,26 +13451,35 @@ msgid "C_olors"
 msgstr "_Farby"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Kontrolujem novú poštu"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "Kontrolovať pravopis _priebežne"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Kontrolujem novú poštu"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "Farba pre ne_správne slová:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Písanie správ"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Nastavenie"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12598,273 +13495,278 @@ msgstr ""
 "\n"
 "Kliknutím na \"Použiť\" uložíte vaše nastavenie."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "Š_tandardné"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Štandardné chovanie"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "Štandardná _znaková sada:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Odstraňovanie správ"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Vždy podpisovať správy pri použití tohto účtu"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "Necitovať pôvodnú správu"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 "Nepodpisovať požiadavky na _stretnutie (pre kompatibilitu s klientom Outlook)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Hotovo"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "Priečinok _konceptov:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "_Povoliť"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "E-mailové účty"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "_E-mailová adresa:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "Vyprázdniť O_dpadky pri ukončení"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "ID _certifikátu:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Sprievodca účtom Evolution"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Vykonať príkaz..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "Pe_vná šírka:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "Filtre"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "Vlastnosti písma"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "Písať správy v _HTML"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "_Zvýrazniť citácie pomocou"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "v texte"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Popisy a farby"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Nahrávanie obrázkov"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Nastavenie pošty"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Umiestnenie poštovej schránky"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Písanie správ"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Zobrazovanie správ"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 msgid "Message Fonts"
 msgstr "Písma pre správy"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Upozornenie na novú poštu"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Poznámka: Kým sa prvýkrát nepripojíte, nebudete musieť heslo zadávať."
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Nepovinné informácie"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "Or_ganizácia:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "ID PGP/GPG _kľúča:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Vyberte farbu"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Pýtať sa pri posielaní správ s adresátmi iba v _Bcc"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Písma pre tlač"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "Citovať pôvodnú správu"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Citovať"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "_Uložiť toto heslo"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "Komu o_dpovedať:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Príjem pošty"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "Nastavenie _príjmu"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "Zapamätať toto _heslo"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Povinné informácie"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "Obnoviť štandardné"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "_Bezpečnosť"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "Bezpečné MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr "Vyberte písmo pevnej širky pre HTML"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr "Vyberte písmo pevnej širky pre tlač HTML"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr "Vyberte písmo premenlivej širky pre HTML"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr "Vyberte písmo premenlivej šírky pre tlač HTML"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Posielanie pošty"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Priečinok pre _odoslané správy:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Odoslané a koncepty"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Server vyžaduje _prihlásenie"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Nastavenie serveru"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "_Typ serveru:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Samopodpísaný certifikát v reťazci"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "Zadajte _meno súboru:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "Kontrola _pravopisu"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Štandardný Unixový súbor mbox"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12873,7 +13775,7 @@ msgstr ""
 "Výstup tohto skriptu sa použije ako vaša signatúra.\n"
 "Zadané meno sa použije iba pre zobrazenie."
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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 "
@@ -12882,7 +13784,7 @@ msgstr ""
 "Táto časť umožňuje nastviť chovanie a jazyk pre kontrolu pravopisu. Zoznam "
 "jazykov obsahuje iba tie, pre ktoré máte nainštalované slovníky."
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12890,11 +13792,15 @@ msgstr ""
 "Zadajte meno, ako chcete tento účet označovať.\n"
 "Napríklad \"Pracovný\" alebo \"Osobný\"."
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "_Premenlivá šírka:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12904,170 +13810,179 @@ msgstr ""
 "\n"
 "Kliknutím \"Nasledujúci\" začnete."
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "_Pridať podpis"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "_Vždy načítavať obrázky zo siete"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 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:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "_Typ overenia:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "_Typ overenia:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr "_Automaticky kontrolovať novú poštu každých"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "_Automaticky vložiť smajlíky"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "Píp_nuť pri príchode novej správy"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "_Potvrdenie pri čistení priečinku"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "Š_tandardný podpis:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "Š_tandardné"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Neuprozorňovať na príchod novej správy"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "_Povoliť"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "Štýl _preposielania:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "_Celé meno:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "_HTML správy"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "_Identita"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Jún"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "_Načítať obrázky ak je odosielateľ v adresári"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "Použiť ako š_tandardný účet"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "_Označiť správy ako prečítané po"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Meno:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "_Nikdy nenačítať obrázky zo siete"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "_Zahrať zvuk pri príchode novej správy"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 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:159
+#: mail/mail-config.glade.h:165
 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:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "_Prijem pošty"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "Š_týl odpovede:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "Š_tandardné"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Odstrániť..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "_Posielanie pošty"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "Zobraziť _animované obrázky"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Podpisy"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr "Š_tandardné písmo:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr "Písmo _terminálu:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "Použiť _bezpečné pripojenie (SSL):"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr "_Použiť rovnaké písma ako ostatné aplikácie"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "popis"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr "Prehľadávam %s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13076,7 +13991,7 @@ msgstr ""
 "Chyba počas '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13085,7 +14000,7 @@ msgstr ""
 "Chyba pri vykonávaní operácie:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Pracujem"
 
@@ -13097,12 +14012,12 @@ msgstr "Filtrujem priečinok"
 msgid "Fetching Mail"
 msgstr "Prijímam poštu"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nepodarilo sa použiť filtre pre odosielanú poštu : %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13111,106 +14026,106 @@ msgstr ""
 "Nepodarilo sa pridať do %s: %s\n"
 "Namiesto toho sa pridá do priečinka `Odoslané'."
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Nepodarilo sa pridať do lokálneho priečinku \"Odoslené\": %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Posielam \"%s\""
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Posielam správu %d z %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Zlyhanie na správe %d z %d"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Dokončené."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Ukladám správu do priečinku"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Presúvam správy do %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopírujem správy do %s"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Prechádzam priečinky v \"%s\""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Správy predané ďalej"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otváram priečinok %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "Otváram sklad %s"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstraňujem priečinok %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ukladám priečinok '%s'"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Aktualizujem priečinok"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Čistím priečinok"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vyprázdňujem kôš v '%s'"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Lokálne priečinky"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Získavam správu %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Získavam %d správ"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Ukladám %d správ"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13219,7 +14134,7 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13228,11 +14143,11 @@ msgstr ""
 "Chyba pri ukladaní správ do `%s':\n"
 "%s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Ukladám prílohu"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13241,21 +14156,25 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie je možné zapísať dáta: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odpojujem sa od %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Znovu sa pripojujem na %s"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Rozlišovať veľkosť písmen"
@@ -13273,59 +14192,74 @@ msgstr "Hľadať:"
 msgid "Search"
 msgstr "_Nájsť"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Upraviť podpis"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Výnimky"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Informácia o účte"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Ruším..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Cesta: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Príjem a odoslanie pošty"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 msgid "Cancel _All"
 msgstr "Zrušiť _všetko"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Obnovujem..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Čakám..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Používateľ zrušil operáciu."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Zadajte vaše heslo pre %s"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Zadajte heslo"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "_Uložiť toto heslo"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamätať si heslo pre zvyšok tohto sedenia"
 
@@ -13364,26 +14298,31 @@ msgstr "Zadajte meno pre tento podpis."
 msgid "Name:"
 msgstr "Meno:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Predaná správa - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Predaná správa"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Otváram priečinok %s"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Nastavujem vpriečinok: '%s'"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Aktualizujem vpriečinky pre uri: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13396,88 +14335,88 @@ msgstr ""
 "    '%s'\n"
 "A boli aktualizované."
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "VPriečinky"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "vPriečinky"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Upraviť vpriečinok"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Pokús o úpravu vpriečinku '%s', ktorý neexistuje."
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Nový vPriečinok"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Nevidené"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Videné"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Odpovedané"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Viacero neprečítaných správ"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Viacero správ"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Najnižšia"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Nižšia"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Vyššia"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Najvyššia"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Dnes %l:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Včera %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Generujem zoznam správ"
 
@@ -13533,11 +14472,11 @@ msgstr "Poslať ďalej"
 msgid "No Response Necessary"
 msgstr "Odpoveď nie je nutná"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Odpovedať"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Odpovedať všetkým"
 
@@ -13589,41 +14528,139 @@ msgstr "_Prihlásiť si"
 msgid "_Unsubscribe"
 msgstr "O_dhlásiť"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr "Nastavenie špeciálnych priečinkov a ich off-line chovanie"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Shell Evolution"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Nastavenie priečinkov"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "80%"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Premenuje túto skupinu skratiek"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Prepne, či sa má zobrazovať panel priečinkov"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Skryť panel skratiek"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Štandardná priorita:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Štandardná priorita:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Rozhranie pre nastavenie pošty Evolution"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+#, fuzzy
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "Označiť prílohu, že má byť zobrazená štandardne v texte."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
 msgstr ""
-"Nie je možné preniesť priečinok:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Pridať priečinok"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Koncepty"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Doručená pošta"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "Otváram štandardný priečinok úloh"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Otváram štandardný priečinok úloh"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Otváram štandardný priečinok úloh"
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Odoslaná pošta"
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Odoslané"
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Otváram štandardný priečinok úloh"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Prepne, či sa má zobrazovať panel priečinkov"
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Prepne, či sa má zobrazovať panel skratiek"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "E-mail"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Nepodarilo sa korektne aktualizovať súbory"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13634,7 +14671,7 @@ msgstr ""
 "%s\n"
 "Chyba: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13643,7 +14680,7 @@ msgstr ""
 "Nastala chyba počas kopírovania súborov do\n"
 "`%s'."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13654,7 +14691,7 @@ msgstr ""
 "Prosím, presuňte ho, aby mohli\n"
 "byť nainštalované súbory Evolution."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13752,10 +14789,11 @@ msgstr ""
 "Nie je možné premenovať priečinok:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr "Priečinok \"%s\" už existuje. Prosím, zadajte iné meno."
+msgid "The specified folder name is not valid: %s"
+msgstr "Zadané meno priečinku nie je platné: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -13779,19 +14817,15 @@ msgstr ""
 "Zadaný priečinok sa nedá vytvoriť:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Vytvoriť nový priečinok"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Bez mena)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Vyberte typ importéra, ktorý chcete spustiť:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13805,11 +14839,11 @@ msgstr ""
 "Použijte \"Automaticky\" ak typ nepoznáte a Evolution sa\n"
 "ho pokúsi určiť."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Prosím, vyberte informácie, ktoré chcete importovať:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13821,7 +14855,7 @@ msgstr ""
 "ktoré by bolo možné importovať. Ak to chcete skúsiť znovu,\n"
 "stlačte \"Dozadu\".\n"
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13830,21 +14864,21 @@ msgstr ""
 "Importujem %s\n"
 "Importujem položku %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "Vyberte nástroj pre import"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "Súbor %s neexistuje"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Chyba Evolution"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -13854,11 +14888,11 @@ msgstr ""
 "%s\n"
 "nie je k dispozícii importér."
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Importujem"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -13867,17 +14901,17 @@ msgstr ""
 "Importujem %s\n"
 "Začínam %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Chyba pri štarte %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Chyba pri načítavaní %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13886,35 +14920,35 @@ msgstr ""
 "Importujem %s\n"
 "Importujem položku 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Meno súboru:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Vyberte súbor"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Typ súboru:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Importovať dáta a nastavenia zo starších programov"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Importovať jeden súbor"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -13922,47 +14956,28 @@ msgstr ""
 "Prosím, čakajte...\n"
 "Hľadám existujúce nastavenie"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Spúšťam inteligentné importy"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Vyberte cieľový priečinok pre import týchro dát"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Import"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Zatváram spojenia..."
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Chyba počas synchronizácie \"%s\":\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "Synchronizujem priečinok"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Synchronizujem \"%s\" (%d z %d) ..."
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Nastavenie Evolution"
@@ -13997,7 +15012,7 @@ msgstr "Nie je možné otvoriť zdieľaný priečinok: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Nepodarilo sa nájsť zadaný zdieľaný priečinok."
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14011,16 +15026,10 @@ msgstr ""
 "\n"
 "Chcete ukončiť sprievodcu?"
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 msgid "Quit Assistant"
 msgstr "Ukončiť sprievodcu"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Nová"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Nezadané meno priečinku."
@@ -14078,64 +15087,51 @@ msgstr "Vytvoriť novú skratku"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vyberte priečinok, kam má skratka smerovať:"
 
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "Pracovať _on-line"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "_Pracovať off-line"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Pracovať off-line"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Nezobrazený žiadny priečinok)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Žiadna)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 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:2090
+#: shell/e-shell-window.c:331
 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:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution je momentálne off-line. Stlačením tohto tlačidla prejdete "
 "do módu on-line."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Neplatné argumenty"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Nie je možné zaregistrovať u OAF"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Konfiguračná databáza nenájdená"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Všeobecná chyba"
 
@@ -14248,74 +15244,18 @@ msgstr "O_dstrániť"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstrániť túto skratku z panelu skratiek"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Chyba pri ukladaní skratiek."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Doručená pošta"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Skratky"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Žiadna chyba"
-
-#: 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:575
-msgid "The specified folder type is not valid"
-msgstr "Uvedený typ priečinku nie je platný"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "Chyba V/V"
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr "Nedostatok miesta pre vytvorenie priečinku"
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr "Priečinok je prázdny"
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "Uvedený priečinok nebol nájdený"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "Funkcia nie je v tomto sklade implementovaná"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "Operácia nepodporovaná"
-
-#: 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: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: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:597
-msgid "Cannot create a folder with that name"
-msgstr "Nepodarilo sa vytvoriť priečinok s týmto menom"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Túto operáciu nie je možné urobiť v režime off-line"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Zaškrtávacie tlačidlo"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14326,6 +15266,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% hotových)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Nová"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "\"%s\" v \"%s\""
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14363,74 +15314,6 @@ msgstr ""
 "Chyba z aktivačného systému:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "Chyba CORBA"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Prerušené"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Neplatné argumenty"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Už je vlastník"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Žiadny vlastník"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Nenájdený"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Nepodporovaný typ"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Nepodporovaná schéma"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Nepodporovaná operácia"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Interná chyba"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Existuje"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "Neplatné URI"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Má podpriečinky"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Žiadne voľné miesto"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "Starý vlastník skončil"
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Typ testu"
-
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr "Testovací komponent Evolution"
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr "Aktívne spojenia"
@@ -14459,10 +15342,6 @@ msgstr "_Pošta:"
 msgid "_Tasks:"
 msgstr "Ú_lohy:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr "_Meno priečinku:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder _type:"
 msgstr "_Typ priečinku:"
@@ -14525,22 +15404,6 @@ msgstr ""
 "\n"
 "Stlačením \"Použiť\" uložíte tieto nastavenia."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "Nastavenie špeciálnych priečinkov a ich off-line chovanie"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Shell Evolution"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Ovládací prvok pre priečinok nastavenia Evolution"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Nastavenie priečinkov"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Kliknite na \"Import\" pre spustenie importu súboru do Evolution."
@@ -14579,7 +15442,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Importy"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Import"
 
@@ -14595,16 +15458,16 @@ msgstr "Túto správu už nezobrazovať"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution našiel tieto súbory dát pre import:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Evolution končí..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14639,7 +15502,7 @@ msgstr ""
 "Dúfame, že si užijete výsledky našej tvrdej práce a\n"
 "uvítame vaše príspevky.\n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -14647,36 +15510,48 @@ msgstr ""
 "Ďakujeme\n"
 "Tím Ximian Evolution\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr "Túto správu už nezobrazovať"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Nie je možné inicializovať shell Ximian Evolution."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nie je možné inicializovať shell Ximian Evolution: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Spustiť v režime off-line"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Spustiť v režime on-line"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr "Vynútiť ukončenie všetkých komponentov Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Poslať ladiaci výstup zo všetkých komponent od súboru."
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14685,31 +15560,60 @@ msgstr ""
 "%s: --online a --offline nie je možné použiť naraz.\n"
 "  Použite %s --help pre zobrazenie dalších informácií.\n"
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Vyberte nástroj pre import"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "ID _certifikátu:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "Priebeh"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Výraz"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Zliať e-mailovú adresu"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"Platnosť certifikátu vypršala: %s\n"
+"Vydal: %s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14767,91 +15671,376 @@ msgid "Backup All"
 msgstr "Blackpool"
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "ID _certifikátu:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Nedôveryhodný certifikát"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "ID _certifikátu:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Spoločé meno"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "ID _certifikátu:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "_Upraviť"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Nepodarilo sa overiť certifikáty"
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Výraz"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Organizácia"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Organizáčná jednotka"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Pohľad"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "ID _certifikátu:"
+
+#: smime/gui/smime-ui.glade.h:42
+#, fuzzy
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr "Neplatná certifikačná autorita (CA)"
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "ID _certifikátu:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Import"
+msgid "Certificate already exists"
+msgstr "ID karty už existuje"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Vermont"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "S"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "OK"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "S"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "ID _certifikátu:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "ID _certifikátu:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "Nedôveryhodný certifikát"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "ID"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Predmet je %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Nie je možné spracovať priečinok fronty"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "Neplatná certifikačná autorita (CA)"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Neplatná certifikačná autorita (CA)"
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Žiadna informácia"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "príloha"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "ID _certifikátu:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Curitiba"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "Severmí Karolina"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Výraz"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s o %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Zlyhanie podpisu certifikátu"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "_Vložiť"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Predmet je %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Zlyhanie podpisu certifikátu"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Zadajte vaše heslo pre %s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "ID _certifikátu:"
 
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
@@ -14902,7 +16091,7 @@ msgstr "Skopíruje výber"
 msgid "Copy to Folder..."
 msgstr "Kopírovať do priečinku..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Vystrihne výber"
 
@@ -14918,7 +16107,7 @@ msgstr "Presunúť vybrané kontakty do iného priečinku..."
 msgid "Move to Folder..."
 msgstr "Presunúť do priečinka..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Vloží obsah schránky"
 
@@ -14926,8 +16115,8 @@ msgstr "Vloží obsah schránky"
 msgid "Previews the contacts to be printed"
 msgstr "Náhľad kontaktov pred tlačou"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "U_kážka pred tlačou"
@@ -14972,13 +16161,13 @@ msgstr "Zastaviť načítavanie"
 msgid "View the current contact"
 msgstr "Zobraziť aktuálny kontakt"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "A_kcie"
 
@@ -15008,142 +16197,110 @@ msgstr "_Poslať správu kontaktu..."
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "Vytvoriť novú celodennú schôdzku"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Vytvoriť novú schôdzku"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "Vytvoriť nový priečinok"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Vytvorí novú požiadavku na stretnutie"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Vytvorí novú úlohu"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Deň"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Odstrániť všetky výskyty"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Odstrániť schôdzku"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Odstrániť tento výskyt"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Odstrániť tento výskyt"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Prejsť na"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Prejsť dozadu"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Prejsť dopredu"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Prejsť na _dátum"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Prejsť na zadaný dátum"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Prejsť na dnešný dátum"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "Zoznam"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Mesiac"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Nová _schôdzka"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Nová Kaledónia"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Nové stretnutie"
-
-#: ui/evolution-calendar.xml.h:27
-#, fuzzy
-msgid "New _Task"
-msgstr "Nová úloha"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Ukážka kalendára pred tlačou"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Vytlačí tento kalendár"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publikovať informácie o voľnom čase pre tento kalendár"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Bourges"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Verejný priečinok obsahujúci schôdzky a udalosti"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Zobraziť detaily"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Zobraziť jeden deň"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Zobraziť jeden mesiac"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Zobraziť jeden týždeň"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Zobraziť pracovný týždeň"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Týždeň"
 
@@ -15207,7 +16364,7 @@ msgstr "Uložiť túto položku na disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Súbor"
 
@@ -15423,7 +16580,7 @@ msgstr "Označiť _všetky ako prečítané"
 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 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "Vložiť správy zo schránky"
 
@@ -15479,16 +16636,6 @@ msgstr "_Obrátiť výber"
 msgid "_Threaded Message List"
 msgstr "Zoznam _vlákien"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Zavrie toto okno"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "_Zavrieť"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "_Pridať odosielateľa do adresára"
@@ -15646,256 +16793,281 @@ msgstr "Predá vybranú správu niekomu ako prílohu"
 msgid "Increase the text size"
 msgstr "Zväčšiť veľkosť písma"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Nahrávať _obrázky"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Označiť ako _dôležité"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Označiť ako _neprečítanú"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Označiť ako nedô_ležité"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "Označí vybrané správy ako už prečítané"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "Označí vybrané správy ako dôležité"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Označí vybrané správy ako nedôležité"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Označí vybrané správy ako neprečítané"
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Označí vybrané správy ako neprečítané"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Označí vybrané správy ako nedôležité"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Označí vybrané správy na zmazanie"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Presunúť"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "Presunúť vybrané správy do iného priečinku"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Nasledujúca"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "Nasledujúca _dôležitá správa"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "Nasledujúce _vlákno"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "Nasledujúca _neprečítaná správa"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Nenájdený"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Otvorí aktuálnu správu v novom okne"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Otvorí vybranú správu v composeri pre nové poslanie"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Pôvodná _veľkosť"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "Predchádzajúca n_eprečítaná správa"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Poslať odpoveď"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr "Poslať odpoveď na správu vo verejnom priečinku"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "P_redchádzajúca dôležitá správa"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Náhľad správy pred tlačou"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Predchádzajúca"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Vytlačí túto správu"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "_Presmerovať"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Presmeruje (bounce) vybranú správu niekomu inému"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Vráti text na jeho pôvodnú veľkosť"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 msgid "S_earch in Message..."
 msgstr "_Nájsť v správe..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "_Menšie"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Uložiť správu do textového súboru"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Hľadá v texte zobrazenej správy"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr "Nastaví stránku pre aktuálnu tlačiareň"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Zobraziť zdrojový _kód správy"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Zobraziť ú_plné hlavičky"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Hľadá v texte zobrazenej správy"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Zobraziť správu normálne"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Zobraziť správu so všetkými hlavičkami"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Zobraziť zdrojový poštový formát v správe"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "_Veľkosť textu"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Obnoviť vybrané správy"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "VPriečinok na _konferenciu..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "Vpriečinok na _odosielateľa..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "Vpriečinok na _adresátov..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "Vpriečinok na _predmet..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "_Priložené"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "_Kopírovať do priečinku"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "Vytvoriť _filter zo správy"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "Správy _predané ďalej"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "_Prejsť na"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "_V texte"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "_Väčšie"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "Zobrazenie _správy"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Presunúť do priečinku"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "_Nasledujúca správa"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "_Normálne zobrazenie"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "_Otvoriť správu"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "_Predchádzajúca správa"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "_Citované"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "Poslať _znovu..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "_Nástroje"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "Obnoviť _zmazané"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Zavrie toto okno"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "_Zavrieť"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Priložiť"
@@ -16173,12 +17345,13 @@ msgid "Change Evolution's settings"
 msgstr "Zmeniť nastavenie Evolution"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "_Koniec"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Vytvorí novú požiadavku na stretnutie"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "_Okno Evolution"
+msgid "E_xit"
+msgstr "_Koniec"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16190,62 +17363,75 @@ msgstr "Importovať dáta z iných programov"
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "_Okno Evolution"
+msgid "Open a new window"
+msgstr "Otvoriť v novom okne"
 
 #: ui/evolution.xml.h:11
 msgid "Pi_lot Settings..."
 msgstr "Nastavenie _pilota..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Príjem / odoslanie"
+
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr "Poslať neodoslanú poštu a prijať novú poštu"
+
+#: ui/evolution.xml.h:14
 msgid "Set up Pilot configuration"
 msgstr "Nastavenie Pilota"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Zobrazí informáciu o Ximian Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Pošle správu o chybe"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "_Poslať správu o chybe"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 "Pošle správu o chybe pomocou nástroja pre oznamovanie chýb Priateľ v núdzi."
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Prepnúť"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Prepne, či pracujete on alebo off-line."
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "O Ximian _Evolution..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "_Pomocník"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "_Import..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Nový"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Poslať / Prijať"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "_Nájsť teraz"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Tlač súhrnu"
@@ -16374,12 +17560,12 @@ msgstr "Definovať pohľady..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "PUSŠPSN"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -16512,7 +17698,7 @@ msgstr "_Nájsť"
 msgid "_Find Now"
 msgstr "_Nájsť teraz"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "_Vyčistiť"
 
@@ -16528,24 +17714,264 @@ msgstr "ID podpoložky"
 msgid "Text"
 msgstr "Text"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Vymazať"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Nájsť"
 
+#~ msgid "Account Name"
+#~ msgstr "Meno účtu"
+
+#~ msgid "Server Name"
+#~ msgstr "Meno serveru"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "LDAP nie je v tejto verzii Evolution povolený"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Iné kontakty"
+
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "Nastavenie prístupu k adresárovým serverom LDAP"
+
+#~ msgid "Directory Servers"
+#~ msgstr "Adresárové servery"
+
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Rozhranie pre konfiguráciu LDAP adresára Evolution"
+
+#~ msgid "Add LDAP Server"
+#~ msgstr "Pridať LDAP Server"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Krok 4. Meno displeja"
+
+#~ msgid "Find contact in"
+#~ msgstr "Nájsť kontakt v"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Kliknutím pridáte kontakt *"
+
+#~ msgid "Business Address"
+#~ msgstr "Adresa zamestania"
+
+#~ msgid "Department"
+#~ msgstr "Oddelenie"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "Voľno/zaneprázdnený URL"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Povolanie"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Otváram úlohy na %s"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Poslať aj tak?"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Zrušiť aktuálnu poštovú operáciu"
+#~ msgid "Folder _name"
+#~ msgstr "_Meno priečinku:"
+
+#~ 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."
+
+#~ msgid "Connecting..."
+#~ msgstr "Pripájam sa na server..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Tento priečinok nemôže obsahovať správy."
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Nie je možné otvoriť zdieľaný priečinok: %s."
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Vyberte cieľový priečinok pre import týchro dát"
+
+#, fuzzy
+#~ msgid "A folder named \"%s\" already exists.  Please use a different name."
+#~ msgstr "Priečinok \"%s\" už existuje. Prosím, zadajte iné meno."
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nie je možné preniesť priečinok:\n"
+#~ "%s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "Pridať priečinok"
+
+#~ msgid "Drafts"
+#~ msgstr "Koncepty"
+
+#~ msgid "Outbox"
+#~ msgstr "Odoslaná pošta"
+
+#~ msgid "Sent"
+#~ msgstr "Odoslané"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Chyba počas synchronizácie \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "Synchronizujem priečinok"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Synchronizujem \"%s\" (%d z %d) ..."
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Nezobrazený žiadny priečinok)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(Žiadna)"
+
+#~ msgid "No error"
+#~ msgstr "Žiadna chyba"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Priečinok s týmto menom už existuje"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Uvedený typ priečinku nie je platný"
+
+#~ msgid "I/O error"
+#~ msgstr "Chyba V/V"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Nedostatok miesta pre vytvorenie priečinku"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Priečinok je prázdny"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Uvedený priečinok nebol nájdený"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Funkcia nie je v tomto sklade implementovaná"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Operácia nepodporovaná"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Uvedený typ nie je podporovaný týmto skladom"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Uvedený priečinok nie je možné zmeniť alebo odstrániť"
+
+#~ 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."
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Nepodarilo sa vytvoriť priečinok s týmto menom"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Túto operáciu nie je možné urobiť v režime off-line"
+
+#~ msgid "Checkbox"
+#~ msgstr "Zaškrtávacie tlačidlo"
+
+#~ msgid "CORBA error"
+#~ msgstr "Chyba CORBA"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Neplatné argumenty"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Už je vlastník"
+
+#~ msgid "No owner"
+#~ msgstr "Žiadny vlastník"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Nepodporovaný typ"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Nepodporovaná schéma"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Nepodporovaná operácia"
+
+#~ msgid "Internal error"
+#~ msgstr "Interná chyba"
+
+#~ msgid "Exists"
+#~ msgstr "Existuje"
+
+#~ msgid "Invalid URI"
+#~ msgstr "Neplatné URI"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Má podpriečinky"
+
+#~ msgid "No space left"
+#~ msgstr "Žiadne voľné miesto"
+
+#~ msgid "Old owner has died"
+#~ msgstr "Starý vlastník skončil"
+
+#~ msgid "Test type"
+#~ msgstr "Typ testu"
+
+#~ msgid "Evolution Test Component"
+#~ msgstr "Testovací komponent Evolution"
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Meno poľa"
+#~ msgid "import"
+#~ msgstr "Import"
 
-#~ msgid "Family Name"
-#~ msgstr "Priezvisko"
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Vytvoriť novú celodennú schôdzku"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Nová _schôdzka"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Nové stretnutie"
+
+#, fuzzy
+#~ msgid "New _Task"
+#~ msgstr "Nová úloha"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "_Okno Evolution"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "_Okno Evolution"
+
+#~ msgid "Toggle"
+#~ msgstr "Prepnúť"
+
+#~ msgid "Clear"
+#~ msgstr "Vymazať"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Zrušiť aktuálnu poštovú operáciu"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -16638,9 +18064,6 @@ msgstr "Nájsť"
 #~ msgid "VCard (.vcf, .gcrd)"
 #~ msgstr "VCard (.vcf, .gcrd)"
 
-#~ msgid "Loading..."
-#~ msgstr "Načítavam..."
-
 #~ msgid "Searching..."
 #~ msgstr "Hľadám...."
 
@@ -16692,10 +18115,6 @@ msgstr "Nájsť"
 #~ msgstr "EBook nenačítaný\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "ID karty už existuje"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Operácia zrušená"
 
@@ -16842,9 +18261,6 @@ msgstr "Nájsť"
 #~ msgid "Callback"
 #~ msgstr "Spätné volanie"
 
-#~ msgid "Company"
-#~ msgstr "Firma"
-
 #~ msgid "Comp"
 #~ msgstr "Firma"
 
@@ -16911,9 +18327,6 @@ msgstr "Nájsť"
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#~ msgid "Phone"
-#~ msgstr "Telefón"
-
 #~ msgid "Birth date"
 #~ msgstr "Dátum narodenia"
 
@@ -16926,9 +18339,6 @@ msgstr "Nájsť"
 #~ msgid "Arbitrary"
 #~ msgstr "Iné"
 
-#~ msgid "ID"
-#~ msgstr "ID"
-
 #~ msgid "Last Use"
 #~ msgstr "Posledné použitie"
 
@@ -16941,9 +18351,6 @@ msgstr "Nájsť"
 #~ msgid "Folder containing contact information"
 #~ msgstr "Priečinok obsahujúci informácie o kontaktoch"
 
-#~ msgid "LDAP Server"
-#~ msgstr "LDAP Server"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "LDAP server obsahujúci informácie o kontaktoch"
 
@@ -16953,18 +18360,6 @@ msgstr "Nájsť"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Priečinok obsahujúci informácie o verejných kontaktoch"
 
-#~ msgid "_Contact"
-#~ msgstr "_Kontakt"
-
-#~ msgid "Create a new contact"
-#~ msgstr "Vytvoriť nový kontakt"
-
-#~ msgid "New Contact List"
-#~ msgstr "Nový zoznam kontaktov"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "Vytvoriť nový zoznam kontaktov"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "URI, ktoré zobrazí prehliadač priečinku"
 
@@ -16980,9 +18375,6 @@ msgstr "Nájsť"
 #~ msgid "Is New Card"
 #~ msgstr "Je nová karta"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "Žiadne karty"
 
@@ -17029,30 +18421,6 @@ msgstr "Nájsť"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "Verejný priečinok obsahujúci úlohy to-do"
 
-#~ msgid "New appointment"
-#~ msgstr "Nová schôdzka"
-
-#~ msgid "_Appointment"
-#~ msgstr "S_chôdzka"
-
-#~ msgid "New meeting"
-#~ msgstr "Nové stretnutie"
-
-#~ msgid "M_eeting"
-#~ msgstr "_Stretnutie"
-
-#~ msgid "New task"
-#~ msgstr "Nová úloha"
-
-#~ msgid "_Task"
-#~ msgstr "Ú_loha"
-
-#~ msgid "New All Day Appointment"
-#~ msgstr "Nová celodenná schôdzka"
-
-#~ msgid "All _Day Appointment"
-#~ msgstr "_Celodenná Schôdzka"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "Nepodarilo sa aktualizovať neplatný objekt"
 
@@ -17098,9 +18466,6 @@ msgstr "Nájsť"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "Otváram kalendára na%s"
 
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Otváram štandardný priečinok úloh"
-
 #~ msgid "Evaluation of the search expression did not yield a boolean value"
 #~ msgstr "Vyhodnotenie výrazu pre hľadanie neskončilo pravdivostnou hodnotou"
 
@@ -17138,9 +18503,6 @@ msgstr "Nájsť"
 #~ "Evolution našiel súbory GnomeCard.\n"
 #~ "Chcete ich naimportovať do Evolution?"
 
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Rozhranie pre nastavenie pošty Evolution"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "Priečinok obsahujúci poštu"
 
@@ -17156,9 +18518,6 @@ msgstr "Nájsť"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Virtuálny priečinok s odpadkami"
 
-#~ msgid "Properties..."
-#~ msgstr "Vlastnosti..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Zmení vlastnosti tohto priečinku"
 
@@ -17168,15 +18527,6 @@ msgstr "Nájsť"
 #~ msgid "You have unsent messages, do you wish to quit anyway?"
 #~ msgstr "Máte neodoslané správy. Chcete skončiť aj tak?"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Nová správa"
-
-#~ msgid "_Mail Message"
-#~ msgstr "_Poslať správu"
-
-#~ msgid "Compose a new mail message"
-#~ msgstr "Napísať novú správu"
-
 #~ msgid "New Message Post"
 #~ msgstr "Nová správa"
 
@@ -18987,9 +20337,6 @@ msgstr "Nájsť"
 #~ msgid "Cumberland"
 #~ msgstr "Cumberland"
 
-#~ msgid "Curitiba"
-#~ msgstr "Curitiba"
-
 #~ msgid "Curitiba Apt"
 #~ msgstr "Curitiba Apt"
 
@@ -21981,9 +23328,6 @@ msgstr "Nájsť"
 #~ msgid "North Bend"
 #~ msgstr "North Bend"
 
-#~ msgid "North Carolina"
-#~ msgstr "Severmí Karolina"
-
 #~ msgid "North Conway"
 #~ msgstr "North Conway"
 
@@ -23595,9 +24939,6 @@ msgstr "Nájsť"
 #~ msgid "State College"
 #~ msgstr "State College"
 
-#~ msgid "Stauning"
-#~ msgstr "Stauning"
-
 #~ msgid "Staunton"
 #~ msgstr "Staunton"
 
@@ -24186,9 +25527,6 @@ msgstr "Nájsť"
 #~ msgid "United Arab Emirates "
 #~ msgstr "Spojené Arabské Emiráty"
 
-#~ msgid "Unst"
-#~ msgstr "Unst"
-
 #~ msgid "Upington"
 #~ msgstr "Upington"
 
@@ -24297,12 +25635,6 @@ msgstr "Nájsť"
 #~ msgid "Veracruz"
 #~ msgstr "Veracruz"
 
-#~ msgid "Vermillion"
-#~ msgstr "Vermillion"
-
-#~ msgid "Vermont"
-#~ msgstr "Vermont"
-
 #~ msgid "Vernal"
 #~ msgstr "Vernal"
 
@@ -24834,9 +26166,6 @@ msgstr "Nájsť"
 #~ msgid " F"
 #~ msgstr " F"
 
-#~ msgid " C"
-#~ msgstr " C"
-
 #~ msgid "knots"
 #~ msgstr "uzlov"
 
@@ -25455,9 +26784,6 @@ msgstr "Nájsť"
 #~ msgid "Freezing haze"
 #~ msgstr "Mrznúci opar"
 
-#~ msgid "Spray"
-#~ msgstr "Sprej"
-
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Jemné spŕšky v okolí"
 
@@ -25823,18 +27149,6 @@ msgstr "Nájsť"
 #~ "Odstrániť priečinok pridaný pomocou \"Otvoriť priečinok iného používateľa"
 #~ "\""
 
-#~ msgid "Send / Receive"
-#~ msgstr "Príjem / odoslanie"
-
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Poslať neodoslanú poštu a prijať novú poštu"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Prepne, či sa má zobrazovať panel priečinkov"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Prepne, či sa má zobrazovať panel skratiek"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Zobraziť vybraný priečinok"
 
@@ -25862,9 +27176,6 @@ msgstr "Nájsť"
 #~ msgid "_Rename..."
 #~ msgstr "_Premenovať..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Poslať / Prijať"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "_Panel skratiek"
 
diff --git a/po/sl.po b/po/sl.po
index 8aded5a503..cc7a94b9ea 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-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"
@@ -28,12 +28,172 @@ msgstr "Nisem mogel naložiti %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Nisem mogel prebrati Pilotovega adresarja"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Krajevne mape"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "ID _certifikata:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Nastavi mapo..."
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Stiki"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Evolucijin adresarjev veznik"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolucijin adresarjev veznik"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolucijin adresarjev veznik"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolucijin veznik Koledarja"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Nastavitev Evolucijine pošte"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Adresar"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Lastnosti..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Zbriši"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "P_reimenuj"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Nov stik:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Stik"
+
+#: addressbook/gui/component/addressbook-component.c:219
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Ustvari nov stik"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Nov seznam stikov"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "Seznam _stikov"
+
+#: addressbook/gui/component/addressbook-component.c:226
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Ustvari nov seznam stikov"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+#, fuzzy
+msgid "Personal"
+msgstr "Priština"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+#, fuzzy
+msgid "Work"
+msgstr "Delam"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "Strežnik LDAP"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Nisem mogel ustvariti imenika %s: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr "Nisem se mogel povezati s strežnikom LDAP."
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -41,49 +201,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 #, fuzzy
 msgid "Could not perform query on Root DSE"
 msgstr "Nisem mogel razčleniti niza poizvedbe"
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Napaka ob nalaganju podatkov o filtrih:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "Odgovor strežnika IMAP ni vseboval podatkov %s"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Ime računa"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Ime strežnika"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(SSL v to zgradbi Evolucije ni vgrajen)"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Drugo stiki"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -91,7 +234,7 @@ msgstr ""
 "Nisem megel odpreti tega adresarja. Prosim preverite, ali \n"
 "pot obstaja in ali imate dovoljenje za dostop."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -101,7 +244,7 @@ msgstr ""
 "Ne morem odpreti tega adresarja. To pomeni, da \n"
 "ste vpisali neveljaven URI ali, da strežnik LDAP ne deluje"
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -113,7 +256,7 @@ msgstr ""
 "ko boste s spodnje povezave prenesli program OpenLDAP,\n"
 "Evolucijo prevesti iz izvorne kode CVS.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -127,46 +270,45 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Kliknite tu za odprtje adresarja"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr "Nisem mogel preveriti certifikatov."
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "Vpišite geslo za %s (uporabnik %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "Ime se začne z"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 #, fuzzy
 msgid "Email begins with"
 msgstr "Ime se začne z"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Kategorija je"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Katerokoli polje vsebuje"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Napredno..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -174,7 +316,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -182,96 +324,41 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "katerakoli kategorija"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "URI, ki naj ga prikaže brskalnik map"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "ID _certifikata:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
 msgstr ""
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Stiki"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#, fuzzy
-msgid "Directory Servers"
-msgstr "N_ov strežnik imenikov"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Evolucijin adresarjev veznik"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Evolucijin adresarjev veznik"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolucijin adresarjev veznik"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Evolucijin adresarjev veznik"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolucijin veznik Koledarja"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -295,6 +382,7 @@ msgstr "_Preveri za podprte vrste  "
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -330,8 +418,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Add LDAP Server"
-msgstr "Strežnik LDAP"
+msgid "Addressbook Creation Assistant"
+msgstr "Nastavitev"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -349,65 +437,64 @@ msgstr "Anonimno"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 #, fuzzy
 msgid "Connecting"
 msgstr "Connecticut"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "_Razločno ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Edit LDAP Server"
 msgstr "Strežnik LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address:"
 msgstr "_E-poštni naslov:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 "Evolucija bo uporabila ta e-poštni naslov, za vašo avtentifikacijo pri "
 "strežniku"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolucija bo uporabila ta e-poštni naslov, za vašo avtentifikacijo pri "
 "strežniku"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Finished"
 msgstr "_Poišči"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Splošno"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
-msgid "LDAP Configuration Assistant"
-msgstr "Nastavitev"
+msgid "Group:"
+msgstr "Skupina"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Nikoli"
 
@@ -431,8 +518,8 @@ msgid "S_earch scope: "
 msgstr "_Doseg iskanja:"
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Iskanje"
 
@@ -477,28 +564,28 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:47
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-#, fuzzy
-msgid "Step 1: Server Information"
-msgstr "Podatki o izvorni kodi"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
-msgid "Step 2: Connecting to Server"
-msgstr "Vzpostavljam povezavo s strežnikom..."
+msgid "Step 2: Server Information"
+msgstr "Podatki o izvorni kodi"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr ""
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Vzpostavljam povezavo s strežnikom..."
 
 #: addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
-msgid "Step 4: Display Name"
-msgstr "Piskaj ob zaslonskih alarmih"
+msgid "Step 4: Searching the Directory"
+msgstr "Vzpostavljam povezavo s strežnikom..."
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -511,14 +598,6 @@ msgstr "Shranjena iskanja"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -526,7 +605,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -534,7 +613,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -544,23 +623,22 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -570,7 +648,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:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -580,7 +658,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:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -590,6 +668,15 @@ msgstr ""
 "To ime bo uporabljeno za identifikacijo vašega računa. Uporablja se le za "
 "prikaz."
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"To ime bo uporabljeno za identifikacijo vašega računa. Uporablja se le za "
+"prikaz."
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -617,23 +704,31 @@ msgid "Using email address"
 msgstr "E-poštni naslov"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Kadar je možno"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Prikaz"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 #, fuzzy
 msgid "_Download limit:"
 msgstr "_Omejitev prenosov"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -641,61 +736,60 @@ msgstr "_Omejitev prenosov"
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 #, fuzzy
 msgid "_Port number:"
 msgstr "Številka vrat:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 #, fuzzy
 msgid "_Search base:"
 msgstr "Iskanje v _zbirki:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "Ime _strežnika:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Čas podaljška spanja (minut)"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid "cards"
 msgstr "ni vizitk"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Znova se povezujem z %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid "general-tab"
 msgstr "Splošno"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "searching-tab"
 msgstr "Iskanje"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Ime"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolucijin vmesnik za izibro imen iz adresarja."
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Odstrani vse"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Odstrani"
@@ -724,25 +818,21 @@ msgstr "Dodaj k stikom"
 msgid "Unnamed Contact"
 msgstr "Neimenovan stik"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Ime"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Izvorna koda"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Izberi stike iz adresarja"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-#, fuzzy
-msgid "Find contact in"
-msgstr "Poišči stik"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolucijin vmesnik za izibro imen iz adresarja."
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
 msgid "Find"
@@ -823,7 +913,8 @@ msgid "D_epartment:"
 msgstr "O_ddelek:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Podrobnosti"
 
@@ -893,12 +984,12 @@ msgid "_Categories..."
 msgstr "Ka_tegorije..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Zbriši"
@@ -2038,7 +2129,7 @@ msgid "Esq."
 msgstr "Ssq."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Polno ime"
 
@@ -2134,11 +2225,27 @@ msgstr "Urejevalnik stikov"
 msgid "Save List as VCard"
 msgstr "Shrani kot vVizitko"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Spremenjen stik:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Konfliktni stik:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Zaznan podvojen stik"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Spremenjeno ime ali e-poštni naslov tega stika že\n"
+"obstaja v tej mapi. Ga želite vseeno dodati?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Nov stik:"
@@ -2155,22 +2262,6 @@ msgstr ""
 "Ime ali e-poštni naslov tega stika že obstaja v tej mapi.\n"
 "Ga želite vseeno dodati?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Spremenjen stik:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Konfliktni stik:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"Spremenjeno ime ali e-poštni naslov tega stika že\n"
-"obstaja v tej mapi. Ga želite vseeno dodati?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2278,9 +2369,9 @@ msgstr "Posreduj _stik"
 msgid "Send Message to Contact"
 msgstr "Stiku pošlji sporočilo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Natisni"
@@ -2302,9 +2393,12 @@ msgstr "Prestavi v mapo..."
 msgid "Cut"
 msgstr "Izreži"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopiraj"
 
@@ -2313,16 +2407,8 @@ msgstr "Kopiraj"
 msgid "Paste"
 msgstr "Prilepi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Zbriši"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 #, fuzzy
 msgid "Current View"
 msgstr "_Trenutni pogled"
@@ -2336,166 +2422,170 @@ msgid ""
 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:2
 msgid "Assistant"
 msgstr "Pomočnik"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Službeni faks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Službebni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Službeni telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Povratni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Telefon v avtu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "kategorije"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Telefon podjetja"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Oddelek"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "E-pošta"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "E-naslov 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "E-naslov 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Družinsko ime"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Zavedi kot"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "URL zasedenosti"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Domači naslov"
+#, fuzzy
+msgid "Given Name"
+msgstr "Družinsko ime"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Domači faks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Domač telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Domač telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Suein telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Jordanija"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Upravljalec"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Prenosni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Vzdevek"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Opomba"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Pisarna"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organizacija"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Drug naslov"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Drugi faks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Drug telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Pozivnik"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Osnovni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Poklic"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Radijo"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Vloga"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Partner(ka)"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Naziv"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Enote: "
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Spletna stran"
 
@@ -2596,11 +2686,19 @@ msgstr "Člani"
 msgid "Job Title"
 msgstr "Službeni _naziv:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Domači naslov"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Domači naslov"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Drug naslov"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2612,116 +2710,113 @@ msgstr "Domači faks"
 msgid "Blog"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Uspeh"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Skladišče, ki ni na mreži"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Nimate dovoljenja"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Vizitka ni bila najdena"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "ID vizitke že obstaja"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Protokol ni podprt"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "preklicano"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "Avtentifikacija ni uspela."
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Potrebna je avtentifikacija"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #, fuzzy
 msgid "Addressbook does not exist"
 msgstr "Mapa %s ne obstaja"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Drugačna napaka"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Želite shraniti spremembe"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 #, fuzzy
 msgid "_Discard"
 msgstr "_Prikaz"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Napaka ob dodajanju seznama"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Napaka ob dodajanju vizitke"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Napaka ob spreminjanju seznama"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Napaka ob spreminjanju vizitke"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Napaka ob odstranjevanju seznama"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Napaka ob odstranjevanju vizitke"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2730,7 +2825,7 @@ msgstr ""
 "Zahtevali ste prikaz %d vizitk. To bo povzročilo odprtje %d novih oken na \n"
 " vašem zaslonu. Resnično želite prikazati vse te vizitke?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2739,50 +2834,50 @@ msgstr ""
 "%s že obstaja\n"
 "Jo želite prepisati?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, fuzzy
 msgid "Overwrite"
 msgstr "Prepiši datoteko?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, fuzzy, c-format
 msgid "Error saving %s: %s"
 msgstr "Napaka ob shranjevanju datoteke: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "vizitka.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "seznam"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Prestavi vizitko v"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kopiraj vizitko v"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Prestavi vizitke v"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kopiraj vizitke v"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Več vVizitk"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "VVizitka za %s"
@@ -2979,7 +3074,7 @@ msgstr "Robovi"
 msgid "Number of columns:"
 msgstr "Število stolpcev:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Možnosti"
 
@@ -3168,18 +3263,18 @@ msgstr "Neimenovan seznam stikov"
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Nisem mogel pognati strežnika wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Nisem mogel pognati programa wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nisem mogel prebrati Pilotovega koledarja"
 
@@ -3187,24 +3282,91 @@ msgstr "Nisem mogel prebrati Pilotovega koledarja"
 msgid "Default Priority:"
 msgstr "Privzeta prioriteta:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nisem mogel prebrati Pilotovega seznama opravil"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Nastavitve koledarja in nalog"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Koledar"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolucijin veznik koledarja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Evolucijin veznik Koledarja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolucijin pregledovalnik iTip/iMip"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolucijin pregledovalnik iTip/iMip"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolucijin veznik Koledarja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Urejevalnik Evolucijinih novic"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolucijin veznik Koledarja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolucijin veznik opravil"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Naloge"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Tovarna za storitev opozorlinega alarma"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Pričetek ob:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Konec ob:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Alarm Evolucije"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarmi ob %s"
@@ -3279,44 +3441,173 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "O tem programu me ne sprašuj več."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Tovarna za storitev opozorlinega alarma"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Nisem mogel inicializirati Bonoba"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Nisem mogel inicializirati gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Nisem mogel ustvariti tovarne opozorilnega alrama"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "neveljaven čas"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "Napaka iKoledarja"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Barva za opravila, ki so na vrsti danes"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Barva za opravila, ki so na vrsti danes"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "Kaži čase _koncev sestankov v tedenskih in mesečnih pogledih"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Predogled koledarja, ki bo natisnjen"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#, fuzzy
+msgid "Units of default reminder"
+msgstr "Ustvari nove sestanke s privzetim _opomnilnikom"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "_Vprašaj za potrditev ob brisanju predmetov"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "_Vprašaj za potrditev ob brisanju predmetov"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Zbriši izbrana opravila"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Kaži številke tednov v navigatorju po dnevih"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Povzetek vsebuje"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Opis vsebuje"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Komentar vsebuje"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Brez zadetka"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3328,83 +3619,111 @@ msgstr ""
 " \n"
 "Resnično zbriši te naloge? "
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "je manjše"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "dni"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A, %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Natisni ta koledar"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Nova Kaledonija"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "Nov sestanek"
+
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "_Sestanek"
+
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Ustvari nov sestanek"
+
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "Nov sestanek"
+
+#: calendar/gui/calendar-component.c:640
 #, fuzzy
-msgid "Rename"
-msgstr "P_reimenuj"
+msgid "M_eeting"
+msgstr "Sestanek"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:641
+msgid "Create a new meeting request"
+msgstr "Ustvari nov zahtevek za sestanek"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
+#: calendar/gui/calendar-component.c:646
 #, fuzzy
-msgid "Personal"
-msgstr "Priština"
+msgid "New all day appointment"
+msgstr "Nov sestanek"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
+#: calendar/gui/calendar-component.c:647
 #, fuzzy
-msgid "Work"
-msgstr "Delam"
+msgid "All _Day Appointment"
+msgstr "_Sestanek"
+
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Ustvari nov sestanek"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3528,7 +3847,7 @@ msgstr "Pošlji kot:"
 msgid "With these arguments:"
 msgstr "S temi argumenti:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 #, fuzzy
 msgid "dialog1"
 msgstr "Kaži dialog"
@@ -3545,6 +3864,10 @@ msgstr "ur"
 msgid "minutes"
 msgstr "minut"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3578,8 +3901,8 @@ msgstr "Pošlji e-pošto"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Povzetek:"
 
@@ -3608,7 +3931,7 @@ msgstr "konec sestanka"
 msgid "hour(s)"
 msgstr "ur"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minut"
 
@@ -3664,7 +3987,7 @@ msgstr "Dni"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "petek"
 
@@ -3678,7 +4001,7 @@ msgstr "Minut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "ponedeljek"
 
@@ -3689,7 +4012,7 @@ msgstr "_ned"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "sobota"
 
@@ -3703,7 +4026,7 @@ msgstr "Kaži številke tednov v navigatorju po dnevih"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "nedeljo"
 
@@ -3723,7 +4046,7 @@ msgstr "Seznam _nalog"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "četrtek"
 
@@ -3741,7 +4064,7 @@ msgstr "Oblika izpisa časa:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "torek"
 
@@ -3751,12 +4074,12 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "sreda"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Delavni teden"
 
@@ -3794,7 +4117,7 @@ msgid "_Fri"
 msgstr "_pet"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Splošno"
 
@@ -3839,76 +4162,76 @@ msgstr "_sre"
 msgid "before every appointment"
 msgstr "pred koncem sestanka"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Ste prepričani, da želite preklicati in zbrisati ta sestanek?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Ste prepričani, da želite preklicati in zbrisati to opravilo?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Ste prepričani, da želite preklicati in zbrisati ta dnevniški vpis?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Ta dogodek je bil zbrisan."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "To opravilo je bilo zbrisano."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Ta dnevniški vpis je bil zbrisan."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Naredili ste spremembe. Prekliči spremembe in zapri urejevalnik?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Ničesar niste spremenili, zapri urejevalnik?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Ta dogodek je bil spremenjen."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Ta posel je bil spremenjen."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Ta dnevniški vpis je bil spremenjen."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Naredili ste spremembe. Pozabi spremembe in posodobi urejevalnik?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Ničesar niste spremenili, posodobi urejevalnik?"
@@ -3918,169 +4241,174 @@ msgstr "%s Ničesar niste spremenili, posodobi urejevalnik?"
 msgid "Validation error: %s"
 msgstr "Neznana napaka: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " do "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Končano "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "končano "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Rok "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Rok"
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 #, fuzzy
 msgid "Could not update object"
 msgstr "Nisem mogel posodobiti predmeta!"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Uredi sestake"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Sestanek - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Naloga - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Vpis v dnevniku - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Ni povzetka"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Shrani kot..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Ne morem dobiti trenutne različice!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Izberite ciljno mapo za uvoz teh podatkov"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Ste prepričani, da želite zbrisati ta sestanek `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Ste prepričani, želite zbrisati ta neimenovan sestanek?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Ste prepričani, da želite zbrisati posel `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Ste prepričani, da želite zbrisati ta neimenovan posel?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Ste prepričani, da želite zbrisati dnevniški vpis `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Ste prepričani, da želite zbrisati ta neimenovan dnevniški vpis?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Ste prepričani, da želite zbrisati %d sestankov?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Ste prepričani, da želite zbrisati %d opravil?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Ste prepričani, da želite zbrisati %d dnevniških vpisov?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 #, fuzzy
 msgid "The item could not be deleted due to a corba error"
 msgstr "Predmeta ni bilo mogoče poslati!\n"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 #, fuzzy
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 "Stanja udeleženca ni bilo možno posodobiti zaradi neveljavnega stanja!\n"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Predmeta ni bilo mogoče poslati!\n"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Predmeta ni bilo mogoče poslati!\n"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr ""
 "Stanja udeleženca ni bilo možno posodobiti zaradi neveljavnega stanja!\n"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Predmeta ni bilo mogoče poslati!\n"
@@ -4097,45 +4425,45 @@ msgstr "Delegirano komu:"
 msgid "Enter Delegate"
 msgstr "Vnesi delegata"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Sestanek"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Opomnilnik"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Ponovitev"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Načrtovanje časa"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Sestanek"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Datum pričetka"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 #, fuzzy
 msgid "Start time is wrong"
 msgstr "_Čas pričetka:"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr ""
 
@@ -4205,31 +4533,31 @@ msgid "_Start time:"
 msgstr "_Čas pričetka:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "brez"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "Potreben je organizator."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "Potreben je vsaj en udeleženec."
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Delegiraj komu..."
 
@@ -4270,21 +4598,15 @@ msgid "Member"
 msgstr "Član"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Vloga"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stanje"
@@ -4304,6 +4626,7 @@ msgid "_Invite Others..."
 msgstr "_Povabi ostale..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4336,6 +4659,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Nisem mogel ustvariti imenika %s: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "Organizator mora biti naveden."
@@ -4365,34 +4689,59 @@ msgstr "Podatki o kodledarju"
 msgid "Calendar Name"
 msgstr "Koledar"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Nisem mogel ustvariti imenika %s: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Podatki o kodledarju"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Seznam _nalog"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Seznam _nalog"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Seznam _nalog"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Wallisovi in Futunini otoki"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 #, fuzzy
 msgid "This and Future Instances"
 msgstr "Wallisovi in Futunini otoki"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 #, fuzzy
 msgid "All Instances"
 msgstr "Vse _postaje:"
@@ -4446,10 +4795,15 @@ msgstr "dan"
 msgid "on the"
 msgstr "na"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "pojavitve"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Datum/ura:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "_Dodaj"
@@ -4514,7 +4868,7 @@ msgstr "tednov"
 msgid "year(s)"
 msgstr "let"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 #, fuzzy
 msgid ""
 "This event has been changed, but has not been saved.\n"
@@ -4525,34 +4879,34 @@ msgstr ""
 "\n"
 "Želite shraniti spremembe?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 #, fuzzy
 msgid "_Discard Changes"
 msgstr "Zavrzi to sporočilo"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 #, fuzzy
 msgid "Save Event"
 msgstr "Sporočilo koledarja"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Podatki o sestanku so bili ustvarjeni. Naj jih pošljem?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 "Podatki o sestanku so se spremenili. Naj pošljem posodobljeno različico?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "Podatki o nalogi so bili ustvarjeni. Naj jih pošljem?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "Podatki o nalogi so se spremenili. Naj pošljem posodobljeno različico?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "končano "
@@ -4563,43 +4917,43 @@ msgid "% _Complete"
 msgstr "% končano"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "končano"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "visoka"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "v teku"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "nizka"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "običajna"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "ni pričeto"
 
@@ -4608,7 +4962,7 @@ msgid "Progress"
 msgstr "Napredek"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "ni definirana"
 
@@ -4630,21 +4984,21 @@ msgstr "_Stanje:"
 msgid "_Web Page:"
 msgstr "Naslov _spletne strani:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Osnovno"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Dodelitev"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4652,9 +5006,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "_Zaupno"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Opis:"
 
@@ -4759,26 +5113,21 @@ msgstr "%s ob %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s za neznano vrsto sprožilca"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "javno"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "osebno"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "zaupno"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "kategorije"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4791,29 +5140,27 @@ msgid "Start Date"
 msgstr "Datum pričetka"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Povzetek"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " barvo"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Sestanek"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Prost"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Zaseden"
 
@@ -4825,7 +5172,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "E"
 
@@ -4833,7 +5180,7 @@ msgstr "E"
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4843,7 +5190,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4851,7 +5198,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Da"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4859,17 +5206,17 @@ msgstr "Ne"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "neznano"
 
@@ -4881,189 +5228,187 @@ msgstr "Ponovi se"
 msgid "Assigned"
 msgstr "Določena"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Posodabljam predmete"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Brišem izbrane predmete"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Posodabljam predmete"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Nov _sestanek..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Nov celodnevni _dogodek"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 #, fuzzy
 msgid "New Meeting"
 msgstr "Nov sestanek"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 #, fuzzy
 msgid "New Task"
 msgstr "Nova _naloga"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "Na_tisni..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Prilepi"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Pojdi na _danes"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "_Pojdi na datum..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Objavi podatek o zasedenosti"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-#, fuzzy
-msgid "_Settings..."
-msgstr "_Nastavitve pošte..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Odpri"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Shrani kot..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Kopiraj"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Načrtuj sestanek"
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Posreduj naprej kot i_Koledar"
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Zbriši to _pojavitev"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Zbriši _vse pojavitve"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+#, fuzzy
+msgid "_Settings..."
+msgstr "_Nastavitve pošte..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "FIXME: _Odpri spletno stran"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Dodeli nalogo"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Posreduj naprej kot i_Koledar"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "_Označi kot opravljeno"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Označi opravila kot opravljena"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "_Zbriši izbrana opravila"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Kliknite tu za dodajanje opravila"
@@ -5077,8 +5422,8 @@ msgstr "% končano"
 msgid "Alarms"
 msgstr "Alarmi"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Končano"
 
@@ -5107,18 +5452,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5137,7 +5482,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5150,134 +5495,134 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "dop"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pop"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "_Enostavna ponovitev"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
 msgid "Every day"
 msgstr "Vsak "
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, fuzzy, c-format
 msgid "Every %d days"
 msgstr "%d dni"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 #, fuzzy
 msgid "Every week"
 msgstr "Vsak "
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, fuzzy, c-format
 msgid "Every %d weeks"
 msgstr "%d tednov"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 #, fuzzy
 msgid "Every week on "
 msgstr "Vsak "
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, fuzzy, c-format
 msgid "Every %d weeks on "
 msgstr "%d tednov"
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 #, fuzzy
 msgid " and "
 msgstr "Pesek"
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 #, fuzzy
 msgid "every month"
 msgstr "En _mesec"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 #, fuzzy
 msgid "Every year"
 msgstr "Vsak "
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, fuzzy, c-format
 msgid "Every %d years"
 msgstr "Vsak "
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Konec: <b>"
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "končano "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "Podatki o iKoledarju"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "Napaka iKoledarja"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "neznana oseba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5285,322 +5630,321 @@ msgstr ""
 "<br> Prosimo, preglejte sledeče podatke in izberite dejanje iz spodnjega "
 "menuja."
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Nič</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 #, fuzzy
 msgid "Location:"
 msgstr "_Lega:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Stanje:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Sprejeto"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Poskusno sprejeto"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Zavrnjeno"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Izberi dejanje:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Posodobi"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "V redu"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Sprejmi"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Poskusno sprejmi"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Odbij"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Pošlji podatek o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Osveži stanje respondenta"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Pošlji zadnje podatke"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, 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:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Podatki o sestanku"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, 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:1271
+#: calendar/gui/e-itip-control.c:1269
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Predlog sestanka"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Posodobitev sestanka"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Zahtevek za posodobitev sestanka"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, 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:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Odgovor na sestanek"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> je preklical(a) sestanek."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Preklic sestanka"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, 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:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Nerazumljivo sporočilo o sestanku"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Podatki o nalogi"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, 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:1338
+#: calendar/gui/e-itip-control.c:1336
 #, 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:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Predlog naloge"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, 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:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Posodobitev naloge"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, 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:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Zahtevek za posodobitev naloge"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, 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:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Odgovor na nalogo"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> je preklical(a) nalogo."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Preklic naloge"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Nerazumljivo sporočilo o nalogi"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, 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:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Podatek o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, 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:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Zahtevek po podatkih o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, 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:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Odgovor zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Nerazumljivo sporočilo o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 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:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "To sporočilo vsebuje le nepodprte zahtevke."
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Priloga ne vsebuje veljavnega sporočila koledarja"
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr "Priloga nima gledljivih predmetov koledarja"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "Datoteke koledarja ni bilo mogoče posodobiti!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Posodobitev končana\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 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:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 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:1942
+#: calendar/gui/e-itip-control.c:1940
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Napaka ob prenašanju podatkov za"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Predmeta ni bilo mogoče poslati!\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Stanje udeleženca posodobljeno\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "Stanja udeleženca ni bilo možno posodobiti!\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Odstranjevanje končano"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Predmet poslan!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Predmeta ni bilo mogoče poslati!\n"
 
@@ -5763,7 +6107,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -5827,48 +6171,43 @@ msgstr "Čas pričetka sestanka:"
 msgid "Meeting _end time:"
 msgstr "Čas zaključka sestanka:"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "Datum _pričetka:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 msgid "Due Date:"
 msgstr "Do datuma:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "_Prioriteta:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Stran"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Odpiram naloge v %s"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nisem mogel naložiti nalog v `%s'"
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Postopek potreben za naložitev `%s' ni podprt"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, 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:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5877,50 +6216,41 @@ msgstr ""
 "Napaka ob '%s':\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Datum zaključka"
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Brišem izbrane predmete"
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "Uničujem"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Naloge"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Koledar"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nisem mogel odpreti imenika v `%s'"
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Postopek potreben za naložitev `%s' ni podprt"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarmi ob %s"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5928,7 +6258,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5936,65 +6266,11 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Odhodna"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#, fuzzy
-msgid "Calendar and Tasks"
-msgstr "Nastavitve koledarja in nalog"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Koledar"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolucijin veznik koledarja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Evolucijin veznik Koledarja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolucijin pregledovalnik iTip/iMip"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Evolucijin pregledovalnik iTip/iMip"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolucijin veznik Koledarja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Urejevalnik Evolucijinih novic"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolucijin veznik Koledarja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolucijin veznik opravil"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "april"
@@ -6051,296 +6327,332 @@ msgstr "oktober"
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Organizator mora biti naveden."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Potreben je vsaj en udeleženec"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Podatki o dogodku"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Podatki o nalogi"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Podatki o dnevniku"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Podatki o zasedenosti"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Podatki o kodledarju"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Posodobljen"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Osveži"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "Proti-predlog"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Podatki o zasedenosti (%s do %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "Podatki o iKodledarju"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Biti morate udeleženec dogodka."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "ne"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "po"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "to"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "sr"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "če"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "pe"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "so"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Izbrann dan (%b %a %d %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Izbran teden (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Izbran mesec (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Izbrano leto (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Naloga"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Stanje: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioriteta: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procentov opravljeno: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorije: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Stiki: "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Predogled tiskanja"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Natisni predmet"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Nastavitev tiskanja"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Preimenuj to bližnjico"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Seznam _nalog"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Nova naloga"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Naloga"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Ustvari nov posel"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "URI mape nalog, ki naj se kaže"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6352,11 +6664,11 @@ msgstr ""
 " \n"
 "Resnično zbriši te naloge? "
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Ne sprašuj me več."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "Natisni naloge"
 
@@ -6388,17 +6700,17 @@ msgstr "Sporočilo koledarja"
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Opomnilnik"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Sporočilo koledarja"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6407,7 +6719,7 @@ msgstr ""
 "Evolucija je našla poštne datoteke programa Pine.\n"
 "Jih želite uvoziti v Evolucijo?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Gnome Koledar"
 
@@ -7944,28 +8256,28 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "Podpisovanje v tem kodirniku ni podprto"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "Preverjanje v tem šifrirniku ni podprto"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Šifriranje v tem šifrirniku ni podprto"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Dešifriranje v tem šifrirniku ni podprto"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 #, fuzzy
 msgid "You may not import keys with this cipher"
 msgstr "Dešifriranje v tem šifrirniku ni podprto"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 #, fuzzy
 msgid "You may not export keys with this cipher"
 msgstr "Dešifriranje v tem šifrirniku ni podprto"
@@ -8018,88 +8330,88 @@ msgstr "Odstranjujem mapo %s"
 msgid "You must be working online to complete this operation"
 msgstr "Za dokončanje te operacije morate delati z mrežo"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Nisem mogel ustvariti cevi do %s: %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Nisem uspel predpomniti sporočila %s: %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Uskljajujem mape"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Napaka ob razčlenjanju filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Napaka ob izvajanju filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Ne morem odpreti mape vrste 'spool'"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Nisem mogel obdelati mape vrste 'spool'"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Dobivam sporočilo %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Ne morem dobiti sporočila"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nauspeh ob sporočilu %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Uskljajujem mapo"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Dobivam sporočilo %d od %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Neuspeh pri sporočilu %d od %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Nisem uspel prenesti sporočila"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Neveljavni argumenti"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Neveljavni argumenti"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Napaka ob izvajanju iskanja s filtrom: %s: %s"
@@ -8131,36 +8443,36 @@ msgstr "(match-all) zahteva enojen booleanov rezultat"
 msgid "Performing query on unknown header: %s"
 msgstr "Opravljam poizvedbo na neznani glavi: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nepodprto dejanje: dodaj sporočilo: za %s"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nepodprto dejanje: iskanje z izrazom: za %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nepodprto dejanje: iskanje po uid-jih: za %s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Prestavljam sporočila"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 #, fuzzy
 msgid "Copying messages"
 msgstr "Kopiram sporočila v %s"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Prenašam %d sporočil"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8168,47 +8480,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Preklicano."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Nepričakovan odgovor strežnika POP: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 #, fuzzy
 msgid "No data provided"
 msgstr "Ime datoteke ni navedeno."
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 #, 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:1114
+#: camel/camel-gpg-context.c:1121
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8216,52 +8528,66 @@ msgid ""
 "%s"
 msgstr "Nisem uspel predpomniti sporočila %s: %s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Nisem uspel predpomniti sporočila %s: %s"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nisem mogel izvršiti %s: %s\n"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Nisem uspel dešifrirati sporočila"
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "To je digitalno podpisan del sporočila"
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr ""
+"Nisem mogel preveriti tega sporočila: nisem mogel ustvariti začasne "
+"datoteke: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Nisem mogel preveriti tega sporočila: nisem mogel ustvariti začasne "
 "datoteke: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "To je digitalno podpisan del sporočila"
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Šifrirano sporočilo"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Od urejevalnika nisem uspel dobiti sporočila"
@@ -8362,15 +8688,15 @@ msgstr "Napaka ob pisanju v začasno poštno datoteko: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Napaka ob kopiranju začasne poštne datoteke: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 #, fuzzy
 msgid "parse error"
 msgstr "Drugačna napaka"
@@ -8690,12 +9016,12 @@ msgstr "Nuditelj virutalne mape e-pošte"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Za branje pošte kot poizvedbe po drugem sklopu map"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Noben nuditelj za protokol '%s' ni dostopen"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8704,71 +9030,82 @@ msgstr ""
 "Nisem mogel ustvariti imenika %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Prosim vpišite svoje %s geslo za %s"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Ni naveden"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Seznam podpisov"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Seznam podpisov"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Nisem mogel podpisati: certifikat za \"%s\" ni bil najden."
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "ID _certifikata:"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Podpisi"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Drugačna napaka"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Strežnik: %s, vrsta: %s:"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Ne morem dobiti mape: neveljavno dejanje na tej shrambi"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ne morem ustvariti mape: neveljavno dejanje na tej shrambi"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Smeti"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "junij"
+
 #: camel/camel-tcp-stream-openssl.c:568
 #, fuzzy
 msgid "Unable to get issuer's certificate"
@@ -8978,7 +9315,7 @@ msgid ""
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Ne morem odpreti razčleniti URLja '%s'"
@@ -8998,22 +9335,22 @@ msgstr "Ni takšnega sporočila %s v %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Preveri za nova sporočila v vseh mapah"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ne morem zbrisati mape: %s: neveljavno dejanje"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ne morem zbrisati mape: %s: mapa ne obstaja"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ne morem preimenovati mape %s: neveljavno dejanjea"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ne morem preimenovati mape: %s: mapa ne obstaja"
@@ -9091,7 +9428,7 @@ msgstr "Nisem uspel prenesti sporočila"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9105,7 +9442,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Ni takšnega sporočila"
@@ -9143,54 +9480,69 @@ msgid "Failed to cache %s: %s"
 msgstr "Nisem uspel predpomniti sporočila %s: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Poveži se s strežnikom"
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Nisem se mogel povezati s strežnikom LDAP."
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "_Podjetje:"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Preverjam za novo pošto"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 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:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Mape"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Kaži le naročene mape"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "Povozi imenski prostor map, ki ga nudi strežnik"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Imenski prostor"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Uveljavi filtre na novih sporočiliv v mapi INBOX tega strežnika"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Samodejno preveri za novo pošto"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Za branje in hranjenje pošte na strežnikih IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Geslo"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Ta možnost narekuje povezavo s strežnikom IMAP z nešifriranim geslom."
@@ -9440,7 +9792,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Nisem mogel preimenovati mape %s v %s: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nisem mogel preimenovati mape: %s"
@@ -9557,29 +9909,29 @@ msgstr "Pregledujem za novimi sporočili"
 msgid "Storing folder"
 msgstr "Shranjujem mapo"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ne morem ustvariti ključavnice na mapi: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Ne morem odpreti poštnega predala: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "Dodajanje sporočila razveljavljeno"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Ne morem pripeti sporočila k datoteki vrste mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9588,11 +9940,11 @@ msgstr ""
 "Ne morem dobiti sporočila: %s iz mape %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Zdi se, da je mapa poškodovana in je ni mogoče popraviti."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Konstrukcija sporočila ni uspela: Naj pokvarim poštni predal?"
 
@@ -9660,12 +10012,17 @@ msgstr "Nisem mogel ustvariti imenika %s: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "Ne morem dobiti mape: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "ID vizitke že obstaja"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Nisem mogel preimenovati mape %s v %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Izbrano ime mape ni veljavno: %s"
@@ -9709,7 +10066,7 @@ msgstr "Nisem mogel zapreti izvorne mape %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Nisem mogel zapreti začasne mape: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nisem mogel preimenovati mape: %s"
@@ -9989,7 +10346,7 @@ msgstr "Zbriši po %s dneh"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -10078,7 +10435,7 @@ msgid "No such folder `%s'."
 msgstr "Ni takšne mape `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Program sendmail"
 
@@ -10132,7 +10489,7 @@ msgstr "program sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Dostava pošte preko programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10301,7 +10658,7 @@ msgstr "Dostava pošte s SMTP preko %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Ne morem poslati sporočila: naslov pošiljatelja ni veljaven."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Pošiljam sporočilo"
 
@@ -10428,7 +10785,7 @@ msgstr "%.1fM"
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "priloga"
 
@@ -10473,14 +10830,14 @@ msgstr "Vrsta MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Predlagan samodejen prikaz priloge"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Nastaviti morate sovjo identiteto\n"
 "preden lahko skladate pošto."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Kliknite tu za adresar"
 
@@ -10491,45 +10848,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Odgovori-na:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Zadeva:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Za:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Vnesite prejemnike sporočila"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Vnesite naslove, ki bodo prejeli, karbonske kopije sporočila"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10540,16 +10897,21 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 #, fuzzy
 msgid "Posting destination"
 msgstr "Brez opisa"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Priloži datoteko k sporočilu"
+
 #: composer/e-msg-composer-select-file.c:119
 #, fuzzy
 msgid "Attach file(s)"
@@ -10586,21 +10948,21 @@ msgstr "Datoteka obstaja, prepiši?"
 msgid "Error saving file: %s"
 msgstr "Napaka ob shranjevanju datoteke: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Napaka ob nalaganju datoteke %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Napaka ob dostopanju do datoteke: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Od urejevalnika nisem uspel dobiti sporočila"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10609,7 +10971,7 @@ msgstr ""
 "Nisem mogel izvesti klica 'seek' na datoteki: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10618,7 +10980,7 @@ msgstr ""
 "Nisem mogel odsekati datoteke: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10627,7 +10989,7 @@ msgstr ""
 "Nisem mogel izvesti klica 'seek' na datoteki: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10636,7 +10998,7 @@ msgstr ""
 "Napaka ob samodejnem shranjevanju sporočila: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10644,7 +11006,7 @@ msgstr ""
 "Evolucija je zaznala neshranjene datoteke iz prejšnjih sej.\n"
 "Jih želite poskusiti obnoviti?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10655,29 +11017,29 @@ msgstr ""
 "\n"
 "Želite shraniti spremembe?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Opozorilo: Spremenjeno sporočilo"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Odpri datoteko"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 #, fuzzy
 msgid "Signature:"
 msgstr "Podpisi"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Sestavi novo sporočilo"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10685,7 +11047,7 @@ msgstr ""
 "Nisem mogel ustvariti okna skladatelja:\n"
 "Nisem mogel aktivirati gradnika za izbiro naslova."
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10696,7 +11058,7 @@ msgstr ""
 "Nisem mogel ustvariti okna skladatelja:\n"
 "Ne morem aktivirati komponente urejevalnika HTML."
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10704,18 +11066,20 @@ msgstr ""
 "Nisem mogel ustvariti okna skladatelja:\n"
 "Ne morem aktivirati komponente urejevalnika HTML."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Evolucijino programje za delo v skupini"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Evolucija Ximian"
 
 #: data/evolution.keys.in.h:1
@@ -10964,13 +11328,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11100,7 +11464,7 @@ msgstr "Potem"
 msgid "You must specify a folder."
 msgstr "vMapi morate dati ime."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Izberi mapo"
@@ -11114,26 +11478,26 @@ msgstr ""
 "Napaka v regularnem izrazu '%s':\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Pomembno"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 #, fuzzy
 msgid "To Do"
 msgstr "Seznam opravil"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 #, fuzzy
 msgid "Later"
 msgstr "po"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Preizkus"
 
@@ -11237,7 +11601,7 @@ msgstr "nazaj"
 msgid "months"
 msgstr "mesecev"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr " sekund"
 
@@ -11336,7 +11700,7 @@ msgstr "Izraz"
 msgid "Follow Up"
 msgstr "Navezava"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 #, fuzzy
 msgid "Label"
 msgstr "oznaka9"
@@ -11409,116 +11773,122 @@ msgid "Source Account"
 msgstr "Izvorni račun"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Pršec"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Določena glava"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Prenehaj z obdelavo"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Zadeva"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "Nastavi stanje"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "vsebuje"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "ne vsebuje"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "se ne konča z"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "ne obstaja"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 #, fuzzy
 msgid "does not return"
 msgstr "ne obstaja"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "ne zveni kot"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "se ne začne z"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "se konča z"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "obstaja"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr "je označeno"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr "je po"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "is before"
 msgstr "je pred"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "je večje"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "je manjše"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr "ni označeno"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "ni"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "je"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 #, fuzzy
 msgid "returns greater than"
 msgstr "je večje"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 #, fuzzy
 msgid "returns less than"
 msgstr "je manjše"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr ""
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "zveni kot"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "se začne z"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
@@ -11544,19 +11914,89 @@ msgstr "Ime pravila: "
 msgid "Score Rules"
 msgstr "Točke pravil"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "vMapi morate dati ime."
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr "Kot vir morate navesti vsaj eno mapo."
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 #, fuzzy
 msgid "VFolder source"
 msgstr "Viri vMap"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#, fuzzy
+msgid "Composer Preferences"
+msgstr "Nastavitve koledarja"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#, fuzzy
+msgid "Configure your email accounts here"
+msgstr "Ustvari ali uredi poštne račune in ostale nastavitve"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolucija "
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Nastavitev Evolucijine pošte"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Evolucijin setavljalnik pošte."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Evolucijin setavljalnik pošte."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Nastavitev Evolucijine pošte"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Evolucijina komponenta za poštne mape."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolucijin veznik Koledarja"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Pošta"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Poštni račun"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "Nastavitve"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Ste prepričani, da želite zbrisati ta račun?"
@@ -11601,7 +12041,7 @@ msgid "Protocol"
 msgstr "Portoriko"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr "Neimenovan"
 
@@ -11629,21 +12069,17 @@ msgstr "Dodaj nov podpis"
 msgid "Signature(s)"
 msgstr "Podpisi"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
-#, fuzzy
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "Pošiljate pošto v obliki HTML, a naslednji prejemniki ne želijo prejemati "
 "takšne pošte:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Vseeno pošlji?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11651,7 +12087,7 @@ msgstr ""
 "To poročilo nima 'zadeve'.\n"
 "Resnično pošlji?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11659,11 +12095,11 @@ msgstr ""
 "Ker je seznam kontaktov, ki mu pošiljate, nastavljen, da skrije seznam "
 "naslovov, bo to sporočilo vsebovalo le naslovnike bcc."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "To sporočilo vsebuje le prejemnike bcc"
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11673,11 +12109,11 @@ msgstr ""
 "To(očitno-za).\n"
 "Vseeno pošlji?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Navesti morate naslovnike, če želiti poslati sporočilo."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11689,189 +12125,406 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Iz iskanja ustvari na_videzno mapo..."
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "Pošta"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<kliknite tukaj za izbiro mape>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, fuzzy, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "%s ob %s"
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Ustvari _novo mapo..."
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Navedi kje naj se ustvarimapa:"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
-msgid "Folder _name"
+msgid "Folder _name:"
 msgstr "Ime mape:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Nisem mogel ustvariti začasnega imenika: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Nisem mogel ustvariti začasnega imenika: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Nisem mogel ustvariti začasne datoteke '%s': %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Nisem mogel zapreti začasne mape: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Nalagam..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, fuzzy, c-format
+msgid "%s"
+msgstr "s"
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Izberi mapo"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Ustvari novo mapo"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Nisem mogel zbrisati mape `%s': %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Zbriši mapo '%s'"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Zbriši \"%s\""
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Preimenuj mapo \"%s\" v:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+#, fuzzy
+msgid "Rename Folder"
+msgstr "Preimenuj mapo"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Lastnosti računa"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Lastnosti"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "Ime mape:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "Po_gled"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Odpri v novem oknu"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Prestavi"
+
+#: mail/em-folder-tree.c:1500
+#, fuzzy
+msgid "_New Folder..."
+msgstr "_Nova mapa"
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "P_reimenuj"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "_Lastnosti..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "_Uredi kot novo sporočilo..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "Na_tisni"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljatelju"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Odgovori na _seznam"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Odgovori _vsem"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "_Posreduj naprej"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr "Nave_zuj se..."
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr "Postavi zastavico končano"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "Zb_riši zastavico"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Označi kot _prebrano"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "Označi kot _neprebrano"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Označi kot po_membno"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "Označi kot _nepomembno"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Označi kot _neprebrano"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Označi kot po_membno"
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "O_dbriši"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "Presta_vi v mapo..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj v mapo..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "Pošiljatelja dodaj v _adresar"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "Uveljavi filtre"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "Iz sporočila ustvari _pravilo"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "vMapa glede na p_redmet"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "vMapa glede na _pošiljatelja"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "vMapa glede na pre_jemnike"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "vMapa glede na poštni se_znam"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "vMapa glede na Pošiljatelja"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Filter glede na za_devo"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Filter glede na pošilja_telja"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Filter glede na preje_mnike"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Filter glede na p_oštni seznam"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filter glede na pošilja_telja"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Privzeto"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Natisni sporočilo"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopiraj lokacijo povezave"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Ustreza:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Določena"
+
+#: mail/em-format-html-display.c:597
+#, fuzzy
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr ""
+"To sporočilo ima elektronski podpis, a se ne da dokazati, da je avtentično."
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Seznam podpisov"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Seznam podpisov"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+#, fuzzy
+msgid "Valid signature, cannot verify sender"
+msgstr "Uredi vsebino podpisa v urejevalniku"
+
+#: mail/em-format-html-display.c:600
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "šifriranje"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+#, fuzzy
+msgid "Encrypted, weak"
+msgstr "Šifrirano sporočilo"
+
+#: mail/em-format-html-display.c:607
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
 msgstr ""
-"To sporočilo ima elektronski podpis. Za več podatkov kliknite na ikono "
-"ključavnice."
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "šifriranje"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+#, fuzzy
+msgid "Encrypted, strong"
+msgstr "Šifrirano sporočilo"
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Nisem mogel razčleniti sporočila MIME. Kažem izvorno besedilo."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Nepodprta shema"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Nisem mogel preveriti certifikatov."
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Poglej vsebino"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Skrij"
@@ -11881,185 +12534,207 @@ msgstr "Skrij"
 msgid "Page %d of %d"
 msgstr "Stran %d od %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Prenašam sporočilo %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Napačno oblikovano dodatno telo sporočila."
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Kazalec na FTP povezavo (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Kazalec na krajevno datoteko (%s) veljaven na strežniku \"%s\""
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Kazalec na lokalno datoteko (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Kazalec na oddaljen podatek (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kazalec na neznane zunanje podatke (vrsta \"%s\")"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-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/em-format-html.c:906 mail/em-format.c:1217
-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/em-format-html.c:930 mail/em-format.c:1190
-#, fuzzy
-msgid "No signature present"
-msgstr "Datoteka s podpisom HTML:"
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Nisem mogel inicializirati GNOMEa"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Nepodprta shema"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nisem mogel razčleniti sporočila MIME. Kažem izvorno besedilo."
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Prestavljam sporočila"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Od"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Odgovori-na:"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Za"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 #, fuzzy
 msgid "Mailer"
 msgstr "Pošta"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "priloga %s"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Nisem mogel razčleniti sporočila MIME. Kažem izvorno besedilo."
+msgid "Session not initialised"
+msgstr "Nisem mogel inicializirati GNOMEa"
+
+#: mail/em-format.c:1210
+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/em-format.c:1212
+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/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Čakam..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Ustvarjam \"%s\""
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Nisem uspel predpomniti sporočila %s: %s"
 
-#: mail/em-popup.c:593
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Nisem mogel ustvariti cevi do %s: %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Nisem uspel predpomniti sporočila %s: %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Shrani kot..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 #, fuzzy
 msgid "Set as _Background"
 msgstr "Ozadje:"
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Odgovori pošiljatelju"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Odpri povezavo v brskalniku"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Pošlji _sporočilo na seznam..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Dodaj adresar"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Odpri v %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 msgid "Subscribed"
 msgstr "Naročen"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Mapa"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Prosimo izberite strežnik."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Strežnik ni bil izbran"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Tega sporočila ne kaži več."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12068,27 +12743,27 @@ msgstr ""
 "Napaka ob nalaganju podatkov o filtrih:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Posredovano sporočilo"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "neznan pošiljatelj"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Na %s, %Y-%m-%d ob %H:%M, je %%s napisal(a):"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12097,7 +12772,7 @@ msgstr ""
 "Nisem mogel odpreti URIja `%s':\n"
 "%s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12106,26 +12781,39 @@ msgstr ""
 "%s že obstaja\n"
 "Jo želite prepisati?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Sporočilo"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Shrani sporočilo kot..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Nisem mogel ustvariti začasnega imenika: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "_Naslov:"
+
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
+msgid ""
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"To dejanje bo trajno zbrisalo vsa sporočila označena kot zbrisana. Če boste "
+"nadaljevali, ne boste mogli več do teh sporočil. \n"
+" \n"
+"Resnično zbriši ta sporočila? "
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2288
 #, fuzzy
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12134,107 +12822,390 @@ msgstr ""
 " \n"
 "Resnično zbriši ta sporočila? "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#: mail/evolution-mail.schemas.in.in.h:1
 #, fuzzy
-msgid "Composer Preferences"
-msgstr "Nastavitve koledarja"
+msgid "Automatic link recognition"
+msgstr "_Samodejno preveri za novo pošto"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "_Samodejno preveri za novo pošto"
+
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:6
 #, fuzzy
-msgid "Configure your email accounts here"
-msgstr "Ustvari ali uredi poštne račune in ostale nastavitve"
+msgid "Default charset in which to compose messages"
+msgstr "Zbriši to sporčilo"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/evolution-mail.schemas.in.in.h:7
 #, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolucija "
+msgid "Default charset in which to compose messages."
+msgstr "Zbriši to sporčilo"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Nastavitev Evolucijine pošte"
+msgid "Default charset in which to display messages"
+msgstr "Išči besedilo v telesu prikazanega sporočila"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
-msgid "Evolution Mail component"
-msgstr "Evolucijin setavljalnik pošte."
+msgid "Default charset in which to display messages."
+msgstr "Išči besedilo v telesu prikazanega sporočila"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Evolucijin setavljalnik pošte."
+msgid "Default forward style"
+msgstr "Privzet način posredovanja naprej je: "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Nastavitev Evolucijine pošte"
+msgid "Default reply style"
+msgstr "Privzet način posredovanja naprej je: "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
 #, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Evolucijina komponenta za poštne mape."
+msgid "Empty Trash folders on exit"
+msgstr "Ob izhodu _sprazni mapo smeti"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Evolucijin veznik Koledarja"
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Ob izhodu _sprazni mapo smeti"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
-msgid "Mail Accounts"
+msgid "Height of the message-list pane"
+msgstr "Pošlji sporočilo kasneje"
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "Poštni račun"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
-msgid "Mail Preferences"
-msgstr "Nastavitve"
+msgid "Log filter actions"
+msgstr "Zapisuj dejanja filtra v:"
 
-#: mail/importers/elm-importer.c:105
-msgid "Evolution is importing your old Elm mail"
-msgstr "Evolucija uvaža vašo staro pošto Elm."
+#: mail/evolution-mail.schemas.in.in.h:28
+#, fuzzy
+msgid "Log filter actions to the specified log file."
+msgstr "Zapisuj dejanja filtra v:"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
-msgid "Importing..."
-msgstr "Uvažam..."
+#: mail/evolution-mail.schemas.in.in.h:29
+#, fuzzy
+msgid "Logfile to log filter actions"
+msgstr "Zapisuj dejanja filtra v:"
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
-msgid "Please wait"
-msgstr "Prosim pokačajte"
+#: mail/evolution-mail.schemas.in.in.h:30
+#, fuzzy
+msgid "Logfile to log filter actions."
+msgstr "Zapisuj dejanja filtra v:"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Uvažam %s kot %s"
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
 
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Pregledujem %s"
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
 
-#: mail/importers/elm-importer.c:547
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Opozorilo o novi pošti"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Opozorilo o novi pošti"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
-"Evolucija je našla poštne datoteke programa Elm.\n"
-"Jih želite uvoziti v Evolucijo?"
 
-#: mail/importers/elm-importer.c:568
-msgid "Elm"
-msgstr "Elm"
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+"Zahtevaj potrditev ob pošiljanju v obliki HTML tistim stikom, ki tega nočejo"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "Zahtevaj potrditev ob pošiljanju sporočil, ki imajo le BCC prejemnike"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "Privzeto pošiljaj pošto v _HTML obliki."
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "Privzeto pošiljaj pošto v _HTML obliki."
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "Kaži čas kot"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "Kaži čas kot"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Kaži sporočila v običajnem slogu"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "Pano _predogleda"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "Ob prihodu nove pošte zaigraj zvočno datoteko"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+msgid "Spell check inline"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "Prvotni stik:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+msgid "The variable width font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Niten seznam sporočil"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Niten seznam sporočil"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+#, fuzzy
+msgid "Thread the message-list based on Subject"
+msgstr "Posredovano sporočilo (brez navedene zadeve)"
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "Naj bo to moj p_rivzet račun"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "Spremenljivo"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 #, fuzzy
@@ -12268,6 +13239,44 @@ msgstr ""
 msgid "Evolution Pine importer"
 msgstr "Evolucijin setavljalnik pošte."
 
+#: mail/importers/elm-importer.c:105
+msgid "Evolution is importing your old Elm mail"
+msgstr "Evolucija uvaža vašo staro pošto Elm."
+
+#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
+#: mail/importers/pine-importer.c:115
+msgid "Importing..."
+msgstr "Uvažam..."
+
+#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
+#: mail/importers/pine-importer.c:117
+msgid "Please wait"
+msgstr "Prosim pokačajte"
+
+#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
+#: mail/importers/pine-importer.c:288
+#, c-format
+msgid "Importing %s as %s"
+msgstr "Uvažam %s kot %s"
+
+#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
+#: mail/importers/pine-importer.c:425
+#, c-format
+msgid "Scanning %s"
+msgstr "Pregledujem %s"
+
+#: mail/importers/elm-importer.c:547
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolucija je našla poštne datoteke programa Elm.\n"
+"Jih želite uvoziti v Evolucijo?"
+
+#: mail/importers/elm-importer.c:568
+msgid "Elm"
+msgstr "Elm"
+
 #: mail/importers/netscape-importer.c:75
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
@@ -12309,12 +13318,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolucija uvaža vaše podatke iz Netscapea"
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Smeti"
-
 #: mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
@@ -12324,7 +13327,7 @@ msgstr "Krajevna datoteka s pošto %s"
 msgid "Scanning directory"
 msgstr "Pregledujem mapo"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Pričenjam uvoz"
 
@@ -12401,24 +13404,24 @@ msgid "You have not filled in all of the required information."
 msgstr "Niste vpisali vseh potrebnih podatkov."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Urejevalnik Evolucijinih računov"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Gostitelj:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "_Uporabniško ime:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Pot:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Ne morete ustvariti dveh računov z enakim imenom."
 
@@ -12427,35 +13430,35 @@ msgstr "Ne morete ustvariti dveh računov z enakim imenom."
 msgid "Mail to %s"
 msgstr "Pošta za %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Zadeva je %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s poštnih seznamov"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Odgovorjeno na"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Filtru dodaj pravilo"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, fuzzy, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12467,146 +13470,31 @@ msgstr ""
 "    '%s'\n"
 "in so bile posodobljene."
 
-#: mail/mail-component.c:194
-#, fuzzy
-msgid "Connecting..."
-msgstr "Vzpostavljam povezavo s strežnikom..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Ta mapa ne more vsebovati sporočil."
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Novo poštno sporočilo"
 
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Nisem mogel preimenovati mape: %s"
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "_Pošlji sporočilo"
 
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Nisem mogel ustvariti začasnega imenika: %s"
-
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Nisem mogel ustvariti začasne datoteke '%s': %s"
-
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Nisem mogel zapreti začasne mape: %s"
+#: mail/mail-component.c:381
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Sestavi novo sporočilo"
 
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Izberite ciljno mapo za uvoz teh podatkov"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Izberite ciljno mapo za uvoz teh podatkov"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Ustvari novo mapo"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Navedi kje naj se ustvarimapa:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Nisem mogel zbrisati mape `%s': %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Zbriši mapo '%s'"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Zbriši \"%s\""
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Preimenuj mapo \"%s\" v:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-#, fuzzy
-msgid "Rename Folder"
-msgstr "Preimenuj mapo"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Izbrano ime mape ni veljavno: %s"
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Lastnosti računa"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Lastnosti"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "Ime mape:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "Po_gled"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Odpri v novem oknu"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Prestavi"
-
-#: mail/mail-component.c:2087
-#, fuzzy
-msgid "_New Folder..."
-msgstr "_Nova mapa"
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "P_reimenuj"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Lastnosti..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Identiteta"
 
@@ -12673,11 +13561,11 @@ msgstr ""
 "Prosim, v prostor spodaj vpišite ime za ta račun. Ime bo uporabljeno le za "
 "prikaz."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Preverjam storitev"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Vzpostavljam povezavo s strežnikom..."
 
@@ -12766,27 +13654,36 @@ msgid "C_olors"
 msgstr "_Zapri"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Strežnik dohodne pošte"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Preverjam za novo pošto"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Barva za opravila, ki so na vrsti danes"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Sestavljanje sporočil"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Nastavitev"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -12803,313 +13700,318 @@ msgstr ""
 "\n"
 "Kliknite \"Končaj\" za shranitev vaših nastavitev."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "_Privzeto"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Privzeta prioriteta:"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Privzet nabor znakov: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Sprejemanje pošte"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Ob uporabi tega računa _vedno podpiši odhodno pošto"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Ne morem dobiti sporočila"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Opravljeno"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Mapa _osnutkov:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "_Vključi"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Poštni račun"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email _address:"
 msgstr "_E-poštni naslov:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "Ob izhodu _sprazni mapo smeti"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "ID _certifikata:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Evolucijin druid za račune"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Izvrši ukaz..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "se konča z"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "Filtri"
+
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Font Properties"
 msgstr "Lastnosti računa"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Posredovana sporočila"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Osvetli citiranja z"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Kot del sporočila"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Shrani in zapri"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Loading Images"
 msgstr "Naloži _slike"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Nastavitev pošte"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Mesto poštnega predala"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Composer"
 msgstr "Sporočila"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Message Display"
 msgstr "Prikaz _sporočila"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Fonts"
 msgstr "Sporočilo vsebuje"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Opozorilo o novi pošti"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Podatki po želji"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_zacija:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _ključa PGP/GPG:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Izberi barvo"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Zahtevaj potrditev ob pošiljanju sporočil, ki imajo le BCC prejemnike"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Natisni izbrane stike"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Poštni imenik Qmail"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Quote original message"
 msgstr "Ne morem dobiti sporočila"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Citirano"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "Zapo_mni si to geslo"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Odgovori-na:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Sprejemam e-pošto"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Možnosti sprejema"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Zapomni si geslo"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Potrebni podatki"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Privzeto"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Varnost"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "Varni MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Pošiljam e-pošto"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Mapa _poslanih sporočil:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Poslana sporočila in osnutki"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "St_režnik zahteva avtentifikacijo"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Nastavitev strežnika"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Vrs_ta strežnika:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Nisem mogel podpisati: certifikat za \"%s\" ni bil najden."
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Navedite ime datoteke:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Običajnen Unix poštni predal"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13117,12 +14019,16 @@ msgstr ""
 "Vpišite ime s katerimi želite imenovati ta račun. Na primer:\"službeni\" ali "
 "\"domači\"."
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Spremenljivo"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -13133,195 +14039,204 @@ msgstr ""
 "\n"
 "Kliknite \"Naprej\" za začetek. "
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_Podpisi"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "_Vedno naloži slike s spleta"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 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:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "Način _avtentifikacije: "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "Način _avtentifikacije: "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "_Samodejno preveri za novo pošto"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Samodejno preveri za novo pošto"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Beep when new mail arrives"
 msgstr "Ob prihodu nove pošte zapiskaj"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Potrdi ob uničevanju mape"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Zbriši vse razen podpisa"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Defaults"
 msgstr "Privzeto"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "Ob prihodu nove pošte me ne obvesti"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Enable"
 msgstr "Vključi"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Posreduj naprej kot"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "_Polno ime:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "V pošti HTML"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Identity"
 msgstr "Identiteta"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "junij"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "_Naloži slike, če je pošiljatelj v adresarju"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Naj bo to moj p_rivzet račun"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Označi sporočila kot prebrana po:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "_Nikoli ne naloži slik s spleta"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "Ob prihodu nove pošte zaigraj zvočno datoteko"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 #, 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:159
+#: mail/mail-config.glade.h:165
 #, 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:160
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Sprejemanje pošte"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Odgovori vsem"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Script:"
 msgstr "_Skripta"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Zbriši..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Pošiljanje pošte"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Kaži čas kot"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Podpisi"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Standard Font:"
 msgstr "Običajnen Unix poštni predal"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Terminal Font:"
 msgstr "Prvotni stik:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Uporabi _varno povezavo (SSL)"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "opis"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Pregledujem %s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13330,7 +14245,7 @@ msgstr ""
 "Napaka ob '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13339,7 +14254,7 @@ msgstr ""
 "Napaka ob opravljanju dejanja:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Delam"
 
@@ -13351,118 +14266,118 @@ msgstr "Mapa filtrov"
 msgid "Fetching Mail"
 msgstr "Sprejemanje pošte"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nisem uspel shraniti pošte v začasno datoteko %s: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Nisem uspel shraniti pošte v začasno datoteko %s: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Pošiljam \"%s\""
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Pošiljam sporočilo %d od %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Neuspeh pri sporočilu %d od %d"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Končano."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Shranjujem sporočilo v mapo"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Prestavljam sporočila v %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram sporočila v %s"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Pregledujem mape v \"%s\""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Posredovana sporočila"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Odpiram mapo %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "Odpiram shrambo %s"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Osvežujem mapo"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Uničujem mapo"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Uvažam %s kot %s"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Krajevne mape"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Prenašam sporočilo %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Prenašam %d sporočil"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Shranjujem %d sporočil"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13471,7 +14386,7 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13480,11 +14395,11 @@ msgstr ""
 "Napaka ob shranjevanju sporočil v: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Shranjujem prilogo"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13493,21 +14408,25 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odklapljam se od %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Znova se povezujem z %s"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Razlikuj velike in male črke"
@@ -13524,60 +14443,75 @@ msgstr "Poišči"
 msgid "Search"
 msgstr "Iskanje"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Seznam podpisov"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "šifriranje"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Podatki o računu"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Preklicujem..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Strežnik: %s, vrsta: %s:"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Pot: %s, vrsta: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Vrsta: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Pošlji in spreji pošto"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Prekliči vse"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Posodabljam..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Čakam..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Uporabnik je dejanje preklical."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Vpišite geslo za %s"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Vpišite geslo"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "_Zapomni si to geslo"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "Pomni geslo do konca seje"
@@ -13621,26 +14555,31 @@ msgstr "za ta podpis uporabi _HTML"
 msgid "Name:"
 msgstr "Ime:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Posredovano sporočilo %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Posredovano sporočilo"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Odpiram mapo %s"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Nastavljam vMapo: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Posodabljam vmape za uri: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13653,88 +14592,88 @@ msgstr ""
 "    '%s'\n"
 "in so bile posodobljene."
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "vMape"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "vMape"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Uredi VMapo"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Poskus ureditve vmape '%s', ki ne obstaja."
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Nova vMapa"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Nevideno"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Videno"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Odgovorjeno"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "več nevidenih sporočil"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Več sporočil"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "najnižja"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "nizka"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "visoka"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "najvišja"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Danes %l:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Včeraj %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Ustvarjam seznam sporočil"
 
@@ -13795,11 +14734,11 @@ msgstr "Posreduj naprej"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Odgovori"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Odgovori vsem"
 
@@ -13857,42 +14796,142 @@ msgstr "_Naroči se"
 msgid "_Unsubscribe"
 msgstr "_Prekliči naročnino"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Evolucijina lupina."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+#, fuzzy
+msgid "Folder Settings"
+msgstr "Nastavitev pošte"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "80%"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Preimenuj to skupino bližnjic"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Preklopi prikaz vrstice z mapami"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Skrij vrstico z bližnjicami"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Privzeta prioriteta:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Privzeta prioriteta:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Vmesnik za nastavitev pošte"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
 msgstr ""
-"Nisem mogel prenesti mape:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 #, fuzzy
-msgid "Add a Folder"
-msgstr "Dodaj pravilo vMape"
+msgid "Path to the default calendar folder"
+msgstr "Krajevno hranjenje nima privzete mape"
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Osnutki"
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "Odpiram mapo %s"
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Dohodna pošta"
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Krajevno hranjenje nima privzete mape"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Odpiram mapo %s"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Odhodna pošta"
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+#, fuzzy
+msgid "Physical URI to the default mail folder"
+msgstr "Krajevno hranjenje nima privzete mape"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Odpiram mapo %s"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Poslano"
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Preklopi prikaz vrstice z mapami"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Preklopi prikaz vrstice z bližnjicami"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "E-pošta"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Nisem mogel pravilno posodobiti datotek"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13903,7 +14942,7 @@ msgstr ""
 "%s\n"
 "Napaka: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13913,7 +14952,7 @@ msgstr ""
 "`%s'\n"
 " se je zgodila napaka."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13924,7 +14963,7 @@ msgstr ""
 "Prosim premestite jo, da se lahko namestitev\n"
 "Evolucijinih uporabniških datotek nadaljuje."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -14029,10 +15068,11 @@ msgstr ""
 "Nisem mogel preimenovati mape:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+msgid "The specified folder name is not valid: %s"
+msgstr "Izbrano ime mape ni veljavno: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -14056,20 +15096,15 @@ msgstr ""
 "Ne morem ustvariti izbrane mape:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-#, fuzzy
-msgid "Create New Folder"
-msgstr "Ustvari _novo mapo..."
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Neimenovana)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Izberite  vrsto uvoznika, ki naj se požene:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -14083,11 +15118,11 @@ msgstr ""
 "Če ne veste, lahko izberete \"Samodejno\" in Evolucija bo poskusila "
 "ugotoviti."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Prosim, izberite podatke, ki jih želite uvoziti:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -14095,7 +15130,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14104,22 +15139,22 @@ msgstr ""
 "Uvažam %s\n"
 "Uvažam predmet %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 #, fuzzy
 msgid "Select importer"
 msgstr "Izberi mapo"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "Mapa %s ne obstaja"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Napaka Evolucije"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -14128,11 +15163,11 @@ msgstr ""
 "Ni uvoznika, ki bi lahko obravnaval\n"
 " %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Uvažam"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -14141,17 +15176,17 @@ msgstr ""
 "Uvažam %s.\n"
 "Pričenjam %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Napaka ob zagonu %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Napaka ob nalaganju %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14160,35 +15195,35 @@ msgstr ""
 "Uvažam %s\n"
 "Uvažam predmet 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "_Ime datoteke:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Izberi datoteko"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Vrsta datoteke:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Uvozi podatke in nastavitve iz starejših programov"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Uvozi eno samo datoteko"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -14196,46 +15231,28 @@ msgstr ""
 "Prosim počakajte...\n"
 "Iščem že obstoječe namestitve"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Poganjam pametne uvoznike"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "Od: %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Izberite ciljno mapo za uvoz teh podatkov"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Uvozi"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Prekinjam povezave..."
 
-#: shell/e-shell-offline-sync.c:163
-#, fuzzy, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr "Uskladi \"%s\""
-
-#: shell/e-shell-offline-sync.c:232
-#, fuzzy
-msgid "Syncing Folder"
-msgstr "Uskljajujem mapo"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, fuzzy, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Uskladi \"%s\""
-
 #: shell/e-shell-settings-dialog.c:346
 #, fuzzy
 msgid "Evolution Settings"
@@ -14276,7 +15293,7 @@ msgstr ""
 "Ne morem ustvariti izbrane mape:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14285,17 +15302,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Pomočnik"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Nov"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Ime mape ni navedeno."
@@ -14357,63 +15368,50 @@ 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:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "Delaj na _mreži"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "Delaj _brez mreže"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Delaj brez mreže"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Nobena mapa ni prikazana)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(brez)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 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:2090
+#: shell/e-shell-window.c:331
 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:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolucija trenutno ni na mreži.  Kliknite ta gumb za delo z mrežo."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Neveljavni argumenti"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Ne morem se registrirati pri OAF"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Podatkovna zbirka nastavitev ni bila najdena"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Generična napaka"
 
@@ -14533,74 +15531,18 @@ msgstr "_Odstrani"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstrani to bližnjico iz vrstice bližnjic"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Napaka ob shranjevanju bližnjic."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Dohodna pošta"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Bližnjice"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Brez napak"
-
-#: 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:575
-msgid "The specified folder type is not valid"
-msgstr "Izbrana vrsta mape ni veljavna"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "V/I napaka"
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr "Ni dovolj prostora za ustvaritev mape"
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr "Mapa ni prazna"
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "Izbrana mapa ni bila najdena"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "Funkcija ni implementirana v tem hranilniku"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "Operacija ni podprta"
-
-#: 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:593
-msgid "The specified folder cannot be modified or removed"
-msgstr "Izbrane mape ni možno spremeniti ali odstraniti"
-
-#: 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:597
-msgid "Cannot create a folder with that name"
-msgstr "Ne morem ustvariti mape s takšnim imenom"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr ""
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr ""
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14611,6 +15553,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% končano)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Nov"
+
+#: shell/evolution-folder-selector-button.c:128
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "%s ob %s"
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14648,75 +15601,6 @@ msgstr ""
 "Napaka iz aktivacijskega sistema je:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "Napaka CORBA"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Prekinjen"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Neveljaven argument"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Že ima lastnika"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Brez lastnika"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Ni bil(a) najden(a)"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Nepodprta vrsta"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Nepodprta shema"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Nepodprto dejanje"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Notranja napaka"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Obstaja"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "Neveljaven URI"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Ima podmape"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Ni več prostora"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "Star lastnik je umru"
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Preveri vrsto"
-
-#: shell/evolution-test-component.c:703
-#, fuzzy
-msgid "Evolution Test Component"
-msgstr "Evolucijin veznik opravil"
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "Active Connections"
@@ -14750,11 +15634,6 @@ msgstr "_Pošta"
 msgid "_Tasks:"
 msgstr "Naloge"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-#, fuzzy
-msgid "Folder _name:"
-msgstr "Ime mape:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 #, fuzzy
 msgid "Folder _type:"
@@ -14822,25 +15701,6 @@ msgstr ""
 "nastavitev Evolucije. \n"
 "Kliknite gumb \"Končaj\" za shranitev vaših nastavitev. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Evolucijina lupina."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-#, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Nastavitev Evolucijine pošte"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-#, fuzzy
-msgid "Folder Settings"
-msgstr "Nastavitev pošte"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Kliknite \"Uvozi\" za pričetek uvoza datoteke v Evolucijo. "
@@ -14879,7 +15739,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Uvozniki"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Uvozi"
 
@@ -14895,16 +15755,16 @@ msgstr "Ne sprašuj me več"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolucija lahko uvozi podatke iz sledečih datotek:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolucija"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Evolucije se sedaj zapira..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14936,7 +15796,7 @@ msgstr ""
 "Upamo, da boste uživali sadove našega trdega dela in nestrpno\n"
 "pričakujemo vaše prispevke!\n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -14945,38 +15805,51 @@ msgstr ""
 "Hvala,\n"
 "skupina Evolucije\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Ne sprašuj me več"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ne morem dostopati do lupine Ximian Evolucije."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ne morem inicializirati lupine Ximian Evolucije: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+#, fuzzy
+msgid "Start Evolution activating the specified component"
+msgstr "Evolucijina komponenta za povzetke."
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Začni v ne-mrežnem načinu"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Začni v mrežnem načinu"
 
-#: shell/main.c:535
+#: shell/main.c:533
 #, fuzzy
 msgid "Forcibly shut down all evolution components"
 msgstr "Tovarna komponent Evolucije zaznamkov."
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Pošlji razhroščevalna sporočila vseh komponent v datoteko."
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14985,31 +15858,62 @@ msgstr ""
 "%s: --online in --ofline ne moreta biti uporabljena skupaj.\n"
 "  Uporabite %s --help za več podatkov.\n"
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Izberi mapo"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "ID _certifikata:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "Napredek"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Izraz"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "E-poštni naslov:"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr "ID _certifikata:"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, fuzzy, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+"Proizvedel: %s\n"
+"Zadeva: %s"
+
+#: smime/gui/e-cert-selector.c:117
+#, fuzzy, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+"Proizvedel: %s\n"
+"Zadeva: %s"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -15063,90 +15967,376 @@ msgid "Backup All"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "ID _certifikata:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "ID _certifikata:"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "ID _certifikata:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Splošno ime"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "ID _certifikata:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 msgid "Edit"
 msgstr "Uredi"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Nisem mogel preveriti certifikatov."
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Izraz"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Organizacija"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Organizacija"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "Po_gled"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "ID _certifikata:"
+
+#: smime/gui/smime-ui.glade.h:42
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "ID _certifikata:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Uvozi"
+msgid "Certificate already exists"
+msgstr "ID vizitke že obstaja"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Vermont"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Vermont"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Vermont"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Vermont"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "V redu"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "ID _certifikata:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "ID _certifikata:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "ID _certifikata:"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "I"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+#, fuzzy
+msgid "Subject Public Key Info"
+msgstr ""
+"\n"
+"Javni ključ: "
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Zadeva je %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Nisem mogel obdelati mape vrste 'spool'"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#, fuzzy
+msgid "Object Signer"
+msgstr "_Predmet"
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "ID _certifikata:"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Nisem mogel preveriti certifikatov."
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "dohodna"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Ni podatkov"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "priloga"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "ID _certifikata:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Hrvaška"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+msgid "Not Critical"
+msgstr ""
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Izraz"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s ob %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Nisem mogel shraniti datoteke s podpisom."
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "_Vstavi"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Zadeva je %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Nisem mogel shraniti datoteke s podpisom."
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Vpišite geslo za %s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "ID _certifikata:"
 
 #: tools/evolution-launch-composer.c:324
 #, fuzzy
@@ -15200,7 +16390,7 @@ msgstr "Kopiraj izbrano"
 msgid "Copy to Folder..."
 msgstr "Kopiraj v mapo..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Izreži izbrano"
 
@@ -15216,7 +16406,7 @@ msgstr "Prestavi stik(e) v drugo mapo..."
 msgid "Move to Folder..."
 msgstr "Prestavi v mapo..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Prilepi odložišče"
 
@@ -15224,8 +16414,8 @@ msgstr "Prilepi odložišče"
 msgid "Previews the contacts to be printed"
 msgstr "Predogled stikov, ki bodo natisnjeni"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Predogled _tiskanja"
@@ -15270,13 +16460,13 @@ msgstr "Ustavi nalaganje"
 msgid "View the current contact"
 msgstr "Poglej trenutni stik"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "_Dejanja"
 
@@ -15305,146 +16495,114 @@ msgid "_Send Message to Contact..."
 msgstr "Pošlji _sporočilo stiku..."
 
 #: ui/evolution-calendar.xml.h:3
-#, fuzzy
-msgid "Create a new all-day event"
-msgstr "Ustvari nov sestanek"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Ustvari nov sestanek"
-
-#: ui/evolution-calendar.xml.h:5
 msgid "Create a new calendar"
 msgstr "Ustvari nov koledar"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Ustvari _nov sestanek"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Ustvari nov posel"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Dan"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 #, fuzzy
 msgid "Delete All Occurrences"
 msgstr "Zbriši _vse pojavitve"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Zbriši ta sestanek"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "Zbriši to _pojavitev"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "Zbriši to _pojavitev"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Pojdi na"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Pojdi nazaj"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Pojdi naprej"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Pojdi na _datum"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Pojdi na določen datum"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Pojdi na danes"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "List"
 msgstr "seznam"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Mesec"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Nov _sestanek"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Nova Kaledonija"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Nov sestanek"
-
-#: ui/evolution-calendar.xml.h:27
-#, fuzzy
-msgid "New _Task"
-msgstr "Nova _naloga"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Predogled koledarja, ki bo natisnjen"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Natisni ta koledar"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Objavi podatek o zasedenosti za ta koledar"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Stran"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Mapa, ki vsebuje sestanke in dogodke"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Kaži podrobnosti"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Kaži en dan"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Kaži en mesec"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Kaži en teden"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Pokaži delavni teden"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Teden"
 
@@ -15509,7 +16667,7 @@ msgstr "Shrani ta predmet na disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Datoteka"
 
@@ -15735,7 +16893,7 @@ msgstr "Označi vs_e kot prebrano"
 msgid "Mark all visible messages as read"
 msgstr "Označi vsa vidna sporočila kot prebrana"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Paste message(s) from the clipboard"
 msgstr "Prilepi sporočilo na odložišče"
@@ -15792,16 +16950,6 @@ msgstr "_Obrni izbor"
 msgid "_Threaded Message List"
 msgstr "_Niten seznam sporočil"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Zapri to okno"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "_Zapri"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "Pošiljatelja _dodaj v adresar"
@@ -15959,260 +17107,285 @@ msgstr "Nekomu posreduj izbrano sporočilo kot prilogo"
 msgid "Increase the text size"
 msgstr "Povečaj velikost besedila"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Naloži _slike"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Označi kot po_membno"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Označi kot _neprebrano"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Označi kot _nepomembno"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "Označi izbrana sporočila kot prebrana"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "Označi izbrana sporočila kot pomembna"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Označi izbrana sporočila kot nepomembna"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Označi izbrana sporočila kot neprebrana"
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Označi izbrana sporočila kot neprebrana"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Označi izbrana sporočila kot nepomembna"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Označi izbrana sporočila za brisanje"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Prestavi"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "Prestavi izbrana sporočila v drugo mapo"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Naslednje"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "Naslednje po_membno sporočilo"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "Naslednja _nit"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "Naslednje _neprebrano sporočilo"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Ni bil(a) najden(a)"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Odpri izbrano sporočilo v novem oknu"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Odpri izbrano sporočilo v skladatelju za vnovično pošiljanje"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Izvorna _velikost"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "P_rejšnje neprebrano sporočilo"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Odgovor na nalogo"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "Shrani sporočilo v izbrano mapo"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "Pr_ejšnje pomembno sporočilo"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Predogled sporočila, ki bo natisnjeno"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Prejšnje"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Natisni to sporočilo"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "_Preusmeri"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Izbrano sporočilo nekomu posreduj"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Ponastavi besedilo na njegovo izvorno velikost"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "_Išči v sporočilu..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "_Manjša"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Shrani sporočilo kot datoteko z besedilom"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Išči besedilo v telesu prikazanega sporočila"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "Set up the page settings for your current printer"
 msgstr "Nastavi lastnosti strani za vaš trenutni tiskalnik"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Kaži _izvorno kodo pošte"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Kaži celotne _glave"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Išči besedilo v telesu prikazanega sporočila"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Kaži sporočila v običajnem slogu"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Kaži sporočila s celotnimi glavami"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Kaži neposredno izvorno kodo sporočila"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "_Velikost besedila"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Odbriši izbrana sporočila"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "vMapa glede na poštni se_znam..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "vMapa glede na _pošiljatelja..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "vMapa glede na pre_jemnike..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "vMapa glede na p_redmet"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "_Priloženo"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "_Kopiraj v mapo"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "Iz sporočila _ustvari filter"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "Sporočilo _posreduj naprej"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "Po_jdi na"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "Kot _del sporočila"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "_Večje"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "Prikaz _sporočila"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Prestavi v mapo"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "_Naslednje sporočilo"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "_Običajen prikaz"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "_Odpri sporočilo"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "_Prejšnje sporočilo"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "_Citirano"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 #, fuzzy
 msgid "_Resend..."
 msgstr "_Preimenuj..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "_Orodja"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "O_dbriši"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Zapri to okno"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "_Zapri"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Priloži"
@@ -16495,12 +17668,13 @@ msgid "Change Evolution's settings"
 msgstr "Evolucijina lupina."
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "Iz_hod"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Ustvari _nov sestanek"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "_Okno Evolucije"
+msgid "E_xit"
+msgstr "Iz_hod"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16512,8 +17686,8 @@ msgstr "Uvozi podatke iz drugih programov"
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "_Okno Evolucije"
+msgid "Open a new window"
+msgstr "Odpri v novem oknu"
 
 #: ui/evolution.xml.h:11
 #, fuzzy
@@ -16521,54 +17695,68 @@ msgid "Pi_lot Settings..."
 msgstr "_Nastavitve pilota..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Oddaja / sprejem"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "Pošlji pošto v vrsti in sprejmi novo pošto"
+
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Nastavitev pošte"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Kaži podatke o Ximian Evoluciji"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Pošlji poročilo o hrošču"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "_Pošlji poročilo o hrošču"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Pošlji poročilo o hrošču z uporabo progama Bug buddy"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Preklopi"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Preklopi delo z mrežo"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "_Pogosto zastavljena vprašanja"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "_O Ximian Evoluciji..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "_Pomoč"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "_Uvozi..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Nova"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Oddaja / sprejem"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "_Išči sedaj"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Natisni povzetek"
@@ -16710,12 +17898,12 @@ msgstr "Določi poglede"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "PTSČPSN"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -16849,7 +18037,7 @@ msgstr "I_skanje"
 msgid "_Find Now"
 msgstr "_Išči sedaj"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 #, fuzzy
 msgid "_Clear"
 msgstr "Počisti"
@@ -16868,24 +18056,267 @@ msgstr ""
 msgid "Text"
 msgstr "Preizkus"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Počisti"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Išči sedaj"
 
+#~ msgid "Account Name"
+#~ msgstr "Ime računa"
+
+#~ msgid "Server Name"
+#~ msgstr "Ime strežnika"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Prekliči trenutno operacijo pošte"
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "(SSL v to zgradbi Evolucije ni vgrajen)"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Drugo stiki"
+
+#, fuzzy
+#~ msgid "Directory Servers"
+#~ msgstr "N_ov strežnik imenikov"
+
+#, fuzzy
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Evolucijin adresarjev veznik"
+
+#, fuzzy
+#~ msgid "Add LDAP Server"
+#~ msgstr "Strežnik LDAP"
+
+#, fuzzy
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Piskaj ob zaslonskih alarmih"
+
+#, fuzzy
+#~ msgid "Find contact in"
+#~ msgstr "Poišči stik"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Kliknite tu za dodajo stika *"
+
+#~ msgid "Business Address"
+#~ msgstr "Službeni naslov"
+
+#~ msgid "Department"
+#~ msgstr "Oddelek"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "URL zasedenosti"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Poklic"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Odpiram naloge v %s"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Vseeno pošlji?"
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Družinsko ime"
+#~ msgid "Folder _name"
+#~ msgstr "Ime mape:"
 
-#~ msgid "Family Name"
-#~ msgstr "Družinsko ime"
+#~ 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."
+
+#, fuzzy
+#~ msgid "No signature present"
+#~ msgstr "Datoteka s podpisom HTML:"
+
+#, fuzzy
+#~ msgid "Connecting..."
+#~ msgstr "Vzpostavljam povezavo s strežnikom..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Ta mapa ne more vsebovati sporočil."
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Nisem mogel preimenovati mape: %s"
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Izberite ciljno mapo za uvoz teh podatkov"
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nisem mogel prenesti mape:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Add a Folder"
+#~ msgstr "Dodaj pravilo vMape"
+
+#~ msgid "Drafts"
+#~ msgstr "Osnutki"
+
+#~ msgid "Outbox"
+#~ msgstr "Odhodna pošta"
+
+#~ msgid "Sent"
+#~ msgstr "Poslano"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr "Uskladi \"%s\""
+
+#, fuzzy
+#~ msgid "Syncing Folder"
+#~ msgstr "Uskljajujem mapo"
+
+#, fuzzy
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Uskladi \"%s\""
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Nobena mapa ni prikazana)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(brez)"
+
+#~ msgid "No error"
+#~ msgstr "Brez napak"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Mapa z enakim imenom že obstaja"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Izbrana vrsta mape ni veljavna"
+
+#~ msgid "I/O error"
+#~ msgstr "V/I napaka"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Ni dovolj prostora za ustvaritev mape"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Mapa ni prazna"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Izbrana mapa ni bila najdena"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Funkcija ni implementirana v tem hranilniku"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Operacija ni podprta"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Izbrana vrsta ni podprta v tem hranilniku"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Izbrane mape ni možno spremeniti ali odstraniti"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "Mapa ne more postati otrok svojih potomcev"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Ne morem ustvariti mape s takšnim imenom"
+
+#~ msgid "CORBA error"
+#~ msgstr "Napaka CORBA"
+
+#~ msgid "Interrupted"
+#~ msgstr "Prekinjen"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Neveljaven argument"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Že ima lastnika"
+
+#~ msgid "No owner"
+#~ msgstr "Brez lastnika"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Nepodprta vrsta"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Nepodprta shema"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Nepodprto dejanje"
+
+#~ msgid "Internal error"
+#~ msgstr "Notranja napaka"
+
+#~ msgid "Exists"
+#~ msgstr "Obstaja"
+
+#~ msgid "Invalid URI"
+#~ msgstr "Neveljaven URI"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Ima podmape"
+
+#~ msgid "No space left"
+#~ msgstr "Ni več prostora"
+
+#~ msgid "Old owner has died"
+#~ msgstr "Star lastnik je umru"
+
+#~ msgid "Test type"
+#~ msgstr "Preveri vrsto"
+
+#, fuzzy
+#~ msgid "Evolution Test Component"
+#~ msgstr "Evolucijin veznik opravil"
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "Uvozi"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Ustvari nov sestanek"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Nov _sestanek"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Nov sestanek"
+
+#, fuzzy
+#~ msgid "New _Task"
+#~ msgstr "Nova _naloga"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "_Okno Evolucije"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "_Okno Evolucije"
+
+#~ msgid "Toggle"
+#~ msgstr "Preklopi"
+
+#~ msgid "Clear"
+#~ msgstr "Počisti"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Prekliči trenutno operacijo pošte"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -16980,9 +18411,6 @@ msgstr "Išči sedaj"
 #~ msgid "Evolution VCard importer"
 #~ msgstr "Evolucijin setavljalnik pošte."
 
-#~ msgid "Loading..."
-#~ msgstr "Nalagam..."
-
 #~ msgid "Searching..."
 #~ msgstr "Iščem..."
 
@@ -17037,10 +18465,6 @@ msgstr "Išči sedaj"
 #~ msgstr "EKnjiga ni naložena\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "ID vizitke že obstaja"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Operacija razveljavljena"
 
@@ -17276,10 +18700,6 @@ msgstr "Išči sedaj"
 #~ msgstr "Prvi"
 
 #, fuzzy
-#~ msgid "ID"
-#~ msgstr "I"
-
-#, fuzzy
 #~ msgid "Last Use"
 #~ msgstr "Prilepi"
 
@@ -17293,9 +18713,6 @@ msgstr "Išči sedaj"
 #~ msgid "Folder containing contact information"
 #~ msgstr "Mapa, ki vsebuje podatke o stikih"
 
-#~ msgid "LDAP Server"
-#~ msgstr "Strežnik LDAP"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "Strežnik LDAP, ki vsebuje podatke o stikih"
 
@@ -17307,20 +18724,6 @@ msgstr "Išči sedaj"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Mapa, ki vsebuje podatke o stikih"
 
-#~ msgid "_Contact"
-#~ msgstr "_Stik"
-
-#, fuzzy
-#~ msgid "Create a new contact"
-#~ msgstr "Ustvari nov stik"
-
-#~ msgid "New Contact List"
-#~ msgstr "Nov seznam stikov"
-
-#, fuzzy
-#~ msgid "Create a new contact list"
-#~ msgstr "Ustvari nov seznam stikov"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "URI, ki naj ga prikaže brskalnik map"
 
@@ -17334,9 +18737,6 @@ msgstr "Išči sedaj"
 #~ msgid "Card"
 #~ msgstr "Avto"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "ni vizitk"
 
@@ -17386,36 +18786,6 @@ msgstr "Išči sedaj"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "Mapa, ki vsebuje predmete za opravit"
 
-#~ msgid "New appointment"
-#~ msgstr "Nov sestanek"
-
-#~ msgid "_Appointment"
-#~ msgstr "_Sestanek"
-
-#~ msgid "New meeting"
-#~ msgstr "Nov sestanek"
-
-#, fuzzy
-#~ msgid "M_eeting"
-#~ msgstr "Sestanek"
-
-#~ msgid "Create a new meeting request"
-#~ msgstr "Ustvari nov zahtevek za sestanek"
-
-#~ msgid "New task"
-#~ msgstr "Nova naloga"
-
-#~ msgid "_Task"
-#~ msgstr "_Naloga"
-
-#, fuzzy
-#~ msgid "New All Day Appointment"
-#~ msgstr "Nov sestanek"
-
-#, fuzzy
-#~ msgid "All _Day Appointment"
-#~ msgstr "_Sestanek"
-
 #, fuzzy
 #~ msgid "Could not update invalid object"
 #~ msgstr "Nisem mogel posodobiti predmeta!"
@@ -17457,10 +18827,6 @@ msgstr "Išči sedaj"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "Odpiram koledar v %s"
 
-#, fuzzy
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Odpiram mapo %s"
-
 #~ msgid "Evaluation of the search expression did not yield a boolean value"
 #~ msgstr ""
 #~ "Izračun iskalnega izraza ni podal vrednosti resnično/neresnično (boolean)"
@@ -17501,10 +18867,6 @@ msgstr "Išči sedaj"
 #~ "Evolucija je našla datoteke GnomeCard-a.\n"
 #~ "Jih želite uvoziti v Evolucijo?"
 
-#, fuzzy
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Vmesnik za nastavitev pošte"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "Mapa, ki vsebuje pošto"
 
@@ -17522,25 +18884,12 @@ msgstr "Išči sedaj"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Mapa navideznih smeti"
 
-#~ msgid "Properties..."
-#~ msgstr "Lastnosti..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Spremeni lastnosti te mape"
 
 #~ msgid "You have not set a mail transport method"
 #~ msgstr "Niste nastavili postopka prenašanja pošte"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Novo poštno sporočilo"
-
-#~ msgid "_Mail Message"
-#~ msgstr "_Pošlji sporočilo"
-
-#, fuzzy
-#~ msgid "Compose a new mail message"
-#~ msgstr "Sestavi novo sporočilo"
-
 #, fuzzy
 #~ msgid "New Message Post"
 #~ msgstr "Novo sporočilo"
@@ -18483,9 +19832,6 @@ msgstr "Išči sedaj"
 #~ msgid "Venezia"
 #~ msgstr "Benetke"
 
-#~ msgid "Vermont"
-#~ msgstr "Vermont"
-
 #~ msgid "Vladikavkaz"
 #~ msgstr "Vladikavkaz"
 
@@ -18614,9 +19960,6 @@ msgstr "Išči sedaj"
 #~ msgid " F"
 #~ msgstr " F"
 
-#~ msgid " C"
-#~ msgstr " C"
-
 #~ msgid "knots"
 #~ msgstr "vozlov"
 
@@ -19237,9 +20580,6 @@ msgstr "Išči sedaj"
 #~ msgid "Freezing haze"
 #~ msgstr "Zmrzujoča suha motnost"
 
-#~ msgid "Spray"
-#~ msgstr "Pršec"
-
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Pršec v okolici"
 
@@ -19611,19 +20951,6 @@ msgstr "Išči sedaj"
 #~ msgid "Open this folder in an other window"
 #~ msgstr "Odpri to mapo v drugem oknu"
 
-#~ msgid "Send / Receive"
-#~ msgstr "Oddaja / sprejem"
-
-#, fuzzy
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Pošlji pošto v vrsti in sprejmi novo pošto"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Preklopi prikaz vrstice z mapami"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Preklopi prikaz vrstice z bližnjicami"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Poglej izbrane mape"
 
@@ -19653,9 +20980,6 @@ msgstr "Išči sedaj"
 #~ msgid "_Rename..."
 #~ msgstr "_Preimenuj..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Oddaja / sprejem"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "_Vrstica z bližnjicami"
 
@@ -19700,10 +21024,6 @@ msgstr "Išči sedaj"
 #~ msgstr "Nastavitve"
 
 #, fuzzy
-#~ msgid "Automatically _detect links"
-#~ msgstr "_Samodejno preveri za novo pošto"
-
-#, fuzzy
 #~ msgid "Emacs"
 #~ msgstr "vzhod"
 
@@ -19962,9 +21282,6 @@ msgstr "Išči sedaj"
 #~ "To je opozorilo preko elektronske pošte, ki pa ga Evolucija še ne "
 #~ "podpira. Ne boste mogli spremeniti možnosti za to opozorilo."
 
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "Ustvari nove sestanke s privzetim _opomnilnikom"
-
 #~ msgid "First day of wee_k:"
 #~ msgstr "Prvi dan ted_na:"
 
@@ -20158,13 +21475,6 @@ msgstr "Išči sedaj"
 #~ msgid "(unknown host)"
 #~ msgstr "(neznan gostitelj)"
 
-#~ msgid ""
-#~ "Issuer: %s\n"
-#~ "Subject: %s"
-#~ msgstr ""
-#~ "Proizvedel: %s\n"
-#~ "Zadeva: %s"
-
 #~ msgid "No such message: %s"
 #~ msgstr "Ni takšnega sporočila: %s"
 
@@ -20388,9 +21698,6 @@ msgstr "Išči sedaj"
 #~ msgid "Evolution component for handling mail."
 #~ msgstr "Evolucijina komponenta za obravnavo pošte."
 
-#~ msgid "Evolution mail executive summary component."
-#~ msgstr "Evolucijina komponenta za povzetke."
-
 #~ msgid "Evolution mail folder factory component."
 #~ msgstr "Evolucijina komponenta za tovarne poštnih map."
 
@@ -20507,9 +21814,6 @@ msgstr "Išči sedaj"
 #~ msgid "Composer"
 #~ msgstr "Skladatelj"
 
-#~ msgid "Default Forward style is: "
-#~ msgstr "Privzet način posredovanja naprej je: "
-
 #~ msgid "Delete selected signature"
 #~ msgstr "Zbriši izbran podpis"
 
@@ -20525,9 +21829,6 @@ msgstr "Išči sedaj"
 #~ msgid "Edi_t..."
 #~ msgstr "Ur_edi..."
 
-#~ msgid "Edit signature content in editor"
-#~ msgstr "Uredi vsebino podpisa v urejevalniku"
-
 #~ msgid "File containing signature"
 #~ msgstr "Datoteka, ki vsebuje podpis"
 
@@ -20582,9 +21883,6 @@ msgstr "Išči sedaj"
 #~ msgid "_HTML Signature:"
 #~ msgstr "Podpis _HTML:"
 
-#~ msgid "_Log filter actions to:"
-#~ msgstr "Zapisuj dejanja filtra v:"
-
 #~ msgid "_Name"
 #~ msgstr "_Ime"
 
@@ -20594,9 +21892,6 @@ msgstr "Išči sedaj"
 #~ msgid "_PGP binary path:"
 #~ msgstr "Pot do izvršljive datoteke _PGP"
 
-#~ msgid "_Send mail in HTML format by default."
-#~ msgstr "Privzeto pošiljaj pošto v _HTML obliki."
-
 #~ msgid "_Server type: "
 #~ msgstr "Vrsta _strežnika: "
 
@@ -20780,9 +22075,6 @@ msgstr "Išči sedaj"
 #~ msgid "Dump"
 #~ msgstr "Shrani"
 
-#~ msgid "_Contact List"
-#~ msgstr "Seznam _stikov"
-
 #~ msgid "Configure the calendar's settings"
 #~ msgstr "Nastavi pogled koledarja"
 
@@ -20837,9 +22129,6 @@ msgstr "Išči sedaj"
 #~ msgid "Search through the messages in this folder"
 #~ msgstr "Išči skozi sporočila v tej mapi"
 
-#~ msgid "Sue's Phone"
-#~ msgstr "Suein telefon"
-
 #~ msgid "_Advanced Search..."
 #~ msgstr "N_apredno iskanje..."
 
@@ -20861,9 +22150,6 @@ msgstr "Išči sedaj"
 #~ msgid "Send _later"
 #~ msgstr "Pošlji _kasneje"
 
-#~ msgid "Send the message later"
-#~ msgstr "Pošlji sporočilo kasneje"
-
 #~ msgid "Configure the task view's settings"
 #~ msgstr "Nastavi pogled nalog"
 
@@ -21147,13 +22433,6 @@ msgstr "Išči sedaj"
 #~ "\n"
 #~ "Enoličen niz:  "
 
-#~ msgid ""
-#~ "\n"
-#~ "Public Key: "
-#~ msgstr ""
-#~ "\n"
-#~ "Javni ključ: "
-
 #~ msgid "New _Contact"
 #~ msgstr "Nov _stik"
 
@@ -21392,9 +22671,6 @@ msgstr "Išči sedaj"
 #~ msgid "r"
 #~ msgstr "r"
 
-#~ msgid "s"
-#~ msgstr "s"
-
 #~ msgid "t"
 #~ msgstr "t"
 
@@ -21557,9 +22833,6 @@ msgstr "Išči sedaj"
 #~ msgid "Could not create composer window."
 #~ msgstr "Nisem mogel ustvariti okna skladatelja."
 
-#~ msgid "%d/%m/%Y"
-#~ msgstr "%d/%m/%Y"
-
 #~ msgid "%Y/%m/%d"
 #~ msgstr "%d/%m/%Y"
 
@@ -21590,9 +22863,6 @@ msgstr "Išči sedaj"
 #~ msgid "Encrypted message not displayed"
 #~ msgstr "Šifrirano sporočilo ni prikazano"
 
-#~ msgid "Encrypted message"
-#~ msgstr "Šifrirano sporočilo"
-
 #~ msgid "Click icon to decrypt."
 #~ msgstr "Kliknite ikono za dešifriranje."
 
@@ -21611,9 +22881,6 @@ msgstr "Išči sedaj"
 #~ msgid "Volcanic ash w/ thunders"
 #~ msgstr "Vulkanski dim z grmenjem"
 
-#~ msgid "Units: "
-#~ msgstr "Enote: "
-
 #~ msgid "_Refresh time (seconds):"
 #~ msgstr "_Čas osvežitve (sekund):"
 
@@ -21707,9 +22974,6 @@ msgstr "Išči sedaj"
 #~ msgid "???"
 #~ msgstr "???"
 
-#~ msgid "_Company:"
-#~ msgstr "_Podjetje:"
-
 #~ msgid "Category contains"
 #~ msgstr "Kategorija vsebuje"
 
@@ -21887,9 +23151,6 @@ msgstr "Išči sedaj"
 #~ msgid "[%s] (forwarded message)"
 #~ msgstr "[%s] (posredovano sporočilo)"
 
-#~ msgid "Forwarded message (no subject)"
-#~ msgstr "Posredovano sporočilo (brez navedene zadeve)"
-
 #~ msgid ""
 #~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
 #~ "s<br><b>Subject:</b> %s<br>"
@@ -22138,9 +23399,6 @@ msgstr "Išči sedaj"
 #~ msgid "sign"
 #~ msgstr "podpis"
 
-#~ msgid "encrypt"
-#~ msgstr "šifriranje"
-
 #~ msgid "That file exists but is not readable."
 #~ msgstr "Ta datoteka obstaja a ni berljiva."
 
@@ -22343,9 +23601,6 @@ msgstr "Išči sedaj"
 #~ msgid "Apply any new filters to the mail in this box"
 #~ msgstr "Uveljavi vse nove filtre pošti tega predala"
 
-#~ msgid "Configure Folder..."
-#~ msgstr "Nastavi mapo..."
-
 #~ msgid "Display all of the message headers"
 #~ msgstr "Kaži vse glave sporočil"
 
@@ -22644,9 +23899,6 @@ msgstr "Išči sedaj"
 #~ msgid "Include in \"Get Mail\" operations."
 #~ msgstr "Vključuj v operacije \"Dobi pošto\"."
 
-#~ msgid "Incoming Mail Server"
-#~ msgstr "Strežnik dohodne pošte"
-
 #~ msgid "Outgoing Mail Server"
 #~ msgstr "Strežnik odhodne pošte"
 
@@ -22695,9 +23947,6 @@ msgstr "Išči sedaj"
 #~ msgid "Error saving composition to 'Drafts': %s"
 #~ msgstr "Napaka ob shranjevanju kompozicije v 'Osnutki': %s"
 
-#~ msgid "Connect to server"
-#~ msgstr "Poveži se s strežnikom"
-
 #~ msgid "Registering local folder"
 #~ msgstr "Registriam krajevno mapo"
 
@@ -22766,9 +24015,6 @@ msgstr "Išči sedaj"
 #~ "III\n"
 #~ "Esq.\n"
 
-#~ msgid "Local stores do not have a default folder"
-#~ msgstr "Krajevno hranjenje nima privzete mape"
-
 #~ msgid "Note: When converting between mailbox formats, a failure\n"
 #~ msgstr ""
 #~ "Opomba: Med pretvarjanjem med različnimi oblikami poštnih predalov\n"
@@ -22917,9 +24163,6 @@ msgstr "Išči sedaj"
 #~ msgid "_Find..."
 #~ msgstr "_Poišči..."
 
-#~ msgid "_Object"
-#~ msgstr "_Predmet"
-
 #~ msgid "_Redo"
 #~ msgstr "Obnovi"
 
@@ -23293,9 +24536,6 @@ msgstr "Išči sedaj"
 #~ msgid "Load \"%s\""
 #~ msgstr "Naloži \"%s\""
 
-#~ msgid "Creating \"%s\""
-#~ msgstr "Ustvarjam \"%s\""
-
 #~ msgid "Exception while reporting result to shell component listener."
 #~ msgstr "Izjema med sporočanjem rezultatov lupini"
 
diff --git a/po/sr.po b/po/sr.po
index 7659fa41f2..dac35c6df8 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Ximian Evolution 1.4\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-07-26 14:41+0200\n"
 "Last-Translator: Igor Nestorović <jung@one.ekof.bg.ac.yu>\n"
 "Language-Team: Serbian (sr) <serbiangnome-lista@nongnu.org>\n"
@@ -33,51 +33,184 @@ msgstr "Нисам могао да учитам %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Нисам могао да прочитам програмски блок адреса пилота"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Директоријуми за самодопуњавање"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "Лична карта _сертификата:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Подесите ваше налоге за пошту овде"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Контакти"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
+msgstr "Еволуција адресар"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address pop-up"
+msgstr "Искачући прозор за адресе Еволуција адресара"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address viewer"
+msgstr "Прегледник адреса Еволуција адресара"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook card viewer"
+msgstr "Прегледник Еволуција адресара"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook component"
+msgstr "Део Еволуција адресара"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook folder viewer"
+msgstr "Прегледник директоријума Еволуција адресара"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Контрола особина Еволуција поште"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Контрола подешавања поставки Еволуција директоријума"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Адресар"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Особине..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Обриши"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "Преимену_ј"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Нови контакт:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Контакт"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "Унеси нови контакт"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Нова контакт листа"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "Нова контакт листа"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "Направи нову контакт листу"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Лично"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Посао"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "LDAP сервер"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Нисам могао да направим директоријум %s: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "Неуспешно повезивање са LDAP сервером"
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "Неуспешна пријава на LDAP сервер"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "Нисам могао да обавим упит на Root DSE"
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "Сервер је одговорио неподржаним базама за претрагу"
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Овај сервер не подржава податке LDAPv3 шеме"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "Грешка у читању података шеме"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr "Сервер није одговорио са исправним подацима шеме"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Име налога"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Име сервера"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP није омогућен у овој верзији Еволуције"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Остали контакти"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -85,7 +218,7 @@ msgstr ""
 "Нисмо успели да отворимо овај адресар. Молимо проверите да\n"
 "путања постоји и да имате права приступа."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -94,7 +227,7 @@ msgstr ""
 "Нисмо успели да отворимо овај адресар. То значи или\n"
 "да сте унели нетачан URI, или је LDAP сервер недоступан."
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -106,7 +239,7 @@ msgstr ""
 "да изградите програм од CVS изворног кода пошто сте\n"
 "преузели OpenLDAP са следеће адресе.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -119,44 +252,43 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Не могу да отворим адресар"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "Анонимно приступам LDAP серверу"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "Нисам могао да се пријавим.\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sУнеси лозинку за %s (корисник %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "Име почиње са"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "Е-пошта почиње са"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Категорија је"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Поље које садржи"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Напредно..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -168,7 +300,7 @@ msgstr ""
 "Молим да прецизније формулишете упит или повећате лимит\n"
 "броја резултата у подешавањима адресара за сервер директоријума."
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -180,88 +312,41 @@ msgstr ""
 "упит или повећате временски лимит у подешавањима адресара\n"
 "за сервер директоријума."
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Основни процес овог адресара није могао да обради упит."
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Основни процес овог адресара је одбио да обради овај упит."
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "Овај упит није успешно завршен."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Било која категорија"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "URI коју ће календар показати"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "Лична карта _сертификата:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "Овде подеси приступ серверима са LDAP директоријумима"
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Контакти"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "Сервери са директоријумима"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Еволуција адресар"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Контрола подешавања за  Еволуцију LDAP адресар"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "Искачући прозор за адресе Еволуција адресара"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "Прегледник адреса Еволуција адресара"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Прегледник Еволуција адресара"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr "Део Еволуција адресара"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook folder viewer"
-msgstr "Прегледник директоријума Еволуција адресара"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Контрола особина Еволуција поште"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -284,6 +369,7 @@ msgstr " П_окажи подржане базе "
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -317,8 +403,9 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "Додај LDAP сервер"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "Асистент конфигурације за LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -334,9 +421,9 @@ msgid "Anonymously"
 msgstr "Анонимно"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -346,48 +433,49 @@ msgstr ""
 "\n"
 "Молим притисните \"Finish\" дугме да сачувате подешавања која сте унели овде."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "Повезујем"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "Посебно _име:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr "Мењај LDAP сервер"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
 msgstr "Електронска адреса:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Еволуција ће користити овај DN за пријављивање на сервер"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Еволуција ће користити ову електронску адресу за пријављивање на сервер"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "Готово"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Опште"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "Асистент конфигурације за LDAP"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "Група"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Никада"
 
@@ -416,8 +504,8 @@ msgid "S_earch scope: "
 msgstr "Опсег п_ретраге:"
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Тражим"
 
@@ -474,26 +562,30 @@ msgstr ""
 "за LDAP претраге, и за уписивање и мењање контаката. "
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr "Одабирање имена је последњи обавезан корак у подешавању LDAP сервера."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "Корак 1: Информације о серверу"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "Корак 2: Повезивање на сервер"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "Корак 1: Информације о серверу"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "Корак 3: Претрага директоријума"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Корак 2: Повезивање на сервер"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "Корак 4: Име"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Корак 3: Претрага директоријума"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -505,17 +597,6 @@ msgstr "Подржане базе за претрагу"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"Први корак у подешавању LDAP сервера је додела имена, и података о\n"
-"пријави на систем. Молим питајте вашег систем администратора ако нисте "
-"сигурни за праве податке."
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -526,7 +607,7 @@ msgstr ""
 "претрага узима времена. Питајте вашег систем администратора ако хоћете\n"
 "да мењате ове опције."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -537,7 +618,7 @@ msgstr ""
 "почети. Ако ово оставите празно, претрага ће почети из корена стабла "
 "директоријума."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -551,14 +632,14 @@ msgstr ""
 "\"sub\" ће укључити све уносе испод ваше базе за претрагу. Опсег претраге "
 "\"one\" ће укључити само уносе један ниво испод ваше базе.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
+#, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "Асистент ће вам помоћи да приступите услугама директоријума\n"
 "на мрежи коришћењем LDAP (Lightweight Directory Access Protocol)\n"
@@ -568,13 +649,13 @@ msgstr ""
 "серверу. Молим саветујте вашег систем администратора уколико \n"
 "вам је потребна помоћ да нађете потребне податке."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Ово је пуно име вашег ldap сервера. На пример, \"ldap.mojafirma.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -583,7 +664,7 @@ msgstr ""
 "Ово је највећи број уноса за преузимање. Ако унесете сувише велики \n"
 "број, успорићете ваш адресар."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -593,7 +674,7 @@ msgstr ""
 "укључивање овога на \"Email Address\" захтева анонимни приступ на ваш ldap "
 "сервер."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -602,6 +683,15 @@ msgstr ""
 "Ово је име сервера које ће се појавити у листи директоријума Еволуције.\n"
 "То је само за потребе приказивања. "
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Ово је име сервера које ће се појавити у листи директоријума Еволуције.\n"
+"То је само за потребе приказивања. "
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -631,21 +721,33 @@ msgid "Using email address"
 msgstr "Користим електронску адресу"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Када је могуће"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+"Први корак у подешавању LDAP сервера је додела имена, и података о\n"
+"пријави на систем. Молим питајте вашег систем администратора ако нисте "
+"сигурни за праве податке."
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "_Име:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "Лимит за _преузимање:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -653,54 +755,52 @@ msgstr "Лимит за _преузимање:"
 msgid "_Edit"
 msgstr "_Измени"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "Метод _пријаве:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "Број _порта:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "База _претраге:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "Име _сервера:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "_Одзив (минути):"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "карте"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr "језичак за везу"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr "језичак за опште податке"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr "језичак за претрагу"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Име"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Алат за одабир имена Еволуција адресара"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Уклони све"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Уклони"
@@ -727,23 +827,21 @@ msgstr "Додај у контакте"
 msgid "Unnamed Contact"
 msgstr "Неименовани контакт"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Име"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Извор"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Одабрани контакти из Адресара"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "Пронађи контакт у"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Алат за одабир имена Еволуција адресара"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Пронађи"
@@ -820,7 +918,8 @@ msgid "D_epartment:"
 msgstr "О_делење:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Детаљи"
 
@@ -887,12 +986,12 @@ msgid "_Categories..."
 msgstr "Ка_тегорије..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Обриши"
@@ -2016,7 +2115,7 @@ msgid "Esq."
 msgstr "г-дин"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Пуно име"
 
@@ -2109,11 +2208,27 @@ msgstr "Уредник контакт листе"
 msgid "Save List as VCard"
 msgstr "Сачувај листу као VCard"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Промењен контакт:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Споран контакт:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Откривен дуплиран контакт"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Промењена електронска адреса или име овог контакта\n"
+"већ постоји у овом директоријуму. Желите ли свеједно да додате?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Нови контакт:"
@@ -2130,22 +2245,6 @@ msgstr ""
 "Име или електронска адреса овог контакта већ постоји\n"
 "у овом директоријуму. Желите ли свеједно да додате?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Промењен контакт:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Споран контакт:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"Промењена електронска адреса или име овог контакта\n"
-"већ постоји у овом директоријуму. Желите ли свеједно да додате?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2244,9 +2343,9 @@ msgstr "Проследи контакт"
 msgid "Send Message to Contact"
 msgstr "Пошаљи контакту поруку"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Штампај"
@@ -2268,9 +2367,12 @@ msgstr "Пренеси у директоријум..."
 msgid "Cut"
 msgstr "Исеци"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Копирај"
 
@@ -2279,16 +2381,8 @@ msgstr "Копирај"
 msgid "Paste"
 msgstr "Уметни"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Обриши"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "Тренутан поглед"
 
@@ -2305,166 +2399,170 @@ 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:2
 msgid "Assistant"
 msgstr "Помоћник"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Пословни факс"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Телефон на послу"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Телефон на послу 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Повратни телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Телефон у колима"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Категорије"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Телефон фирме"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Оделење"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "Е-пошта"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "Е-пошта 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "Е-пошта 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Презиме"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Смести као"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "Слободна-заузета адреса"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Кућна адреса"
+#, fuzzy
+msgid "Given Name"
+msgstr "Име поља"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Кућни факс"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Кућни телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Кућни телефон 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Јордан"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Менаџер"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Мобилни телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Надимак"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Напомена"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Канцеларија"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Организација"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Друга адреса"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Други факс"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Други телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Пејџер"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Главни телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Занимање"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Радио"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Улога"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Супружник"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Телекс"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Назив"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Unst"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Интернет адреса"
 
@@ -2557,11 +2655,19 @@ msgstr "Чланови"
 msgid "Job Title"
 msgstr "Назив _посла:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Кућна адреса"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Кућна адреса"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Друга адреса"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2574,112 +2680,109 @@ msgstr "Кућни факс"
 msgid "Blog"
 msgstr "Болоња"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Успех"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Непозната грешка"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Архива није на мрежи"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Забрањен приступ"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Карта није пронађена"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "ID карте већ постоји"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Протокол није подржан"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Поништено"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "Пријава неуспела"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "Пријава обавезна"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS није доступан"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "Адресар не постоји"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Друга грешка"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Желите ли да сачувате промене?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr "_Одбаци"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Грешка код додавања листе"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Грешка код додавања карте"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Грешка код измене листе"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Грешка при измени карте"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Грешка код уклањања листе"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Грешка код уклањања карте"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2688,7 +2791,7 @@ msgstr ""
 "Отварање %d карата ће такође отворити %d нових прозора.\n"
 "Да ли стварно желите да погледате све ове карте?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2697,49 +2800,49 @@ msgstr ""
 "%s већ постоји\n"
 "Желите ли да препишете новим уносом?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "Препиши"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Грешка код чувања %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "karta.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "листа"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Помери карту у"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Копирај карту у"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Помери карте у"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Копирај карте у"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Вишеструке VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard за %s"
@@ -2934,7 +3037,7 @@ msgstr "Маргине"
 msgid "Number of columns:"
 msgstr "Број колона:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Опције"
 
@@ -3121,18 +3224,18 @@ msgstr "Листа без имена"
 msgid "Split Multi-Day Events:"
 msgstr "Подели вишедневне догађаје:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Нисам могао да покренем вомбат сервер"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Нисам могао да покренем вомбат"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Нисам могао да прочитам програмски блок Календара"
 
@@ -3140,24 +3243,83 @@ msgstr "Нисам могао да прочитам програмски бло�
 msgid "Default Priority:"
 msgstr "Предефинисан приоритет:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Нисам могао да прочитам пилотов ToDo програмски блок"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Календар и задаци"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Календар"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Подесите вашу временску зону, календар и листу задатака овде "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Еволуција календар и задужења"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Контрола подешавања Еволуција календара"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Прегледник заказаних порука Еволуција календара"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Прегледник Еволуција календара"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Уредник Еволуција календара/задужења"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Прегледник Еволуција задужења"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Еволуција део за календар и задужења"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Пробни део Еволуције"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Задужења"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Сервис за аларм обавештења Еволуција календара"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Покрећем:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Обустављам:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Еволуција аларм"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Аларм на %s"
@@ -3232,43 +3394,172 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Не питај ме поново за овај програм."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Сервис за аларм обавештења Еволуција календара"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Нисам успео да покренем Бонобо"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Нисам могао да учитам  gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Нисам могао да покренем стварање сервиса за аларм обавештења"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "Погрешно време"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "iCalendar грешка"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Боја задужења за данас"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Боја задужења за данас"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "_Покажи завршетке заказаних састанака у недељним и месечним приказима"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Преглед календара за штампу"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "_Тражи потврду за брисање података"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "_Тражи потврду за брисање података"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Обриши извршена задужења"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Покажи _бројеве недеља у навигатору за датуме"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Сажетак садржи"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Опис садржи"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Коментар садржи"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Нерасподељено"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -3279,80 +3570,109 @@ msgstr ""
 "\n"
 "Стварно да бришем ове задатке?"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 msgid "Purge events older than"
 msgstr "Обриши догађаје старије од"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "дана"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Штампај овај календар"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Нова Каледонија"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "Нови заказани састанак"
+
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "Заказани _Састанак"
+
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Закажи састанак"
+
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "Нови састанак"
+
+#: calendar/gui/calendar-component.c:640
+msgid "M_eeting"
+msgstr "С_астанак"
+
+#: calendar/gui/calendar-component.c:641
 #, fuzzy
-msgid "Rename"
-msgstr "Преимену_ј"
+msgid "Create a new meeting request"
+msgstr "Унесите нови захтев за састанком"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Нови целодневни заказани састанак"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Лично"
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr "Цело_дневни заказани састанак"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Посао"
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Закажи састанак"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3469,7 +3789,7 @@ msgstr "За:"
 msgid "With these arguments:"
 msgstr "Са овим аргументима:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr "дијалог1"
 
@@ -3486,6 +3806,10 @@ msgstr "сати"
 msgid "minutes"
 msgstr "минут(а)"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3518,8 +3842,8 @@ msgstr "Пошаљи електронску поруку"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Закључак:"
 
@@ -3549,7 +3873,7 @@ msgid "hour(s)"
 msgstr "сат(а)"
 
 # bug:plural-forms
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "минут(а)"
 
@@ -3603,7 +3927,7 @@ msgstr "Дани"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Петак"
 
@@ -3617,7 +3941,7 @@ msgstr "Минути"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Понедељак"
 
@@ -3627,7 +3951,7 @@ msgstr "Н_ед"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Субота"
 
@@ -3641,7 +3965,7 @@ msgstr "Покажи _бројеве недеља у навигатору за �
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Недеља"
 
@@ -3659,7 +3983,7 @@ msgstr "Листа задужења"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Четвртак"
 
@@ -3677,7 +4001,7 @@ msgstr "Формат за време:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Уторак"
 
@@ -3687,12 +4011,12 @@ msgstr "Почетак н_едеље:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Среда"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Радна недеља"
 
@@ -3729,7 +4053,7 @@ msgid "_Fri"
 msgstr "_Пет"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Опште"
 
@@ -3769,7 +4093,7 @@ msgstr "_Сре"
 msgid "before every appointment"
 msgstr "пре сваког заказаног састанка"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
@@ -3777,11 +4101,11 @@ msgstr ""
 "Обрисани догађај је састанак, желите ли да пошаљете поруку за његово "
 "отказивање?"
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Сигурно желите да поништите и обришете овај састанак?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
@@ -3789,11 +4113,11 @@ msgstr ""
 "Обрисано задужење је расподељено, желите ли да пошаљете поруку за њено "
 "отказивање?"
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Сигурно желите да поништите и обришете ово задужење?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -3801,50 +4125,50 @@ msgstr ""
 "Обрисани унос у дневник је објављен, желите ли да пошаљете поруку за његово "
 "отказивање?"
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Сигурно желите да поништите и обришете овај унос у дневник?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Овај догађај је обрисан."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Ово задужење је обрисано."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Овај унос у дневник је обрисан."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s Унели сте измене. Да их заборавим и затворим уредник?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Нисте уносили измене, да затворим уредника?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Овај догађај је измењен."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Ово задужење је измењено."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Овај унос у дневник је измењен."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s Унели сте измене. Да их заборавим и освежим променама уредник?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Нисте унели измене, да освежим променама уредник?"
@@ -3854,166 +4178,171 @@ msgstr "%s Нисте унели измене, да освежим промен�
 msgid "Validation error: %s"
 msgstr "Грешка при провери: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " за "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Завршено "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Завршено "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (До "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "До "
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "Нисам могао да освежим променама објекат"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Измени заказани састанак"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Заказани састанак - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Задужење - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Унос у дневник - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Нема сажетка"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Сачувај као..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Измене учињене на овом предмету могу бити занемарене ако буде освежен "
 "променама"
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Не могу да учитам важећу верзију!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Изаберите одредишни директоријум за увоз ових података"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Сигурно желите да обришете овај заказани састанак `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Сигурно желите да обришете овај неименовани заказани састанак"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Сигурно желите да обришете задужење `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Сигурно желите да обришете ово неименовано задужење?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Сигурно желите да избришете унос у дневник `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Сигурно желите да избришете ован неименовани унос у дневник?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Сигурно желите да избришете %d заказаних састанака?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Сигурно желите да избришете %d задужења"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Сигурно желите да избришете %d уноса у дневник?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "Догађај није могао бити обрисан због corba грешке"
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "Задужење није могло бити избрисано због corba грешке"
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Унос у дневник није могао бити обрисан због corba грешке"
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Унос није могао бити обрисан због corba грешке"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "Догађај није могао бити обрисан због немогућности приступа"
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "Задужење није могло бити обрисано због немогућности приступа"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Унос у дневник није могао бити обрисан због немогућности приступа"
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "Унос није могао бити обрисан због немогућности приступа"
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Догађај није могао бити обрисан због corba грешке"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Задужење није могло бити избрисано због corba грешке"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Унос у дневник није могао бити обрисан због corba грешке"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Унос није могао бити обрисан због corba грешке"
@@ -4030,43 +4359,43 @@ msgstr "Делегирај за:"
 msgid "Enter Delegate"
 msgstr "Унеси делегата"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Заказани састанак"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Подсетник"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Повраћај"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Заказивање"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Састанак"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "Почетни датум је погрешан"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "Крајњи датум је погрешан"
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "Почетно време је погрешно"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "Крајње време је погрешно"
 
@@ -4136,31 +4465,31 @@ msgid "_Start time:"
 msgstr "_Почетно време:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Ништа"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr "Изабрани организатор више нема налог."
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "Захтева организатор."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "Најмање један присутни је потребан."
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Делегирај за..."
 
@@ -4201,21 +4530,15 @@ msgid "Member"
 msgstr "Члан"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Улога"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Стање"
@@ -4235,6 +4558,7 @@ msgid "_Invite Others..."
 msgstr "_Позови друге..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4267,6 +4591,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Нисам могао да направим директоријум %s: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "Организатор мора бити послат."
@@ -4296,33 +4621,58 @@ msgstr "Информација о календару"
 msgid "Calendar Name"
 msgstr "Календар"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Нисам могао да направим директоријум %s: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Информација о календару"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Листа задужења"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Листа задужења"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Листа задужења"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr "Мењате повратни догађај, шта желите да измените?"
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Мењате повратно задужење, шта желите да измените?"
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr "Мењате повратни унос у дневник, шта желите да измените?"
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr "Само овај унос"
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Овај и будући уноси"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr "Овај и будући уноси"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr "Сви уноси"
 
@@ -4372,10 +4722,15 @@ msgstr "дан"
 msgid "on the"
 msgstr "на"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "појаве"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Датум/Време:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "До_дај"
@@ -4440,7 +4795,7 @@ msgstr "недеља(е)"
 msgid "year(s)"
 msgstr "година(е)"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
@@ -4450,31 +4805,31 @@ msgstr ""
 "\n"
 "Желите ли да сачувате ваше измене?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "_Занемари промене"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 msgid "Save Event"
 msgstr "Сачувај догађај"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Информација о састанку је сачињена. Да је пошаљем?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Информација о састанку је измењена. Да пошаљем новију верзију?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "Информација о примљеном задужењу је сачињена. Да је пошаљем?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "Информација о задужењу је измењена. Да пошаљем новију верзију?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Датум завршетка је погрешан"
 
@@ -4484,43 +4839,43 @@ msgid "% _Complete"
 msgstr "% _готово"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Готово"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Високо"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "У току"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Ниско"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Нормално"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Није покренут"
 
@@ -4529,7 +4884,7 @@ msgid "Progress"
 msgstr "Ток"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Недефинисано"
 
@@ -4549,21 +4904,21 @@ msgstr "_Статус:"
 msgid "_Web Page:"
 msgstr "_Веб страница:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Основно"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Задатак"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "Датум за завршетак је погрешан"
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4571,9 +4926,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "Пов_ерљиво"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Опис:"
 
@@ -4678,26 +5033,21 @@ msgstr "%s на %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s за непознат тип покретача"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Јавно"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Лично"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Поверљиво"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Категорије"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4710,28 +5060,26 @@ msgid "Start Date"
 msgstr "Почетни датум"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Извештај"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "боја"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Заказани састанак"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Слободан"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Заузет"
 
@@ -4743,7 +5091,7 @@ msgstr "С"
 msgid "S"
 msgstr "Ј"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "И"
 
@@ -4751,7 +5099,7 @@ msgstr "И"
 msgid "W"
 msgstr "З"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4761,7 +5109,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4769,7 +5117,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Да"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4777,17 +5125,17 @@ msgstr "Не"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Непознато"
 
@@ -4799,180 +5147,178 @@ msgstr "Повратно"
 msgid "Assigned"
 msgstr "Додељено"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Уносим промене у објекте"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Бришем изабране објекте"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Уносим промене у објекте"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Нов заказан _састанак..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Нов целодневни _догађај"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "Нови састанак"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Ново задужење"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "Штам_пај..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "Умет_ни"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Иди на _данас"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "_Иди на датум..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Објави слободан/заузет информацију"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "_Подешавања..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Отвори"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Сачувај као..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Копирај"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "_Закажи састанак..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "_Проследи као iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Обриши ову _појаву"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Обриши _све појаве"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "_Подешавања..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 msgid "Open _Web Page"
 msgstr "Отвори _веб страницу"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "_Додели задужење"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "_Проследи као iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "_Обележи као завршено"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Обележи изабрана задужења као завршена"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "_Обриши изабрана задужења"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Притисни за ново задужење"
@@ -4986,8 +5332,8 @@ msgstr "% Готово"
 msgid "Alarms"
 msgstr "Аларми"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Завршено"
 
@@ -5016,18 +5362,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5046,7 +5392,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5059,125 +5405,125 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr "Да. (Сложени повраћај)"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "Сваки дан"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "Свака %d дана"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "Сваке недеље"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "Сваких %d недеља"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr "Сваке недеље у "
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Сваких %d недеља у "
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " и "
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr "%s дан "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s "
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "сваки месец"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr "сваких %d месеци"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "Сваке године"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "Сваких %d година"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr "укупно %d пута"
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ", завршавајући се "
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>Почетак:</b> "
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Крај:</b> "
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>Завршетак:</b> "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>До:</b> "
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "iCalendar информација"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "iCalendar грешка"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Непозната особа"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5185,318 +5531,317 @@ msgstr ""
 "<br> Молим проверите следећу информацију, и потом одаберите акцију из доњег "
 "менија."
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Ништа</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "Место:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Стање:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Прихваћено"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Прихваћено с резервом"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Одбијено"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Изабери акцију:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Ажурирај"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "ОК"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Прихвати"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Прихвати са резервом"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Одбиј"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Пошаљи слободан/заузет информацију"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Ажурирај стање странке"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Пошаљи најновију информацију"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Одустани"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> је објавио информацију о састанку."
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Информација о састанку"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> тражи присуство %s на састанку."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> тражи Ваше присуство на састанку."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Предлог за састанак"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> жели да дода постојећем састанку"
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Промена састанка"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> жели да добије најновију информацију о састанку."
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Захтев за новим подацима о састанку"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> је одговорио на захтев о састанку."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Одговор за састанак"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> је отказо састанак."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Отказивање састанка"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> је послао неразумљиву поруку."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Лоша порука о састанку"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> је објавио информацију о задужењу."
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Информација о задужењу"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> тражи %s за обављање задужења."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> тражи да Ви извршите задужење."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Предлог за задужење"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b жели да дода на постојеће задужење."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Ажурирање задужења"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> жели да прими најновију информацију о задужењу."
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Захтев за променама задужења"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> је одговорио на додељено задужење."
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Одговор на задужење"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> је отказао задужење."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Отказивање задужења"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Лоша порука о задужењу"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> је објавио слободан/заузет информацију."
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Слободан/заузет информација"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> тражи Вашу слободан/заузет информацију."
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Слободан/заузет захтев"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> је одговорио на слободан/заузет захтев."
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Слободан/заузет одговор"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Лоша слободан/заузет порука"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr "Порука изгледа да није исправно сачињена"
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "Порука садржи само неподржане захтеве."
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Прилог не садржи исправну поруку за календар"
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr "Прилог нема делове календара који се могу прегледати"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "Датотека календара није могла бити ажурирана\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Ажурирање завршено\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Стање присутног не може бити ажурирано јер унос више не постоји"
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Објекат је неисправан и не може бити ажуриран\n"
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Овај одговор није послао тренутно присутан. Да га додам у присутне?"
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Стање присутног није могло бити ажурирано због неисправног стања!\n"
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr "Настала је грешка у CORBA систему\n"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr "Објекат није могао бити пронађен\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Немате праве дозволе за ажурирање календара\n"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Ажурирано стање присутног\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "Стање присутног није могло бити ажурирано!\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Уклањање завршено"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Унос послат!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Унос није могао бити послат!\n"
 
@@ -5656,7 +6001,7 @@ msgstr "%a %m/%d/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
@@ -5720,45 +6065,40 @@ msgstr "_Почетно време састанка:"
 msgid "Meeting _end time:"
 msgstr "_Крајње време састанка:"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 msgid "Start Date:"
 msgstr "Датум почетка:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 msgid "Due Date:"
 msgstr "Датум завршетка:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 msgid "Priority:"
 msgstr "Важност:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 msgid "Web Page:"
 msgstr "Веб страница:"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Отварам задужења у %s"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Нисам могао да учитам задужења у `%s"
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Метод потребан за учитавање `%s' није подржан"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Немате дозволу да отворите директоријум у `%s"
 
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5767,48 +6107,39 @@ msgstr ""
 "Грешка на %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "Испуњавам задужења..."
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "Бришем изабране објекте..."
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "Избацујем"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Задужења"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Календар"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Нисам могао да отворим директоријум у `%s"
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Потребан метод за отварање `%s' није подржан"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Додајем аларме за %s"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5819,7 +6150,7 @@ msgstr ""
 "%s\n"
 " је пао. Мораћете да поново покренете Еволуцију да би наставили да користите"
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5830,57 +6161,10 @@ msgstr ""
 "%s\n"
 " је пао. Мораћете да поново покренете Еволуцију да би наставили да користите"
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 msgid "Purging"
 msgstr "Брише"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Календар и задаци"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Календар"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Подесите вашу временску зону, календар и листу задатака овде "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Еволуција календар и задужења"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Контрола подешавања Еволуција календара"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Прегледник заказаних порука Еволуција календара"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Прегледник Еволуција календара"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Уредник Еволуција календара/задужења"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Прегледник Еволуција задужења"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Еволуција део за календар и задужења"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Пробни део Еволуције"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Април"
@@ -5937,296 +6221,332 @@ msgstr "Октобар"
 msgid "September"
 msgstr "Септембар"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Организатор мора бити послат."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Најмање један присутни је неопходан"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Информација о догађају"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Информација о задужењу"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Информација о уносу у дневник"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Слободан/заузет информација"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Информација о календару"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Ажурирано"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Освежи"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "Контра-предлог"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Слободан/заузет информација (%s до %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "iCalendar информација"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Морате бити учесник догађаја"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Не"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "По"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Ут"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Ср"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Че"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Пе"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Су"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Изабрани дан (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Изабрана недеља (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Изабран месец (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Изабрана година (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Задужење"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Стање: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Важност: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Проценат завршеног: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "Адреса (URL): %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Категорије: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Конаткти: "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Штампај приказ"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Штампај унос"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Подеси штампу"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Преименуј ову пречицу"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Листа задужења"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Ново задужење"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Задужење"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Унеси ново задужење"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "URI за приказ директоријума задужења"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6238,11 +6558,11 @@ msgstr ""
 "\n"
 "Стварно да бришем ове задатке?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Не питај ме поново."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "Штампај задужења"
 
@@ -6270,15 +6590,15 @@ msgstr "iCalendar датотеке (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar датотеке (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "Подсетник!!"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "Календарски догађаји"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6286,7 +6606,7 @@ msgstr ""
 "Еволуција је пронашла датотеке Гном календара.\n"
 "Желит ели да их увезете у Еволуцију?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Гном календар"
 
@@ -7819,27 +8139,27 @@ msgstr "ПАцифик/Волис"
 msgid "Pacific/Yap"
 msgstr "Пацифик/Јап"
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "Потписивање овај логаритам не подржава"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "Проверу овај логаритам не подржава"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Шифрирање овај логаритам не подржава"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Дешифрирање овај логаритам не подржава"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr "Можда нећете моћи да увезете кључеве са овим логаритмом"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr "Можда нећете моћи да извезете кључеве са овим логаритмом"
 
@@ -7891,86 +8211,86 @@ msgstr "Припремам директоријум '%s' за рад без мр
 msgid "You must be working online to complete this operation"
 msgstr "Морате да будете на мрежи да би завршили ову операцију"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Неуспело прављење везе ка '%s': %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Неуспело прављење садржаног процеса '%s': %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Неисправан низ порука примљен од %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Синхронизујем директоријуме"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Грешка код читања филтера: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Грешка код примене филтера: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Нисам могао да отворим директоријум за смештање реда"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Нисам могао да прођем кроз директоријум са редом"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Примам поруку %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Не могу да отворим поруку"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Грешка код поруке %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Синхронизујем директоријум"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Примам поруку %d од %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Грешка код поруке %d од %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Нисам могао да примим поруку"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr "Неисправни аргументи за (системска-ознака)"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr "Неипсравни аргументи за (корисничка-ознака)"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Грешка код примене филтера за претрагу: %s: %s"
@@ -8002,35 +8322,35 @@ msgstr "(одговара-све) захтева само један логич�
 msgid "Performing query on unknown header: %s"
 msgstr "Извршавам претрагу на непознато заглавље: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Неподржана операција: прикључена порука: за %s"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Неподржана операција: претрага по изразу: за %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Неподржана операција: претрага по uid-у: за %s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Померам поруке"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr "Копирам поруке"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Учитавам %d порука(е)"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8041,15 +8361,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr "Нисам могао да прочитам gpg userid подсетник."
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr "Нисам могао да прочитам захтев за gpg лозинком"
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8058,30 +8378,30 @@ msgstr ""
 "Потребна вам је лозинка за откључавање кључа\n"
 "корисника: \"%s\""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Поништено."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Нисам могао да откључам тајни кључ: дате су 3 погрешне лозинке."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Неочекиван одговор од GnuPG: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr "Нисам добио податке"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Нисам могао да шифрирам: нису означени исправни примаоци. "
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8092,50 +8412,63 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Нисам могао да применим GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Нисам могао да упишем: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Нисам могао да извршим gpg: %s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr "Нисам могао да извршим gpg."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "Ово је део поруке са дигиталним потписом"
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr ""
+"Не могу да проверим потпис поруке: нисам могао да направим temp датотеку: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Не могу да проверим потпис поруке: нисам могао да направим temp датотеку: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Нисам могао да упишем: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Ово је део поруке са дигиталним потписом"
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Садржај тела индекса"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Не могу да повратим поруку из уредника"
@@ -8237,15 +8570,15 @@ msgstr "Грешка код писања temp датотеке поште: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Грешка код копирања temp датотеке: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Нисам могао да дешифрујем MIME део: грешка у протоколу"
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "Нисам могао да дешифрујем MIME део: неисправна структура"
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "грешка читања"
 
@@ -8563,12 +8896,12 @@ msgstr "Понуђач елктронске поште са виртуелним
 msgid "For reading mail as a query of another set of folders"
 msgstr "За читање поште као упита другог низа директоријума"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Нема доступног понуђача за протокол `%s'"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8577,71 +8910,82 @@ msgstr ""
 "Нисам могао да направим директоријум %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Унесите лозинку за %s"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Недефинисано"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Измени потпис"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Измени потпис"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Самопотписани сертификат у ланцу"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "Неповерљив сертификат"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Сачувај потпис"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Грешка при обради"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Сервер: %s, тип: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Не могу да добијем директоријум: неисправна операција"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Не могу да направим директоријум: неисправна операција"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Смеће"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "Јун"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "Не могу да добијем сертификат издавача"
@@ -8850,7 +9194,7 @@ msgstr ""
 "Истекла листа признатих сертификата: %s\n"
 "Издавач: %s"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Нисам могао да обрадим URL `%s"
@@ -8869,22 +9213,22 @@ msgstr "Нема такве поруке %s у %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Не могу да копирам или преместим поруке у виртуелни директоријум"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Не могу да обришем директоријум: %s: неисправна операција"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Не могу да обришем директоријум: %s: нема таквог директоријума"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Не могу да променим име  директоријуму: %s: неисправна операција"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Не могу да променим име  директоријуму: %s: нема таквог директоријума"
@@ -8964,7 +9308,7 @@ msgstr "Не могу да покупим поруку: %s"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -8978,7 +9322,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Нема такве поруке"
@@ -9016,54 +9360,69 @@ msgid "Failed to cache %s: %s"
 msgstr "Нисам могао да привремено сачувам %s: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Повезујем се на сервер..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Неуспешно повезивање са LDAP сервером"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "Предузеће"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Проверавам за нове поруке"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Check for new messages in all folders"
 msgstr "Провери за нове поруке у свим директоријумима"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Директоријуми"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Покажи само одабране директоријуме"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "Премости формат имена директоријума које даје сервер"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Формат имена"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Примени филтере на нове поруке у INBOX-у овог сервера"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Аутоматски провери за нову пошту сваких"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "За читање и смештање поште на IMAP сервере."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Лозинка"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9316,7 +9675,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Нисам могао да преименујем директоријум %s у %s: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Нисам могао да преименујем '%s': %s"
@@ -9431,29 +9790,29 @@ msgstr "Проверавам за нове поруке"
 msgid "Storing folder"
 msgstr "Смештам директоријум"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Не могу да закључам директоријум %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Не могу да отворим сандуче: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "Додавање поште отказано"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Не могу да додам поруку у mbox датотеку: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9462,11 +9821,11 @@ msgstr ""
 "Не могу да добијем поруку: %s из директоријума %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Директоријум изгледа непоправљиво оштећен."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Састављање поруке неуспело: Оштећено сандуче?"
 
@@ -9534,12 +9893,17 @@ msgstr "Нисам могао да направим директоријум %s:
 msgid "Cannot create folder: %s: %s"
 msgstr "Не могу да добијем директоријум: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "ID карте већ постоји"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Нисам могао да преименујем директоријум %s у %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Наведено име директоријума није исправно: %s"
@@ -9583,7 +9947,7 @@ msgstr "Нисам могао да затворим изворни директ�
 msgid "Could not close temp folder: %s"
 msgstr "Нисам могао да затворим temp директоријум: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Нисам могао да преименујем директоријум: %s"
@@ -9869,7 +10233,7 @@ msgstr "Обриши након %s дана"
 msgid "Disable support for all POP3 extensions"
 msgstr "Онемогући подршку за сва POP3 проширења"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -9958,7 +10322,7 @@ msgid "No such folder `%s'."
 msgstr "Нема таквог директоријума `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10011,7 +10375,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Достава поште преко програма sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10177,7 +10541,7 @@ msgstr "SMTP достава поште преко %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Не могу да пошаљем поруку: адреса пошиљаоца није исправна."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Слање припремљених порука"
 
@@ -10298,7 +10662,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "прилог"
 
@@ -10342,14 +10706,14 @@ msgstr "МИМЕ тип:"
 msgid "Suggest automatic display of attachment"
 msgstr "Предложи аутоматско отварање прилога"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Морате да подесите налог\n"
 "да би могли да саставите поруку."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Притисните овде за адресар."
 
@@ -10360,45 +10724,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Одговор-За:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Од:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Наслов:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "За:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Унесите примаоце поруке"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Копија:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Унесите адресе које ће примити копију поруке"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Невидљива копија:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10409,14 +10773,19 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Пошаљи:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr "Одредиште"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Додај датотеку поруци"
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Приложи датотеку(е)"
@@ -10451,21 +10820,21 @@ msgstr "Датотека постоји, да је препишем?"
 msgid "Error saving file: %s"
 msgstr "Грешка код чувања датотеке: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Грешка код учитавања датотеке: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Грешка код приступа датотеци: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Не могу да повратим поруку из уредника"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10474,7 +10843,7 @@ msgstr ""
 "Не могу да тражим датотеку: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10483,7 +10852,7 @@ msgstr ""
 "Не могу да скратим датотеку: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10492,7 +10861,7 @@ msgstr ""
 "Не могу да копирам опис датотеке: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10501,7 +10870,7 @@ msgstr ""
 "Грешка код аутоматског чувања поруке: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10509,7 +10878,7 @@ msgstr ""
 "Ximian Еволуција је нашла несачуване датотеке из претходних сесија.\n"
 "Желите ли да покуша да их поврати?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10520,28 +10889,28 @@ msgstr ""
 "\n"
 "Желите ли да сачувам промене?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Упозорење: измењена порука"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Отвори датотеку"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "Потпис:"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "Аутогенерисан"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Састави поруку"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10549,7 +10918,7 @@ msgstr ""
 "Нисам могао да направим прозор за састављање:\n"
 "Не могу да покренем контролу бирања адреса."
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10561,7 +10930,7 @@ msgstr ""
 "Молим проверите да имате одговарајуће верзије\n"
 "gtkhtml и libgtkhtml на систему.\n"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10569,7 +10938,7 @@ msgstr ""
 "Нисам могао да направим прозор за састављање:\n"
 "Не могу да активирам компоненту HTML уредника."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10577,11 +10946,13 @@ msgstr ""
 "<b>(Уредник садржи у тексту поруке не садржи текст, и не може бити мењан.)<b>"
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Пакет програма Еволуција"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Еволуција"
 
 #: data/evolution.keys.in.h:1
@@ -10833,13 +11204,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -10958,7 +11329,7 @@ msgstr "Онда"
 msgid "You must specify a folder."
 msgstr "Морате одредити директоријум."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Одаберите директоријум"
@@ -10972,24 +11343,24 @@ msgstr ""
 "Грешка у регуларном изразу '%s':\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Важно"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "За урадити"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Касније"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Проба"
 
@@ -11090,7 +11461,7 @@ msgid "months"
 msgstr "месеци"
 
 # bug: plural-forms
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "секунде"
 
@@ -11187,7 +11558,7 @@ msgstr "Израз"
 msgid "Follow Up"
 msgstr "Следи"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "Етикета"
 
@@ -11257,112 +11628,118 @@ msgid "Source Account"
 msgstr "Изворни налог"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Кишица"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Одређено заглавље"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Прекини са обрадом"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Наслов"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "Недодељен статус"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "садржи"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "не садржи"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "не завршава се са"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "не постоји"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "does not return"
 msgstr "не враћа"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "не звучи као"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "не почиње са"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "завршава се са"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "постоји"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr "је означен"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr "је после"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "is before"
 msgstr "је пре"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "је већи од"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "је мањи од"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr "није означен"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "није"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "је"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr "више повраћаја од"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr "мање повраћаја од"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr "повраћаји"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "звучи као"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "почиње са"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Правило '%s' није јединствено, изаберите друго."
@@ -11387,18 +11764,78 @@ msgstr "Име правила"
 msgid "Score Rules"
 msgstr "Правила резултата"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Морате именовати овај vfolder."
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr "Морате да одредите најмање један директоријум као извор."
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 msgid "VFolder source"
 msgstr "VFolder извор"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Поставке састављача"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "Подесите особине за пошту, укључујући сигурност и приказ поруке, овде"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Подесите проверу правописа, потписе, и састављач поруке овде"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Подесите ваше налоге за пошту овде"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Еволуција пошта"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Контрола подешавања Еволуција налога за пошту"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Компонента Еволуција поште"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Састављач Еволуција поште"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Контрола подешавања Еволуција састављача"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail folder viewer"
+msgstr "Прегледник за директоријуме Еволуција поште"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Контрола особина Еволуција поште"
+
+# 48x48/emblems/emblem-mail.icon.in.h:1
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Пошта"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Поштански налози"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "Особине поште"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Сигурно желите да обришете овај налог?"
@@ -11440,7 +11877,7 @@ msgid "Protocol"
 msgstr "Протокол"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr "Без имена"
 
@@ -11464,20 +11901,17 @@ msgstr "Додај потпис скрипте"
 msgid "Signature(s)"
 msgstr "Потпис(и)"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "Шаљете поруку у HTML формату. Молим проверите да\n"
 "су следећи примаци спремни и у могућности да приме HTML пошту:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Свеједно да пошаљем?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11485,7 +11919,7 @@ msgstr ""
 "Ова поруке нема наслов.\n"
 "Стварно да пошаљем?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11493,11 +11927,11 @@ msgstr ""
 "Пошто је контакт листа коју шаљете подешена да сакрије адресе, ова поруке ће "
 "садржати само скривене примаоце."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Ова порука садржи само скривене примаоце."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11507,11 +11941,11 @@ msgstr ""
 "заглавље.\n"
 "Свеједно да пошаљем?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Морате да одредите примаоце да би послали поруку."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11523,190 +11957,401 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Направи _Виртуелни директоријум из претраге..."
 
-# 48x48/emblems/emblem-mail.icon.in.h:1
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "Пошта"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<протисните овде да изаберете директоријум>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "„%s“ у „%s“"
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Направи нови директоријум"
 
-#: mail/em-folder-selector.c:267
-#, fuzzy
-msgid "Folder _name"
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Наведите где да направим директоријум:"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
 msgstr "_Име директоријума:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Нисам могао да направим привремени директоријум: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Нисам могао да направим привремени директоријум: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Нисам могао да направим привремену датотеку '%s': %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Нисам могао да затворим temp директоријум: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Учитавам..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Одаберите директоријум"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Направи нови директоријум"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Нисам могао да обришем директоријум `%s': %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Заиста да бришем директоријум „%s“?"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Обриши „%s“"
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Преименуј директоријум „%s“ у:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+msgid "Rename Folder"
+msgstr "Преименуј директоријум"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+"Директоријум са именом „%s“ већ постоји. Молим користите неко друго име."
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Особине писма"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Особине"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "_Име директоријума:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Погледај"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Отвори у новом прозору"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Премести"
+
+#: mail/em-folder-tree.c:1500
+msgid "_New Folder..."
+msgstr "_Нови директоријум..."
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "Преимену_ј"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "_Подешавања..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "_Уреди као нову поруку..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "_Штампај"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Одговори пошиљаоцу"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Одговори на _листу"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Одговори _Свима"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "Просл_еди"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr "Пр_ати..."
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr "Означ_и завршене"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "Скло_ни ознаку"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "О_значи као прочитано"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "Означи као _непрочитано"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Оначи као _важно"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "_Означи као неважно"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Означи као _непрочитано"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Оначи као _важно"
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "Пониш_ти брисање"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "Прене_си у директоријум..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Копирај у директоријум..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "Додај пошиљаоца у адреса_р"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "При_мени филтере"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "На_прави правило од поруке"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "VFolder на _Наслов"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "VFolder на П_ошиљаоца"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "VFolder на _Примаоце"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "VFolder на дописну _листу"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "VFolder на П_ошиљаоца"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Филтер на Насло_в"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Филтер на П_ошиљаоца"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Филер на При_маоце"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Филер на _дописну листу"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Филтер на П_ошиљаоца"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Предефинисано"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Штампај поруку"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Копирај адресу везе"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Одговара:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Додељено"
+
+#: mail/em-format-html-display.c:597
+#, fuzzy
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr "Ова порука је дигитално потписана али не може бити проверена."
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Измени потпис"
+
+#: mail/em-format-html-display.c:598
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
 msgstr ""
-"Ова порука је дигитално потписана. Притисните на икону са катанцем за веше "
-"информација."
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Измени потпис"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+#, fuzzy
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"input_token садржи неисправну структуру, или потпис није могао бити проверен."
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Прекинуто"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "PGP шифрирање"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Нисам могао да обрадим MIME поруку. Показујем као извор."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Неподржана шема"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Не могу да добијем потпис листа"
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Погледај унутар"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Сакри"
@@ -11716,183 +12361,206 @@ msgstr "Сакри"
 msgid "Page %d of %d"
 msgstr "Страна %d од %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Учитавам поруку %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Лоше сложен спољни део."
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Показивач на FTP адресу (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Показивач на локалну датотеку (%s) која одговара адреси \"%s\""
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "показивач на локалну датотеку (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Показивач на мрежни податак (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Показивач на напознати спољни податак (\"%s\" типа)"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "Ова порука је дигитално потписана али не може бити проверена."
-
-#: mail/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Ова порука је дигитално потписана и одговара потпису."
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-msgid "No signature present"
-msgstr ""
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Нисам успео да покренем Бонобо"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Неподржана шема"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Нисам могао да обрадим MIME поруку. Показујем као извор."
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Померам поруке"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Од"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Одговор-За"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "За"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Cc (копија)"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Bcc (невидљива копија)"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "Пошиљалац"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Датум"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "%s прилог"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Нисам могао да обрадим MIME поруку. Показујем као извор."
+msgid "Session not initialised"
+msgstr "Нисам успео да покренем Бонобо"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Ова порука је дигитално потписана и одговара потпису."
+
+#: mail/em-format.c:1212
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr "Ова порука је дигитално потписана али не може бити проверена."
+
+#: mail/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Чекам..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
 
-#: mail/em-popup.c:593
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Пингујем %s"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Нисам могао да привремено сачувам %s: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Неуспело прављење везе ка '%s': %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Нисам могао да пронађем домаћина `%s': %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Сачувај као..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Одговори пошиљаоцу"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Отвори везу у читачу"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Пошаљи _поруку на листу"
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Додај пошиљаоца у адресар"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Отвори у %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "Овај сервер не подржава податке LDAPv3 шеме"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Претплати се"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Директоријум"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Молим изаберите сервер."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Није изабран сервер"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Не показуј поново ову поруку."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11901,27 +12569,27 @@ msgstr ""
 "Грешка код учитавања података филтера:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Филтери"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Прослеђена Порука"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "непознати пошиљалац"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Дана %a, %d-%m-%Y у %H:%M, %%s је написао:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -11930,7 +12598,7 @@ msgstr ""
 "Не могу да сачувам у `%s'\n"
 " %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -11939,25 +12607,26 @@ msgstr ""
 "`%s' већ постоји.\n"
 "Да препишем?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Порука"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Сачувај поруку као..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Нисам могао да направим привремени директоријум: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Адреса"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -11966,58 +12635,425 @@ msgstr ""
 "\n"
 "Стварно да обришем ове поруке?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Поставке састављача"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/em-utils.c:2288
+#, fuzzy
 msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "Подесите особине за пошту, укључујући сигурност и приказ поруке, овде"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Ова операција ће трајно да обрише све поруке означене као\n"
+"обрисане. Ако наставите, нећете моћи да повратите ове поруке.\n"
+"\n"
+"Стварно да обришем ове поруке?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Подесите проверу правописа, потписе, и састављач поруке овде"
+#: mail/evolution-mail.schemas.in.in.h:1
+msgid "Automatic link recognition"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Подесите ваше налоге за пошту овде"
+#: mail/evolution-mail.schemas.in.in.h:2
+msgid "Automatic smiley recognition"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Еволуција пошта"
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Контрола подешавања Еволуција налога за пошту"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Компонента Еволуција поште"
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Састављач Еволуција поште"
+#: mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
+msgid "Default charset in which to compose messages"
+msgstr "Предефинисан наслов поруке."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Контрола подешавања Еволуција састављача"
+#: mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
+msgid "Default charset in which to compose messages."
+msgstr "Предефинисан наслов поруке."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Прегледник за директоријуме Еволуција поште"
+#: mail/evolution-mail.schemas.in.in.h:8
+#, fuzzy
+msgid "Default charset in which to display messages"
+msgstr "Тражи текст у телу приказане поруке"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Контрола особина Еволуција поште"
+#: mail/evolution-mail.schemas.in.in.h:9
+#, fuzzy
+msgid "Default charset in which to display messages."
+msgstr "Тражи текст у телу приказане поруке"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/evolution-mail.schemas.in.in.h:10
+#, fuzzy
+msgid "Default forward style"
+msgstr "Стил _прослеђивања"
+
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default reply style"
+msgstr "_Стил одговора:"
+
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Empty Trash folders on exit"
+msgstr "Испразни директоријуме са _смећем на излазу"
+
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Испразни директоријуме са _смећем на излазу"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "Поштански налози"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "Особине поште"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "Изврши акције"
+
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Обавештење о новој пошти"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Обавештење о новој пошти"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr "_Упозори када шаљеш HTML поруке онима који их не желе"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "Упозори када шаљеш поруке само са дефинисаним Bcc примаоцима"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "Пошаљи HTML поруку?"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "Пошаљи HTML поруку?"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "_Покажи анимиране слике"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "_Покажи анимиране слике"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Прикажи поруку у нормалном стилу"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "_Простор за преглед"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "_Пусти звучну датотеку када стигне нова пошта"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "Провера _правописа"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "_Писмо за терминал:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "Одабери HTML писмо варијабилне величине за штампу"
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Списак порука према нити разговора"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Списак порука према нити разговора"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "_Нека ово буде мој главни налог"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "В_аријабилна ширина:"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Еволуција Elm увозник"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+msgid "Evolution mbox importer"
+msgstr "Еволуција mbox увозник"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
+msgstr "MБокс (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Netscape Mail importer"
+msgstr "Еволуција Netscape пошта увозник"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Еволуција Outlook Express 4 увозник"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Pine importer"
+msgstr "Еволуција Pine увозник"
 
 #: mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
@@ -12057,34 +13093,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Еволуција Elm увозник"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Еволуција mbox увозник"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MБокс (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Netscape Mail importer"
-msgstr "Еволуција Netscape пошта увозник"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Еволуција Outlook Express 4 увозник"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Pine importer"
-msgstr "Еволуција Pine увозник"
-
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -12145,12 +13153,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Еволуција увози ваше старе Netscape податке"
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Смеће"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Претражујем филтере за пошту"
@@ -12159,7 +13161,7 @@ msgstr "Претражујем филтере за пошту"
 msgid "Scanning directory"
 msgstr "Претражујем директоријум"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Почињем увоз"
 
@@ -12234,23 +13236,23 @@ msgid "You have not filled in all of the required information."
 msgstr "Нисте унели све потребне податке."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Уредник Еволуција налога"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Домаћин:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "Корисничко_име"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Путања:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Не можете отворити два налога са истим именом."
 
@@ -12259,36 +13261,36 @@ msgstr "Не можете отворити два налога са истим �
 msgid "Mail to %s"
 msgstr "Пошта за %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Наслове је %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Пошта од %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s дописна листа"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Одговорено на"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Додај правило за филтер"
 
 # Овде недостаје превод за једнину.
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "Следећа правила филтера:\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12299,144 +13301,30 @@ msgstr ""
 "    '%s'\n"
 "И освежен садржај."
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "Повезујем се..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Овај директоријум не може да садржи поруке."
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Нова порука"
 
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Не могу да отворим дељени директоријум: %s"
-
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Нисам могао да направим привремени директоријум: %s"
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "_Порука"
 
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Нисам могао да направим привремену датотеку '%s': %s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "Састави нову поруку"
 
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Нисам могао да затворим temp директоријум: %s"
-
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Изаберите одредишни директоријум за увоз ових података"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Изаберите одредишни директоријум за увоз ових података"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Направи нови директоријум"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Наведите где да направим директоријум:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Нисам могао да обришем директоријум `%s': %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Заиста да бришем директоријум „%s“?"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Обриши „%s“"
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Преименуј директоријум „%s“ у:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-msgid "Rename Folder"
-msgstr "Преименуј директоријум"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Наведено име директоријума није исправно: %s"
-
-#: mail/mail-component.c:1860
-#, fuzzy, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-"Директоријум са именом „%s“ већ постоји. Молим користите неко друго име."
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Особине писма"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Особине"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "_Име директоријума:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Погледај"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Отвори у новом прозору"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Премести"
-
-#: mail/mail-component.c:2087
-msgid "_New Folder..."
-msgstr "_Нови директоријум..."
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "Преимену_ј"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Подешавања..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Идентитет"
 
@@ -12495,11 +13383,11 @@ msgstr ""
 "Еволуција налог за пошту. Молим унесите доле име за овај налог. Ово име ће "
 "бити коришћено само за потребе приказивања на екрану."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "проверавам сервис"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Повезујем се на сервер..."
 
@@ -12581,26 +13469,35 @@ msgid "C_olors"
 msgstr "_Боје"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Провери за нову пошту"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "Провери граматику док _куцам"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Провери за нову пошту"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "Боја за _погрешно написане речи:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Састављање порука"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Подешавања"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12616,272 +13513,277 @@ msgstr ""
 "\n"
 "Притисните \"Примени\" да сачувате подешавања."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "Пре_дефинисано"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Предефинисано понашање"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "Предефинисана кодна _страна"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Брисање поште"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Увек потпиши одлазеће поруке на овом налогу"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "Не цитирај оригиналну поруку"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Не потписуј захтеве за с_астанцима (за компатибилност са Outlook-ом)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Готово"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "Д_иректоријум Припрема:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "О_могући"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "Електронски налози"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "Електронска адреса:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "Испразни директоријуме са _смећем на излазу"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "Лична карта _сертификата:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "помоћник Еволуција налога"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Изврши команду..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "Фик_сирана ширина:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "Филтери"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "Особине писма"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "Среди поруке у H_TML"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "Нагласи _цитате са"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Унутар"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Етикете и боје"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Учитавање слика"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Подешавање поште"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Локација сандучета"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Састављач поруке"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Приказ поруке"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 msgid "Message Fonts"
 msgstr "Писма поруке"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Обавештење о новој пошти"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Напомена: бићете упитани за лозинку док се не повежете први пут"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Опционе информације"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "Ор_ганизација:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG лична карта _кључа:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Изаберите боју"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Упозори када шаљеш поруке само са дефинисаним Bcc примаоцима"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Штампана писма"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "Цитирај оригиналну поруку"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Цитирано"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "За_памти ову лозинку"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "Од_говори-на:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Примање поште"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "_Опције за примање"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "Запамти ову _лозинку"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Неопходне информације"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "Поврати предефинисано"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "С_игурност"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "Сигурни MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr "Одабери HTML писмо фиксиране величине"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr "Одабери HTML писмо фиксиране величине за штампу"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr "Одабери HTML писмо варијабилне величине"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr "Одабери HTML писмо варијабилне величине за штампу"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Слање поште"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Директоријум Послате _поруке"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Поруке из Припреме и Послато директоријума"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Сер_вер тражи идентификацију"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Подешавање сервера"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "_Тип сервера"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Самопотписани сертификат у ланцу"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "Одреди име _датотеке:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "Провера _правописа"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Стандардни Unix mbox"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12891,7 +13793,7 @@ msgstr ""
 "потпис. Име које сте дали ће бити коришћено\n"
 "само за сврху приказивања на екрану."
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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 "
@@ -12900,7 +13802,7 @@ msgstr ""
 "Ова вам страна омогућава да подесите проверу правописа и језик. Листа језика "
 "овде осликава само оне језике за које постоји инсталиран речник."
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12908,11 +13810,15 @@ msgstr ""
 "Унесите име по коме желите да назовете овај налог.\n"
 "На пример: \"Пословни\" или \"Лични\""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "В_аријабилна ширина:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12922,169 +13828,178 @@ msgstr ""
 "\n"
 "Притисните \"Напред\" за почетак. "
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "_Додај потпис"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "_Увек учитај слике са мреже"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Увек потпиши одлазеће поруке на овом налогу"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "_Тип идентификације: "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "_тип идентификације: "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr "_Аутоматски провери за нову пошту сваких"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "_Аутоматски убаци слике са осмесима"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "_Огласи се када стигне нова пошта"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "_Потврди када избацујеш директоријум"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "_Предефинисан потпис:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "_Предефинисано"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Немој да ме обавештаваш када стигне нова пошта"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "_Омогући"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "Стил _прослеђивања"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "_Пуно име:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "_HTML пошта"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "_Идентитет"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Јун"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "_Учитај слике ако је пошиљалац у адресару"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "_Нека ово буде мој главни налог"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "_Означи поруке као прочитане после"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Име:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "_Никада не учитавај слике са мреже"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "_Пусти звучну датотеку када стигне нова пошта"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Упозори када шаљеш HTML поруке онима који их не желе"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Упозори када шаљеш поруке без наслова"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "_Примање поште"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "_Стил одговора:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "_Поврати предефинисано"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Скрипта:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Бриши..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "_Слање поште"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "_Покажи анимиране слике"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Потписи"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr "_Стандардно писмо:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr "_Писмо за терминал:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "_Користи сигурносну везу (SSL):"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr "_Користи иста писма као други програми"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "опис"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr "Пингујем %s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13093,7 +14008,7 @@ msgstr ""
 "Грешка током '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13102,7 +14017,7 @@ msgstr ""
 "Грешка током операције:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Радим"
 
@@ -13114,118 +14029,118 @@ msgstr "Филтрирам директоријум"
 msgid "Fetching Mail"
 msgstr "Узимам пошту"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Нисам могао да сместим пошту у temp датотеку %s: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Нисам могао да сместим пошту у temp датотеку %s: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Шаљем \"%s\""
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Шаљем поруку %d од %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Порука %d од %d није послата"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Готово."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Чувам поруку у директоријум"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Премештам поруке у %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копирам поруке у %s"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Претражујем директоријуме у \"%s\""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Прослеђене поруке"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Отварам директоријум %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "Отварам оставу %s"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Уклањам директоријум %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Смештам директоријум '%s'"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Освежавам директоријум"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Избацујем директоријум"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Празним смеће у '%s'"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Локални директоријуми"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Учитавам поруку %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Учитавам %d порука(е)"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Чувам %d порука(е)"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13234,7 +14149,7 @@ msgstr ""
 "Не могу да направим излазну датотеку: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13243,11 +14158,11 @@ msgstr ""
 "Грешка код чувања порука у: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Чувам прилог"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13256,21 +14171,25 @@ msgstr ""
 "Не могу да направим излазну датотеку: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Нисам могао да упишем: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Прекидам везу са %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Поново се повезујем на %s"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Осетљиво на велика и мала слова"
@@ -13288,59 +14207,74 @@ msgstr "Тражи:"
 msgid "Search"
 msgstr "Прона_ђи"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Измени потпис"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Изузеци"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Информација о налогу"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Поништавам..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Сервер: %s, тип: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Путања: %s, тип: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Пошаљи и прими пошту"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 msgid "Cancel _All"
 msgstr "Поништи _све"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Освежавам..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Чекам..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Корисник је поништио операцију."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Унесите лозинку за %s"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Унесите лозинку"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "_Запамти ову лозинку"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Запамти ову лозинку до краја ове сесије"
 
@@ -13379,26 +14313,31 @@ msgstr "Унеси име за овај потпис."
 msgid "Name:"
 msgstr "Име:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Прослеђена порука - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Прослеђена порука"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Отварам директоријум %s"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Постављам vfolder: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Освежавам vfolder-е за uri: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13411,88 +14350,88 @@ msgstr ""
 "    '%s'\n"
 "Потом су освежени."
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "VFolder-и"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "vFolders-и"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Измени VFolder-е"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Покушавам да изменим vfolder '%s' који не постоји."
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Нови VFolder"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Невиђено"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Виђено"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Одговорено"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Вишеструке невиђене поруке"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Вишеструке поруке"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Најниже"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Ниже"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Више"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Највише"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Данас %k:%M "
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Јуче %k:%M "
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M "
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b, %k:%M "
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Правим листу порука"
 
@@ -13548,11 +14487,11 @@ msgstr "Проследи"
 msgid "No Response Necessary"
 msgstr "Није неопходан одговор"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Одговори"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Одговори свима"
 
@@ -13604,41 +14543,139 @@ msgstr "Претп_лати се"
 msgid "_Unsubscribe"
 msgstr "Одјави претплату"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr "Овде подесите понашање посебних и директоријума који нису на мрежи"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Еволуција конзола"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Подешавања директоријума"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "80%"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Преименуј ову групу пречица"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Бирај да ли ће бити приказана линија директоријума"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Сакриј линију са пречицама"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Предефинисан приоритет:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Предефинисан приоритет:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Алат за подешавање Еволуција поште"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+#, fuzzy
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "Означи да се прилог уобичајено приказује унутар поруке."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
 msgstr ""
-"Не могу да пренесем директоријум:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Додај директоријум"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Припрема"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Сандуче"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "Отварам подразумеван директоријум задужења"
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "За слање"
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Отварам подразумеван директоријум задужења"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Отварам подразумеван директоријум задужења"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Послато"
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Отварам подразумеван директоријум задужења"
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Бирај да ли ће бити приказана линија директоријума"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Бирај да ли ће бити приказана линија пречица"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "Е-пошта"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Нисам могао да исправно освежим датотеке"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13649,7 +14686,7 @@ msgstr ""
 "%s\n"
 "Грешка: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13658,7 +14695,7 @@ msgstr ""
 "Дошло је до грешке код копирања датотека у\n"
 "`%s'."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13669,7 +14706,7 @@ msgstr ""
 "Молим да га померите како би дозволили инсталацију\n"
 "Еволуција корисничких датотека."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13767,11 +14804,11 @@ msgstr ""
 "Не могу да применујем директоријум:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
-"Директоријум са именом „%s“ већ постоји. Молим користите неко друго име."
+msgid "The specified folder name is not valid: %s"
+msgstr "Наведено име директоријума није исправно: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -13795,19 +14832,15 @@ msgstr ""
 "Не могу да направим наведени директоријум:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Направи нови директоријум"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Безимено)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Изаберите врсту увозника:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13821,11 +14854,11 @@ msgstr ""
 "Можете изабрати \"Аутоматски\" уколико не знате, и Еволуција ће покушати да "
 "сама заврши посао."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Молим изаберите податке које желите да увезете:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13837,7 +14870,7 @@ msgstr ""
 "подешавања која би се могла искористити. Уколико желите\n"
 "да пробате поново, притисните дугме „Назад“.\n"
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13846,21 +14879,21 @@ msgstr ""
 "Увозим %s\n"
 "Увозим %d. ставку."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "Изаберите увозника"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "Датотека %s не постоји"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Грешка Еволуције"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -13869,11 +14902,11 @@ msgstr ""
 "Не постоји увозник који уме да ради са\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Увозим"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -13882,17 +14915,17 @@ msgstr ""
 "Увозим %s.\n"
 "Покрећем %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Грешка код покретања %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Грешка код учитавања %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13901,35 +14934,35 @@ msgstr ""
 "Увозим %s\n"
 "Увозим 1. ставку."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Аутоматско"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Име датотеке:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Одаберите датотеку"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Врста датотеке:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Увези податке и подешавања из старијих програма"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Увези једну датотеку"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -13937,47 +14970,28 @@ msgstr ""
 "Молим сачекајте...\n"
 "Тражим постојећа подешавања"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Покрећем интелигентне увознике"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "Од %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Изаберите одредишни директоријум за увоз ових података"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Увоз"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Затварам везе..."
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Грешка код синхронизације „%s“:\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "Синхронизујем директоријум"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Синхронизујем „%s“ (%d од %d)..."
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Подешавања Еволуције"
@@ -14012,7 +15026,7 @@ msgstr "Не могу да отворим дељени директоријум:
 msgid "Cannot find the specified shared folder."
 msgstr "Не могу да нађем наведени дељени директоријум."
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14021,17 +15035,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Помоћник"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Ново"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Није наведено име директоријума."
@@ -14089,64 +15097,51 @@ msgstr "Направи нову пречицу"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Изаберите директоријум на који желите да пречица указује:"
 
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "_На мрежи"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "_Није на мрежи"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Ради без мреже"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(ниједан директоријум није приказан)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Ништа)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Еволуција је тренутно на мрежи. Притисните ово дугме да радите без "
 "мреже."
 
-#: shell/e-shell-view.c:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Еволуција је у процесу одласка у рад без мреже."
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Еволуција није тренутно на мрежи. Притисните ово дугме да радите на "
 "мрежи."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Неисправни аргументи"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Не могу да се региструје на OAF"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "База са подешавањима није нађена"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Општа грешка"
 
@@ -14259,75 +15254,18 @@ msgstr "Ук_лони"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Уклони пречицу са линије пречица"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Грешка код чувања пречица."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Сандуче"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Пречице"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Нема грешке"
-
-#: shell/e-storage.c:573
-msgid "A folder with the same name already exists"
-msgstr "Директоријум са тим именом већ постоји"
-
-#: shell/e-storage.c:575
-msgid "The specified folder type is not valid"
-msgstr "Наведена врста директоријума није исправна"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "I/O грешка"
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr "Недовољно места за прављење директоријума"
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr "Директоријум није празан"
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "Наведени директоријум није пронађен"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "Функција није подржана за ову оставу"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "Операција није подржана"
-
-#: shell/e-storage.c:591
-msgid "The specified type is not supported in this storage"
-msgstr "Наведена врста није подржана за ову оставу"
-
-#: shell/e-storage.c:593
-msgid "The specified folder cannot be modified or removed"
-msgstr "Наведени директоријум се не може изменити нити уклонити"
-
-#: shell/e-storage.c:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr ""
-"Не могу да пребацим директоријум у неки од у њему садржаних директоријума"
-
-#: shell/e-storage.c:597
-msgid "Cannot create a folder with that name"
-msgstr "Не могу да направим директоријум са тим именом"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Ову операцију не можете извршити док радите без мреже"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Кућица"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14338,6 +15276,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% завршено)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Ново"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "„%s“ у „%s“"
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14375,74 +15324,6 @@ msgstr ""
 "Грешка коју је послао систем за покретање је:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "CORBA грешка"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Прекинуто"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Неисправан аргумент"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Већ има власника"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Нема власника"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Није нађен"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Неподржана врста"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Неподржана шема"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Операција није подржана"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Унутрашња грешка"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Постоји"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "Нетачан URI"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Садржи поддиректоријуме"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Нема слободног простора"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "Стари власник је нестао"
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Врста пробе"
-
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr "Пробни део Еволуције"
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr "Активне везе"
@@ -14471,10 +15352,6 @@ msgstr "_Пошта:"
 msgid "_Tasks:"
 msgstr "За_дужења:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr "_Име директоријума:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder _type:"
 msgstr "_Врста директоријума:"
@@ -14537,22 +15414,6 @@ msgstr ""
 "\n"
 "Притисните дугме \"Примени\" да сачувате ваша подешавања. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "Овде подесите понашање посебних и директоријума који нису на мрежи"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Еволуција конзола"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Контрола подешавања поставки Еволуција директоријума"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Подешавања директоријума"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Притисните \"Увези\" да започнете са увозом датотеке у Еволуцију. "
@@ -14591,7 +15452,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Увозници"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Увоз"
 
@@ -14607,16 +15468,16 @@ msgstr "Не питај ме више"
 msgid "Evolution can import data from the following files:"
 msgstr "Еволуција може да увезе податке из следећих датотека:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Еволуција"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Еволуција сада излази..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14651,7 +15512,7 @@ msgstr ""
 "Надамо се да ћете уживати у плодовима нашег напорног рада, и \n"
 "жељно ишчекујемо ваше доприносе!\n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -14659,36 +15520,48 @@ msgstr ""
 "Хвала\n"
 "Тим Ximian Еволуције\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr "Немој ми поново рећи"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Не могу да приступим конзоли Ximian Еволуције"
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Не могу да покренем конзолу Ximian Еволуције: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Почни са радом без мреже"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Почни са радом на мрежи"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr "Силом угаси све делове еволуције"
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Пошаљи излаз о грешкама из свих делова у датотеку."
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14697,31 +15570,60 @@ msgstr ""
 "%s: --online и --offline се не могу користити заједно.\n"
 "  Користите %s --help за више података.\n"
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Изаберите увозника"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "Лична карта _сертификата:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "Ток"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Израз"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Споји електронске адресе"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"Истекао сертификат: %s\n"
+"Издавач: %s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14779,91 +15681,376 @@ msgid "Backup All"
 msgstr "Blackpool"
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "Лична карта _сертификата:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Неповерљив сертификат"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "Лична карта _сертификата:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Заједничко име"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "Лична карта _сертификата:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "_Измени"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Нисам могао да проверим сертификате."
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Израз"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Организација"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Организациона јединица"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Погледај"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "Лична карта _сертификата:"
+
+#: smime/gui/smime-ui.glade.h:42
+#, fuzzy
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr "Неисправан издавач сертификата (CA)"
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "Лична карта _сертификата:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Увоз"
+msgid "Certificate already exists"
+msgstr "ID карте већ постоји"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%m/%d/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Вермонт"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Вермиљон"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Вермиљон"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Вермиљон"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "С"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "ОК"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "С"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "Лична карта _сертификата:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "Лична карта _сертификата:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "Неповерљив сертификат"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "ID"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Наслове је %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Нисам могао да прођем кроз директоријум са редом"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "Неисправан издавач сертификата (CA)"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Неисправан издавач сертификата (CA)"
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Без информације"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "прилог"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "Лична карта _сертификата:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Curitiba"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "Северна Каролина"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Израз"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s на %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Неуспео потпис сертификата"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "Убац_и"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Наслове је %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Неуспео потпис сертификата"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Унесите лозинку за %s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "Лична карта _сертификата:"
 
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
@@ -14915,7 +16102,7 @@ msgstr "Копирај одабрано"
 msgid "Copy to Folder..."
 msgstr "Копирај у директоријум..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Исеци означено"
 
@@ -14931,7 +16118,7 @@ msgstr "Премести контакт(е) у други директорију
 msgid "Move to Folder..."
 msgstr "Премести у директоријум..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Уметни меморисано"
 
@@ -14939,8 +16126,8 @@ msgstr "Уметни меморисано"
 msgid "Previews the contacts to be printed"
 msgstr "Прегледај контакте за штампање"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Пре_глед пред штампу"
@@ -14985,13 +16172,13 @@ msgstr "Прекини учитавање"
 msgid "View the current contact"
 msgstr "Прегледај текући контакт"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "_Акције"
 
@@ -15021,140 +16208,108 @@ msgstr "_Пошаљи поруку контакту..."
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "Унесите нови целодневни састанак"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Закажи састанак"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "Направи нови директоријум"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Унесите нови захтев за састанком"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Унеси ново задужење"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Дан"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Обриши све појаве"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Обриши заказани састанак"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Обриши ову појаву"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Обриши ову појаву"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Иди на"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Иди назад"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Иди напред"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Иди на _датум"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Иди на наведени датум"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Иди на данашњи дан"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "Листа"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Месец"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Нов _заказани састанак"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Нова Каледонија"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Нови састанак"
-
-#: ui/evolution-calendar.xml.h:27
-#, fuzzy
-msgid "New _Task"
-msgstr "Ново задужење"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Преглед календара за штампу"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Штампај овај календар"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Објави слободан/заузет информацију за овај календар"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 msgid "Purg_e"
 msgstr "Обри_ши"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 msgid "Purge old appointments and meetings"
 msgstr "Обриши старе састанке и договоре"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Прикажи детаље"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Прикажи један дан"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Прикажи један месец"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Прикажи једну недељу"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Прикажи радну недељу"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Недеља"
 
@@ -15219,7 +16374,7 @@ msgstr "Сачувај ставку на диск"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "Дато_тека"
 
@@ -15436,7 +16591,7 @@ msgstr "Означи све као п_рочитане"
 msgid "Mark all visible messages as read"
 msgstr "Означи све видљиве поруке као прочитане"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "Убаци поруку(е) из меморије"
 
@@ -15493,16 +16648,6 @@ msgstr "_Обрни избор"
 msgid "_Threaded Message List"
 msgstr "Листа порука према _нити разговора"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Затвори овај прозор"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "_Затвори"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "Додај _пошиљаоца у адресар"
@@ -15659,257 +16804,282 @@ msgstr "Проследи изабрану поруку некоме као пр�
 msgid "Increase the text size"
 msgstr "Увећај величину текста"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Учитај _слике"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Означи као _важно"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Означи као _непрочитано"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Означи као нева_жно"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "Означи изабрану поруку(е) као прочитану"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "Означи изабрану поруку(е) као важну"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Означи изабрану поруку(е) као неважну"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Означи изабрану поруку(е) као непрочитану"
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Означи изабрану поруку(е) као непрочитану"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Означи изабрану поруку(е) као неважну"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Означи изабране поруке за брисање"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Премести"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "Премести изабрану поруку(е) у други директоријум"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Следеће"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "Следећа _важна порука"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "Следећа _нит"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "Следећа _непрочитана порука"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Није нађен"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Отвори изабрану поруку у новом прозору"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Отвори изабрану поруку ради поновног слања"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Оригинална _величина"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "П_ретходна непрочитана порука"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Пошаљи одговор"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr "Пошаљи одговор на поруку у јавни директоријум"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "Пр_етходна важна порука"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Прегледај поруку за штампу"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Претходно"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Штампај ову поруку"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "Преу_смери"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Преу_смери (одбаци) изабрани поруку некоме"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Врати текст на изворну величину"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "Пре_тражи поруку..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "_Мање"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Сачувај поруку као текстуалну датотеку"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Тражи текст у телу приказане поруке"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr "Постави подешавања странице за ваш текући штампач"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Прикажи извор поруке"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Прикажи цела _заглавља"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Прикажи трепћући курзор у телу приказаних порука"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Прикажи поруку у нормалном стилу"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Прикажи поруку са свим заглављима е-поште"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Прикажи изворни код електронске поруке"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "Величина те_кста"
 
 # Од-обриши?
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Поврати изабране поруке"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "VFolder директоријум на _дописну листу..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "VFolder директоријум на _пошиљаоца..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "VFolder директоријум на _примаоца..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "Привидни директоријум на _наслов..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "_Приложено"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "_Копирај у директоријум"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "_Направи филтер од поруке"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "Про_следи поруку"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "_Иди на"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "Унутар"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "_Веће"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "Приказ _поруке"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Премести у директоријум"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "_Следећа порука"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "Нормалан при_каз"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "_Отвори поруку"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "_Претходна порука"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "_Цитирано"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "Поново поша_љи..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "Ала_ти"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "_Поврати"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Затвори овај прозор"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "_Затвори"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Приложи"
@@ -16187,12 +17357,13 @@ msgid "Change Evolution's settings"
 msgstr "Измени подешавања Еволуције"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "_Излаз"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Унесите нови захтев за састанком"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "_Прозор Еволуције"
+msgid "E_xit"
+msgstr "_Излаз"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16204,61 +17375,74 @@ msgstr "Увези податке из других програма"
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "_Прозор Еволуције"
+msgid "Open a new window"
+msgstr "Отвори у новом прозору"
 
 #: ui/evolution.xml.h:11
 msgid "Pi_lot Settings..."
 msgstr "Подешавања Пи_лота..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Слање / примање"
+
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr "Пошаљи заказане и добави нове ставке"
+
+#: ui/evolution.xml.h:14
 msgid "Set up Pilot configuration"
 msgstr "Подеси поставке Пилота"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Прикажи информацију о Ximian Еволуцији"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Пошаљи извештај о грешци"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "Пошаљи извештај о _грешци"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Пошаљи извештај о грешци помоћу Bug Buddy"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Промена"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Бирај да ли ћемо радити без мреже."
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "_Честа питања у вези Еволуције"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "_О Ximian Еволуцији..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "Помо_ћ"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "_Увези..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Ново"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Пошаљи / прими"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "_Пронађи"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Штампај сажетак"
@@ -16386,12 +17570,12 @@ msgstr "Установи прегледе..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "ПУСЧПСН"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y."
 
@@ -16524,7 +17708,7 @@ msgstr "Прона_ђи"
 msgid "_Find Now"
 msgstr "_Пронађи"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "_Очисти"
 
@@ -16540,24 +17724,265 @@ msgstr "Лична карта подставке"
 msgid "Text"
 msgstr "Текст"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Очисти"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Пронађи сада"
 
+#~ msgid "Account Name"
+#~ msgstr "Име налога"
+
+#~ msgid "Server Name"
+#~ msgstr "Име сервера"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "LDAP није омогућен у овој верзији Еволуције"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Остали контакти"
+
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "Овде подеси приступ серверима са LDAP директоријумима"
+
+#~ msgid "Directory Servers"
+#~ msgstr "Сервери са директоријумима"
+
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Контрола подешавања за  Еволуцију LDAP адресар"
+
+#~ msgid "Add LDAP Server"
+#~ msgstr "Додај LDAP сервер"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Корак 4: Име"
+
+#~ msgid "Find contact in"
+#~ msgstr "Пронађи контакт у"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Стисните овде да додате контакт *"
+
+#~ msgid "Business Address"
+#~ msgstr "Адреса на послу"
+
+#~ msgid "Department"
+#~ msgstr "Оделење"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "Слободна-заузета адреса"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Занимање"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Отварам задужења у %s"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Свеједно да пошаљем?"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Откажи текући рад са поштом"
+#~ msgid "Folder _name"
+#~ msgstr "_Име директоријума:"
+
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "Ова порука је дигитално потписана. Притисните на икону са катанцем за "
+#~ "веше информација."
+
+#~ msgid "Connecting..."
+#~ msgstr "Повезујем се..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Овај директоријум не може да садржи поруке."
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Не могу да отворим дељени директоријум: %s"
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Изаберите одредишни директоријум за увоз ових података"
+
+#, fuzzy
+#~ msgid "A folder named \"%s\" already exists.  Please use a different name."
+#~ msgstr ""
+#~ "Директоријум са именом „%s“ већ постоји. Молим користите неко друго име."
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не могу да пренесем директоријум:\n"
+#~ "%s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "Додај директоријум"
+
+#~ msgid "Drafts"
+#~ msgstr "Припрема"
+
+#~ msgid "Outbox"
+#~ msgstr "За слање"
+
+#~ msgid "Sent"
+#~ msgstr "Послато"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Грешка код синхронизације „%s“:\n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "Синхронизујем директоријум"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Синхронизујем „%s“ (%d од %d)..."
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(ниједан директоријум није приказан)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(Ништа)"
+
+#~ msgid "No error"
+#~ msgstr "Нема грешке"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Директоријум са тим именом већ постоји"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Наведена врста директоријума није исправна"
+
+#~ msgid "I/O error"
+#~ msgstr "I/O грешка"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Недовољно места за прављење директоријума"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Директоријум није празан"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Наведени директоријум није пронађен"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Функција није подржана за ову оставу"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Операција није подржана"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Наведена врста није подржана за ову оставу"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Наведени директоријум се не може изменити нити уклонити"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr ""
+#~ "Не могу да пребацим директоријум у неки од у њему садржаних директоријума"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Не могу да направим директоријум са тим именом"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Ову операцију не можете извршити док радите без мреже"
+
+#~ msgid "Checkbox"
+#~ msgstr "Кућица"
+
+#~ msgid "CORBA error"
+#~ msgstr "CORBA грешка"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Неисправан аргумент"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Већ има власника"
+
+#~ msgid "No owner"
+#~ msgstr "Нема власника"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Неподржана врста"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Неподржана шема"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Операција није подржана"
+
+#~ msgid "Internal error"
+#~ msgstr "Унутрашња грешка"
+
+#~ msgid "Exists"
+#~ msgstr "Постоји"
+
+#~ msgid "Invalid URI"
+#~ msgstr "Нетачан URI"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Садржи поддиректоријуме"
+
+#~ msgid "No space left"
+#~ msgstr "Нема слободног простора"
+
+#~ msgid "Old owner has died"
+#~ msgstr "Стари власник је нестао"
+
+#~ msgid "Test type"
+#~ msgstr "Врста пробе"
+
+#~ msgid "Evolution Test Component"
+#~ msgstr "Пробни део Еволуције"
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "Увоз"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Унесите нови целодневни састанак"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Нов _заказани састанак"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Нови састанак"
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Име поља"
+#~ msgid "New _Task"
+#~ msgstr "Ново задужење"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "_Прозор Еволуције"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "_Прозор Еволуције"
+
+#~ msgid "Toggle"
+#~ msgstr "Промена"
 
-#~ msgid "Family Name"
-#~ msgstr "Презиме"
+#~ msgid "Clear"
+#~ msgstr "Очисти"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Откажи текући рад са поштом"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -16650,9 +18075,6 @@ msgstr "Пронађи сада"
 #~ msgid "VCard (.vcf, .gcrd)"
 #~ msgstr "VCard (.vcf, .gcrd)"
 
-#~ msgid "Loading..."
-#~ msgstr "Учитавам..."
-
 #~ msgid "Searching..."
 #~ msgstr "Тражим..."
 
@@ -16704,10 +18126,6 @@ msgstr "Пронађи сада"
 #~ msgstr "Екњига није учитана\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "ID карте већ постоји"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Операција обустављена"
 
@@ -16854,9 +18272,6 @@ msgstr "Пронађи сада"
 #~ msgid "Callback"
 #~ msgstr "Повратни позив"
 
-#~ msgid "Company"
-#~ msgstr "Предузеће"
-
 #~ msgid "Comp"
 #~ msgstr "Пред."
 
@@ -16923,9 +18338,6 @@ msgstr "Пронађи сада"
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#~ msgid "Phone"
-#~ msgstr "Телефон"
-
 #~ msgid "Birth date"
 #~ msgstr "Рођендан"
 
@@ -16938,9 +18350,6 @@ msgstr "Пронађи сада"
 #~ msgid "Arbitrary"
 #~ msgstr "Слободно"
 
-#~ msgid "ID"
-#~ msgstr "ID"
-
 #~ msgid "Last Use"
 #~ msgstr "Последња употреба"
 
@@ -16953,9 +18362,6 @@ msgstr "Пронађи сада"
 #~ msgid "Folder containing contact information"
 #~ msgstr "Директоријум са подацима о контактима"
 
-#~ msgid "LDAP Server"
-#~ msgstr "LDAP сервер"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "LDAP сервер са подацима о контактима"
 
@@ -16965,18 +18371,6 @@ msgstr "Пронађи сада"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Јавни директоријум са подацима о контактима"
 
-#~ msgid "_Contact"
-#~ msgstr "_Контакт"
-
-#~ msgid "Create a new contact"
-#~ msgstr "Унеси нови контакт"
-
-#~ msgid "New Contact List"
-#~ msgstr "Нова контакт листа"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "Направи нову контакт листу"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "URI који ће да читач директоријума приказати"
 
@@ -16992,9 +18386,6 @@ msgstr "Пронађи сада"
 #~ msgid "Is New Card"
 #~ msgstr "Да ли је нова карта"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "Нема карата"
 
@@ -17044,30 +18435,6 @@ msgstr "Пронађи сада"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "Јавни директоријум са уносима за-урадити"
 
-#~ msgid "New appointment"
-#~ msgstr "Нови заказани састанак"
-
-#~ msgid "_Appointment"
-#~ msgstr "Заказани _Састанак"
-
-#~ msgid "New meeting"
-#~ msgstr "Нови састанак"
-
-#~ msgid "M_eeting"
-#~ msgstr "С_астанак"
-
-#~ msgid "New task"
-#~ msgstr "Ново задужење"
-
-#~ msgid "_Task"
-#~ msgstr "_Задужење"
-
-#~ msgid "New All Day Appointment"
-#~ msgstr "Нови целодневни заказани састанак"
-
-#~ msgid "All _Day Appointment"
-#~ msgstr "Цело_дневни заказани састанак"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "Нисам могао да освежим променама нетачан објекат"
 
@@ -17104,9 +18471,6 @@ msgstr "Пронађи сада"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "Отварам календар у %s"
 
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Отварам подразумеван директоријум задужења"
-
 #~ msgid "Purging event %s"
 #~ msgstr "Брише догађај %s"
 
@@ -17151,9 +18515,6 @@ msgstr "Пронађи сада"
 #~ "Еволуција је пронашла GnomeCard датотеке.\n"
 #~ "Желите ли да их увезете у Еволуцију?"
 
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Алат за подешавање Еволуција поште"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "Директоријум са поштом"
 
@@ -17169,9 +18530,6 @@ msgstr "Пронађи сада"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Виртуелни директоријум са смећем"
 
-#~ msgid "Properties..."
-#~ msgstr "Особине..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Промени особине овом директоријуму"
 
@@ -17181,15 +18539,6 @@ msgstr "Пронађи сада"
 #~ msgid "You have unsent messages, do you wish to quit anyway?"
 #~ msgstr "Имате непослате поруке, желите ли свеједно да изађете?"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Нова порука"
-
-#~ msgid "_Mail Message"
-#~ msgstr "_Порука"
-
-#~ msgid "Compose a new mail message"
-#~ msgstr "Састави нову поруку"
-
 #~ msgid "New Message Post"
 #~ msgstr "Слање нове поруке"
 
@@ -18999,9 +20348,6 @@ msgstr "Пронађи сада"
 #~ msgid "Cumberland"
 #~ msgstr "Cumberland"
 
-#~ msgid "Curitiba"
-#~ msgstr "Curitiba"
-
 #~ msgid "Curitiba Apt"
 #~ msgstr "Curitiba Apt"
 
@@ -21995,9 +23341,6 @@ msgstr "Пронађи сада"
 #~ msgid "North Bend"
 #~ msgstr "North Bend"
 
-#~ msgid "North Carolina"
-#~ msgstr "Северна Каролина"
-
 #~ msgid "North Conway"
 #~ msgstr "North Conway"
 
@@ -23610,9 +24953,6 @@ msgstr "Пронађи сада"
 #~ msgid "State College"
 #~ msgstr "State College"
 
-#~ msgid "Stauning"
-#~ msgstr "Stauning"
-
 #~ msgid "Staunton"
 #~ msgstr "Staunton"
 
@@ -24204,9 +25544,6 @@ msgstr "Пронађи сада"
 #~ msgid "United Arab Emirates "
 #~ msgstr "Уједињени Арапски Емирати"
 
-#~ msgid "Unst"
-#~ msgstr "Unst"
-
 #~ msgid "Upington"
 #~ msgstr "Upington"
 
@@ -24315,12 +25652,6 @@ msgstr "Пронађи сада"
 #~ msgid "Veracruz"
 #~ msgstr "Веракруз"
 
-#~ msgid "Vermillion"
-#~ msgstr "Вермиљон"
-
-#~ msgid "Vermont"
-#~ msgstr "Вермонт"
-
 #~ msgid "Vernal"
 #~ msgstr "Vernal"
 
@@ -24849,9 +26180,6 @@ msgstr "Пронађи сада"
 #~ msgid " F"
 #~ msgstr " F"
 
-#~ msgid " C"
-#~ msgstr " C"
-
 #~ msgid "knots"
 #~ msgstr "чворови"
 
@@ -25474,9 +26802,6 @@ msgstr "Пронађи сада"
 #~ msgid "Freezing haze"
 #~ msgstr "Ледена сумаглица"
 
-#~ msgid "Spray"
-#~ msgstr "Кишица"
-
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Кишица у близини"
 
@@ -25846,18 +27171,6 @@ msgstr "Пронађи сада"
 #~ msgstr ""
 #~ "Уклони директоријум додат помоћу \"Отвори директоријум другог корисника\""
 
-#~ msgid "Send / Receive"
-#~ msgstr "Слање / примање"
-
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Пошаљи заказане и добави нове ставке"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Бирај да ли ће бити приказана линија директоријума"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Бирај да ли ће бити приказана линија пречица"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Прегледај изабрани директоријум"
 
@@ -25885,9 +27198,6 @@ msgstr "Пронађи сада"
 #~ msgid "_Rename..."
 #~ msgstr "_Преименуј..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Пошаљи / прими"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "_Трака са пречицама"
 
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index b85a2467c6..9749ad367c 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Ximian Evolution 1.4\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-07-26 14:41+0200\n"
 "Last-Translator: Igor Nestorović <jung@one.ekof.bg.ac.yu>\n"
 "Language-Team: Serbian (sr) <serbiangnome-lista@nongnu.org>\n"
@@ -33,51 +33,184 @@ msgstr "Nisam mogao da učitam %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Nisam mogao da pročitam programski blok adresa pilota"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Direktorijumi za samodopunjavanje"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "Lična karta _sertifikata:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Podesite vaše naloge za poštu ovde"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Kontakti"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
+msgstr "Evolucija adresar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address pop-up"
+msgstr "Iskačući prozor za adrese Evolucija adresara"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address viewer"
+msgstr "Preglednik adresa Evolucija adresara"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook card viewer"
+msgstr "Preglednik Evolucija adresara"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook component"
+msgstr "Deo Evolucija adresara"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook folder viewer"
+msgstr "Preglednik direktorijuma Evolucija adresara"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Kontrola osobina Evolucija pošte"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Kontrola podešavanja postavki Evolucija direktorijuma"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Adresar"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Osobine..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Obriši"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "Preimenu_j"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Novi kontakt:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "Unesi novi kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Nova kontakt lista"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "Nova kontakt lista"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "Napravi novu kontakt listu"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Lično"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Posao"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "LDAP server"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Nisam mogao da napravim direktorijum %s: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "Neuspešno povezivanje sa LDAP serverom"
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "Neuspešna prijava na LDAP server"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "Nisam mogao da obavim upit na Root DSE"
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "Server je odgovorio nepodržanim bazama za pretragu"
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Ovaj server ne podržava podatke LDAPv3 šeme"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "Greška u čitanju podataka šeme"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr "Server nije odgovorio sa ispravnim podacima šeme"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Ime naloga"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Ime servera"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP nije omogućen u ovoj verziji Evolucije"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Ostali kontakti"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -85,7 +218,7 @@ msgstr ""
 "Nismo uspeli da otvorimo ovaj adresar. Molimo proverite da\n"
 "putanja postoji i da imate prava pristupa."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -94,7 +227,7 @@ msgstr ""
 "Nismo uspeli da otvorimo ovaj adresar. To znači ili\n"
 "da ste uneli netačan URI, ili je LDAP server nedostupan."
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -106,7 +239,7 @@ msgstr ""
 "da izgradite program od CVS izvornog koda pošto ste\n"
 "preuzeli OpenLDAP sa sledeće adrese.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -119,44 +252,43 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Ne mogu da otvorim adresar"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "Anonimno pristupam LDAP serveru"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "Nisam mogao da se prijavim.\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sUnesi lozinku za %s (korisnik %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "Ime počinje sa"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "E-pošta počinje sa"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Kategorija je"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Polje koje sadrži"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Napredno..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -168,7 +300,7 @@ msgstr ""
 "Molim da preciznije formulišete upit ili povećate limit\n"
 "broja rezultata u podešavanjima adresara za server direktorijuma."
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -180,88 +312,41 @@ msgstr ""
 "upit ili povećate vremenski limit u podešavanjima adresara\n"
 "za server direktorijuma."
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Osnovni proces ovog adresara nije mogao da obradi upit."
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Osnovni proces ovog adresara je odbio da obradi ovaj upit."
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "Ovaj upit nije uspešno završen."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "URI koju će kalendar pokazati"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "Lična karta _sertifikata:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "Ovde podesi pristup serverima sa LDAP direktorijumima"
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Kontakti"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "Serveri sa direktorijumima"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolucija adresar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Kontrola podešavanja za  Evoluciju LDAP adresar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "Iskačući prozor za adrese Evolucija adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "Preglednik adresa Evolucija adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Preglednik Evolucija adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr "Deo Evolucija adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook folder viewer"
-msgstr "Preglednik direktorijuma Evolucija adresara"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Kontrola osobina Evolucija pošte"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -284,6 +369,7 @@ msgstr " P_okaži podržane baze "
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -317,8 +403,9 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "Dodaj LDAP server"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "Asistent konfiguracije za LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -334,9 +421,9 @@ msgid "Anonymously"
 msgstr "Anonimno"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -347,48 +434,49 @@ msgstr ""
 "Molim pritisnite \"Finish\" dugme da sačuvate podešavanja koja ste uneli "
 "ovde."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "Povezujem"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "Posebno _ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr "Menjaj LDAP server"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
 msgstr "Elektronska adresa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolucija će koristiti ovaj DN za prijavljivanje na server"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolucija će koristiti ovu elektronsku adresu za prijavljivanje na server"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "Gotovo"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Opšte"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "Asistent konfiguracije za LDAP"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "Grupa"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Nikada"
 
@@ -417,8 +505,8 @@ msgid "S_earch scope: "
 msgstr "Opseg p_retrage:"
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Tražim"
 
@@ -476,27 +564,31 @@ msgstr ""
 "za LDAP pretrage, i za upisivanje i menjanje kontakata. "
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 "Odabiranje imena je poslednji obavezan korak u podešavanju LDAP servera."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "Korak 1: Informacije o serveru"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "Korak 2: Povezivanje na server"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "Korak 1: Informacije o serveru"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "Korak 3: Pretraga direktorijuma"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Korak 2: Povezivanje na server"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "Korak 4: Ime"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Korak 3: Pretraga direktorijuma"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -508,17 +600,6 @@ msgstr "Podržane baze za pretragu"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"Prvi korak u podešavanju LDAP servera je dodela imena, i podataka o\n"
-"prijavi na sistem. Molim pitajte vašeg sistem administratora ako niste "
-"sigurni za prave podatke."
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -529,7 +610,7 @@ msgstr ""
 "pretraga uzima vremena. Pitajte vašeg sistem administratora ako hoćete\n"
 "da menjate ove opcije."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -540,7 +621,7 @@ msgstr ""
 "početi. Ako ovo ostavite prazno, pretraga će početi iz korena stabla "
 "direktorijuma."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -554,14 +635,14 @@ msgstr ""
 "\"sub\" će uključiti sve unose ispod vaše baze za pretragu. Opseg pretrage "
 "\"one\" će uključiti samo unose jedan nivo ispod vaše baze.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
+#, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "Asistent će vam pomoći da pristupite uslugama direktorijuma\n"
 "na mreži korišćenjem LDAP (Lightweight Directory Access Protocol)\n"
@@ -571,13 +652,13 @@ msgstr ""
 "serveru. Molim savetujte vašeg sistem administratora ukoliko \n"
 "vam je potrebna pomoć da nađete potrebne podatke."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Ovo je puno ime vašeg ldap servera. Na primer, \"ldap.mojafirma.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -586,7 +667,7 @@ msgstr ""
 "Ovo je najveći broj unosa za preuzimanje. Ako unesete suviše veliki \n"
 "broj, usporićete vaš adresar."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -596,7 +677,7 @@ msgstr ""
 "uključivanje ovoga na \"Email Address\" zahteva anonimni pristup na vaš ldap "
 "server."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -605,6 +686,15 @@ msgstr ""
 "Ovo je ime servera koje će se pojaviti u listi direktorijuma Evolucije.\n"
 "To je samo za potrebe prikazivanja. "
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Ovo je ime servera koje će se pojaviti u listi direktorijuma Evolucije.\n"
+"To je samo za potrebe prikazivanja. "
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -634,21 +724,33 @@ msgid "Using email address"
 msgstr "Koristim elektronsku adresu"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Kada je moguće"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+"Prvi korak u podešavanju LDAP servera je dodela imena, i podataka o\n"
+"prijavi na sistem. Molim pitajte vašeg sistem administratora ako niste "
+"sigurni za prave podatke."
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "_Ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "Limit za _preuzimanje:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -656,54 +758,52 @@ msgstr "Limit za _preuzimanje:"
 msgid "_Edit"
 msgstr "_Izmeni"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "Metod _prijave:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "Broj _porta:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "Baza _pretrage:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "Ime _servera:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "_Odziv (minuti):"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "karte"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr "jezičak za vezu"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr "jezičak za opšte podatke"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr "jezičak za pretragu"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Ime"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Alat za odabir imena Evolucija adresara"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Ukloni sve"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Ukloni"
@@ -730,23 +830,21 @@ msgstr "Dodaj u kontakte"
 msgid "Unnamed Contact"
 msgstr "Neimenovani kontakt"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Ime"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Izvor"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Odabrani kontakti iz Adresara"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "Pronađi kontakt u"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Alat za odabir imena Evolucija adresara"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Pronađi"
@@ -823,7 +921,8 @@ msgid "D_epartment:"
 msgstr "O_delenje:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalji"
 
@@ -890,12 +989,12 @@ msgid "_Categories..."
 msgstr "Ka_tegorije..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Obriši"
@@ -2019,7 +2118,7 @@ msgid "Esq."
 msgstr "g-din"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Puno ime"
 
@@ -2112,11 +2211,27 @@ msgstr "Urednik kontakt liste"
 msgid "Save List as VCard"
 msgstr "Sačuvaj listu kao VCard"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Promenjen kontakt:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Sporan kontakt:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Otkriven dupliran kontakt"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Promenjena elektronska adresa ili ime ovog kontakta\n"
+"već postoji u ovom direktorijumu. Želite li svejedno da dodate?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Novi kontakt:"
@@ -2133,22 +2248,6 @@ msgstr ""
 "Ime ili elektronska adresa ovog kontakta već postoji\n"
 "u ovom direktorijumu. Želite li svejedno da dodate?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Promenjen kontakt:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Sporan kontakt:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"Promenjena elektronska adresa ili ime ovog kontakta\n"
-"već postoji u ovom direktorijumu. Želite li svejedno da dodate?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2247,9 +2346,9 @@ msgstr "Prosledi kontakt"
 msgid "Send Message to Contact"
 msgstr "Pošalji kontaktu poruku"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Štampaj"
@@ -2271,9 +2370,12 @@ msgstr "Prenesi u direktorijum..."
 msgid "Cut"
 msgstr "Iseci"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopiraj"
 
@@ -2282,16 +2384,8 @@ msgstr "Kopiraj"
 msgid "Paste"
 msgstr "Umetni"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Obriši"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "Trenutan pogled"
 
@@ -2308,166 +2402,170 @@ msgstr ""
 "da je koristite"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "* Click here to add a contact *"
-msgstr "* Stisnite ovde da dodate kontakt *"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Pomoćnik"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant Phone"
 msgstr "Telefon asistenta"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Address"
-msgstr "Adresa na poslu"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Poslovni faks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Telefon na poslu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Telefon na poslu 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Povratni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Telefon u kolima"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategorije"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Telefon firme"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Odelenje"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "E-pošta"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "E-pošta 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "E-pošta 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Prezime"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Smesti kao"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "Slobodna-zauzeta adresa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Kućna adresa"
+#, fuzzy
+msgid "Given Name"
+msgstr "Ime polja"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Kućni faks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Kućni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Kućni telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Jordan"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Menadžer"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Nadimak"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Napomena"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Kancelarija"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organizacija"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Druga adresa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Drugi faks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Drugi telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Pejdžer"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Glavni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Zanimanje"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Uloga"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Supružnik"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Naziv"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Unst"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Internet adresa"
 
@@ -2560,11 +2658,19 @@ msgstr "Članovi"
 msgid "Job Title"
 msgstr "Naziv _posla:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Kućna adresa"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Kućna adresa"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Druga adresa"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2577,112 +2683,109 @@ msgstr "Kućni faks"
 msgid "Blog"
 msgstr "Bolonja"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Uspeh"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Nepoznata greška"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Arhiva nije na mreži"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Zabranjen pristup"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Karta nije pronađena"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "ID karte već postoji"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Protokol nije podržan"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Poništeno"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "Prijava neuspela"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "Prijava obavezna"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS nije dostupan"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "Adresar ne postoji"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Druga greška"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Želite li da sačuvate promene?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr "_Odbaci"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Greška kod dodavanja liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Greška kod dodavanja karte"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Greška kod izmene liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Greška pri izmeni karte"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Greška kod uklanjanja liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Greška kod uklanjanja karte"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2691,7 +2794,7 @@ msgstr ""
 "Otvaranje %d karata će takođe otvoriti %d novih prozora.\n"
 "Da li stvarno želite da pogledate sve ove karte?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2700,49 +2803,49 @@ msgstr ""
 "%s već postoji\n"
 "Želite li da prepišete novim unosom?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "Prepiši"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Greška kod čuvanja %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "karta.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Pomeri kartu u"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kopiraj kartu u"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Pomeri karte u"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kopiraj karte u"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Višestruke VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard za %s"
@@ -2937,7 +3040,7 @@ msgstr "Margine"
 msgid "Number of columns:"
 msgstr "Broj kolona:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Opcije"
 
@@ -3124,18 +3227,18 @@ msgstr "Lista bez imena"
 msgid "Split Multi-Day Events:"
 msgstr "Podeli višednevne događaje:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Nisam mogao da pokrenem vombat server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Nisam mogao da pokrenem vombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nisam mogao da pročitam programski blok Kalendara"
 
@@ -3143,24 +3246,83 @@ msgstr "Nisam mogao da pročitam programski blok Kalendara"
 msgid "Default Priority:"
 msgstr "Predefinisan prioritet:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nisam mogao da pročitam pilotov ToDo programski blok"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Kalendar i zadaci"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Kalendar"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Podesite vašu vremensku zonu, kalendar i listu zadataka ovde "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolucija kalendar i zaduženja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Kontrola podešavanja Evolucija kalendara"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Preglednik zakazanih poruka Evolucija kalendara"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Preglednik Evolucija kalendara"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Urednik Evolucija kalendara/zaduženja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Preglednik Evolucija zaduženja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolucija deo za kalendar i zaduženja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Probni deo Evolucije"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Zaduženja"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Servis za alarm obaveštenja Evolucija kalendara"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Pokrećem:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Obustavljam:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Evolucija alarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm na %s"
@@ -3235,43 +3397,172 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Ne pitaj me ponovo za ovaj program."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Servis za alarm obaveštenja Evolucija kalendara"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Nisam uspeo da pokrenem Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Nisam mogao da učitam  gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Nisam mogao da pokrenem stvaranje servisa za alarm obaveštenja"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "Pogrešno vreme"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "iCalendar greška"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Boja zaduženja za danas"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Boja zaduženja za danas"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "_Pokaži završetke zakazanih sastanaka u nedeljnim i mesečnim prikazima"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Pregled kalendara za štampu"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "_Traži potvrdu za brisanje podataka"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "_Traži potvrdu za brisanje podataka"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Obriši izvršena zaduženja"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Pokaži _brojeve nedelja u navigatoru za datume"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Sažetak sadrži"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Opis sadrži"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Komentar sadrži"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Neraspodeljeno"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -3282,80 +3573,109 @@ msgstr ""
 "\n"
 "Stvarno da brišem ove zadatke?"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 msgid "Purge events older than"
 msgstr "Obriši događaje starije od"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "dana"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Štampaj ovaj kalendar"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Nova Kaledonija"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "Novi zakazani sastanak"
+
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "Zakazani _Sastanak"
+
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Zakaži sastanak"
+
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "Novi sastanak"
+
+#: calendar/gui/calendar-component.c:640
+msgid "M_eeting"
+msgstr "S_astanak"
+
+#: calendar/gui/calendar-component.c:641
 #, fuzzy
-msgid "Rename"
-msgstr "Preimenu_j"
+msgid "Create a new meeting request"
+msgstr "Unesite novi zahtev za sastankom"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Novi celodnevni zakazani sastanak"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Lično"
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr "Celo_dnevni zakazani sastanak"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Posao"
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Zakaži sastanak"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3472,7 +3792,7 @@ msgstr "Za:"
 msgid "With these arguments:"
 msgstr "Sa ovim argumentima:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr "dijalog1"
 
@@ -3489,6 +3809,10 @@ msgstr "sati"
 msgid "minutes"
 msgstr "minut(a)"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3521,8 +3845,8 @@ msgstr "Pošalji elektronsku poruku"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Zaključak:"
 
@@ -3552,7 +3876,7 @@ msgid "hour(s)"
 msgstr "sat(a)"
 
 # bug:plural-forms
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minut(a)"
 
@@ -3606,7 +3930,7 @@ msgstr "Dani"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Petak"
 
@@ -3620,7 +3944,7 @@ msgstr "Minuti"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Ponedeljak"
 
@@ -3630,7 +3954,7 @@ msgstr "N_ed"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Subota"
 
@@ -3644,7 +3968,7 @@ msgstr "Pokaži _brojeve nedelja u navigatoru za datume"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Nedelja"
 
@@ -3662,7 +3986,7 @@ msgstr "Lista zaduženja"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Četvrtak"
 
@@ -3680,7 +4004,7 @@ msgstr "Format za vreme:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Utorak"
 
@@ -3690,12 +4014,12 @@ msgstr "Početak n_edelje:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Sreda"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Radna nedelja"
 
@@ -3732,7 +4056,7 @@ msgid "_Fri"
 msgstr "_Pet"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Opšte"
 
@@ -3772,7 +4096,7 @@ msgstr "_Sre"
 msgid "before every appointment"
 msgstr "pre svakog zakazanog sastanka"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
@@ -3780,11 +4104,11 @@ msgstr ""
 "Obrisani događaj je sastanak, želite li da pošaljete poruku za njegovo "
 "otkazivanje?"
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Sigurno želite da poništite i obrišete ovaj sastanak?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
@@ -3792,11 +4116,11 @@ msgstr ""
 "Obrisano zaduženje je raspodeljeno, želite li da pošaljete poruku za njeno "
 "otkazivanje?"
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Sigurno želite da poništite i obrišete ovo zaduženje?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -3804,50 +4128,50 @@ msgstr ""
 "Obrisani unos u dnevnik je objavljen, želite li da pošaljete poruku za "
 "njegovo otkazivanje?"
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Sigurno želite da poništite i obrišete ovaj unos u dnevnik?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Ovaj događaj je obrisan."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Ovo zaduženje je obrisano."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Ovaj unos u dnevnik je obrisan."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s Uneli ste izmene. Da ih zaboravim i zatvorim urednik?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Niste unosili izmene, da zatvorim urednika?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Ovaj događaj je izmenjen."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Ovo zaduženje je izmenjeno."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Ovaj unos u dnevnik je izmenjen."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s Uneli ste izmene. Da ih zaboravim i osvežim promenama urednik?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Niste uneli izmene, da osvežim promenama urednik?"
@@ -3857,166 +4181,171 @@ msgstr "%s Niste uneli izmene, da osvežim promenama urednik?"
 msgid "Validation error: %s"
 msgstr "Greška pri proveri: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " za "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Završeno "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Završeno "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Do "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Do "
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "Nisam mogao da osvežim promenama objekat"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Izmeni zakazani sastanak"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Zakazani sastanak - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Zaduženje - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Unos u dnevnik - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Nema sažetka"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Sačuvaj kao..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Izmene učinjene na ovom predmetu mogu biti zanemarene ako bude osvežen "
 "promenama"
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Ne mogu da učitam važeću verziju!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Izaberite odredišni direktorijum za uvoz ovih podataka"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Sigurno želite da obrišete ovaj zakazani sastanak `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Sigurno želite da obrišete ovaj neimenovani zakazani sastanak"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Sigurno želite da obrišete zaduženje `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Sigurno želite da obrišete ovo neimenovano zaduženje?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Sigurno želite da izbrišete unos u dnevnik `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Sigurno želite da izbrišete ovan neimenovani unos u dnevnik?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Sigurno želite da izbrišete %d zakazanih sastanaka?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Sigurno želite da izbrišete %d zaduženja"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Sigurno želite da izbrišete %d unosa u dnevnik?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "Događaj nije mogao biti obrisan zbog corba greške"
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "Zaduženje nije moglo biti izbrisano zbog corba greške"
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Unos u dnevnik nije mogao biti obrisan zbog corba greške"
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Unos nije mogao biti obrisan zbog corba greške"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "Događaj nije mogao biti obrisan zbog nemogućnosti pristupa"
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "Zaduženje nije moglo biti obrisano zbog nemogućnosti pristupa"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Unos u dnevnik nije mogao biti obrisan zbog nemogućnosti pristupa"
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "Unos nije mogao biti obrisan zbog nemogućnosti pristupa"
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Događaj nije mogao biti obrisan zbog corba greške"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Zaduženje nije moglo biti izbrisano zbog corba greške"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Unos u dnevnik nije mogao biti obrisan zbog corba greške"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Unos nije mogao biti obrisan zbog corba greške"
@@ -4033,43 +4362,43 @@ msgstr "Delegiraj za:"
 msgid "Enter Delegate"
 msgstr "Unesi delegata"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Zakazani sastanak"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Podsetnik"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Povraćaj"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Zakazivanje"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Sastanak"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "Početni datum je pogrešan"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "Krajnji datum je pogrešan"
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "Početno vreme je pogrešno"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "Krajnje vreme je pogrešno"
 
@@ -4139,31 +4468,31 @@ msgid "_Start time:"
 msgstr "_Početno vreme:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Ništa"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr "Izabrani organizator više nema nalog."
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "Zahteva organizator."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "Najmanje jedan prisutni je potreban."
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Delegiraj za..."
 
@@ -4204,21 +4533,15 @@ msgid "Member"
 msgstr "Član"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Uloga"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stanje"
@@ -4238,6 +4561,7 @@ msgid "_Invite Others..."
 msgstr "_Pozovi druge..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4270,6 +4594,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Nisam mogao da napravim direktorijum %s: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "Organizator mora biti poslat."
@@ -4299,33 +4624,58 @@ msgstr "Informacija o kalendaru"
 msgid "Calendar Name"
 msgstr "Kalendar"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Nisam mogao da napravim direktorijum %s: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Informacija o kalendaru"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Lista zaduženja"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Lista zaduženja"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Lista zaduženja"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr "Menjate povratni događaj, šta želite da izmenite?"
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Menjate povratno zaduženje, šta želite da izmenite?"
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr "Menjate povratni unos u dnevnik, šta želite da izmenite?"
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr "Samo ovaj unos"
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Ovaj i budući unosi"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr "Ovaj i budući unosi"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr "Svi unosi"
 
@@ -4375,10 +4725,15 @@ msgstr "dan"
 msgid "on the"
 msgstr "na"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "pojave"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Datum/Vreme:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "Do_daj"
@@ -4443,7 +4798,7 @@ msgstr "nedelja(e)"
 msgid "year(s)"
 msgstr "godina(e)"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
@@ -4453,31 +4808,31 @@ msgstr ""
 "\n"
 "Želite li da sačuvate vaše izmene?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "_Zanemari promene"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 msgid "Save Event"
 msgstr "Sačuvaj događaj"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Informacija o sastanku je sačinjena. Da je pošaljem?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Informacija o sastanku je izmenjena. Da pošaljem noviju verziju?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "Informacija o primljenom zaduženju je sačinjena. Da je pošaljem?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "Informacija o zaduženju je izmenjena. Da pošaljem noviju verziju?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Datum završetka je pogrešan"
 
@@ -4487,43 +4842,43 @@ msgid "% _Complete"
 msgstr "% _gotovo"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Gotovo"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Visoko"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "U toku"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Nisko"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Normalno"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Nije pokrenut"
 
@@ -4532,7 +4887,7 @@ msgid "Progress"
 msgstr "Tok"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Nedefinisano"
 
@@ -4552,21 +4907,21 @@ msgstr "_Status:"
 msgid "_Web Page:"
 msgstr "_Veb stranica:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Osnovno"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Zadatak"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "Datum za završetak je pogrešan"
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4574,9 +4929,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "Pov_erljivo"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Opis:"
 
@@ -4681,26 +5036,21 @@ msgstr "%s na %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s za nepoznat tip pokretača"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Javno"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Lično"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Poverljivo"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategorije"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4713,28 +5063,26 @@ msgid "Start Date"
 msgstr "Početni datum"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Izveštaj"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "boja"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Zakazani sastanak"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Slobodan"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Zauzet"
 
@@ -4746,7 +5094,7 @@ msgstr "S"
 msgid "S"
 msgstr "J"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "I"
 
@@ -4754,7 +5102,7 @@ msgstr "I"
 msgid "W"
 msgstr "Z"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4764,7 +5112,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4772,7 +5120,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Da"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4780,17 +5128,17 @@ msgstr "Ne"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Nepoznato"
 
@@ -4802,180 +5150,178 @@ msgstr "Povratno"
 msgid "Assigned"
 msgstr "Dodeljeno"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Unosim promene u objekte"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Brišem izabrane objekte"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Unosim promene u objekte"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Nov zakazan _sastanak..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Nov celodnevni _događaj"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "Novi sastanak"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Novo zaduženje"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "Štam_paj..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "Umet_ni"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Idi na _danas"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "_Idi na datum..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Objavi slobodan/zauzet informaciju"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "_Podešavanja..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Otvori"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Sačuvaj kao..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Iseci"
 
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Kopiraj"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "_Zakaži sastanak..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "_Prosledi kao iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Obriši ovu _pojavu"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Obriši _sve pojave"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "_Podešavanja..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 msgid "Open _Web Page"
 msgstr "Otvori _veb stranicu"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "_Dodeli zaduženje"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "_Prosledi kao iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "_Obeleži kao završeno"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Obeleži izabrana zaduženja kao završena"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "_Obriši izabrana zaduženja"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Pritisni za novo zaduženje"
@@ -4989,8 +5335,8 @@ msgstr "% Gotovo"
 msgid "Alarms"
 msgstr "Alarmi"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Završeno"
 
@@ -5019,18 +5365,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5049,7 +5395,7 @@ msgstr "%02i minutni razmaci"
 #. 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5062,125 +5408,125 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr "Da. (Složeni povraćaj)"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "Svaki dan"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "Svaka %d dana"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "Svake nedelje"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "Svakih %d nedelja"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr "Svake nedelje u "
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Svakih %d nedelja u "
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " i "
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr "%s dan "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s "
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "svaki mesec"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr "svakih %d meseci"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "Svake godine"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "Svakih %d godina"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr "ukupno %d puta"
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ", završavajući se "
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>Početak:</b> "
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Kraj:</b> "
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>Završetak:</b> "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>Do:</b> "
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "iCalendar informacija"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "iCalendar greška"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Nepoznata osoba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5188,318 +5534,317 @@ msgstr ""
 "<br> Molim proverite sledeću informaciju, i potom odaberite akciju iz donjeg "
 "menija."
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Ništa</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "Mesto:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Stanje:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Prihvaćeno"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Prihvaćeno s rezervom"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Odbijeno"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Izaberi akciju:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Ažuriraj"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Prihvati"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Prihvati sa rezervom"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Odbij"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Pošalji slobodan/zauzet informaciju"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Ažuriraj stanje stranke"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Pošalji najnoviju informaciju"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Odustani"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> je objavio informaciju o sastanku."
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Informacija o sastanku"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> traži prisustvo %s na sastanku."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> traži Vaše prisustvo na sastanku."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Predlog za sastanak"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> želi da doda postojećem sastanku"
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Promena sastanka"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> želi da dobije najnoviju informaciju o sastanku."
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Zahtev za novim podacima o sastanku"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> je odgovorio na zahtev o sastanku."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Odgovor za sastanak"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> je otkazo sastanak."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Otkazivanje sastanka"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> je poslao nerazumljivu poruku."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Loša poruka o sastanku"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> je objavio informaciju o zaduženju."
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Informacija o zaduženju"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> traži %s za obavljanje zaduženja."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> traži da Vi izvršite zaduženje."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Predlog za zaduženje"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b želi da doda na postojeće zaduženje."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Ažuriranje zaduženja"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> želi da primi najnoviju informaciju o zaduženju."
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Zahtev za promenama zaduženja"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> je odgovorio na dodeljeno zaduženje."
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Odgovor na zaduženje"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> je otkazao zaduženje."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Otkazivanje zaduženja"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Loša poruka o zaduženju"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> je objavio slobodan/zauzet informaciju."
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Slobodan/zauzet informacija"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> traži Vašu slobodan/zauzet informaciju."
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Slobodan/zauzet zahtev"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> je odgovorio na slobodan/zauzet zahtev."
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Slobodan/zauzet odgovor"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Loša slobodan/zauzet poruka"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr "Poruka izgleda da nije ispravno sačinjena"
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "Poruka sadrži samo nepodržane zahteve."
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Prilog ne sadrži ispravnu poruku za kalendar"
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr "Prilog nema delove kalendara koji se mogu pregledati"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "Datoteka kalendara nije mogla biti ažurirana\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Ažuriranje završeno\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Stanje prisutnog ne može biti ažurirano jer unos više ne postoji"
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekat je neispravan i ne može biti ažuriran\n"
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Ovaj odgovor nije poslao trenutno prisutan. Da ga dodam u prisutne?"
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Stanje prisutnog nije moglo biti ažurirano zbog neispravnog stanja!\n"
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr "Nastala je greška u CORBA sistemu\n"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr "Objekat nije mogao biti pronađen\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Nemate prave dozvole za ažuriranje kalendara\n"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Ažurirano stanje prisutnog\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "Stanje prisutnog nije moglo biti ažurirano!\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Uklanjanje završeno"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Unos poslat!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Unos nije mogao biti poslat!\n"
 
@@ -5659,7 +6004,7 @@ msgstr "%a %m/%d/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
@@ -5723,45 +6068,40 @@ msgstr "_Početno vreme sastanka:"
 msgid "Meeting _end time:"
 msgstr "_Krajnje vreme sastanka:"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 msgid "Start Date:"
 msgstr "Datum početka:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 msgid "Due Date:"
 msgstr "Datum završetka:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 msgid "Priority:"
 msgstr "Važnost:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 msgid "Web Page:"
 msgstr "Veb stranica:"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Otvaram zaduženja u %s"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nisam mogao da učitam zaduženja u `%s"
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metod potreban za učitavanje `%s' nije podržan"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Nemate dozvolu da otvorite direktorijum u `%s"
 
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5770,48 +6110,39 @@ msgstr ""
 "Greška na %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "Ispunjavam zaduženja..."
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "Brišem izabrane objekte..."
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "Izbacujem"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Zaduženja"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nisam mogao da otvorim direktorijum u `%s"
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Potreban metod za otvaranje `%s' nije podržan"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Dodajem alarme za %s"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5822,7 +6153,7 @@ msgstr ""
 "%s\n"
 " je pao. Moraćete da ponovo pokrenete Evoluciju da bi nastavili da koristite"
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5833,57 +6164,10 @@ msgstr ""
 "%s\n"
 " je pao. Moraćete da ponovo pokrenete Evoluciju da bi nastavili da koristite"
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 msgid "Purging"
 msgstr "Briše"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalendar i zadaci"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Kalendar"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Podesite vašu vremensku zonu, kalendar i listu zadataka ovde "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolucija kalendar i zaduženja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Kontrola podešavanja Evolucija kalendara"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Preglednik zakazanih poruka Evolucija kalendara"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Preglednik Evolucija kalendara"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Urednik Evolucija kalendara/zaduženja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Preglednik Evolucija zaduženja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolucija deo za kalendar i zaduženja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Probni deo Evolucije"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -5940,296 +6224,332 @@ msgstr "Oktobar"
 msgid "September"
 msgstr "Septembar"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Organizator mora biti poslat."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Najmanje jedan prisutni je neophodan"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Informacija o događaju"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Informacija o zaduženju"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Informacija o unosu u dnevnik"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Slobodan/zauzet informacija"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Informacija o kalendaru"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Ažurirano"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Osveži"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "Kontra-predlog"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Slobodan/zauzet informacija (%s do %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "iCalendar informacija"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Morate biti učesnik događaja"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Ne"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Po"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Ut"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Sr"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Če"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Pe"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Su"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Izabrani dan (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Izabrana nedelja (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Izabran mesec (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Izabrana godina (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Zaduženje"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Stanje: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Važnost: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procenat završenog: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "Adresa (URL): %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorije: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Konatkti: "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Štampaj prikaz"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Štampaj unos"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Podesi štampu"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Preimenuj ovu prečicu"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Lista zaduženja"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Novo zaduženje"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Zaduženje"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Unesi novo zaduženje"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "URI za prikaz direktorijuma zaduženja"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6241,11 +6561,11 @@ msgstr ""
 "\n"
 "Stvarno da brišem ove zadatke?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Ne pitaj me ponovo."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "Štampaj zaduženja"
 
@@ -6273,15 +6593,15 @@ msgstr "iCalendar datoteke (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar datoteke (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "Podsetnik!!"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "Kalendarski događaji"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6289,7 +6609,7 @@ msgstr ""
 "Evolucija je pronašla datoteke Gnom kalendara.\n"
 "Želit eli da ih uvezete u Evoluciju?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Gnom kalendar"
 
@@ -7822,27 +8142,27 @@ msgstr "PAcifik/Volis"
 msgid "Pacific/Yap"
 msgstr "Pacifik/Jap"
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "Potpisivanje ovaj logaritam ne podržava"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "Proveru ovaj logaritam ne podržava"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Šifriranje ovaj logaritam ne podržava"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Dešifriranje ovaj logaritam ne podržava"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr "Možda nećete moći da uvezete ključeve sa ovim logaritmom"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr "Možda nećete moći da izvezete ključeve sa ovim logaritmom"
 
@@ -7894,86 +8214,86 @@ msgstr "Pripremam direktorijum '%s' za rad bez mreže"
 msgid "You must be working online to complete this operation"
 msgstr "Morate da budete na mreži da bi završili ovu operaciju"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Neuspelo pravljenje veze ka '%s': %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Neuspelo pravljenje sadržanog procesa '%s': %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Neispravan niz poruka primljen od %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Sinhronizujem direktorijume"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Greška kod čitanja filtera: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Greška kod primene filtera: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Nisam mogao da otvorim direktorijum za smeštanje reda"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Nisam mogao da prođem kroz direktorijum sa redom"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Primam poruku %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Ne mogu da otvorim poruku"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Greška kod poruke %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Sinhronizujem direktorijum"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Primam poruku %d od %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Greška kod poruke %d od %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Nisam mogao da primim poruku"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr "Neispravni argumenti za (sistemska-oznaka)"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr "Neipsravni argumenti za (korisnička-oznaka)"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Greška kod primene filtera za pretragu: %s: %s"
@@ -8005,35 +8325,35 @@ msgstr "(odgovara-sve) zahteva samo jedan logički rezultat"
 msgid "Performing query on unknown header: %s"
 msgstr "Izvršavam pretragu na nepoznato zaglavlje: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nepodržana operacija: priključena poruka: za %s"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nepodržana operacija: pretraga po izrazu: za %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nepodržana operacija: pretraga po uid-u: za %s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Pomeram poruke"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr "Kopiram poruke"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Učitavam %d poruka(e)"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8044,15 +8364,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr "Nisam mogao da pročitam gpg userid podsetnik."
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr "Nisam mogao da pročitam zahtev za gpg lozinkom"
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8061,30 +8381,30 @@ msgstr ""
 "Potrebna vam je lozinka za otključavanje ključa\n"
 "korisnika: \"%s\""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Poništeno."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Nisam mogao da otključam tajni ključ: date su 3 pogrešne lozinke."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Neočekivan odgovor od GnuPG: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr "Nisam dobio podatke"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nisam mogao da šifriram: nisu označeni ispravni primaoci. "
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8095,50 +8415,63 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Nisam mogao da primenim GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Nisam mogao da upišem: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nisam mogao da izvršim gpg: %s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr "Nisam mogao da izvršim gpg."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "Ovo je deo poruke sa digitalnim potpisom"
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr ""
+"Ne mogu da proverim potpis poruke: nisam mogao da napravim temp datoteku: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Ne mogu da proverim potpis poruke: nisam mogao da napravim temp datoteku: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nisam mogao da upišem: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Ovo je deo poruke sa digitalnim potpisom"
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Sadržaj tela indeksa"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Ne mogu da povratim poruku iz urednika"
@@ -8240,15 +8573,15 @@ msgstr "Greška kod pisanja temp datoteke pošte: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Greška kod kopiranja temp datoteke: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Nisam mogao da dešifrujem MIME deo: greška u protokolu"
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "Nisam mogao da dešifrujem MIME deo: neispravna struktura"
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "greška čitanja"
 
@@ -8566,12 +8899,12 @@ msgstr "Ponuđač elktronske pošte sa virtuelnim direktorijumom"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Za čitanje pošte kao upita drugog niza direktorijuma"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Nema dostupnog ponuđača za protokol `%s'"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8580,71 +8913,82 @@ msgstr ""
 "Nisam mogao da napravim direktorijum %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Unesite lozinku za %s"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Nedefinisano"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Izmeni potpis"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Izmeni potpis"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Samopotpisani sertifikat u lancu"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "Nepoverljiv sertifikat"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Sačuvaj potpis"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Greška pri obradi"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Server: %s, tip: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Ne mogu da dobijem direktorijum: neispravna operacija"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ne mogu da napravim direktorijum: neispravna operacija"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Smeće"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "Jun"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "Ne mogu da dobijem sertifikat izdavača"
@@ -8853,7 +9197,7 @@ msgstr ""
 "Istekla lista priznatih sertifikata: %s\n"
 "Izdavač: %s"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Nisam mogao da obradim URL `%s"
@@ -8872,22 +9216,22 @@ msgstr "Nema takve poruke %s u %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Ne mogu da kopiram ili premestim poruke u virtuelni direktorijum"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ne mogu da obrišem direktorijum: %s: neispravna operacija"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ne mogu da obrišem direktorijum: %s: nema takvog direktorijuma"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ne mogu da promenim ime  direktorijumu: %s: neispravna operacija"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ne mogu da promenim ime  direktorijumu: %s: nema takvog direktorijuma"
@@ -8967,7 +9311,7 @@ msgstr "Ne mogu da pokupim poruku: %s"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -8981,7 +9325,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Nema takve poruke"
@@ -9019,54 +9363,69 @@ msgid "Failed to cache %s: %s"
 msgstr "Nisam mogao da privremeno sačuvam %s: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Povezujem se na server..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Neuspešno povezivanje sa LDAP serverom"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "Preduzeće"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Proveravam za nove poruke"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Check for new messages in all folders"
 msgstr "Proveri za nove poruke u svim direktorijumima"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Direktorijumi"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Pokaži samo odabrane direktorijume"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "Premosti format imena direktorijuma koje daje server"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Format imena"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Primeni filtere na nove poruke u INBOX-u ovog servera"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Automatski proveri za novu poštu svakih"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Za čitanje i smeštanje pošte na IMAP servere."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Lozinka"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9320,7 +9679,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Nisam mogao da preimenujem direktorijum %s u %s: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nisam mogao da preimenujem '%s': %s"
@@ -9435,29 +9794,29 @@ msgstr "Proveravam za nove poruke"
 msgid "Storing folder"
 msgstr "Smeštam direktorijum"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ne mogu da zaključam direktorijum %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Ne mogu da otvorim sanduče: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "Dodavanje pošte otkazano"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Ne mogu da dodam poruku u mbox datoteku: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9466,11 +9825,11 @@ msgstr ""
 "Ne mogu da dobijem poruku: %s iz direktorijuma %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Direktorijum izgleda nepopravljivo oštećen."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Sastavljanje poruke neuspelo: Oštećeno sanduče?"
 
@@ -9538,12 +9897,17 @@ msgstr "Nisam mogao da napravim direktorijum %s: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "Ne mogu da dobijem direktorijum: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "ID karte već postoji"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Nisam mogao da preimenujem direktorijum %s u %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Navedeno ime direktorijuma nije ispravno: %s"
@@ -9587,7 +9951,7 @@ msgstr "Nisam mogao da zatvorim izvorni direktorijum %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Nisam mogao da zatvorim temp direktorijum: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nisam mogao da preimenujem direktorijum: %s"
@@ -9873,7 +10237,7 @@ msgstr "Obriši nakon %s dana"
 msgid "Disable support for all POP3 extensions"
 msgstr "Onemogući podršku za sva POP3 proširenja"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -9962,7 +10326,7 @@ msgid "No such folder `%s'."
 msgstr "Nema takvog direktorijuma `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10015,7 +10379,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Dostava pošte preko programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10181,7 +10545,7 @@ msgstr "SMTP dostava pošte preko %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Ne mogu da pošaljem poruku: adresa pošiljaoca nije ispravna."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Slanje pripremljenih poruka"
 
@@ -10303,7 +10667,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "prilog"
 
@@ -10347,14 +10711,14 @@ msgstr "MIME tip:"
 msgid "Suggest automatic display of attachment"
 msgstr "Predloži automatsko otvaranje priloga"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Morate da podesite nalog\n"
 "da bi mogli da sastavite poruku."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Pritisnite ovde za adresar."
 
@@ -10365,45 +10729,45 @@ msgstr "Pritisnite ovde 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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Odgovor-Za:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Naslov:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Za:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Unesite primaoce poruke"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Kopija:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Unesite adrese koje će primiti kopiju poruke"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Nevidljiva kopija:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10414,14 +10778,19 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Pošalji:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr "Odredište"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Dodaj datoteku poruci"
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Priloži datoteku(e)"
@@ -10456,21 +10825,21 @@ msgstr "Datoteka postoji, da je prepišem?"
 msgid "Error saving file: %s"
 msgstr "Greška kod čuvanja datoteke: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Greška kod učitavanja datoteke: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Greška kod pristupa datoteci: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Ne mogu da povratim poruku iz urednika"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10479,7 +10848,7 @@ msgstr ""
 "Ne mogu da tražim datoteku: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10488,7 +10857,7 @@ msgstr ""
 "Ne mogu da skratim datoteku: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10497,7 +10866,7 @@ msgstr ""
 "Ne mogu da kopiram opis datoteke: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10506,7 +10875,7 @@ msgstr ""
 "Greška kod automatskog čuvanja poruke: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10514,7 +10883,7 @@ msgstr ""
 "Ximian Evolucija je našla nesačuvane datoteke iz prethodnih sesija.\n"
 "Želite li da pokuša da ih povrati?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10525,28 +10894,28 @@ msgstr ""
 "\n"
 "Želite li da sačuvam promene?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Upozorenje: izmenjena poruka"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Otvori datoteku"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "Potpis:"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "Autogenerisan"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Sastavi poruku"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10554,7 +10923,7 @@ msgstr ""
 "Nisam mogao da napravim prozor za sastavljanje:\n"
 "Ne mogu da pokrenem kontrolu biranja adresa."
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10566,7 +10935,7 @@ msgstr ""
 "Molim proverite da imate odgovarajuće verzije\n"
 "gtkhtml i libgtkhtml na sistemu.\n"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10574,7 +10943,7 @@ msgstr ""
 "Nisam mogao da napravim prozor za sastavljanje:\n"
 "Ne mogu da aktiviram komponentu HTML urednika."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10583,11 +10952,13 @@ msgstr ""
 "<b>"
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Paket programa Evolucija"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolucija"
 
 #: data/evolution.keys.in.h:1
@@ -10839,13 +11210,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -10964,7 +11335,7 @@ msgstr "Onda"
 msgid "You must specify a folder."
 msgstr "Morate odrediti direktorijum."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Odaberite direktorijum"
@@ -10978,24 +11349,24 @@ msgstr ""
 "Greška u regularnom izrazu '%s':\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Važno"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "Za uraditi"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Kasnije"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Proba"
 
@@ -11096,7 +11467,7 @@ msgid "months"
 msgstr "meseci"
 
 # bug: plural-forms
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "sekunde"
 
@@ -11193,7 +11564,7 @@ msgstr "Izraz"
 msgid "Follow Up"
 msgstr "Sledi"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "Etiketa"
 
@@ -11263,112 +11634,118 @@ msgid "Source Account"
 msgstr "Izvorni nalog"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Kišica"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Određeno zaglavlje"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Prekini sa obradom"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Naslov"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "Nedodeljen status"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "sadrži"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "ne sadrži"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "ne završava se sa"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "ne postoji"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "does not return"
 msgstr "ne vraća"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "ne zvuči kao"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "ne počinje sa"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "završava se sa"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "postoji"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr "je označen"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr "je posle"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "is before"
 msgstr "je pre"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "je veći od"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "je manji od"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr "nije označen"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "nije"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "je"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr "više povraćaja od"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr "manje povraćaja od"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr "povraćaji"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "zvuči kao"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "počinje sa"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Pravilo '%s' nije jedinstveno, izaberite drugo."
@@ -11393,18 +11770,78 @@ msgstr "Ime pravila"
 msgid "Score Rules"
 msgstr "Pravila rezultata"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Morate imenovati ovaj vfolder."
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr "Morate da odredite najmanje jedan direktorijum kao izvor."
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 msgid "VFolder source"
 msgstr "VFolder izvor"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Postavke sastavljača"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "Podesite osobine za poštu, uključujući sigurnost i prikaz poruke, ovde"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Podesite proveru pravopisa, potpise, i sastavljač poruke ovde"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Podesite vaše naloge za poštu ovde"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolucija pošta"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Kontrola podešavanja Evolucija naloga za poštu"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Komponenta Evolucija pošte"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Sastavljač Evolucija pošte"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Kontrola podešavanja Evolucija sastavljača"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail folder viewer"
+msgstr "Preglednik za direktorijume Evolucija pošte"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Kontrola osobina Evolucija pošte"
+
+# 48x48/emblems/emblem-mail.icon.in.h:1
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Pošta"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Poštanski nalozi"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "Osobine pošte"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Sigurno želite da obrišete ovaj nalog?"
@@ -11446,7 +11883,7 @@ msgid "Protocol"
 msgstr "Protokol"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr "Bez imena"
 
@@ -11470,20 +11907,17 @@ msgstr "Dodaj potpis skripte"
 msgid "Signature(s)"
 msgstr "Potpis(i)"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "Šaljete poruku u HTML formatu. Molim proverite da\n"
 "su sledeći primaci spremni i u mogućnosti da prime HTML poštu:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Svejedno da pošaljem?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11491,7 +11925,7 @@ msgstr ""
 "Ova poruke nema naslov.\n"
 "Stvarno da pošaljem?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11499,11 +11933,11 @@ msgstr ""
 "Pošto je kontakt lista koju šaljete podešena da sakrije adrese, ova poruke "
 "će sadržati samo skrivene primaoce."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Ova poruka sadrži samo skrivene primaoce."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11513,11 +11947,11 @@ msgstr ""
 "zaglavlje.\n"
 "Svejedno da pošaljem?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Morate da odredite primaoce da bi poslali poruku."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11529,190 +11963,401 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Napravi _Virtuelni direktorijum iz pretrage..."
 
-# 48x48/emblems/emblem-mail.icon.in.h:1
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "Pošta"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<protisnite ovde da izaberete direktorijum>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "„%s“ u „%s“"
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Napravi novi direktorijum"
 
-#: mail/em-folder-selector.c:267
-#, fuzzy
-msgid "Folder _name"
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Navedite gde da napravim direktorijum:"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
 msgstr "_Ime direktorijuma:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Nisam mogao da napravim privremeni direktorijum: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Nisam mogao da napravim privremeni direktorijum: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Nisam mogao da napravim privremenu datoteku '%s': %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Nisam mogao da zatvorim temp direktorijum: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Učitavam..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Odaberite direktorijum"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Napravi novi direktorijum"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Nisam mogao da obrišem direktorijum `%s': %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Zaista da brišem direktorijum „%s“?"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Obriši „%s“"
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Preimenuj direktorijum „%s“ u:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+msgid "Rename Folder"
+msgstr "Preimenuj direktorijum"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+"Direktorijum sa imenom „%s“ već postoji. Molim koristite neko drugo ime."
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Osobine pisma"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Osobine"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "_Ime direktorijuma:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Pogledaj"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Otvori u novom prozoru"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Premesti"
+
+#: mail/em-folder-tree.c:1500
+msgid "_New Folder..."
+msgstr "_Novi direktorijum..."
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "Preimenu_j"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "_Podešavanja..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "_Uredi kao novu poruku..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "_Štampaj"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljaocu"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Odgovori na _listu"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Odgovori _Svima"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "Prosl_edi"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr "Pr_ati..."
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr "Označ_i završene"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "Sklo_ni oznaku"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "O_znači kao pročitano"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "Označi kao _nepročitano"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Onači kao _važno"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "_Označi kao nevažno"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Označi kao _nepročitano"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Onači kao _važno"
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "Poniš_ti brisanje"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "Prene_si u direktorijum..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj u direktorijum..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "Dodaj pošiljaoca u adresa_r"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "Pri_meni filtere"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "Na_pravi pravilo od poruke"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "VFolder na _Naslov"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "VFolder na P_ošiljaoca"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "VFolder na _Primaoce"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "VFolder na dopisnu _listu"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "VFolder na P_ošiljaoca"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Filter na Naslo_v"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Filter na P_ošiljaoca"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Filer na Pri_maoce"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Filer na _dopisnu listu"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filter na P_ošiljaoca"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Predefinisano"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Štampaj poruku"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopiraj adresu veze"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Odgovara:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Dodeljeno"
+
+#: mail/em-format-html-display.c:597
+#, fuzzy
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr "Ova poruka je digitalno potpisana ali ne može biti proverena."
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Izmeni potpis"
+
+#: mail/em-format-html-display.c:598
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
 msgstr ""
-"Ova poruka je digitalno potpisana. Pritisnite na ikonu sa katancem za veše "
-"informacija."
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Izmeni potpis"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+#, fuzzy
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"input_token sadrži neispravnu strukturu, ili potpis nije mogao biti proveren."
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Prekinuto"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "PGP šifriranje"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Nisam mogao da obradim MIME poruku. Pokazujem kao izvor."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Nepodržana šema"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Ne mogu da dobijem potpis lista"
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Pogledaj unutar"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Sakri"
@@ -11722,183 +12367,206 @@ msgstr "Sakri"
 msgid "Page %d of %d"
 msgstr "Strana %d od %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Učitavam poruku %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Loše složen spoljni deo."
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pokazivač na FTP adresu (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pokazivač na lokalnu datoteku (%s) koja odgovara adresi \"%s\""
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "pokazivač na lokalnu datoteku (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pokazivač na mrežni podatak (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pokazivač na napoznati spoljni podatak (\"%s\" tipa)"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "Ova poruka je digitalno potpisana ali ne može biti proverena."
-
-#: mail/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Ova poruka je digitalno potpisana i odgovara potpisu."
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-msgid "No signature present"
-msgstr ""
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Nisam uspeo da pokrenem Bonobo"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Nepodržana šema"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nisam mogao da obradim MIME poruku. Pokazujem kao izvor."
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Pomeram poruke"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Od"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Odgovor-Za"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Za"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Cc (kopija)"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Bcc (nevidljiva kopija)"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "Pošiljalac"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "%s prilog"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Nisam mogao da obradim MIME poruku. Pokazujem kao izvor."
+msgid "Session not initialised"
+msgstr "Nisam uspeo da pokrenem Bonobo"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Ova poruka je digitalno potpisana i odgovara potpisu."
+
+#: mail/em-format.c:1212
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr "Ova poruka je digitalno potpisana ali ne može biti proverena."
+
+#: mail/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Čekam..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
 
-#: mail/em-popup.c:593
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Pingujem %s"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Nisam mogao da privremeno sačuvam %s: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Neuspelo pravljenje veze ka '%s': %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Nisam mogao da pronađem domaćina `%s': %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Sačuvaj kao..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Odgovori pošiljaocu"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Otvori vezu u čitaču"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Pošalji _poruku na listu"
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Dodaj pošiljaoca u adresar"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Otvori u %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "Ovaj server ne podržava podatke LDAPv3 šeme"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Pretplati se"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Direktorijum"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Molim izaberite server."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Nije izabran server"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Ne pokazuj ponovo ovu poruku."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11907,27 +12575,27 @@ msgstr ""
 "Greška kod učitavanja podataka filtera:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Filteri"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Prosleđena Poruka"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "nepoznati pošiljalac"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Dana %a, %d-%m-%Y u %H:%M, %%s je napisao:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -11936,7 +12604,7 @@ msgstr ""
 "Ne mogu da sačuvam u `%s'\n"
 " %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -11945,25 +12613,26 @@ msgstr ""
 "`%s' već postoji.\n"
 "Da prepišem?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Poruka"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Sačuvaj poruku kao..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Nisam mogao da napravim privremeni direktorijum: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Adresa"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -11972,58 +12641,425 @@ msgstr ""
 "\n"
 "Stvarno da obrišem ove poruke?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Postavke sastavljača"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/em-utils.c:2288
+#, fuzzy
 msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "Podesite osobine za poštu, uključujući sigurnost i prikaz poruke, ovde"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Ova operacija će trajno da obriše sve poruke označene kao\n"
+"obrisane. Ako nastavite, nećete moći da povratite ove poruke.\n"
+"\n"
+"Stvarno da obrišem ove poruke?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Podesite proveru pravopisa, potpise, i sastavljač poruke ovde"
+#: mail/evolution-mail.schemas.in.in.h:1
+msgid "Automatic link recognition"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Podesite vaše naloge za poštu ovde"
+#: mail/evolution-mail.schemas.in.in.h:2
+msgid "Automatic smiley recognition"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolucija pošta"
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Kontrola podešavanja Evolucija naloga za poštu"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Komponenta Evolucija pošte"
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Sastavljač Evolucija pošte"
+#: mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
+msgid "Default charset in which to compose messages"
+msgstr "Predefinisan naslov poruke."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Kontrola podešavanja Evolucija sastavljača"
+#: mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
+msgid "Default charset in which to compose messages."
+msgstr "Predefinisan naslov poruke."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Preglednik za direktorijume Evolucija pošte"
+#: mail/evolution-mail.schemas.in.in.h:8
+#, fuzzy
+msgid "Default charset in which to display messages"
+msgstr "Traži tekst u telu prikazane poruke"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Kontrola osobina Evolucija pošte"
+#: mail/evolution-mail.schemas.in.in.h:9
+#, fuzzy
+msgid "Default charset in which to display messages."
+msgstr "Traži tekst u telu prikazane poruke"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/evolution-mail.schemas.in.in.h:10
+#, fuzzy
+msgid "Default forward style"
+msgstr "Stil _prosleđivanja"
+
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default reply style"
+msgstr "_Stil odgovora:"
+
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Empty Trash folders on exit"
+msgstr "Isprazni direktorijume sa _smećem na izlazu"
+
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Isprazni direktorijume sa _smećem na izlazu"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "Poštanski nalozi"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "Osobine pošte"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "Izvrši akcije"
+
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Obaveštenje o novoj pošti"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Obaveštenje o novoj pošti"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr "_Upozori kada šalješ HTML poruke onima koji ih ne žele"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "Upozori kada šalješ poruke samo sa definisanim Bcc primaocima"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "Pošalji HTML poruku?"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "Pošalji HTML poruku?"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "_Pokaži animirane slike"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "_Pokaži animirane slike"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Prikaži poruku u normalnom stilu"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "_Prostor za pregled"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "_Pusti zvučnu datoteku kada stigne nova pošta"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "Provera _pravopisa"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "_Pismo za terminal:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "Odaberi HTML pismo varijabilne veličine za štampu"
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Spisak poruka prema niti razgovora"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Spisak poruka prema niti razgovora"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "_Neka ovo bude moj glavni nalog"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "V_arijabilna širina:"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolucija Elm uvoznik"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+msgid "Evolution mbox importer"
+msgstr "Evolucija mbox uvoznik"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
+msgstr "MBoks (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolucija Netscape pošta uvoznik"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolucija Outlook Express 4 uvoznik"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Pine importer"
+msgstr "Evolucija Pine uvoznik"
 
 #: mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
@@ -12063,34 +13099,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolucija Elm uvoznik"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Evolucija mbox uvoznik"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBoks (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolucija Netscape pošta uvoznik"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolucija Outlook Express 4 uvoznik"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Pine importer"
-msgstr "Evolucija Pine uvoznik"
-
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -12151,12 +13159,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolucija uvozi vaše stare Netscape podatke"
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Smeće"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Pretražujem filtere za poštu"
@@ -12165,7 +13167,7 @@ msgstr "Pretražujem filtere za poštu"
 msgid "Scanning directory"
 msgstr "Pretražujem direktorijum"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Počinjem uvoz"
 
@@ -12240,23 +13242,23 @@ msgid "You have not filled in all of the required information."
 msgstr "Niste uneli sve potrebne podatke."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Urednik Evolucija naloga"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Domaćin:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "Korisničko_ime"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Putanja:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Ne možete otvoriti dva naloga sa istim imenom."
 
@@ -12265,36 +13267,36 @@ msgstr "Ne možete otvoriti dva naloga sa istim imenom."
 msgid "Mail to %s"
 msgstr "Pošta za %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Naslove je %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s dopisna lista"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Odgovoreno na"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Dodaj pravilo za filter"
 
 # Ovde nedostaje prevod za jedninu.
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "Sledeća pravila filtera:\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12305,144 +13307,30 @@ msgstr ""
 "    '%s'\n"
 "I osvežen sadržaj."
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "Povezujem se..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Ovaj direktorijum ne može da sadrži poruke."
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Nova poruka"
 
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Ne mogu da otvorim deljeni direktorijum: %s"
-
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Nisam mogao da napravim privremeni direktorijum: %s"
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "_Poruka"
 
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Nisam mogao da napravim privremenu datoteku '%s': %s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "Sastavi novu poruku"
 
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Nisam mogao da zatvorim temp direktorijum: %s"
-
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Izaberite odredišni direktorijum za uvoz ovih podataka"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Izaberite odredišni direktorijum za uvoz ovih podataka"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Napravi novi direktorijum"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Navedite gde da napravim direktorijum:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Nisam mogao da obrišem direktorijum `%s': %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Zaista da brišem direktorijum „%s“?"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Obriši „%s“"
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Preimenuj direktorijum „%s“ u:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-msgid "Rename Folder"
-msgstr "Preimenuj direktorijum"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Navedeno ime direktorijuma nije ispravno: %s"
-
-#: mail/mail-component.c:1860
-#, fuzzy, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-"Direktorijum sa imenom „%s“ već postoji. Molim koristite neko drugo ime."
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Osobine pisma"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Osobine"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "_Ime direktorijuma:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Pogledaj"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Otvori u novom prozoru"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Premesti"
-
-#: mail/mail-component.c:2087
-msgid "_New Folder..."
-msgstr "_Novi direktorijum..."
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "Preimenu_j"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Podešavanja..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Identitet"
 
@@ -12501,11 +13389,11 @@ msgstr ""
 "Evolucija nalog za poštu. Molim unesite dole ime za ovaj nalog. Ovo ime će "
 "biti korišćeno samo za potrebe prikazivanja na ekranu."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "proveravam servis"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Povezujem se na server..."
 
@@ -12587,26 +13475,35 @@ msgid "C_olors"
 msgstr "_Boje"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Proveri za novu poštu"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "Proveri gramatiku dok _kucam"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Proveri za novu poštu"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "Boja za _pogrešno napisane reči:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Sastavljanje poruka"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Podešavanja"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12622,272 +13519,277 @@ msgstr ""
 "\n"
 "Pritisnite \"Primeni\" da sačuvate podešavanja."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "Pre_definisano"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Predefinisano ponašanje"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "Predefinisana kodna _strana"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Brisanje pošte"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Uvek potpiši odlazeće poruke na ovom nalogu"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "Ne citiraj originalnu poruku"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Ne potpisuj zahteve za s_astancima (za kompatibilnost sa Outlook-om)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Gotovo"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "D_irektorijum Priprema:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "O_mogući"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "Elektronski nalozi"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "Elektronska adresa:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "Isprazni direktorijume sa _smećem na izlazu"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "Lična karta _sertifikata:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "pomoćnik Evolucija naloga"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Izvrši komandu..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "Fik_sirana širina:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "Filteri"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "Osobine pisma"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "Sredi poruke u H_TML"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "Naglasi _citate sa"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Unutar"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Etikete i boje"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Učitavanje slika"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Podešavanje pošte"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Lokacija sandučeta"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Sastavljač poruke"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Prikaz poruke"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 msgid "Message Fonts"
 msgstr "Pisma poruke"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Obaveštenje o novoj pošti"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Napomena: bićete upitani za lozinku dok se ne povežete prvi put"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Opcione informacije"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "Or_ganizacija:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG lična karta _ključa:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Izaberite boju"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Upozori kada šalješ poruke samo sa definisanim Bcc primaocima"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Štampana pisma"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "Citiraj originalnu poruku"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Citirano"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "Za_pamti ovu lozinku"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "Od_govori-na:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Primanje pošte"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "_Opcije za primanje"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "Zapamti ovu _lozinku"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Neophodne informacije"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "Povrati predefinisano"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "S_igurnost"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "Sigurni MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr "Odaberi HTML pismo fiksirane veličine"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr "Odaberi HTML pismo fiksirane veličine za štampu"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr "Odaberi HTML pismo varijabilne veličine"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr "Odaberi HTML pismo varijabilne veličine za štampu"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Slanje pošte"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Direktorijum Poslate _poruke"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Poruke iz Pripreme i Poslato direktorijuma"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver traži identifikaciju"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Podešavanje servera"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "_Tip servera"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Samopotpisani sertifikat u lancu"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "Odredi ime _datoteke:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "Provera _pravopisa"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Standardni Unix mbox"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12897,7 +13799,7 @@ msgstr ""
 "potpis. Ime koje ste dali će biti korišćeno\n"
 "samo za svrhu prikazivanja na ekranu."
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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 "
@@ -12906,7 +13808,7 @@ msgstr ""
 "Ova vam strana omogućava da podesite proveru pravopisa i jezik. Lista jezika "
 "ovde oslikava samo one jezike za koje postoji instaliran rečnik."
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12914,11 +13816,15 @@ msgstr ""
 "Unesite ime po kome želite da nazovete ovaj nalog.\n"
 "Na primer: \"Poslovni\" ili \"Lični\""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "V_arijabilna širina:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12928,169 +13834,178 @@ msgstr ""
 "\n"
 "Pritisnite \"Napred\" za početak. "
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "_Dodaj potpis"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "_Uvek učitaj slike sa mreže"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Uvek potpiši odlazeće poruke na ovom nalogu"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "_Tip identifikacije: "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "_tip identifikacije: "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr "_Automatski proveri za novu poštu svakih"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "_Automatski ubaci slike sa osmesima"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "_Oglasi se kada stigne nova pošta"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "_Potvrdi kada izbacuješ direktorijum"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "_Predefinisan potpis:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "_Predefinisano"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Nemoj da me obaveštavaš kada stigne nova pošta"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "_Omogući"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "Stil _prosleđivanja"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "_Puno ime:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "_HTML pošta"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "_Identitet"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Jun"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "_Učitaj slike ako je pošiljalac u adresaru"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "_Neka ovo bude moj glavni nalog"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "_Označi poruke kao pročitane posle"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "_Nikada ne učitavaj slike sa mreže"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "_Pusti zvučnu datoteku kada stigne nova pošta"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Upozori kada šalješ HTML poruke onima koji ih ne žele"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Upozori kada šalješ poruke bez naslova"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "_Primanje pošte"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "_Stil odgovora:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "_Povrati predefinisano"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Skripta:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Briši..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "_Slanje pošte"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "_Pokaži animirane slike"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Potpisi"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr "_Standardno pismo:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr "_Pismo za terminal:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "_Koristi sigurnosnu vezu (SSL):"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr "_Koristi ista pisma kao drugi programi"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "opis"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingujem %s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13099,7 +14014,7 @@ msgstr ""
 "Greška tokom '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13108,7 +14023,7 @@ msgstr ""
 "Greška tokom operacije:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Radim"
 
@@ -13120,118 +14035,118 @@ msgstr "Filtriram direktorijum"
 msgid "Fetching Mail"
 msgstr "Uzimam poštu"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nisam mogao da smestim poštu u temp datoteku %s: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Nisam mogao da smestim poštu u temp datoteku %s: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Šaljem \"%s\""
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Šaljem poruku %d od %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Poruka %d od %d nije poslata"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Gotovo."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Čuvam poruku u direktorijum"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Premeštam poruke u %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram poruke u %s"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Pretražujem direktorijume u \"%s\""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Prosleđene poruke"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otvaram direktorijum %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "Otvaram ostavu %s"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Uklanjam direktorijum %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Smeštam direktorijum '%s'"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Osvežavam direktorijum"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Izbacujem direktorijum"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Praznim smeće u '%s'"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Lokalni direktorijumi"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Učitavam poruku %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Učitavam %d poruka(e)"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Čuvam %d poruka(e)"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13240,7 +14155,7 @@ msgstr ""
 "Ne mogu da napravim izlaznu datoteku: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13249,11 +14164,11 @@ msgstr ""
 "Greška kod čuvanja poruka u: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Čuvam prilog"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13262,21 +14177,25 @@ msgstr ""
 "Ne mogu da napravim izlaznu datoteku: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisam mogao da upišem: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Prekidam vezu sa %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ponovo se povezujem na %s"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Osetljivo na velika i mala slova"
@@ -13294,59 +14213,74 @@ msgstr "Traži:"
 msgid "Search"
 msgstr "Prona_đi"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Izmeni potpis"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Izuzeci"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Informacija o nalogu"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Poništavam..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, tip: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Putanja: %s, tip: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Tip: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Pošalji i primi poštu"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 msgid "Cancel _All"
 msgstr "Poništi _sve"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Osvežavam..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Čekam..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Korisnik je poništio operaciju."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Unesite lozinku za %s"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Unesite lozinku"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "_Zapamti ovu lozinku"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamti ovu lozinku do kraja ove sesije"
 
@@ -13385,26 +14319,31 @@ msgstr "Unesi ime za ovaj potpis."
 msgid "Name:"
 msgstr "Ime:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Prosleđena poruka - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Prosleđena poruka"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Otvaram direktorijum %s"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Postavljam vfolder: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Osvežavam vfolder-e za uri: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13417,88 +14356,88 @@ msgstr ""
 "    '%s'\n"
 "Potom su osveženi."
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "VFolder-i"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "vFolders-i"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Izmeni VFolder-e"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Pokušavam da izmenim vfolder '%s' koji ne postoji."
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Novi VFolder"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Neviđeno"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Viđeno"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Odgovoreno"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Višestruke neviđene poruke"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Višestruke poruke"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Najniže"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Niže"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Više"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Najviše"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Danas %k:%M "
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Juče %k:%M "
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M "
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b, %k:%M "
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Pravim listu poruka"
 
@@ -13554,11 +14493,11 @@ msgstr "Prosledi"
 msgid "No Response Necessary"
 msgstr "Nije neophodan odgovor"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Odgovori"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Odgovori svima"
 
@@ -13610,41 +14549,139 @@ msgstr "Pretp_lati se"
 msgid "_Unsubscribe"
 msgstr "Odjavi pretplatu"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr "Ovde podesite ponašanje posebnih i direktorijuma koji nisu na mreži"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Evolucija konzola"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Podešavanja direktorijuma"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "80%"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Preimenuj ovu grupu prečica"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Biraj da li će biti prikazana linija direktorijuma"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Sakrij liniju sa prečicama"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Predefinisan prioritet:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Predefinisan prioritet:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Alat za podešavanje Evolucija pošte"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+#, fuzzy
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "Označi da se prilog uobičajeno prikazuje unutar poruke."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
 msgstr ""
-"Ne mogu da prenesem direktorijum:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Dodaj direktorijum"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Priprema"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Sanduče"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "Otvaram podrazumevan direktorijum zaduženja"
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Za slanje"
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Otvaram podrazumevan direktorijum zaduženja"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Otvaram podrazumevan direktorijum zaduženja"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Poslato"
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Otvaram podrazumevan direktorijum zaduženja"
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Biraj da li će biti prikazana linija direktorijuma"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Biraj da li će biti prikazana linija prečica"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "E-pošta"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Nisam mogao da ispravno osvežim datoteke"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13655,7 +14692,7 @@ msgstr ""
 "%s\n"
 "Greška: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13664,7 +14701,7 @@ msgstr ""
 "Došlo je do greške kod kopiranja datoteka u\n"
 "`%s'."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13675,7 +14712,7 @@ msgstr ""
 "Molim da ga pomerite kako bi dozvolili instalaciju\n"
 "Evolucija korisničkih datoteka."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13773,11 +14810,11 @@ msgstr ""
 "Ne mogu da primenujem direktorijum:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
-"Direktorijum sa imenom „%s“ već postoji. Molim koristite neko drugo ime."
+msgid "The specified folder name is not valid: %s"
+msgstr "Navedeno ime direktorijuma nije ispravno: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -13801,19 +14838,15 @@ msgstr ""
 "Ne mogu da napravim navedeni direktorijum:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Napravi novi direktorijum"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Bezimeno)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Izaberite vrstu uvoznika:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13827,11 +14860,11 @@ msgstr ""
 "Možete izabrati \"Automatski\" ukoliko ne znate, i Evolucija će pokušati da "
 "sama završi posao."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Molim izaberite podatke koje želite da uvezete:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13843,7 +14876,7 @@ msgstr ""
 "podešavanja koja bi se mogla iskoristiti. Ukoliko želite\n"
 "da probate ponovo, pritisnite dugme „Nazad“.\n"
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13852,21 +14885,21 @@ msgstr ""
 "Uvozim %s\n"
 "Uvozim %d. stavku."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "Izaberite uvoznika"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "Datoteka %s ne postoji"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Greška Evolucije"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -13875,11 +14908,11 @@ msgstr ""
 "Ne postoji uvoznik koji ume da radi sa\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Uvozim"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -13888,17 +14921,17 @@ msgstr ""
 "Uvozim %s.\n"
 "Pokrećem %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Greška kod pokretanja %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Greška kod učitavanja %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13907,35 +14940,35 @@ msgstr ""
 "Uvozim %s\n"
 "Uvozim 1. stavku."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Automatsko"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Ime datoteke:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Odaberite datoteku"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Vrsta datoteke:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Uvezi podatke i podešavanja iz starijih programa"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Uvezi jednu datoteku"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -13943,47 +14976,28 @@ msgstr ""
 "Molim sačekajte...\n"
 "Tražim postojeća podešavanja"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Pokrećem inteligentne uvoznike"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Izaberite odredišni direktorijum za uvoz ovih podataka"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Uvoz"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Zatvaram veze..."
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Greška kod sinhronizacije „%s“:\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "Sinhronizujem direktorijum"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Sinhronizujem „%s“ (%d od %d)..."
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Podešavanja Evolucije"
@@ -14018,7 +15032,7 @@ msgstr "Ne mogu da otvorim deljeni direktorijum: %s"
 msgid "Cannot find the specified shared folder."
 msgstr "Ne mogu da nađem navedeni deljeni direktorijum."
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14027,17 +15041,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Pomoćnik"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Novo"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Nije navedeno ime direktorijuma."
@@ -14095,64 +15103,51 @@ msgstr "Napravi novu prečicu"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Izaberite direktorijum na koji želite da prečica ukazuje:"
 
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "_Na mreži"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "_Nije na mreži"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Radi bez mreže"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(nijedan direktorijum nije prikazan)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Ništa)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolucija je trenutno na mreži. Pritisnite ovo dugme da radite bez "
 "mreže."
 
-#: shell/e-shell-view.c:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolucija je u procesu odlaska u rad bez mreže."
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolucija nije trenutno na mreži. Pritisnite ovo dugme da radite na "
 "mreži."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Neispravni argumenti"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Ne mogu da se registruje na OAF"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Baza sa podešavanjima nije nađena"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Opšta greška"
 
@@ -14265,75 +15260,18 @@ msgstr "Uk_loni"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Ukloni prečicu sa linije prečica"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Greška kod čuvanja prečica."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Sanduče"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Prečice"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Nema greške"
-
-#: shell/e-storage.c:573
-msgid "A folder with the same name already exists"
-msgstr "Direktorijum sa tim imenom već postoji"
-
-#: shell/e-storage.c:575
-msgid "The specified folder type is not valid"
-msgstr "Navedena vrsta direktorijuma nije ispravna"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "I/O greška"
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr "Nedovoljno mesta za pravljenje direktorijuma"
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr "Direktorijum nije prazan"
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "Navedeni direktorijum nije pronađen"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "Funkcija nije podržana za ovu ostavu"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "Operacija nije podržana"
-
-#: shell/e-storage.c:591
-msgid "The specified type is not supported in this storage"
-msgstr "Navedena vrsta nije podržana za ovu ostavu"
-
-#: shell/e-storage.c:593
-msgid "The specified folder cannot be modified or removed"
-msgstr "Navedeni direktorijum se ne može izmeniti niti ukloniti"
-
-#: shell/e-storage.c:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr ""
-"Ne mogu da prebacim direktorijum u neki od u njemu sadržanih direktorijuma"
-
-#: shell/e-storage.c:597
-msgid "Cannot create a folder with that name"
-msgstr "Ne mogu da napravim direktorijum sa tim imenom"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Ovu operaciju ne možete izvršiti dok radite bez mreže"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Kućica"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14344,6 +15282,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% završeno)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Novo"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "„%s“ u „%s“"
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14381,74 +15330,6 @@ msgstr ""
 "Greška koju je poslao sistem za pokretanje je:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "CORBA greška"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Prekinuto"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Neispravan argument"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Već ima vlasnika"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Nema vlasnika"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Nije nađen"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Nepodržana vrsta"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Nepodržana šema"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Operacija nije podržana"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Unutrašnja greška"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Postoji"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "Netačan URI"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Sadrži poddirektorijume"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Nema slobodnog prostora"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "Stari vlasnik je nestao"
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Vrsta probe"
-
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr "Probni deo Evolucije"
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr "Aktivne veze"
@@ -14477,10 +15358,6 @@ msgstr "_Pošta:"
 msgid "_Tasks:"
 msgstr "Za_duženja:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr "_Ime direktorijuma:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder _type:"
 msgstr "_Vrsta direktorijuma:"
@@ -14543,22 +15420,6 @@ msgstr ""
 "\n"
 "Pritisnite dugme \"Primeni\" da sačuvate vaša podešavanja. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "Ovde podesite ponašanje posebnih i direktorijuma koji nisu na mreži"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Evolucija konzola"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Kontrola podešavanja postavki Evolucija direktorijuma"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Podešavanja direktorijuma"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Pritisnite \"Uvezi\" da započnete sa uvozom datoteke u Evoluciju. "
@@ -14597,7 +15458,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Uvoznici"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Uvoz"
 
@@ -14613,16 +15474,16 @@ msgstr "Ne pitaj me više"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolucija može da uveze podatke iz sledećih datoteka:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolucija"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Evolucija sada izlazi..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14657,7 +15518,7 @@ msgstr ""
 "Nadamo se da ćete uživati u plodovima našeg napornog rada, i \n"
 "željno iščekujemo vaše doprinose!\n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -14665,36 +15526,48 @@ msgstr ""
 "Hvala\n"
 "Tim Ximian Evolucije\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr "Nemoj mi ponovo reći"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ne mogu da pristupim konzoli Ximian Evolucije"
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ne mogu da pokrenem konzolu Ximian Evolucije: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Počni sa radom bez mreže"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Počni sa radom na mreži"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr "Silom ugasi sve delove evolucije"
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Pošalji izlaz o greškama iz svih delova u datoteku."
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14703,31 +15576,60 @@ msgstr ""
 "%s: --online i --offline se ne mogu koristiti zajedno.\n"
 "  Koristite %s --help za više podataka.\n"
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Izaberite uvoznika"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "Lična karta _sertifikata:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "Tok"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Izraz"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Spoji elektronske adrese"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"Istekao sertifikat: %s\n"
+"Izdavač: %s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14785,91 +15687,376 @@ msgid "Backup All"
 msgstr "Blackpool"
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "Lična karta _sertifikata:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Nepoverljiv sertifikat"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "Lična karta _sertifikata:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Zajedničko ime"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "Lična karta _sertifikata:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "_Izmeni"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Nisam mogao da proverim sertifikate."
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Izraz"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Organizacija"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Organizaciona jedinica"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Pogledaj"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "Lična karta _sertifikata:"
+
+#: smime/gui/smime-ui.glade.h:42
+#, fuzzy
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr "Neispravan izdavač sertifikata (CA)"
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "Lična karta _sertifikata:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Uvoz"
+msgid "Certificate already exists"
+msgstr "ID karte već postoji"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%m/%d/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Vermont"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Vermiljon"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Vermiljon"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Vermiljon"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "S"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "OK"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "S"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "Lična karta _sertifikata:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "Lična karta _sertifikata:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "Nepoverljiv sertifikat"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "ID"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Naslove je %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Nisam mogao da prođem kroz direktorijum sa redom"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "Neispravan izdavač sertifikata (CA)"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Neispravan izdavač sertifikata (CA)"
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Bez informacije"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "prilog"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "Lična karta _sertifikata:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Curitiba"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "Severna Karolina"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Izraz"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s na %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Neuspeo potpis sertifikata"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "Ubac_i"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Naslove je %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Neuspeo potpis sertifikata"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Unesite lozinku za %s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "Lična karta _sertifikata:"
 
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
@@ -14921,7 +16108,7 @@ msgstr "Kopiraj odabrano"
 msgid "Copy to Folder..."
 msgstr "Kopiraj u direktorijum..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Iseci označeno"
 
@@ -14937,7 +16124,7 @@ msgstr "Premesti kontakt(e) u drugi direktorijum..."
 msgid "Move to Folder..."
 msgstr "Premesti u direktorijum..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Umetni memorisano"
 
@@ -14945,8 +16132,8 @@ msgstr "Umetni memorisano"
 msgid "Previews the contacts to be printed"
 msgstr "Pregledaj kontakte za štampanje"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Pre_gled pred štampu"
@@ -14991,13 +16178,13 @@ msgstr "Prekini učitavanje"
 msgid "View the current contact"
 msgstr "Pregledaj tekući kontakt"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "_Akcije"
 
@@ -15027,140 +16214,108 @@ msgstr "_Pošalji poruku kontaktu..."
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "Unesite novi celodnevni sastanak"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Zakaži sastanak"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "Napravi novi direktorijum"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Unesite novi zahtev za sastankom"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Unesi novo zaduženje"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Dan"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Obriši sve pojave"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Obriši zakazani sastanak"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Obriši ovu pojavu"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Obriši ovu pojavu"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Idi na"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Idi nazad"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Idi napred"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Idi na _datum"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Idi na navedeni datum"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Idi na današnji dan"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "Lista"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Mesec"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Nov _zakazani sastanak"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Nova Kaledonija"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Novi sastanak"
-
-#: ui/evolution-calendar.xml.h:27
-#, fuzzy
-msgid "New _Task"
-msgstr "Novo zaduženje"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Pregled kalendara za štampu"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Štampaj ovaj kalendar"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Objavi slobodan/zauzet informaciju za ovaj kalendar"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 msgid "Purg_e"
 msgstr "Obri_ši"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 msgid "Purge old appointments and meetings"
 msgstr "Obriši stare sastanke i dogovore"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Prikaži detalje"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Prikaži jedan dan"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Prikaži jedan mesec"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Prikaži jednu nedelju"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Prikaži radnu nedelju"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Nedelja"
 
@@ -15225,7 +16380,7 @@ msgstr "Sačuvaj stavku na disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "Dato_teka"
 
@@ -15442,7 +16597,7 @@ msgstr "Označi sve kao p_ročitane"
 msgid "Mark all visible messages as read"
 msgstr "Označi sve vidljive poruke kao pročitane"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "Ubaci poruku(e) iz memorije"
 
@@ -15499,16 +16654,6 @@ msgstr "_Obrni izbor"
 msgid "_Threaded Message List"
 msgstr "Lista poruka prema _niti razgovora"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Zatvori ovaj prozor"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "_Zatvori"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "Dodaj _pošiljaoca u adresar"
@@ -15665,257 +16810,282 @@ msgstr "Prosledi izabranu poruku nekome kao prilog"
 msgid "Increase the text size"
 msgstr "Uvećaj veličinu teksta"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Učitaj _slike"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Označi kao _važno"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Označi kao _nepročitano"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Označi kao neva_žno"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "Označi izabranu poruku(e) kao pročitanu"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "Označi izabranu poruku(e) kao važnu"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Označi izabranu poruku(e) kao nevažnu"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Označi izabranu poruku(e) kao nepročitanu"
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Označi izabranu poruku(e) kao nepročitanu"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Označi izabranu poruku(e) kao nevažnu"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Označi izabrane poruke za brisanje"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Premesti"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "Premesti izabranu poruku(e) u drugi direktorijum"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Sledeće"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "Sledeća _važna poruka"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "Sledeća _nit"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "Sledeća _nepročitana poruka"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Nije nađen"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Otvori izabranu poruku u novom prozoru"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Otvori izabranu poruku radi ponovnog slanja"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Originalna _veličina"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "P_rethodna nepročitana poruka"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Pošalji odgovor"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr "Pošalji odgovor na poruku u javni direktorijum"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "Pr_ethodna važna poruka"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Pregledaj poruku za štampu"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Prethodno"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Štampaj ovu poruku"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "Preu_smeri"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Preu_smeri (odbaci) izabrani poruku nekome"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Vrati tekst na izvornu veličinu"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "Pre_traži poruku..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "_Manje"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Sačuvaj poruku kao tekstualnu datoteku"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Traži tekst u telu prikazane poruke"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr "Postavi podešavanja stranice za vaš tekući štampač"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Prikaži izvor poruke"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Prikaži cela _zaglavlja"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Prikaži trepćući kurzor u telu prikazanih poruka"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Prikaži poruku u normalnom stilu"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Prikaži poruku sa svim zaglavljima e-pošte"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Prikaži izvorni kod elektronske poruke"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "Veličina te_ksta"
 
 # Od-obriši?
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Povrati izabrane poruke"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "VFolder direktorijum na _dopisnu listu..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "VFolder direktorijum na _pošiljaoca..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "VFolder direktorijum na _primaoca..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "Prividni direktorijum na _naslov..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "_Priloženo"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "_Kopiraj u direktorijum"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "_Napravi filter od poruke"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "Pro_sledi poruku"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "_Idi na"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "Unutar"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "_Veće"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "Prikaz _poruke"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Premesti u direktorijum"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "_Sledeća poruka"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "Normalan pri_kaz"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "_Otvori poruku"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "_Prethodna poruka"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "_Citirano"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "Ponovo poša_lji..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "Ala_ti"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "_Povrati"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Zatvori ovaj prozor"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "_Zatvori"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Priloži"
@@ -16193,12 +17363,13 @@ msgid "Change Evolution's settings"
 msgstr "Izmeni podešavanja Evolucije"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "_Izlaz"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Unesite novi zahtev za sastankom"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "_Prozor Evolucije"
+msgid "E_xit"
+msgstr "_Izlaz"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16210,61 +17381,74 @@ msgstr "Uvezi podatke iz drugih programa"
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "_Prozor Evolucije"
+msgid "Open a new window"
+msgstr "Otvori u novom prozoru"
 
 #: ui/evolution.xml.h:11
 msgid "Pi_lot Settings..."
 msgstr "Podešavanja Pi_lota..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Slanje / primanje"
+
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr "Pošalji zakazane i dobavi nove stavke"
+
+#: ui/evolution.xml.h:14
 msgid "Set up Pilot configuration"
 msgstr "Podesi postavke Pilota"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Prikaži informaciju o Ximian Evoluciji"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Pošalji izveštaj o grešci"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "Pošalji izveštaj o _grešci"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Pošalji izveštaj o grešci pomoću Bug Buddy"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Promena"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Biraj da li ćemo raditi bez mreže."
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "_Česta pitanja u vezi Evolucije"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "_O Ximian Evoluciji..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "Pomo_ć"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "_Uvezi..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Novo"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Pošalji / primi"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "_Pronađi"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Štampaj sažetak"
@@ -16392,12 +17576,12 @@ msgstr "Ustanovi preglede..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "PUSČPSN"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y."
 
@@ -16530,7 +17714,7 @@ msgstr "Prona_đi"
 msgid "_Find Now"
 msgstr "_Pronađi"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "_Očisti"
 
@@ -16546,24 +17730,265 @@ msgstr "Lična karta podstavke"
 msgid "Text"
 msgstr "Tekst"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Očisti"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Pronađi sada"
 
+#~ msgid "Account Name"
+#~ msgstr "Ime naloga"
+
+#~ msgid "Server Name"
+#~ msgstr "Ime servera"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "LDAP nije omogućen u ovoj verziji Evolucije"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Ostali kontakti"
+
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "Ovde podesi pristup serverima sa LDAP direktorijumima"
+
+#~ msgid "Directory Servers"
+#~ msgstr "Serveri sa direktorijumima"
+
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Kontrola podešavanja za  Evoluciju LDAP adresar"
+
+#~ msgid "Add LDAP Server"
+#~ msgstr "Dodaj LDAP server"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Korak 4: Ime"
+
+#~ msgid "Find contact in"
+#~ msgstr "Pronađi kontakt u"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Stisnite ovde da dodate kontakt *"
+
+#~ msgid "Business Address"
+#~ msgstr "Adresa na poslu"
+
+#~ msgid "Department"
+#~ msgstr "Odelenje"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "Slobodna-zauzeta adresa"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Zanimanje"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Otvaram zaduženja u %s"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Svejedno da pošaljem?"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Otkaži tekući rad sa poštom"
+#~ msgid "Folder _name"
+#~ msgstr "_Ime direktorijuma:"
+
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "Ova poruka je digitalno potpisana. Pritisnite na ikonu sa katancem za "
+#~ "veše informacija."
+
+#~ msgid "Connecting..."
+#~ msgstr "Povezujem se..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Ovaj direktorijum ne može da sadrži poruke."
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Ne mogu da otvorim deljeni direktorijum: %s"
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Izaberite odredišni direktorijum za uvoz ovih podataka"
+
+#, fuzzy
+#~ msgid "A folder named \"%s\" already exists.  Please use a different name."
+#~ msgstr ""
+#~ "Direktorijum sa imenom „%s“ već postoji. Molim koristite neko drugo ime."
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ne mogu da prenesem direktorijum:\n"
+#~ "%s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "Dodaj direktorijum"
+
+#~ msgid "Drafts"
+#~ msgstr "Priprema"
+
+#~ msgid "Outbox"
+#~ msgstr "Za slanje"
+
+#~ msgid "Sent"
+#~ msgstr "Poslato"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Greška kod sinhronizacije „%s“:\n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "Sinhronizujem direktorijum"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Sinhronizujem „%s“ (%d od %d)..."
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(nijedan direktorijum nije prikazan)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(Ništa)"
+
+#~ msgid "No error"
+#~ msgstr "Nema greške"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Direktorijum sa tim imenom već postoji"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Navedena vrsta direktorijuma nije ispravna"
+
+#~ msgid "I/O error"
+#~ msgstr "I/O greška"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Nedovoljno mesta za pravljenje direktorijuma"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Direktorijum nije prazan"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Navedeni direktorijum nije pronađen"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Funkcija nije podržana za ovu ostavu"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Operacija nije podržana"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Navedena vrsta nije podržana za ovu ostavu"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Navedeni direktorijum se ne može izmeniti niti ukloniti"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr ""
+#~ "Ne mogu da prebacim direktorijum u neki od u njemu sadržanih direktorijuma"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Ne mogu da napravim direktorijum sa tim imenom"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Ovu operaciju ne možete izvršiti dok radite bez mreže"
+
+#~ msgid "Checkbox"
+#~ msgstr "Kućica"
+
+#~ msgid "CORBA error"
+#~ msgstr "CORBA greška"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Neispravan argument"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Već ima vlasnika"
+
+#~ msgid "No owner"
+#~ msgstr "Nema vlasnika"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Nepodržana vrsta"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Nepodržana šema"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Operacija nije podržana"
+
+#~ msgid "Internal error"
+#~ msgstr "Unutrašnja greška"
+
+#~ msgid "Exists"
+#~ msgstr "Postoji"
+
+#~ msgid "Invalid URI"
+#~ msgstr "Netačan URI"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Sadrži poddirektorijume"
+
+#~ msgid "No space left"
+#~ msgstr "Nema slobodnog prostora"
+
+#~ msgid "Old owner has died"
+#~ msgstr "Stari vlasnik je nestao"
+
+#~ msgid "Test type"
+#~ msgstr "Vrsta probe"
+
+#~ msgid "Evolution Test Component"
+#~ msgstr "Probni deo Evolucije"
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "Uvoz"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Unesite novi celodnevni sastanak"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Nov _zakazani sastanak"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Novi sastanak"
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Ime polja"
+#~ msgid "New _Task"
+#~ msgstr "Novo zaduženje"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "_Prozor Evolucije"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "_Prozor Evolucije"
+
+#~ msgid "Toggle"
+#~ msgstr "Promena"
 
-#~ msgid "Family Name"
-#~ msgstr "Prezime"
+#~ msgid "Clear"
+#~ msgstr "Očisti"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Otkaži tekući rad sa poštom"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -16656,9 +18081,6 @@ msgstr "Pronađi sada"
 #~ msgid "VCard (.vcf, .gcrd)"
 #~ msgstr "VCard (.vcf, .gcrd)"
 
-#~ msgid "Loading..."
-#~ msgstr "Učitavam..."
-
 #~ msgid "Searching..."
 #~ msgstr "Tražim..."
 
@@ -16710,10 +18132,6 @@ msgstr "Pronađi sada"
 #~ msgstr "Eknjiga nije učitana\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "ID karte već postoji"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Operacija obustavljena"
 
@@ -16860,9 +18278,6 @@ msgstr "Pronađi sada"
 #~ msgid "Callback"
 #~ msgstr "Povratni poziv"
 
-#~ msgid "Company"
-#~ msgstr "Preduzeće"
-
 #~ msgid "Comp"
 #~ msgstr "Pred."
 
@@ -16929,9 +18344,6 @@ msgstr "Pronađi sada"
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
 #~ msgid "Birth date"
 #~ msgstr "Rođendan"
 
@@ -16944,9 +18356,6 @@ msgstr "Pronađi sada"
 #~ msgid "Arbitrary"
 #~ msgstr "Slobodno"
 
-#~ msgid "ID"
-#~ msgstr "ID"
-
 #~ msgid "Last Use"
 #~ msgstr "Poslednja upotreba"
 
@@ -16959,9 +18368,6 @@ msgstr "Pronađi sada"
 #~ msgid "Folder containing contact information"
 #~ msgstr "Direktorijum sa podacima o kontaktima"
 
-#~ msgid "LDAP Server"
-#~ msgstr "LDAP server"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "LDAP server sa podacima o kontaktima"
 
@@ -16971,18 +18377,6 @@ msgstr "Pronađi sada"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Javni direktorijum sa podacima o kontaktima"
 
-#~ msgid "_Contact"
-#~ msgstr "_Kontakt"
-
-#~ msgid "Create a new contact"
-#~ msgstr "Unesi novi kontakt"
-
-#~ msgid "New Contact List"
-#~ msgstr "Nova kontakt lista"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "Napravi novu kontakt listu"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "URI koji će da čitač direktorijuma prikazati"
 
@@ -16998,9 +18392,6 @@ msgstr "Pronađi sada"
 #~ msgid "Is New Card"
 #~ msgstr "Da li je nova karta"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "Nema karata"
 
@@ -17050,30 +18441,6 @@ msgstr "Pronađi sada"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "Javni direktorijum sa unosima za-uraditi"
 
-#~ msgid "New appointment"
-#~ msgstr "Novi zakazani sastanak"
-
-#~ msgid "_Appointment"
-#~ msgstr "Zakazani _Sastanak"
-
-#~ msgid "New meeting"
-#~ msgstr "Novi sastanak"
-
-#~ msgid "M_eeting"
-#~ msgstr "S_astanak"
-
-#~ msgid "New task"
-#~ msgstr "Novo zaduženje"
-
-#~ msgid "_Task"
-#~ msgstr "_Zaduženje"
-
-#~ msgid "New All Day Appointment"
-#~ msgstr "Novi celodnevni zakazani sastanak"
-
-#~ msgid "All _Day Appointment"
-#~ msgstr "Celo_dnevni zakazani sastanak"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "Nisam mogao da osvežim promenama netačan objekat"
 
@@ -17110,9 +18477,6 @@ msgstr "Pronađi sada"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "Otvaram kalendar u %s"
 
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Otvaram podrazumevan direktorijum zaduženja"
-
 #~ msgid "Purging event %s"
 #~ msgstr "Briše događaj %s"
 
@@ -17157,9 +18521,6 @@ msgstr "Pronađi sada"
 #~ "Evolucija je pronašla GnomeCard datoteke.\n"
 #~ "Želite li da ih uvezete u Evoluciju?"
 
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Alat za podešavanje Evolucija pošte"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "Direktorijum sa poštom"
 
@@ -17175,9 +18536,6 @@ msgstr "Pronađi sada"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Virtuelni direktorijum sa smećem"
 
-#~ msgid "Properties..."
-#~ msgstr "Osobine..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Promeni osobine ovom direktorijumu"
 
@@ -17187,15 +18545,6 @@ msgstr "Pronađi sada"
 #~ msgid "You have unsent messages, do you wish to quit anyway?"
 #~ msgstr "Imate neposlate poruke, želite li svejedno da izađete?"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Nova poruka"
-
-#~ msgid "_Mail Message"
-#~ msgstr "_Poruka"
-
-#~ msgid "Compose a new mail message"
-#~ msgstr "Sastavi novu poruku"
-
 #~ msgid "New Message Post"
 #~ msgstr "Slanje nove poruke"
 
@@ -19005,9 +20354,6 @@ msgstr "Pronađi sada"
 #~ msgid "Cumberland"
 #~ msgstr "Cumberland"
 
-#~ msgid "Curitiba"
-#~ msgstr "Curitiba"
-
 #~ msgid "Curitiba Apt"
 #~ msgstr "Curitiba Apt"
 
@@ -22001,9 +23347,6 @@ msgstr "Pronađi sada"
 #~ msgid "North Bend"
 #~ msgstr "North Bend"
 
-#~ msgid "North Carolina"
-#~ msgstr "Severna Karolina"
-
 #~ msgid "North Conway"
 #~ msgstr "North Conway"
 
@@ -23616,9 +24959,6 @@ msgstr "Pronađi sada"
 #~ msgid "State College"
 #~ msgstr "State College"
 
-#~ msgid "Stauning"
-#~ msgstr "Stauning"
-
 #~ msgid "Staunton"
 #~ msgstr "Staunton"
 
@@ -24210,9 +25550,6 @@ msgstr "Pronađi sada"
 #~ msgid "United Arab Emirates "
 #~ msgstr "Ujedinjeni Arapski Emirati"
 
-#~ msgid "Unst"
-#~ msgstr "Unst"
-
 #~ msgid "Upington"
 #~ msgstr "Upington"
 
@@ -24321,12 +25658,6 @@ msgstr "Pronađi sada"
 #~ msgid "Veracruz"
 #~ msgstr "Verakruz"
 
-#~ msgid "Vermillion"
-#~ msgstr "Vermiljon"
-
-#~ msgid "Vermont"
-#~ msgstr "Vermont"
-
 #~ msgid "Vernal"
 #~ msgstr "Vernal"
 
@@ -24855,9 +26186,6 @@ msgstr "Pronađi sada"
 #~ msgid " F"
 #~ msgstr " F"
 
-#~ msgid " C"
-#~ msgstr " C"
-
 #~ msgid "knots"
 #~ msgstr "čvorovi"
 
@@ -25480,9 +26808,6 @@ msgstr "Pronađi sada"
 #~ msgid "Freezing haze"
 #~ msgstr "Ledena sumaglica"
 
-#~ msgid "Spray"
-#~ msgstr "Kišica"
-
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Kišica u blizini"
 
@@ -25852,18 +27177,6 @@ msgstr "Pronađi sada"
 #~ msgstr ""
 #~ "Ukloni direktorijum dodat pomoću \"Otvori direktorijum drugog korisnika\""
 
-#~ msgid "Send / Receive"
-#~ msgstr "Slanje / primanje"
-
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Pošalji zakazane i dobavi nove stavke"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Biraj da li će biti prikazana linija direktorijuma"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Biraj da li će biti prikazana linija prečica"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Pregledaj izabrani direktorijum"
 
@@ -25891,9 +27204,6 @@ msgstr "Pronađi sada"
 #~ msgid "_Rename..."
 #~ msgstr "_Preimenuj..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Pošalji / primi"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "_Traka sa prečicama"
 
diff --git a/po/sv.po b/po/sv.po
index 202563b3dc..68cdaeda0a 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.185 2003/11/07 07:04:16 jpr Exp $
+# $Id: sv.po,v 1.186 2003/12/08 01:51:24 jpr Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-06-20 23:28+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -34,51 +34,183 @@ msgstr "Kunde inte läsa in %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Kunde inte läsa pilotens adressprogramblock"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Mappar för automatisk ifyllning"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "_Certifikat-ID:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Konfigurera dina e-postkonton här"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Kontakter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
+msgstr "Evolutions adressbok"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address pop-up"
+msgstr "Adress-popup för Evolutions adressbok"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address viewer"
+msgstr "Adressvisare för Evolutions adressbok"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook card viewer"
+msgstr "Kortvisare för Evolutions adressbok"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook component"
+msgstr "Evolutions adressbokskomponent"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook folder viewer"
+msgstr "Mappvisare för Evolutions adressbok"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolutions e-postinställningskontroll"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Evolutions konfigurationskontroll för mappinställningar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Adressbok"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Egenskaper..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Ta bort"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+msgid "Rename"
+msgstr "Byt namn"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Ny kontakt:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "Skapa en ny kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Ny kontaktlista"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "_Kontaktlista"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "Skapa en ny kontaktlista"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Personligt"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Jobb"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "LDAP-server"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Kunde inte skapa katalogen %s: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "Misslyckades med att ansluta till LDAP-server"
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "Misslyckades med att autentisera till LDAP-server"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "Kunde inte utföra fråga på rot-DSE"
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "Servern svarade med inga sökbaser stöds"
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Denna server stöder inte LDAPv3-schemainformation"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "Fel vid hämtande av filterinformation"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr "Servern svarade inte med giltig schemainformation"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Kontonamn"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Servernamn"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP stöds inte i detta bygge av Evolution"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Andra kontakter"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -86,7 +218,7 @@ msgstr ""
 "Vi kunde inte öppna denna adressbok. Kontrollera att sökvägen\n"
 "existerar och att du har rätt att komma åt den."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -96,7 +228,7 @@ msgstr ""
 "att du har angett en felaktig URI eller att LDAP-servern är\n"
 "onåbar."
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -108,7 +240,7 @@ msgstr ""
 "programmet från CVS-källkod efter det att du har hämtat\n"
 "OpenLDAP från länken nedan.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -122,44 +254,43 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Kan inte öppna adressboken"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "Ansluter anonymt till LDAP-servern"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "Misslyckades med autentisering.\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sAnge lösenord för %s (användare %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "Namn börjar med"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "E-postadress börjar med"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Kategori är"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Något fält innehåller"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Avancerat..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -171,7 +302,7 @@ msgstr ""
 "Gör din sökning mer specifik eller höj resultatgränsen i\n"
 "katalogserverinställningarna för denna adressbok."
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -183,88 +314,41 @@ msgstr ""
 "specifik eller höj resultatgränsen i katalogserverinställningarna\n"
 "för denna adressbok."
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Bakänden för denna adressbok kunde inte tolka denna fråga."
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Bakänden för denna adressbok vägrade att utföra denna fråga."
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "Denna fråga returnerade inte utan problem."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Alla kategorier"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "URI:n som kalendern kommer att visa"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "_Certifikat-ID:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "Konfigurera åtkomst till LDAP-katalogservrar här"
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Kontakter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "Katalogservrar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolutions adressbok"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "LDAP-konfigurationskontroll för Evolutions adressbok"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "Adress-popup för Evolutions adressbok"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "Adressvisare för Evolutions adressbok"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Kortvisare för Evolutions adressbok"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr "Evolutions adressbokskomponent"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook folder viewer"
-msgstr "Mappvisare för Evolutions adressbok"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolutions e-postinställningskontroll"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -287,6 +371,7 @@ msgstr "  _Visa de baser som stöds "
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -320,8 +405,9 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "Lägg till LDAP-server"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "Adressboksinställningar"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -337,9 +423,9 @@ msgid "Anonymously"
 msgstr "Anonymt"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -350,50 +436,51 @@ msgstr ""
 "Klicka på knappen \"Slutför\" för att spara de inställningar du har angivit "
 "här."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "Ansluter"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "Distinguished _name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr "Redigera LDAP-server"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
 msgstr "E-postadress:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 "Evolution kommer att använda detta DN för att autentisera dig till servern"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution kommer att använda denna e-postadress för att autentisera dig till "
 "servern"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "Klar"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Allmänt"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "LDAP-konfigurationsassistent"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "Grupp"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Aldrig"
 
@@ -420,8 +507,8 @@ msgid "S_earch scope: "
 msgstr "S_ökomfattning: "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Söker"
 
@@ -481,28 +568,32 @@ msgstr ""
 "för LDAP-sökningar, och för skapande och redigering av kontakter."
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 "Att välja ett visningsnamn är det sista nödvändiga steget vid konfiguration "
 "av en LDAP-server."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "Steg 1: Serverinformation"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "Steg 2: Ansluter till server"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "Steg 1: Serverinformation"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "Steg 3: Söker i katalogen"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Steg 2: Ansluter till server"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "Steg 4: Visar namn"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Steg 3: Söker i katalogen"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -514,18 +605,6 @@ msgstr "Sökbaser som stöds"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"Det första steget vid konfiguration av en LDAP-server är att ange dess namn "
-"och din\n"
-"inloggningsinformation. Fråga din systemadministratör om du är osäker "
-"angående denna information."
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -538,7 +617,7 @@ msgstr ""
 "måste ändra\n"
 "dessa alternativ."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -550,7 +629,7 @@ msgstr ""
 "Om du lämnar detta tomt kommer sökningen att börja vid roten av "
 "katalogträdet."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -566,14 +645,14 @@ msgstr ""
 "En sökomfattning som är \"one\" kommer endast att inkludera de poster som är "
 "en nivå under din sökbas.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
+#, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "Denna assistent kommer att hjälpa dig komma åt katalogtjänster på\n"
 "nätet som använder LDAP-servrar (Lightweight Directory Access\n"
@@ -583,7 +662,7 @@ msgstr ""
 "servern. Kontakta din systemadministratör om behöver hjälp med att hitta "
 "denna information."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -591,7 +670,7 @@ msgstr ""
 "Detta är det fullständiga namnet på din ldap-server. Till exempel \"ldap."
 "mittforetag.se\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -601,7 +680,7 @@ msgstr ""
 "högt\n"
 "kommer att slöa ned adressboken."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -611,7 +690,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:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -621,6 +700,16 @@ msgstr ""
 "mapplista.\n"
 "Det används endast för visning."
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Det här är namnet på denna server som kommer att visas i din Evolution-"
+"mapplista.\n"
+"Det används endast för visning."
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -650,21 +739,34 @@ msgid "Using email address"
 msgstr "Använder e-postadress"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Närsomhelst"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+"Det första steget vid konfiguration av en LDAP-server är att ange dess namn "
+"och din\n"
+"inloggningsinformation. Fråga din systemadministratör om du är osäker "
+"angående denna information."
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "_Visa namn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "_Hämtningsgräns:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -672,54 +774,52 @@ msgstr "_Hämtningsgräns:"
 msgid "_Edit"
 msgstr "_Redigera"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "_Inloggningsmetod:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "_Portnummer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "_Utgångspunkt för sökning:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "_Servernamn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "_Timeout (minuter):"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "kort"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr "anslutningsflik"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr "allmän-flik"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr "sökflik"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Namn"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolutions adressboks namnvalsgränssnitt"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Ta bort alla"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Ta bort"
@@ -746,23 +846,21 @@ msgstr "Lägg till i kontakter"
 msgid "Unnamed Contact"
 msgstr "Namnlös kontakt:"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Namn"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Källkod"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Välj kontakter från adressboken"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "Sök kontakt i"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolutions adressboks namnvalsgränssnitt"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Sök"
@@ -839,7 +937,8 @@ msgid "D_epartment:"
 msgstr "A_vdelning:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detaljer"
 
@@ -906,12 +1005,12 @@ msgid "_Categories..."
 msgstr "_Kategorier..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Ta bort"
@@ -2034,7 +2133,7 @@ msgid "Esq."
 msgstr "Herr"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Fullständigt namn"
 
@@ -2127,11 +2226,27 @@ msgstr "Kontaktlisteredigerare"
 msgid "Save List as VCard"
 msgstr "Spara lista som VCard"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Ändrad kontakt:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Kontakt i konflikt:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Dublett av kontakten upptäckt"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Denna kontakts ändrade namn eller e-postadress finns\n"
+"redan i den här mappen. Vill du lägga till den ändå?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Ny kontakt:"
@@ -2148,22 +2263,6 @@ msgstr ""
 "Denna kontakts namn eller e-postadress finns redan i den\n"
 "här mappen. Vill du lägga till den ändå?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Ändrad kontakt:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Kontakt i konflikt:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"Denna kontakts ändrade namn eller e-postadress finns\n"
-"redan i den här mappen. Vill du lägga till den ändå?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2262,9 +2361,9 @@ msgstr "Vidarebefordra kontakt"
 msgid "Send Message to Contact"
 msgstr "Skicka meddelande till kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Skriv ut"
@@ -2286,9 +2385,12 @@ msgstr "Flytta till mapp..."
 msgid "Cut"
 msgstr "Klipp ut"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopiera"
 
@@ -2297,16 +2399,8 @@ msgstr "Kopiera"
 msgid "Paste"
 msgstr "Klistra in"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Ta bort"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "Aktuell vy"
 
@@ -2323,166 +2417,170 @@ msgstr ""
 "det igen"
 
 #: 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:2
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Företagsfax"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Arbetstelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Företagstelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Tillbakaringningstelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Biltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategorier"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Företagets telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Avdelning"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "E-post 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Efternamn"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Arkivera som"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "Ledig/Upptagen-URL"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Hemadress"
+#, fuzzy
+msgid "Given Name"
+msgstr "Fältnamn"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Fax hem"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Hemtelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Hemtelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Jordanien"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Manager"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Smeknamn"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Notering"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Kontor"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Annan adress"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Annan fax"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Annan telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Personsökare"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Primär telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Yrke"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Roll"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Partner"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Titel"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Unst"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Webbsida"
 
@@ -2575,11 +2673,19 @@ msgstr "Medlemmar"
 msgid "Job Title"
 msgstr "_Jobbtitel:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Hemadress"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Hemadress"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Annan adress"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2592,112 +2698,109 @@ msgstr "Fax hem"
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Lyckades"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Lagret frånkopplat"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Åtkomst nekas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Kortet hittades inte"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Kort-ID finns redan"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Protokollet stöds inte"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Avbruten"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "Autentisering misslyckades"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "Autentisering krävs"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS är inte tillgänglig"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "Adressboken finns inte"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Annat fel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Vill du spara ändringar?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr "_Förkasta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Fel vid tillägg av lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Fel vid tillägg av kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Fel vid ändring av lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Fel vid ändring av kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Fel vid borttagning av lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Fel vid borttagning av kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2706,7 +2809,7 @@ msgstr ""
 "Att öppna %d kort kommer även att öppna %d nya fönster.\n"
 "Vill du verkligen visa alla dessa kort?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2715,49 +2818,49 @@ msgstr ""
 "%s finns redan\n"
 "Vill du skriva över den?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "Skriv över"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Fel vid sparande av %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Flytta kort till"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kopiera kort till"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Flytta kort till"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kopiera kort till"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Flera VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard för %s"
@@ -2953,7 +3056,7 @@ msgstr "Marginaler"
 msgid "Number of columns:"
 msgstr "Antal kolumner:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Alternativ"
 
@@ -3143,18 +3246,18 @@ msgstr "Namnlös lista"
 msgid "Split Multi-Day Events:"
 msgstr "Delade flerdagsevenemang:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Kunde inte starta wombat-server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Kunde inte starta wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunde inte läsa pilotens kalenderprogramblock"
 
@@ -3162,24 +3265,83 @@ msgstr "Kunde inte läsa pilotens kalenderprogramblock"
 msgid "Default Priority:"
 msgstr "Standardprioritet:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunde inte läsa pilotens att-göra-programblock"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Kalender och uppgifter"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Konfigurera din tidszon, kalender och uppgiftslista här "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolutionkalender och -uppgifter"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Evolutionkalenderns konfigurationskontroll"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolutionkalenderns schemaläggningsmeddelandevisare"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Evolutionkalenderns visare"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolutions kalender-/uppgiftsredigerare"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Evolutions uppgiftsvisare"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolutions kalender- och uppgiftskomponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolutions testkomponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Uppgifter"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolutionkalenderns alarmaviseringstjänst"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Startar:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Slutar:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Evolutionalarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm den %s"
@@ -3254,43 +3416,173 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Fråga mig inte om detta program igen."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolutionkalenderns alarmaviseringstjänst"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Kunde inte initiera Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Kunde inte initiera gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunde inte skapa fabriken för alarmaviseringstjänsten"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "ogiltig tid"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "iCalendar-fel"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Färg för uppgifter som ska utföras idag"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Färg för uppgifter som ska utföras idag"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "_Visa sluttiderna på möten i vecko- och månadsvyerna"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Förhandsgranskar kalendern som ska skrivas ut"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#, fuzzy
+msgid "Units of default reminder"
+msgstr "_Skapa nya möten med en standardpåminnelse"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "_Fråga efter bekräftelse vid borttagning av objekt"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "_Fråga efter bekräftelse vid borttagning av objekt"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Ta bort färdigställda uppgifter"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Visa v_eckonummer i datumbläddraren"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Sammanfattningen innehåller"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Beskrivningen innehåller"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Kommentaren innehåller"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Omatchade"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3303,80 +3595,110 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dessa uppgifter?"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "returnerar mindre än"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "dag"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Skriv ut denna kalender"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Nya Kaledonien"
 
-#: calendar/gui/calendar-component.c:207
-msgid "Rename"
-msgstr "Byt namn"
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "Nytt möte"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "_Möte"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Personligt"
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Skapa ett nytt möte"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Jobb"
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "Nytt sammanträde"
+
+#: calendar/gui/calendar-component.c:640
+msgid "M_eeting"
+msgstr "_Sammanträde"
+
+#: calendar/gui/calendar-component.c:641
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Skapa en ny sammanträdesbegäran"
+
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Nytt heldagsmöte"
+
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr "Hel_dagsmöte"
+
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Skapa ett nytt möte"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3493,7 +3815,7 @@ msgstr "Skicka till:"
 msgid "With these arguments:"
 msgstr "Med dessa argument:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -3509,6 +3831,10 @@ msgstr "timme"
 msgid "minutes"
 msgstr "minut"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3541,8 +3867,8 @@ msgstr "Skicka ett e-brev"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Sammanfattning:"
 
@@ -3571,7 +3897,7 @@ msgstr "slut på möte"
 msgid "hour(s)"
 msgstr "timme/timmar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minut(er)"
 
@@ -3625,7 +3951,7 @@ msgstr "dag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "fredag"
 
@@ -3639,7 +3965,7 @@ msgstr "minut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "måndag"
 
@@ -3649,7 +3975,7 @@ msgstr "_sön"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "lördag"
 
@@ -3663,7 +3989,7 @@ msgstr "Visa v_eckonummer i datumbläddraren"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "söndag"
 
@@ -3681,7 +4007,7 @@ msgstr "Uppgiftslista"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "torsdag"
 
@@ -3699,7 +4025,7 @@ msgstr "Tidsformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "tisdag"
 
@@ -3709,12 +4035,12 @@ msgstr "V_eckan börjar:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "onsdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Arbetsvecka"
 
@@ -3751,7 +4077,7 @@ msgid "_Fri"
 msgstr "_fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "Allm_änt"
 
@@ -3791,7 +4117,7 @@ msgstr "_ons"
 msgid "before every appointment"
 msgstr "före varje möte"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
@@ -3799,11 +4125,11 @@ msgstr ""
 "Evenemanget som tas bort är ett sammanträde. Vill du skicka ett "
 "avbokningsmeddelande?"
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Är du säker på att du vill avboka och ta bort detta sammanträde?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
@@ -3811,11 +4137,11 @@ msgstr ""
 "Uppgiften som tas bort är tilldelad. Vill du skicka ett "
 "avbrytningsmeddelande?"
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Är du säker på att du vill avbryta och ta bort denna uppgift?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -3823,52 +4149,52 @@ msgstr ""
 "Dagboksposten som tas bort är publicerad. Vill du skicka ett meddelande om "
 "att det är inställt?"
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Är du säker på att du vill avbryta ta bort denna dagbokspost?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Detta evenemang har tagits bort."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Denna uppgift har tagits bort."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Denna dagbokspost har tagits bort."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Du har gjort ändringar. Glöm dessa ändringar och stäng redigeraren?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Du har inte gjort några ändringar, stäng redigeraren?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Detta evenemang har ändrats."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Denna uppgift har ändrats."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Denna dagbokspost har ändrats."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Du har gjort ändringar. Glöm dessa ändringar och uppdatera redigeraren?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har inte gjort några ändringar, uppdatera redigeraren?"
@@ -3878,166 +4204,171 @@ msgstr "%s  Du har inte gjort några ändringar, uppdatera redigeraren?"
 msgid "Validation error: %s"
 msgstr "Valideringsfel: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " till "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Färdigt "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Färdigt "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Ska utföras "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Ska utföras "
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "Kunde inte uppdatera objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Redigera möte"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Möte - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Uppgift - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagbokspost - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Ingen sammanfattning"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Spara som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Ändringar som görs i detta objekt kan komma att kastas om en uppdatering "
 "kommer"
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Kunde inte få tag i aktuell version!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Välj en destinationsmapp för importen av denna data"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Är du säker på att du vill ta bort mötet \"%s\""
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Är du säker på att du vill ta bort detta namnlösa möte?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Är du säker på att du vill ta bort uppgiften \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Är du säker på att du vill ta bort denna namnlösa uppgift?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Är du säker på att du vill ta bort dagboksposten \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Är du säker på att du vill ta bort denna namnlösa dagbokspost?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Är du säker på att du vill ta bort %d möten?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Är du säker på att du vill ta bort %d uppgifter?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Är du säker på att du vill ta bort %d dagboksposter?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "Evenemanget kunde inte tas bort på grund av ett corba-fel"
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "Uppgiften kunde inte tas bort på grund av ett corba-fel"
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Dagboksposten kunde inte tas bort på grund av ett corba-fel"
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Objektet kunde inte tas bort på grund av ett corba-fel"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "Evenemanget kunde inte tas bort på grund av att åtkomst nekades"
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "Uppgiften kunde inte tas bort på grund av att åtkomst nekades"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Dagboksposten kunde inte tas bort på grund av att åtkomst nekades"
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "Objektet kunde inte tas bort på grund av åtkomst nekades"
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Evenemanget kunde inte tas bort på grund av ett corba-fel"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Uppgiften kunde inte tas bort på grund av ett corba-fel"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Dagboksposten kunde inte tas bort på grund av ett corba-fel"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Objektet kunde inte tas bort på grund av ett corba-fel"
@@ -4054,43 +4385,43 @@ msgstr "Delegera till:"
 msgid "Enter Delegate"
 msgstr "Ange delegerad person"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Möte"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Påminnelse"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Upprepning"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Schemaläggning"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Sammanträde"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "Startdatumet är fel"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "Slutdatumet är fel"
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "Starttiden är fel"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "Sluttiden är fel"
 
@@ -4160,31 +4491,31 @@ msgid "_Start time:"
 msgstr "_Starttid:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr "Organisatören som valts har inte längre ett konto."
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "En organisatör krävs."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "Det måste finnas åtminstone en deltagare."
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Delegera till..."
 
@@ -4225,21 +4556,15 @@ msgid "Member"
 msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "OSA"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Roll"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -4259,6 +4584,7 @@ msgid "_Invite Others..."
 msgstr "Bjud _in andra..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4291,6 +4617,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Kunde inte skapa katalogen %s: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "En organisatör måste vara angiven."
@@ -4320,33 +4647,58 @@ msgstr "Kalenderinformation"
 msgid "Calendar Name"
 msgstr "Kalender"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Kunde inte skapa katalogen %s: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Kalenderinformation"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Uppgiftslista"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Uppgiftslista"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Uppgiftslista"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr "Du ändrar ett återkommande evenemang. Vad vill du ändra?"
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Du ändrar en återkommande uppgift. Vad vill du ändra?"
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr "Du ändrar en återkommande dagsbokspost. Vad vill du ändra?"
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr "Endast denna instans"
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Denna och framtida instanser"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr "Denna och framtida instanser"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr "Alla instanser"
 
@@ -4395,10 +4747,15 @@ msgstr "dag"
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "förekomster"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Datum/tid:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "L_ägg till"
@@ -4463,7 +4820,7 @@ msgstr "veckor"
 msgid "year(s)"
 msgstr "år"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
@@ -4473,31 +4830,31 @@ msgstr ""
 "\n"
 "Vill du spara dina ändringar?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "_Förkasta ändringar"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 msgid "Save Event"
 msgstr "Spara evenemang"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Sammanträdesinformationen har skapats. Skicka den?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Sammanträdesinformationen har ändrats. Skicka en uppdaterad version?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "Uppgiftstilldelningsinformationen har ändrats. Skicka den?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "Uppgiftsinformationen har ändrats. Skicka en uppdaterad version?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Utförtdatumet är fel"
 
@@ -4507,43 +4864,43 @@ msgid "% _Complete"
 msgstr "% färdigt"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Färdigt"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Hög"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "Pågår"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Låg"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Inte startad"
 
@@ -4552,7 +4909,7 @@ msgid "Progress"
 msgstr "Förlopp"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Odefinierad"
 
@@ -4574,21 +4931,21 @@ msgstr "_Status:"
 msgid "_Web Page:"
 msgstr "_Webbsideadress:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Grundläggande"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Tilldelning"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "Förfallodatumet är fel"
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4596,9 +4953,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "_Konfidentiellt"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Beskrivning:"
 
@@ -4703,26 +5060,21 @@ msgstr "%s vid %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s för en okänd triggertyp"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Publikt"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Konfidentiellt"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategorier"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4735,28 +5087,26 @@ msgid "Start Date"
 msgstr "Startdatum"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Sammanfattning"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "färg"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "möte"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Ledig"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Upptagen"
 
@@ -4768,7 +5118,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "Ö"
 
@@ -4776,7 +5126,7 @@ msgstr "Ö"
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4786,7 +5136,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4794,7 +5144,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4802,17 +5152,17 @@ msgstr "Nej"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Okänd"
 
@@ -4824,181 +5174,179 @@ msgstr "Återkommande"
 msgid "Assigned"
 msgstr "Tilldelad"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Uppdaterar objekt"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Tar bort markerade objekt"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Uppdaterar objekt"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Nytt _möte..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Nytt _heldagsevenemang"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "Nytt sammanträde"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Ny uppgift"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "Skriv _ut..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "Klistra _in"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Gå till _idag"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "_Gå till datum..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicera ledig-/upptageninformation"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "_Inställningar..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Öppna"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Spara som..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Kopiera"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "_Boka sammanträde..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "_Vidarebefordra som iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Ta bort denna f_örekomst"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Ta bort _alla förekomster"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "_Inställningar..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Öppna meddelande"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "_Tilldela uppgift"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "_Vidarebefordra som iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "_Markera som färdig"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Markera markerade uppgifter som färdiga"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "_Ta bort markerade uppgifter"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klicka för att lägga till en uppgift"
@@ -5012,8 +5360,8 @@ msgstr "% färdigt"
 msgid "Alarms"
 msgstr "Alarm"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Färdigt"
 
@@ -5042,18 +5390,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %Y-%m-%d %H.%M.%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y-%m-%d %H.%M.%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5072,7 +5420,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5085,446 +5433,445 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "fm"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "em"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja, (Komplex upprepning)"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "Varje dag"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "Var %d dag"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "Varje vecka"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "Var %d vecka"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr "Varje vecka på "
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Varje %d vecka på "
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " och "
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr "Den %s dagen i "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr "Den %s %s i "
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "varje månad"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr "var %d månad"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "Varje år"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "Var %d år"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr " totalt %d gånger"
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ", med slut den "
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>Börjar:</b>"
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Slutar:<b>"
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>Färdigt:</b> "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>Ska utföras:</b> "
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "iCalendar-information"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "iCalendar-fel"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "En okänd person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 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:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "Plats:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Godtaget"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Preliminärt godtaget"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Avböjt"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Välj en åtgärd:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Uppdatera"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Acceptera"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Acceptera preliminärt"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Neka"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Skicka ledig-/upptageninformation"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Uppdatera svarandestatus"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Skicka senaste information"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har publicerat sammanträdesinformation."
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Sammanträdesinformation"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> begär att %s närvarar vid ett sammanträde."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> begär din närvaro vid ett sammanträde."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Sammanträdesförslag"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> vill lägga till i ett befintligt sammanträde."
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Sammanträdesuppdatering"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> vill få den senaste sammanträdesinformationen."
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Begäran av sammanträdesuppdatering"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> har svarat på en sammanträdesbegäran."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Sammanträdessvar"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> har avbokat ett sammanträde."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Sammanträdesavbokning"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, 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:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Felaktigt sammanträdesmeddelande"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> har publicerat uppgiftsinformation."
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Uppgiftsinformation"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> begär att %s utför en uppgift."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, 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:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Uppgiftsförslag"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, 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:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Uppgiftsuppdatering"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, 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:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Begäran om uppgiftsuppdatering"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, 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:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Uppgiftssvar"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> har avbokat en uppgift."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Uppgiftsavbokning"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Felaktigt uppgiftsmeddelande"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, 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:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Ledig-/upptageninformation"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, 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:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Ledig-/Upptagenbegäran"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, 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:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Ledig-/Upptagensvar"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Felaktigt ledig-/upptagenmeddelande"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr "Meddelandet verkar inte vara korrekt utformat"
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 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:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Bilagan innehåller inte ett giltigt kalendermeddelande"
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr "Bilagan har inga visningsbara kalenderobjekt"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderfilen kunde inte uppdateras!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Uppdateringen färdig\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Närvarostatusen kan inte uppdateras eftersom objektet inte längre finns"
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet är ogiltigt och kan inte uppdateras\n"
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Detta svar är inte från en nuvarande deltagare. Lägg till som deltagare?"
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Närvarostatus kunde inte uppdateras på grund av ogiltig status!\n"
 
 # Detta är inte diskussionsgrupper utan nyheter
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr "Ett fel uppstod i CORBA-systemet\n"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr "Objektet kunde inte hittas\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Du har inte rätt rättigheter för att uppdatera kalendern\n"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Närvarostatus är uppdaterad\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "Närvarostatus kunde inte uppdateras!\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Borttagning färdig"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Objektet skickat!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Objektet kunde inte skickas!\n"
 
@@ -5684,7 +6031,7 @@ msgstr "%a %Y-%m-%d"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
@@ -5748,48 +6095,43 @@ msgstr "Sammanträdets _starttid:"
 msgid "Meeting _end time:"
 msgstr "Sammanträdets slu_ttid:"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "Sta_rtdatum:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 msgid "Due Date:"
 msgstr "Förfallodatum:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "_Prioritet:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Sida"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Öppnar uppgifter i %s"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunde inte läsa in uppgifterna i \"%s\""
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden som krävs för att läsa in \"%s\" stöds inte"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Du har inte rättigheter att öppna mappen i \"%s\""
 
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5798,48 +6140,39 @@ msgstr ""
 "Fel vid %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "Färdigställer uppgifter..."
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "Tar bort markerade objekt..."
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "Utplånar"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Uppgifter"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunde inte öppna mappen i \"%s\""
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, 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"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Lägger till alarm för %s"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5851,7 +6184,7 @@ msgstr ""
 " har kraschat. Du kommer att behöva starta om Evolution för att kunna "
 "använda den igen"
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5863,58 +6196,11 @@ msgstr ""
 " har kraschat. Du kommer att behöva starta om Evolution för att kunna "
 "använda den igen"
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Turin"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalender och uppgifter"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Kalender"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Konfigurera din tidszon, kalender och uppgiftslista här "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolutionkalender och -uppgifter"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolutionkalenderns konfigurationskontroll"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolutionkalenderns schemaläggningsmeddelandevisare"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolutionkalenderns visare"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolutions kalender-/uppgiftsredigerare"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolutions uppgiftsvisare"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolutions kalender- och uppgiftskomponent"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolutions testkomponent"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "april"
@@ -5971,296 +6257,332 @@ msgstr "oktober"
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "En organisatör måste vara angiven."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Åtminstone en deltagare krävs"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Evenemangsinformation"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Uppgiftsinformation"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Dagboksinformation"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Ledig-/upptageninformation"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Kalenderinformation"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Uppdaterat"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "Motförslag"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig-/upptageninformation (%s till %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "iCalendar-information"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Du måste delta i evenemanget."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1:a"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2:a"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3:e"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4:e"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5:e"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6:e"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7:e"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8:e"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9:e"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10:e"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11:e"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12:e"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13:e"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14:e"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15:e"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16:e"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17:e"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18:e"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19:e"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20:e"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21:a"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22:a"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23:e"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24:e"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25:e"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26:e"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27:e"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28:e"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29:e"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30:e"
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31:a"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Sö"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Må"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Ti"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "On"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "To"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Fr"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Lö"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Markerad dag (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Markerad vecka (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Markerad månad (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Markerat år (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Uppgift"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procent klar: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Kontakter: "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Förhandsgranska"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Skriv ut objekt"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Skrivarinställningar"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Byt namn på denna genväg"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Uppgiftslista"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Ny uppgift"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Uppgift"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Skapa en ny uppgift"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "URI:t som uppgiftsmappen ska visa"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6273,11 +6595,11 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dessa uppgifter?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Fråga mig inte igen."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "Skriv ut uppgifter"
 
@@ -6305,15 +6627,15 @@ msgstr "iCalendar-filer (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar-filer (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "Påminnelse!!"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "Kalenderevenemang"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6321,7 +6643,7 @@ msgstr ""
 "Evolution har hittat Gnome-kalenderfiler.\n"
 "Vill du importera dem till Evolution?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Gnome-kalendern"
 
@@ -7854,27 +8176,27 @@ msgstr "Stilla_Havet/Wallis"
 msgid "Pacific/Yap"
 msgstr "Stilla_Havet/Yap"
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "Signering stöds inte av detta chiffer"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "Verifiering stöds inte av detta chiffer"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Kryptering stöds inte av detta chiffer"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Dekryptering stöds inte av detta chiffer"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr "Du kan inte importera nycklar med detta chiffer"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr "Du kan inte exportera nycklar med detta chiffer"
 
@@ -7926,86 +8248,86 @@ msgstr "Förbereder mappen \"%s\" för frånkopplat"
 msgid "You must be working online to complete this operation"
 msgstr "Du måste vara ansluten för att kunna genomföra denna åtgärd"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Misslyckades med att skapa rör till \"%s\": %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Misslyckades med att skapa barnprocessen \"%s\": %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ogiltig meddelandeström mottagen från %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Synkroniserar mappar"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fel vid tolkning av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fel vid körning av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Kan inte öppna spool-mappen"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Kan inte bearbeta spool-mappen"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Hämtar meddelande %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Kan inte öppna meddelande"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Misslyckades med meddelande %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Synkroniserar mapp"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Hämtar meddelande %d av %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Misslyckades vid meddelande %d av %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Misslyckades med att hämta meddelande"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr "Ogiltiga argument till (system-flag)"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr "Ogiltiga argument till (user-tag)"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fel vid körning av filtersökning: %s: %s"
@@ -8037,35 +8359,35 @@ msgstr "(matcha-alla) kräver ett ensamt booleskt resultat"
 msgid "Performing query on unknown header: %s"
 msgstr "Utför fråga på okänt huvud: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Åtgärden stöds inte: lägg till meddelande: för %s"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Åtgärden stöds inte: sökning med uttryck: för %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Åtgärden stöds inte: sökning med uid: för %s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Flyttar meddelanden"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr "Kopierar meddelanden"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Hämtar %d meddelande(n)"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8076,15 +8398,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr "Misslyckades med att tolka gpg-tips för användarid."
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr "Misslyckades med att tolka gpg-lösenfrasbegäran."
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8093,31 +8415,31 @@ msgstr ""
 "Du behöver en lösenfras för att låsa upp nyckeln för\n"
 "användaren: \"%s\""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Avbruten."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Misslyckades med att låsa upp hemlig nyckel: 3 felaktiga lösenfraser angivna."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Oväntat svar från GnuPG: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr "Inga data tillhandahållna"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Misslyckades med att kryptera: inga giltiga mottagare angivna."
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8128,50 +8450,63 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Misslyckades med att GPG:a %s: %s\n"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Kunde inte skriva data: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Misslyckades med att köra gpg: %s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr "Misslyckades med att köra gpg."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "Detta är en digitalt signerad meddelandedel"
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr ""
+"Kan inte verifiera meddelandesignatur: kunde inte skapa temporär fil: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Kan inte verifiera meddelandesignatur: kunde inte skapa temporär fil: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Kunde inte skriva data: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Detta är en digitalt signerad meddelandedel"
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Indexera innehåll i meddelandetext"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Kunde inte hämta meddelande från redigeraren"
@@ -8270,15 +8605,15 @@ msgstr "Fel vid skrivande av temporär brevlådefil: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Fel vid kopierande av temporär brevfil: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Misslyckades med att dekryptera MIME-del: protokollfel"
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "Misslyckades med att dekryptera MIME-del: ogiltig struktur"
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "tolkningsfel"
 
@@ -8607,12 +8942,12 @@ msgstr "E-postleverantör för virtuell mapp"
 msgid "For reading mail as a query of another set of folders"
 msgstr "För läsande av e-post som en fråga av en annan samling mappar"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Det finns ingen leverantör för protokollet \"%s\""
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8621,71 +8956,82 @@ msgstr ""
 "Kunde inte skapa katalogen %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Ange din %s-lösenordsfras för %s"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Odefinierad"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Redigera signatur"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Redigera signatur"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Kunde inte signera: certifikat hittades inte för \"%s\"."
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "Certifikatet opålitligt"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Spara signatur"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Tolkningsfel"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Server: %s, typ: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kan inte få tag i mapp: Ogiltig åtgärd på detta lager"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan inte skapa mapp: Ogiltig åtgärd på detta lager"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Papperskorg"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "juni"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "Kan inte hämta utfärdarens certifikat."
@@ -8896,7 +9242,7 @@ msgstr ""
 "Certifikatåterkallelselistan har gått ut: %s\n"
 "Utfärdare: %s"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Kunde inte tolka URL:en \"%s\""
@@ -8915,22 +9261,22 @@ msgstr "Det finns inget sådant meddelande %s i %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kan inte kopiera eller flytta meddelanden till en virtuell mapp"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan inte ta bort mapp: %s: Ogiltig åtgärd"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan inte ta bort mapp: %s: Det finns ingen sådan mapp"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan inte byta namn på mapp: %s: Ogiltig åtgärd"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan inte byta namn på mapp: %s: Det finns ingen sådan mapp"
@@ -9010,7 +9356,7 @@ msgstr "Kan inte hämta meddelande: %s"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9024,7 +9370,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Det finns inget sådant meddelande"
@@ -9062,55 +9408,70 @@ msgid "Failed to cache %s: %s"
 msgstr "Misslyckades med att cacha %s: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Anslut till server"
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Misslyckades med att ansluta till LDAP-server"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "Kommando"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Kontroll av ny e-post"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 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:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Mappar"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Visa endast prenumererade mappar"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "Åsidosätt mappnamnrymden som servern tillhandahåller"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Namnrymd"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Tillämpa filtren på nya meddelanden i INBOX på denna server"
 
 # Låter konstigt
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "Kontrollera _automatiskt ny e-post var"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "För läsande och lagrande av e-post på IMAP-servrar."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Lösenord"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9363,7 +9724,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Kunde inte byta namn på mappen %s till %s: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kunde inte byta namn på \"%s\": %s"
@@ -9478,29 +9839,29 @@ msgstr "Kontrollerar nya meddelanden"
 msgid "Storing folder"
 msgstr "Lagrar mapp"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kan inte skapa mapplås på %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kan inte öppna brevlåda: %s %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "E-posttillägg avbrutet"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan inte lägga till meddelande till mbox-fil: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9509,11 +9870,11 @@ msgstr ""
 "Kan inte hämta meddelande: %s från mappen %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappen verkar vara obotligt skadad."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Meddelandebyggande misslyckades: Trasig brevlåda?"
 
@@ -9581,12 +9942,17 @@ msgstr "Kunde inte skapa katalogen %s: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "Kan inte få mapp: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "Kort-ID finns redan"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Kunde inte byta namn på mappen %s till %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Det angivna mappnamnet är inte giltigt: %s"
@@ -9630,7 +9996,7 @@ msgstr "Kunde inte stänga källmappen %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Kunde inte stänga temporära mapp: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunde inte byta namn på mapp: %s"
@@ -9913,7 +10279,7 @@ msgstr "Ta bort efter %s dag(ar)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Inaktivera stöd för alla POP3-tillägg"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -10003,7 +10369,7 @@ msgid "No such folder `%s'."
 msgstr "Det finns ingen mapp \"%s\"."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10057,7 +10423,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "E-postleverans via programmet sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10225,7 +10591,7 @@ msgstr "SMTP-epostleverans via %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan inte skicka meddelande: avsändaradressen är inte giltig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Skickar meddelande"
 
@@ -10347,7 +10713,7 @@ msgstr "%.0f M"
 msgid "%.0fG"
 msgstr "%.0f G"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "bilaga"
 
@@ -10391,14 +10757,14 @@ msgstr "MIME-typ:"
 msgid "Suggest automatic display of attachment"
 msgstr "Föreslå automatisk visning av bilaga"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Du måste konfigurera ett konto\n"
 "innan du kan skriva brev."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Klicka här för att ta fram adressboken"
 
@@ -10409,45 +10775,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Svara till:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Från:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Ämne:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Till:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Ange meddelandets mottagare"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Ange adresserna som ska få en kopia av meddelandet"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Blindkopia:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10458,14 +10824,19 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Posta till:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr "Postdestination"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Bifoga en fil till meddelandet"
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Bifoga fil(er)"
@@ -10501,21 +10872,21 @@ msgstr "Filen finns, skriv över?"
 msgid "Error saving file: %s"
 msgstr "Fel vid sparande av filen: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fel vid inläsning av filen: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fel vid åtkomst av filen: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Kunde inte hämta meddelande från redigeraren"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10524,7 +10895,7 @@ msgstr ""
 "Kan inte spola filen: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10533,7 +10904,7 @@ msgstr ""
 "Kan inte trunkera filen: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10542,7 +10913,7 @@ msgstr ""
 "Kan inte kopiera filhandtag: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10551,7 +10922,7 @@ msgstr ""
 "Fel vid automatiskt sparande av meddelande: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10559,7 +10930,7 @@ msgstr ""
 "Ximian Evolution har hittat osparade filer från en tidigare session.\n"
 "Vill du försöka återställa dem?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10570,28 +10941,28 @@ msgstr ""
 "\n"
 "Vill du spara dina ändringar?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Varning: Ändrat meddelande"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Öppna fil"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "Automatiskt genererad"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Skriv ett meddelande"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10599,7 +10970,7 @@ msgstr ""
 "Kan inte skapa redigerarfönstret:\n"
 "Kan inte aktivera adressväljarkontrollen."
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10611,7 +10982,7 @@ msgstr ""
 "Försäkra dig om att du har rätt versioner av\n"
 "gtkhtml och libgtkhtml installerade.\n"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10619,7 +10990,7 @@ msgstr ""
 "Kunde inte skapa redigerarfönstret:\n"
 "Kan inte aktivera HTML-redigerarkomponenten."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10628,11 +10999,13 @@ msgstr ""
 "redigeras.)<b>"
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Grupprogramvaran Evolution"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10888,13 +11261,13 @@ msgstr "%H.%M.%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%H.%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H.%M"
 
@@ -11013,7 +11386,7 @@ msgstr "Då"
 msgid "You must specify a folder."
 msgstr "Du måste ange en mapp."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Välj mapp"
@@ -11027,24 +11400,24 @@ msgstr ""
 "Fel i reguljära uttrycket \"%s\":\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "viktigt"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "Att-göra"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Senare"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Test"
 
@@ -11145,7 +11518,7 @@ msgstr "sedan"
 msgid "months"
 msgstr "månader"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "sekunder"
 
@@ -11242,7 +11615,7 @@ msgstr "Uttryck"
 msgid "Follow Up"
 msgstr "Följ upp"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "Etikett"
 
@@ -11313,112 +11686,118 @@ msgid "Source Account"
 msgstr "Källkonto"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Små vattendroppar i luften"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Specifikt huvud"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Stoppa behandling"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Ämne"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "Töm status"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "innehåller"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "innehåller inte"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "slutar inte med"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "finns inte"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "does not return"
 msgstr "returnerar inte"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "låter inte som"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "börjar inte med"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "slutar med"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "finns"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr "är flaggad"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr "är efter"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "is before"
 msgstr "är innan"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "är större än"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "är mindre än"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr "är inte flaggad"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "är inte"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "är"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr "returnerar större än"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr "returnerar mindre än"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr "returnerar"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "låter som"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "börjar med"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Regelnamnet \"%s\" är inte unikt, välj ett annat."
@@ -11443,18 +11822,80 @@ msgstr "Regelnamn"
 msgid "Score Rules"
 msgstr "Poängregler"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Du måste ge denna virtuella mapp ett namn."
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr "Du måste ange minst en mapp som källa."
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 msgid "VFolder source"
 msgstr "Källa för virtuell mapp"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Redigerarinställningar"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Konfigurera e-postinställningar, inklusive säkerhet och meddelandevisning, "
+"här"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Konfigurera stavningskontroll, signaturer, och meddelanderedigeraren här"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Konfigurera dina e-postkonton här"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolutions e-post"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolutions e-posts konfigurationskontroll för konton"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Evolutions e-postkomponent"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Evolutions e-postredigerare"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolutions e-postredigerarkonfigurationskontroll"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail folder viewer"
+msgstr "Evolutions e-postmappvisare"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolutions e-postinställningskontroll"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "E-post"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "E-postkonton"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "E-postinställningar"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Är du säker på att du vill ta bort detta konto?"
@@ -11496,7 +11937,7 @@ msgid "Protocol"
 msgstr "Protokoll"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr "Namnlös"
 
@@ -11520,20 +11961,17 @@ msgstr "Lägg till skriptsignatur"
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "Du skickar ett HTML-formaterat brev. Försäkra dig om att följande\n"
 "mottagare vill ha, och kan ta emot, HTML-formaterad e-post:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Skicka ändå?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11541,7 +11979,7 @@ msgstr ""
 "Detta meddelande har inget ämne.\n"
 "Vill du verkligen skicka?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11549,11 +11987,11 @@ msgstr ""
 "Eftersom kontaktlistan som du skickar är konfigurerad att dölja listans "
 "adresser kommer detta meddelande endast att innehålla blindkopiemottagare."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Detta meddelande innehåller endast blindkopiemottagare."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11563,11 +12001,11 @@ msgstr ""
 "till ett Apparently-To-huvud.\n"
 "Skicka ändå?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Du måste ange mottagare för att kunna skicka detta meddelande."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11579,189 +12017,401 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Skapa _virtuell mapp från sökning..."
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "E-post"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<klicka här för att välja en mapp>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" i \"%s\""
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Skapa ny mapp"
 
-#: mail/em-folder-selector.c:267
-#, fuzzy
-msgid "Folder _name"
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Ange var mappen ska skapas:"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
 msgstr "Mapp_namn:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Kunde inte skapa temporär katalog: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Kunde inte skapa temporär katalog: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Kunde inte skapa temporär fil \"%s\": %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Kunde inte stänga temporära mapp: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Läser in..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, fuzzy, c-format
+msgid "%s"
+msgstr "s"
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Välj mapp"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Skapa en ny mapp"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Kunde inte ta bort mappen \"%s\": %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Verkligen ta bort mappen \"%s\"?"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Ta bort \"%s\""
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Byt namn på mappen \"%s\" till:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+msgid "Rename Folder"
+msgstr "Byt namn på mapp"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Typsnittsegenskaper"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Egenskaper"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "_Mappnamn:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Visa"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Öppna i nytt fönster"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Flytta"
+
+#: mail/em-folder-tree.c:1500
+msgid "_New Folder..."
+msgstr "_Ny mapp..."
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "_Byt namn"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "_Egenskaper..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "_Redigera som nytt meddelande..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "Skriv _ut"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "Sva_ra till avsändaren"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Svara till _lista"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "Vidare_befordra"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr "Föl_j upp..."
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr "Fla_gga färdig"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "T_öm flagga"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "_Markera som läst"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "Markera som _oläst"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Markera som _viktigt"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "Markera som ovi_ktigt"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Markera som _oläst"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Markera som _viktigt"
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "_Ångra borttagning"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "Fl_ytta till mapp..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kopiera till mapp..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "Lägg till avsändaren i adress_boken"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "Till_ämpa filter"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "Ska_pa regel från meddelande"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "Virtuell mapp på _ämne"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "Virtuell mapp på _avsändare"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "Virtuell mapp på _mottagare"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "Virtuell mapp på sänd_lista"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "Virtuell mapp på avsändare"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Filtrera på _ämne"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Filtrera på _avsändare"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Filtrera på _mottagare"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Filtrera på sä_ndlista"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filtrera på _avsändare"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Standard"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Skriv ut meddelande"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopiera länkplats"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Träffar:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Tilldelad"
+
+#: mail/em-format-html-display.c:597
+#, fuzzy
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr "Detta meddelande är digitalt signerat men äktheten kan inte bevisas."
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Redigera signatur"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Redigera signatur"
+
+#: mail/em-format-html-display.c:599
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
 msgstr ""
-"Detta meddelande är digitalt signerat. Klicka på låsikonen för mer "
-"information."
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:600
+#, fuzzy
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"input_token innehåller en ogiltig signatur, eller en signatur som inte kunde "
+"verifieras."
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "kryptera"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "kryptera"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Kunde inte tolka MIME-meddelande. Visar som källkod."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Schemat stöds inte"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Kan inte verifiera lövsignatur"
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Visa inuti"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Dölj"
@@ -11771,185 +12421,207 @@ msgstr "Dölj"
 msgid "Page %d of %d"
 msgstr "Sida %d av %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Hämtar meddelande %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Felaktig del med extern meddelandetext."
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pekare till FTP-plats (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pekare till lokal fil (%s) giltig på platsen \"%s\""
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pekare till lokal fil (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pekare till fjärrdata (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pekare till okänd extern data (typen \"%s\")"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-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/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Detta meddelande är digitalt signerat och har befunnits äkta."
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-#, fuzzy
-msgid "No signature present"
-msgstr "Dölj signaturtips"
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Kunde inte initiera GNOME"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Schemat stöds inte"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunde inte tolka MIME-meddelande. Visar som källkod."
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Flyttar meddelanden"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Från"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Svara till"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Till"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Kopia"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Blindkopia"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "E-postprogram"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "%s-bilaga"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Kunde inte tolka MIME-meddelande. Visar som källkod."
+msgid "Session not initialised"
+msgstr "Kunde inte initiera GNOME"
 
-#: mail/em-popup.c:593
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Detta meddelande är digitalt signerat och har befunnits äkta."
+
+#: mail/em-format.c:1212
+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/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Väntar..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Skapar \"%s\""
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Misslyckades med att cacha %s: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Misslyckades med att skapa rör till \"%s\": %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Misslyckades med att slå upp värden \"%s\": %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Spara som..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 #, fuzzy
 msgid "Set as _Background"
 msgstr "Bakgrund:"
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Svara till avsändaren"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Öppna länk i webbläsare"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Skicka _meddelande till lista..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Lägg till adressbok"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Öppna i %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "Denna server stöder inte LDAPv3-schemainformation"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Prenumerera"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Mapp"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Välj en server."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Ingen server har valts"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Visa inte detta meddelande igen."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11958,27 +12630,27 @@ msgstr ""
 "Fel vid läsning av filterinformation:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Vidarebefordrat meddelande"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "en okänd avsändare"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%a %Y-%m-%d klockan %H.%M skrev %%s:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -11987,7 +12659,7 @@ msgstr ""
 "Kan inte spara till \"%s\":\n"
 " %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -11996,25 +12668,26 @@ msgstr ""
 "\"%s\" finns redan.\n"
 "Vill du skriva över den?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Meddelande"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Spara meddelande som..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Kunde inte skapa temporär katalog: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Adress"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12024,61 +12697,434 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dessa meddelanden?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Redigerarinställningar"
+#: mail/em-utils.c:2288
+#, fuzzy
+msgid ""
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Denna åtgärd kommer att permanent ta bort de meddelanden som har\n"
+"markerats som borttagna. Om du fortsätter kommer du inte att kunna\n"
+"återställa dessa meddelanden.\n"
+"\n"
+"Vill du verkligen ta bort dessa meddelanden?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/evolution-mail.schemas.in.in.h:1
+#, fuzzy
+msgid "Automatic link recognition"
+msgstr "_Detektera automatiskt länkar"
+
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "_Detektera automatiskt länkar"
+
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
+msgid "Default charset in which to compose messages"
+msgstr "Standardämne för meddelandet."
+
+#: mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
+msgid "Default charset in which to compose messages."
+msgstr "Standardämne för meddelandet."
+
+#: mail/evolution-mail.schemas.in.in.h:8
+#, fuzzy
+msgid "Default charset in which to display messages"
+msgstr "Sök efter text i meddelandetexten på det visade meddelandet"
+
+#: mail/evolution-mail.schemas.in.in.h:9
+#, fuzzy
+msgid "Default charset in which to display messages."
+msgstr "Sök efter text i meddelandetexten på det visade meddelandet"
+
+#: mail/evolution-mail.schemas.in.in.h:10
+#, fuzzy
+msgid "Default forward style"
+msgstr "Standardstil för vidarebefordran är: "
+
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default reply style"
+msgstr "Standardstil för vidarebefordran är: "
+
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Empty Trash folders on exit"
+msgstr "Töm _papperskorgsmappar vid avslut"
+
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Töm _papperskorgsmappar vid avslut"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+#, fuzzy
+msgid "Height of the message-list pane"
+msgstr "Skicka meddelandet senare"
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid ""
-"Configure mail preferences, including security and message display, here"
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
 msgstr ""
-"Konfigurera e-postinställningar, inklusive säkerhet och meddelandevisning, "
-"här"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
 msgstr ""
-"Konfigurera stavningskontroll, signaturer, och meddelanderedigeraren här"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Konfigurera dina e-postkonton här"
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
+msgstr "Lista med signaturer"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolutions e-post"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolutions e-posts konfigurationskontroll för konton"
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolutions e-postkomponent"
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolutions e-postredigerare"
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolutions e-postredigerarkonfigurationskontroll"
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Evolutions e-postmappvisare"
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "_Logga filteråtgärder i:"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolutions e-postinställningskontroll"
+#: mail/evolution-mail.schemas.in.in.h:28
+#, fuzzy
+msgid "Log filter actions to the specified log file."
+msgstr "_Logga filteråtgärder i:"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "E-postkonton"
+#: mail/evolution-mail.schemas.in.in.h:29
+#, fuzzy
+msgid "Logfile to log filter actions"
+msgstr "_Logga filteråtgärder i:"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "E-postinställningar"
+#: mail/evolution-mail.schemas.in.in.h:30
+#, fuzzy
+msgid "Logfile to log filter actions."
+msgstr "_Logga filteråtgärder i:"
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Notifiering om ny post"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Notifiering om ny post"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+#, fuzzy
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr "Fråga då meddelanden skickas med ett _tomt ämne"
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr "_Fråga då HTML-meddelanden skickas till kontakter som inte vill ha dem"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "Fr_åga då meddelanden skickas med endast blindkopiemottagare angivna"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "_Skicka brev i HTML-format som standard."
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "_Skicka brev i HTML-format som standard."
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "_Visa animerade bilder"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "_Visa animerade bilder"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Visa meddelanden i normal stil"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "F_örhandsgranskningspanel"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "_Spela ljudfil då ny post anländer"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "Stavnings_kontroll"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "_Terminaltypsnitt:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "Välj HTML-typsnitt med variabelt breddsteg för utskrift"
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Tråda meddelandelista"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Tråda meddelandelista"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+#, fuzzy
+msgid "Thread the message-list based on Subject"
+msgstr "Tråda meddelandelista"
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "_Gör detta till mitt standardkonto"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "V_ariabelt breddsteg:"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolutions Elm-importör"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+msgid "Evolution mbox importer"
+msgstr "Evolutions mbox-importör"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolutions Netscape Mail-importör"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolutions Outlook Express 4-importör"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Pine importer"
+msgstr "Evolutions Pine-importör"
 
 #: mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
@@ -12118,34 +13164,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolutions Elm-importör"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Evolutions mbox-importör"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolutions Netscape Mail-importör"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolutions Outlook Express 4-importör"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Pine importer"
-msgstr "Evolutions Pine-importör"
-
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -12207,12 +13225,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importerar din gamla Netscape-data"
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Papperskorg"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Genomsöker e-postfilter"
@@ -12221,7 +13233,7 @@ msgstr "Genomsöker e-postfilter"
 msgid "Scanning directory"
 msgstr "Genomsöker katalog"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Startar import"
 
@@ -12296,23 +13308,23 @@ msgid "You have not filled in all of the required information."
 msgstr "Du har inte fyllt i all nödvändig information."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolutions kontoredigerare"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Värd:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "Användar_namn:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Sökväg:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan inte skapa två konton med samma namn."
 
@@ -12321,35 +13333,35 @@ msgstr "Du kan inte skapa två konton med samma namn."
 msgid "Mail to %s"
 msgstr "E-post till %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Ämnet är %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "E-post från %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "Sändlistan %s"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "besvarad"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Lägg till filterregel"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "Följande filterregler:\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12360,143 +13372,30 @@ msgstr ""
 "    \"%s\"\n"
 "och har uppdaterats."
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "Ansluter..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Denna mapp kan inte innehålla meddelanden."
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Nytt e-postmeddelande"
 
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Kunde inte öppna den delade mappen: %s."
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "_E-postmeddelande"
 
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Kunde inte skapa temporär katalog: %s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "Skriv ett nytt e-postmeddelande"
 
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Kunde inte skapa temporär fil \"%s\": %s"
-
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Kunde inte stänga temporära mapp: %s"
-
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Välj en destinationsmapp för importen av denna data"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Välj en destinationsmapp för importen av denna data"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Skapa en ny mapp"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Ange var mappen ska skapas:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Kunde inte ta bort mappen \"%s\": %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Verkligen ta bort mappen \"%s\"?"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Ta bort \"%s\""
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Byt namn på mappen \"%s\" till:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-msgid "Rename Folder"
-msgstr "Byt namn på mapp"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Det angivna mappnamnet är inte giltigt: %s"
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Typsnittsegenskaper"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Egenskaper"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "_Mappnamn:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Visa"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Öppna i nytt fönster"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Flytta"
-
-#: mail/mail-component.c:2087
-msgid "_New Folder..."
-msgstr "_Ny mapp..."
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "_Byt namn"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Egenskaper..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Identitet"
 
@@ -12555,11 +13454,11 @@ msgstr ""
 "att sammanställas för att skapa ett Evolution-epostkonto. Ange ett namn för "
 "detta konto nedan. Detta namn kommer endast att användas för visning."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Kontrollerar tjänst"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Ansluter till server..."
 
@@ -12641,26 +13540,35 @@ msgid "C_olors"
 msgstr "F_ärger"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Server för inkommande post"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "Kontrollera stavning medan jag skri_ver"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Kontrollerar ny e-post"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "Färg för _felstavade ord:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Redigerar meddelanden"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12675,133 +13583,138 @@ msgstr ""
 "\n"
 "Klicka på \"Verkställ\" för att spara dina inställningar."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "_Standard"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Standardbeteende"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "Standardtecken_kodning: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Tar bort post"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Signera _alltid utgående meddelanden när detta konto används"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "Citera inte originalmeddelandet"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Signera inte _sammanträdesbegäran (för kompatibilitet med Outlook)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Klar"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "Utkast_mapp:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "A_ktivera"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "E-postkonton"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "E-post_adress:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "Töm _papperskorgsmappar vid avslut"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Certifikat-ID:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Evolutions kontoassistent"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Kör kommando..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "Fast _breddsteg:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "<< Färre alternativ"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "Typsnittsegenskaper"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "Formatera meddelanden med _HTML"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "Markera _citat med"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Inuti"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Etiketter och färger"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Läser in bilder"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "E-postkonfiguration"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Brevlådeplats"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Meddelanderedigerare"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Meddelandevisning"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 msgid "Message Fonts"
 msgstr "Meddelandetypsnitt"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Notifiering om ny post"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -12809,140 +13722,140 @@ msgstr ""
 "Observera: du kommer inte att efterfrågas ett lösenord innan du ansluter för "
 "första gången"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Valfri information"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "Or_ganisation:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-_nyckelid:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Välj en färg"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Fr_åga då meddelanden skickas med endast blindkopiemottagare angivna"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Utskrivna typsnitt"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail-epostkatalog "
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "Citera originalmeddelande"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Citerad"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "Ko_m ihåg detta lösenord"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "Sva_ra till:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Mottagande av e-post"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "_Alternativ för mottagning"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "Kom ihåg detta _lösenord"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Obligatorisk information"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "Återställ standardalternativ"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "S_äkerhet"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "Säker MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr "Välj HTML-typsnitt med fast breddsteg"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr "Välj HTML-typsnitt med fast breddsteg för utsnitt"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr "Välj HTML-typsnitt med variabelt breddsteg"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr "Välj HTML-typsnitt med variabelt breddsteg för utskrift"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Skickande av e-post"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Mapp för skickade _meddelanden:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Skickade meddelanden och utkast"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Ser_vern kräver autentisering"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Server_typ: "
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Kunde inte signera: certifikat hittades inte för \"%s\"."
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "Ange _filnamn:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "Stavnings_kontroll"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Standard Unix-brevlåda"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12952,7 +13865,7 @@ msgstr ""
 "din signatur. Namnet du anger kommer att endast\n"
 "användas för visning."
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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 "
@@ -12961,7 +13874,7 @@ msgstr ""
 "Denna sida låter dig konfigurera stavningskontroll och språk. Listan med "
 "språk här återspeglar endast de språk för vilka en ordbok är installerad."
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12969,11 +13882,15 @@ msgstr ""
 "Skriv in namnet som du vill använda för att referera till detta konto.\n"
 "Till exempel: \"Jobb\" eller \"Personligt\"."
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "V_ariabelt breddsteg:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12983,170 +13900,179 @@ msgstr ""
 "\n"
 "Klicka på \"Framåt\" för att börja. "
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "_Lägg till signatur"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "Läs alltid in _bilder från nätet"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 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:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "_Autentiseringstyp: "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "_Autentiseringstyp: "
 
 # Låter konstigt
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr "Kontrollera _automatiskt ny e-post var"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "Infoga _automatiskt smilisbilder"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "_Pip då ny post anländer"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "_Bekräfta vid tömning av mapp"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "_Standardsignatur:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "_Standardvärden"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Notifiera inte mig när ny post anländer"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "_Aktivera"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "Stil för _vidarebefordran:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "_Fullständigt namn:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "_HTML-brev"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "_Identitet"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "juni"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "Läs _in bilder om avsändaren finns i adressboken"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "_Gör detta till mitt standardkonto"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "_Markera meddelanden som lästa efter"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "_Läs aldrig in bilder från nätet"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "_Spela ljudfil då ny post anländer"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 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:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Fråga då meddelanden skickas med en _tom ämnesrad"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "_Mottagande av post"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "_Svarsstil:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "_Återställ standardalternativ"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Ta bort..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "_Skickande av post"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "_Visa animerade bilder"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Signaturer"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr "_Standardtypsnitt:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr "_Terminaltypsnitt:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "_Använd säker anslutning (SSL):"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr "_Använd samma typsnitt som andra program"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "beskrivning"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingar %s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13155,7 +14081,7 @@ msgstr ""
 "Fel vid \"%s\":\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13164,7 +14090,7 @@ msgstr ""
 "Fel vid utförande av åtgärd:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Arbetar"
 
@@ -13176,118 +14102,118 @@ msgstr "Filtrerar mapp"
 msgid "Fetching Mail"
 msgstr "Hämtar post"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Misslyckades med att lagra e-post i temporära filen %s: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Misslyckades med att lagra e-post i temporära filen %s: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Skickar \"%s\""
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Skickar meddelande %d av %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Meddelande %d av %d misslyckades"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Färdig."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Sparar meddelande till mappen"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flyttar meddelanden till %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierar meddelanden till %s"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Genomsöker mappar i \"%s\""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Vidarebefordrade meddelanden"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Öppnar mappen %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "Öppnar lagret %s"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Byter namn på mappen %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappen \"%s\""
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Uppdaterar mapp"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Tömmer mapp"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tömmer papperskorgen i \"%s\""
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Lokala mappar"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hämtar meddelande %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Hämtar %d meddelande(n)"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Sparar %d meddelande(n)"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13296,7 +14222,7 @@ msgstr ""
 "Kan inte spara utdatafilen: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13305,11 +14231,11 @@ msgstr ""
 "Fel vid sparande av meddelanden till: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Sparar bilaga"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13318,21 +14244,25 @@ msgstr ""
 "Kan inte skapa utdatafil: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kunde inte skriva data: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kopplar från %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ansluter igen till %s"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Gör skillnad på gemener/VERSALER"
@@ -13349,59 +14279,74 @@ msgstr "Sök:"
 msgid "Search"
 msgstr "Sök"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Redigera signatur"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "kryptera"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Källinformation"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Avbryter..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, typ: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Sökväg: %s, typ: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Skicka och ta emot e-post"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 msgid "Cancel _All"
 msgstr "Avbryt _allt"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Uppdaterar..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Väntar..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Användaren avbröt åtgärden."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Ange lösenord för %s"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Ange lösenord"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "_Kom ihåg detta lösenord"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Kom ihåg detta lösenord för resten av denna session"
 
@@ -13440,26 +14385,31 @@ msgstr "Ange ett namn för denna signatur."
 msgid "Name:"
 msgstr "Namn:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Vidarebefordrat meddelande - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Vidarebefordrat meddelande"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Öppnar mappen %s"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Ställer in virtuell mapp: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Uppdaterar virtuella mappar för uri: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13472,88 +14422,88 @@ msgstr ""
 "    \"%s\"\n"
 "och har uppdaterats."
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "Virtuella mappar"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "Virtuella mappar"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Redigera virtuell mapp"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Försöker redigera en virtuell mapp \"%s\" som inte finns."
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Ny virtuell mapp"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Oläst"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Läst"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Besvarad"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Flera olästa meddelanden"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Flera meddelanden"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Lägsta"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Lägre"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Högre"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Högsta"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Idag %H.%M"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Igår %H.%M"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Genererar meddelandelista"
 
@@ -13609,11 +14559,11 @@ msgstr "Vidarebefordra"
 msgid "No Response Necessary"
 msgstr "Inget svar krävs"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Svara"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Svara till alla"
 
@@ -13665,41 +14615,139 @@ msgstr "_Prenumerera"
 msgid "_Unsubscribe"
 msgstr "_Säg upp prenumeration"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr "Konfigurera beteende för specialmappar och frånkopplade mappar här"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Evolutionskalet"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Mappinställningar"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "380"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Byt namn på denna genvägsgrupp"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Växla om mappraden ska visas"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "_Visa genvägsraden"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Standardprioritet:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Standardprioritet:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Evolutions e-postkonfigurationsgränssnitt"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+#, fuzzy
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "Markera bilagan så att den visas inuti som standard."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
 msgstr ""
-"Kan inte för över mapp:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Lägg till en mapp"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Utkast"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Inkorg"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Utkorg"
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "Öppnar standarduppgiftsmappen"
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Skickat"
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Öppnar standarduppgiftsmappen"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Öppnar standarduppgiftsmappen"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Öppnar standarduppgiftsmappen"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Växla om mappraden ska visas"
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Växla om genvägsraden ska visas"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "E-post"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Kunde inte uppdatera filerna korrekt"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13710,7 +14758,7 @@ msgstr ""
 "%s\n"
 "Fel: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13719,7 +14767,7 @@ msgstr ""
 "Ett fel inträffade vid kopiering av filer till\n"
 "\"%s\"."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13730,7 +14778,7 @@ msgstr ""
 "Var vänlig och flytta den så att installationen\n"
 "av Evolutions användarfiler kan genomföras."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13828,10 +14876,11 @@ msgstr ""
 "Kan inte byta namn på mapp:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+msgid "The specified folder name is not valid: %s"
+msgstr "Det angivna mappnamnet är inte giltigt: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -13855,19 +14904,15 @@ msgstr ""
 "Kan inte skapa den angivna katalogen:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Skapa ny mapp"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Namnlös)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Välj den typ av importör som ska köras:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13881,11 +14926,11 @@ msgstr ""
 "Du kan välja \"Automatisk\" om du inte vet, så kommer Evolution att försöka "
 "reda ut det."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Välj den information som du vill importera:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13893,7 +14938,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13902,21 +14947,21 @@ msgstr ""
 "Importerar %s\n"
 "Importerar objekt %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "Välj importör"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "Filen %s finns inte"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Evolution-fel"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -13925,11 +14970,11 @@ msgstr ""
 "Det finns ingen importör som kan hantera\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Importerar"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -13938,17 +14983,17 @@ msgstr ""
 "Importerar %s.\n"
 "Startar %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Fel vid start av %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Fel vid inläsning av %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13957,35 +15002,35 @@ msgstr ""
 "Importerar %s\n"
 "Importerar objekt 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "_Filnamn"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Välj en fil"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Filtyp:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Importera data och inställningar från äldre program"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Importera en ensam fil"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -13993,47 +15038,28 @@ msgstr ""
 "Var god vänta...\n"
 "Letar efter befintliga konfigurationer"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Startar intelligenta importörer"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "Från %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Välj en destinationsmapp för importen av denna data"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Importera"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Kopplar från anslutningar..."
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Fel vid synkronisering av \"%s\":\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "Synkroniserar mapp"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Synkroniserar \"%s\" (%d av %d)..."
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Inställningar för Evolution"
@@ -14068,7 +15094,7 @@ msgstr "Kunde inte öppna den delade mappen: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Kan inte skapa den angivna utdelade mappen."
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14077,17 +15103,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Assistent"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Ny"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Inget mappnamn är angivet."
@@ -14145,64 +15165,51 @@ msgstr "Skapa 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:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "A_rbeta ansluten"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "A_rbeta frånkopplad"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Arbeta frånkopplad"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Ingen mapp visas)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Ingen)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 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:2090
+#: shell/e-shell-window.c:331
 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:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution är just nu frånkopplad. Klicka på denna knapp för att "
 "ansluta."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Ogiltiga argument"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Kan inte registrera på OAF"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatabasen hittades inte"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Allmänt fel"
 
@@ -14315,74 +15322,18 @@ msgstr "_Ta bort"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Ta bort denna genväg från genvägsraden"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Fel vid sparande av genvägar."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Inkorg"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Genvägar"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Inga fel"
-
-#: 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:575
-msgid "The specified folder type is not valid"
-msgstr "Den angivna mapptypen är inte giltig"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "I/O-fel"
-
-#: 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:581
-msgid "The folder is not empty"
-msgstr "Mappen är inte tom"
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "Den angivna mappen hittades inte"
-
-#: 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:589
-msgid "Operation not supported"
-msgstr "Åtgärden stöds inte"
-
-#: 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:593
-msgid "The specified folder cannot be modified or removed"
-msgstr "Den angivna mappen kan inte ändras eller tas bort"
-
-#: 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:597
-msgid "Cannot create a folder with that name"
-msgstr "Kan inte skapa en mapp med det namnet"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Denna åtgärd kan inte utföras i frånkopplat läge"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Kryssruta"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14393,6 +15344,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% färdigt)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Ny"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "\"%s\" i \"%s\""
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14430,74 +15392,6 @@ msgstr ""
 "Felet från aktiveringssystemet är:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "CORBA-fel"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Avbruten"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Ogiltigt argument"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Har redan en ägare"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Ingen ägare"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Hittades inte"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Typen stöds inte"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Schemat stöds inte"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Åtgärden stöds inte"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Internt fel"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Existerar"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "Ogiltig URI"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Har undermappar"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Inget utrymme kvar"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "Gamla ägaren har dött"
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Testtyp"
-
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr "Evolutions testkomponent"
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr "Aktiva anslutningar"
@@ -14526,10 +15420,6 @@ msgstr "_E-post:"
 msgid "_Tasks:"
 msgstr "_Uppgifter:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr "Mapp_namn:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder _type:"
 msgstr "Mapp_typ:"
@@ -14593,22 +15483,6 @@ msgstr ""
 "Klicka på knappen \"Verkställ\" för att spara dina\n"
 "inställningar. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "Konfigurera beteende för specialmappar och frånkopplade mappar här"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Evolutionskalet"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Evolutions konfigurationskontroll för mappinställningar"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Mappinställningar"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Klicka på \"Importera\" för att börja importera filen till Evolution. "
@@ -14647,7 +15521,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Importörer"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Importera"
 
@@ -14663,16 +15537,16 @@ msgstr "Fråga mig inte igen"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importera data från följande filer:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Evolution avslutar nu..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14709,7 +15583,7 @@ msgstr ""
 "Vi hoppas att du gläds åt resultatet av vårt hårda arbete, och vi\n"
 "inväntar med spänning dina bidrag!\n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -14717,36 +15591,48 @@ msgstr ""
 "Tack\n"
 "Ximian Evolution-teamet\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr "Tala inte om för mig igen"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan inte komma åt Ximian Evolution-skalet."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan inte initiera Ximian Evolution-skalet: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Starta i frånkopplat läge"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Starta i anslutet läge"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr "Tvinga fram nedstängning av alla evolution-komponenter"
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Skicka felsökningsinformation från alla komponenter till en fil."
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14755,31 +15641,64 @@ msgstr ""
 "%s: --online och --offline kan inte användas tillsammans.\n"
 "  Använd %s --help för mer information.\n"
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Välj importör"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Certifikat-ID:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "Förlopp"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Uttryck"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "E-postadress:"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"Certifikatet har gått ut: %s\n"
+"Utfärdare: %s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, fuzzy, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+"Utställare: %s\n"
+"Ämne: %s"
+
+#: smime/gui/e-cert-selector.c:117
+#, fuzzy, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+"Utställare: %s\n"
+"Ämne: %s"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14837,92 +15756,379 @@ msgid "Backup All"
 msgstr "Blackpool"
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "_Certifikat-ID:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Certifikatet opålitligt"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "_Certifikat-ID:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Vanligt namn"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "_Certifikat-ID:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "_Redigera"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 #, fuzzy
 msgid "Email Recipient Certificate"
 msgstr "Inga avsändare är angivna"
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Misslyckades med att verifiera certifikat."
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Uttryck"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Organisation"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Organisationsenhet"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Visa"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "_Certifikat-ID:"
+
+#: smime/gui/smime-ui.glade.h:42
+#, fuzzy
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr "Ogiltig certifikatmyndighet (CA)"
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "_Certifikat-ID:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Importera"
+msgid "Certificate already exists"
+msgstr "Kort-ID finns redan"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+msgid "%d/%m/%Y"
+msgstr "%d-%m-%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Vermont"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " °C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "OK"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "_Certifikat-ID:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "_Certifikat-ID:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "Certifikatet opålitligt"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "ID"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+#, fuzzy
+msgid "Subject Public Key Info"
+msgstr ""
+"\n"
+"Publik nyckel: "
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Ämnet är %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Kan inte bearbeta spool-mappen"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "Ogiltig certifikatmyndighet (CA)"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Ogiltig certifikatmyndighet (CA)"
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Ingen information"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "bilaga"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "_Certifikat-ID:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Curitaba"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "North Carolina"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Uttryck"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s vid %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Certifikatsignaturfel"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "_Infoga"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Ämnet är %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Certifikatsignaturfel"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Ange lösenord för %s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "_Certifikat-ID:"
 
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
@@ -14973,7 +16179,7 @@ msgstr "Kopiera markeringen"
 msgid "Copy to Folder..."
 msgstr "Kopiera till mapp..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Klipp ut markeringen"
 
@@ -14989,7 +16195,7 @@ msgstr "Flytta kontakt(er) till en annan mapp..."
 msgid "Move to Folder..."
 msgstr "Flytta till mapp..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Klistra in från urklipp"
 
@@ -14997,8 +16203,8 @@ msgstr "Klistra in från urklipp"
 msgid "Previews the contacts to be printed"
 msgstr "Förhandsgranskar kontakterna som ska skrivas ut"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Förhands_granska"
@@ -15043,13 +16249,13 @@ msgstr "Stoppa inläsning"
 msgid "View the current contact"
 msgstr "Visa den aktuella kontakten"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "_Åtgärder"
 
@@ -15078,141 +16284,110 @@ msgid "_Send Message to Contact..."
 msgstr "_Skicka meddelande till kontakt..."
 
 #: ui/evolution-calendar.xml.h:3
-#, fuzzy
-msgid "Create a new all-day event"
-msgstr "Skapa ett nytt heldagsmöte"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Skapa ett nytt möte"
-
-#: ui/evolution-calendar.xml.h:5
 msgid "Create a new calendar"
 msgstr "Skapa en ny kalender"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Skapa en ny sammanträdesbegäran"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Skapa en ny uppgift"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Dag"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Ta bort alla förekomster"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Ta bort mötet"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Ta bort denna förekomst"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Ta bort denna förekomst"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Gå till"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Gå bakåt"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Gå framåt"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Gå till _datum"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Gå till ett specifikt datum"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Gå till idag"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "Lista"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Månad"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Nytt m_öte"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Nya Kaledonien"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Nytt sammanträde"
-
-#: ui/evolution-calendar.xml.h:27
-msgid "New _Task"
-msgstr "Ny _uppgift"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Förhandsgranskar kalendern som ska skrivas ut"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Skriv ut denna kalender"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publicera ledig-/upptageninformation för denna kalender"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Bourges"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Publik mapp som innehåller möten och evenemang"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Visa detaljer"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Visa en dag"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Visa en månad"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Visa en vecka"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Visa arbetsveckan"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Vecka"
 
@@ -15277,7 +16452,7 @@ msgstr "Spara detta objekt till disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Arkiv"
 
@@ -15494,7 +16669,7 @@ msgstr "Markera alla som l_ästa"
 msgid "Mark all visible messages as read"
 msgstr "Markera alla synliga meddelanden som lästa"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "Klistra in meddelande(n) från urklipp"
 
@@ -15551,16 +16726,6 @@ msgstr "_Omvänd markering"
 msgid "_Threaded Message List"
 msgstr "_Trådad meddelandelista"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Stäng detta fönster"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "S_täng"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "L_ägg till avsändaren i adressboken"
@@ -15719,257 +16884,282 @@ msgstr "Vidarebefordra det markerade meddelandet till någon som en bilaga"
 msgid "Increase the text size"
 msgstr "Öka textstorleken"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Läs in _bilder"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Markera som _viktigt"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Markera som _oläst"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Markera som ovikti_gt"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "Markera de markerade meddelandena som lästa"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "Markera de markerade meddelandena som viktiga"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Markera de markerade meddelandena som oviktiga"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Markera de markerade meddelandena som olästa"
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Markera de markerade meddelandena som olästa"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Markera de markerade meddelandena som oviktiga"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Markera de markerade meddelandena för borttagning"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Flytta"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "Flytta markerade meddelanden till en annan mapp"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Nästa"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "Nästa _viktiga meddelande"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "Nästa _tråd"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "Nästa _olästa meddelande"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Hittades inte"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Öppna det markerade meddelandet i ett nytt fönster"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Öppna det markerade meddelandet i redigeraren för återsändning av det"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "_Originalstorlek"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "F_öregående olästa meddelande"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Posta ett svar"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr "Posta ett svar till ett meddelande i en publik mapp"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "Fö_regående viktiga meddelande"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Förhandsgranska meddelandet som ska skrivas ut"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Föregående"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Skriv ut detta meddelande"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "_Dirigera om"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Dirigera om (studsa) det markerade meddelandet till någon"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Återställ texten till dess originalstorlek"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "_Sök meddelande..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "_Mindre"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Spara meddelandet som en textfil"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Sök efter text i meddelandetexten på det visade meddelandet"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr "Ställ in sidinställningarna för din aktuella skrivare"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Visa e-post_källkod"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Visa fullständiga _huvuden"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Sök efter text i meddelandetexten på det visade meddelandet"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Visa meddelanden i normal stil"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Visa meddelande med alla e-posthuvuden"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Visa den råa e-postkällkoden till meddelandet"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "Te_xtstorlek"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Ångra borttagning av de markerade meddelandena"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "Virtuell mapp på _sändlista..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "Virtuell mapp på _avsändare..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "Virtuell mapp på _mottagare..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "Virtuell mapp på _ämne..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "_Bifogad"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "_Kopiera till mapp"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "_Skapa filter från meddelande"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "_Vidarebefordra meddelande"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "_Gå till"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "_Inuti"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "_Större"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "M_eddelandevisning"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Flytta till mapp"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "_Nästa meddelande"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "_Normal visning"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "_Öppna meddelande"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "_Föregående meddelande"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "_Citerad"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "Skicka _om..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "V_erktyg"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "_Ångra borttagning"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Stäng detta fönster"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "S_täng"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Bifoga"
@@ -16248,12 +17438,13 @@ msgid "Change Evolution's settings"
 msgstr "Ändra Evolutions inställningar"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "_Avsluta"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Skapa en ny sammanträdesbegäran"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "_Evolutionfönster"
+msgid "E_xit"
+msgstr "_Avsluta"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16265,61 +17456,74 @@ msgstr "Importera data från andra program"
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "_Evolutionfönster"
+msgid "Open a new window"
+msgstr "Öppna i nytt fönster"
 
 #: ui/evolution.xml.h:11
 msgid "Pi_lot Settings..."
 msgstr "Pi_lotinställningar..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Skicka / Ta emot"
+
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr "Skicka kölagda objekt och hämta nya objekt"
+
+#: ui/evolution.xml.h:14
 msgid "Set up Pilot configuration"
 msgstr "Konfigurera Pilotkonfiguration"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Visa information om Ximian Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Skicka felrapport"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "Skicka _felrapport"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Skicka en felrapport med Bug-Buddy"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Växla"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Växla om vi arbetar frånkopplade."
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "Frågor och _svar om Ximian Evolution"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "_Om Ximian Evolution..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "_Importera..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Nytt"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Skicka / Ta emot"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "_Sök nu"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Skriv ut sammanfattning"
@@ -16448,12 +17652,12 @@ msgstr "Definiera vyer..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -16586,7 +17790,7 @@ msgstr "_Sök"
 msgid "_Find Now"
 msgstr "_Sök nu"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "_Töm"
 
@@ -16602,24 +17806,268 @@ msgstr "Underobjekt-ID"
 msgid "Text"
 msgstr "Text"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Töm"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Sök nu"
 
+#~ msgid "Account Name"
+#~ msgstr "Kontonamn"
+
+#~ msgid "Server Name"
+#~ msgstr "Servernamn"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "LDAP stöds inte i detta bygge av Evolution"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Andra kontakter"
+
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "Konfigurera åtkomst till LDAP-katalogservrar här"
+
+#~ msgid "Directory Servers"
+#~ msgstr "Katalogservrar"
+
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "LDAP-konfigurationskontroll för Evolutions adressbok"
+
+#~ msgid "Add LDAP Server"
+#~ msgstr "Lägg till LDAP-server"
+
+#~ msgid "LDAP Configuration Assistant"
+#~ msgstr "LDAP-konfigurationsassistent"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Steg 4: Visar namn"
+
+#~ msgid "Find contact in"
+#~ msgstr "Sök kontakt i"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Klicka här för att lägga till en kontakt *"
+
+#~ msgid "Business Address"
+#~ msgstr "Företagsadress"
+
+#~ msgid "Department"
+#~ msgstr "Avdelning"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "Ledig/Upptagen-URL"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Yrke"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Öppnar uppgifter i %s"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Skicka ändå?"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Avbryt aktuell e-poståtgärd"
+#~ msgid "Folder _name"
+#~ msgstr "Mapp_namn:"
+
+#~ 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."
+
+#, fuzzy
+#~ msgid "No signature present"
+#~ msgstr "Dölj signaturtips"
+
+#~ msgid "Connecting..."
+#~ msgstr "Ansluter..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Denna mapp kan inte innehålla meddelanden."
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Kunde inte öppna den delade mappen: %s."
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Välj en destinationsmapp för importen av denna data"
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan inte för över mapp:\n"
+#~ "%s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "Lägg till en mapp"
+
+#~ msgid "Drafts"
+#~ msgstr "Utkast"
+
+#~ msgid "Outbox"
+#~ msgstr "Utkorg"
+
+#~ msgid "Sent"
+#~ msgstr "Skickat"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Fel vid synkronisering av \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "Synkroniserar mapp"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Synkroniserar \"%s\" (%d av %d)..."
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Ingen mapp visas)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(Ingen)"
+
+#~ msgid "No error"
+#~ msgstr "Inga fel"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "En mapp med samma namn finns redan"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Den angivna mapptypen är inte giltig"
+
+#~ msgid "I/O error"
+#~ msgstr "I/O-fel"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Inte tillräckligt med utrymme för att skapa mapp"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Mappen är inte tom"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Den angivna mappen hittades inte"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Funktionen är ännu inte implementerad i detta lager"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Åtgärden stöds inte"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Den angivna typen stöds inte i detta lager"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Den angivna mappen kan inte ändras eller tas bort"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "Kan inte göra en mapp till barn av dess undermappar"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Kan inte skapa en mapp med det namnet"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Denna åtgärd kan inte utföras i frånkopplat läge"
+
+#~ msgid "Checkbox"
+#~ msgstr "Kryssruta"
+
+#~ msgid "CORBA error"
+#~ msgstr "CORBA-fel"
+
+#~ msgid "Interrupted"
+#~ msgstr "Avbruten"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Ogiltigt argument"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Har redan en ägare"
+
+#~ msgid "No owner"
+#~ msgstr "Ingen ägare"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Typen stöds inte"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Schemat stöds inte"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Åtgärden stöds inte"
+
+#~ msgid "Internal error"
+#~ msgstr "Internt fel"
+
+#~ msgid "Exists"
+#~ msgstr "Existerar"
+
+#~ msgid "Invalid URI"
+#~ msgstr "Ogiltig URI"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Har undermappar"
+
+#~ msgid "No space left"
+#~ msgstr "Inget utrymme kvar"
+
+#~ msgid "Old owner has died"
+#~ msgstr "Gamla ägaren har dött"
+
+#~ msgid "Test type"
+#~ msgstr "Testtyp"
+
+#~ msgid "Evolution Test Component"
+#~ msgstr "Evolutions testkomponent"
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "Importera"
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Fältnamn"
+#~ msgid "Create a new all-day event"
+#~ msgstr "Skapa ett nytt heldagsmöte"
 
-#~ msgid "Family Name"
-#~ msgstr "Efternamn"
+#~ msgid "New _Appointment"
+#~ msgstr "Nytt m_öte"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Nytt sammanträde"
+
+#~ msgid "New _Task"
+#~ msgstr "Ny _uppgift"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "_Evolutionfönster"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "_Evolutionfönster"
+
+#~ msgid "Toggle"
+#~ msgstr "Växla"
+
+#~ msgid "Clear"
+#~ msgstr "Töm"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Avbryt aktuell e-poståtgärd"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -16712,9 +18160,6 @@ msgstr "Sök nu"
 #~ msgid "VCard (.vcf, .gcrd)"
 #~ msgstr "VCard (.vcf, .gcrd)"
 
-#~ msgid "Loading..."
-#~ msgstr "Läser in..."
-
 #~ msgid "Searching..."
 #~ msgstr "Söker..."
 
@@ -16766,10 +18211,6 @@ msgstr "Sök nu"
 #~ msgstr "EBook inte inläst\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "Kort-ID finns redan"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Åtgärden avbruten"
 
@@ -16986,9 +18427,6 @@ msgstr "Sök nu"
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
 #~ msgid "Birth date"
 #~ msgstr "Födelsedatum"
 
@@ -17001,9 +18439,6 @@ msgstr "Sök nu"
 #~ msgid "Arbitrary"
 #~ msgstr "Godtyckligt"
 
-#~ msgid "ID"
-#~ msgstr "ID"
-
 #~ msgid "Last Use"
 #~ msgstr "Senaste användning"
 
@@ -17016,9 +18451,6 @@ msgstr "Sök nu"
 #~ msgid "Folder containing contact information"
 #~ msgstr "Mapp som innehåller kontaktinformation"
 
-#~ msgid "LDAP Server"
-#~ msgstr "LDAP-server"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "LDAP-server som innehåller kontaktinformation"
 
@@ -17028,18 +18460,6 @@ msgstr "Sök nu"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Publik mapp som innehåller kontaktinformation"
 
-#~ msgid "_Contact"
-#~ msgstr "_Kontakt"
-
-#~ msgid "Create a new contact"
-#~ msgstr "Skapa en ny kontakt"
-
-#~ msgid "New Contact List"
-#~ msgstr "Ny kontaktlista"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "Skapa en ny kontaktlista"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "URI:n som mappbläddraren kommer att visa"
 
@@ -17055,9 +18475,6 @@ msgstr "Sök nu"
 #~ msgid "Is New Card"
 #~ msgstr "Är nytt kort"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "Inga kort"
 
@@ -17103,30 +18520,6 @@ msgstr "Sök nu"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "Publik mapp som innehåller att-göra-objekt"
 
-#~ msgid "New appointment"
-#~ msgstr "Nytt möte"
-
-#~ msgid "_Appointment"
-#~ msgstr "_Möte"
-
-#~ msgid "New meeting"
-#~ msgstr "Nytt sammanträde"
-
-#~ msgid "M_eeting"
-#~ msgstr "_Sammanträde"
-
-#~ msgid "New task"
-#~ msgstr "Ny uppgift"
-
-#~ msgid "_Task"
-#~ msgstr "_Uppgift"
-
-#~ msgid "New All Day Appointment"
-#~ msgstr "Nytt heldagsmöte"
-
-#~ msgid "All _Day Appointment"
-#~ msgstr "Hel_dagsmöte"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "Kunde inte uppdatera ogiltigt objekt"
 
@@ -17172,9 +18565,6 @@ msgstr "Sök nu"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "Öppnar kalender i %s"
 
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Öppnar standarduppgiftsmappen"
-
 #~ msgid "Evaluation of the search expression did not yield a boolean value"
 #~ msgstr "Evaluering av sökuttrycket gav inget booleskt värde"
 
@@ -17218,9 +18608,6 @@ msgstr "Sök nu"
 #~ "Evolution har hittat GnomeCard-filer.\n"
 #~ "Vill du importera dem till Evolution?"
 
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Evolutions e-postkonfigurationsgränssnitt"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "Mapp som innehåller e-post"
 
@@ -17236,9 +18623,6 @@ msgstr "Sök nu"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Virtuell papperskorgsmapp"
 
-#~ msgid "Properties..."
-#~ msgstr "Egenskaper..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Ändra egenskaperna för denna mapp"
 
@@ -17248,15 +18632,6 @@ msgstr "Sök nu"
 #~ msgid "You have unsent messages, do you wish to quit anyway?"
 #~ msgstr "Du har oskickade meddelanden, vill du ändå avsluta?"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Nytt e-postmeddelande"
-
-#~ msgid "_Mail Message"
-#~ msgstr "_E-postmeddelande"
-
-#~ msgid "Compose a new mail message"
-#~ msgstr "Skriv ett nytt e-postmeddelande"
-
 #~ msgid "New Message Post"
 #~ msgstr "Postning av nytt meddelande"
 
@@ -19065,9 +20440,6 @@ msgstr "Sök nu"
 #~ msgid "Cumberland"
 #~ msgstr "Cumberland"
 
-#~ msgid "Curitiba"
-#~ msgstr "Curitaba"
-
 #~ msgid "Curitiba Apt"
 #~ msgstr "Curitaba Apt"
 
@@ -22059,9 +23431,6 @@ msgstr "Sök nu"
 #~ msgid "North Bend"
 #~ msgstr "North Bend"
 
-#~ msgid "North Carolina"
-#~ msgstr "North Carolina"
-
 #~ msgid "North Conway"
 #~ msgstr "North Conway"
 
@@ -23673,9 +25042,6 @@ msgstr "Sök nu"
 #~ msgid "State College"
 #~ msgstr "State College"
 
-#~ msgid "Stauning"
-#~ msgstr "Stauning"
-
 #~ msgid "Staunton"
 #~ msgstr "Staunton"
 
@@ -24264,9 +25630,6 @@ msgstr "Sök nu"
 #~ msgid "United Arab Emirates "
 #~ msgstr "Förenade Arabemiraten "
 
-#~ msgid "Unst"
-#~ msgstr "Unst"
-
 #~ msgid "Upington"
 #~ msgstr "Upington"
 
@@ -24375,12 +25738,6 @@ msgstr "Sök nu"
 #~ msgid "Veracruz"
 #~ msgstr "Veracruz"
 
-#~ msgid "Vermillion"
-#~ msgstr "Vermillion"
-
-#~ msgid "Vermont"
-#~ msgstr "Vermont"
-
 #~ msgid "Vernal"
 #~ msgstr "Vernal"
 
@@ -24909,9 +26266,6 @@ msgstr "Sök nu"
 #~ msgid " F"
 #~ msgstr " °F"
 
-#~ msgid " C"
-#~ msgstr " °C"
-
 #~ msgid "knots"
 #~ msgstr "knop"
 
@@ -25530,9 +26884,6 @@ msgstr "Sök nu"
 #~ msgid "Freezing haze"
 #~ msgstr "Underkylt torrdis"
 
-#~ msgid "Spray"
-#~ msgstr "Små vattendroppar i luften"
-
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Små vattendroppar i luften i närheten"
 
@@ -25900,18 +27251,6 @@ msgstr "Sök nu"
 #~ msgstr ""
 #~ "Ta bort en mapp som lagts till med \"Öppna en annan användares mapp\""
 
-#~ msgid "Send / Receive"
-#~ msgstr "Skicka / Ta emot"
-
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Skicka kölagda objekt och hämta nya objekt"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Växla om mappraden ska visas"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Växla om genvägsraden ska visas"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Visa den markerade mappen"
 
@@ -25939,9 +27278,6 @@ msgstr "Sök nu"
 #~ msgid "_Rename..."
 #~ msgstr "_Byt namn..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Skicka / Ta emot"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "_Genvägsrad"
 
@@ -25967,9 +27303,6 @@ msgstr "Sök nu"
 #~ "ping_timeout_callback: kunde inte avgöra om CORBA-objektet är nil eller "
 #~ "inte"
 
-#~ msgid "Automatically _detect links"
-#~ msgstr "_Detektera automatiskt länkar"
-
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 
@@ -26355,18 +27688,12 @@ msgstr "Sök nu"
 #~ msgid "1234"
 #~ msgstr "1234"
 
-#~ msgid "380"
-#~ msgstr "380"
-
 #~ msgid "666"
 #~ msgstr "666"
 
 #~ msgid "<- _Remove"
 #~ msgstr "<- _Ta bort"
 
-#~ msgid "<< Fewer Options"
-#~ msgstr "<< Färre alternativ"
-
 #~ msgid "Add (or Edit) Attribute Mappings"
 #~ msgstr "Lägg till (eller redigera) attributmappningar"
 
@@ -27012,13 +28339,6 @@ msgstr "Sök nu"
 #~ msgid "_Delete this Appointment"
 #~ msgstr "_Ta bort detta möte"
 
-#~ msgid ""
-#~ "Issuer: %s\n"
-#~ "Subject: %s"
-#~ msgstr ""
-#~ "Utställare: %s\n"
-#~ "Ämne: %s"
-
 #~ msgid "SASL Protocol error"
 #~ msgstr "SASL-protokollfel"
 
@@ -27052,9 +28372,6 @@ msgstr "Sök nu"
 #~ "den tid då filtret körs eller en virtuell\n"
 #~ "mapp öppnas."
 
-#~ msgid "Command"
-#~ msgstr "Kommando"
-
 #~ msgid "Are you sure you want to delete this news account?"
 #~ msgstr "Är du säker på att du vill ta bort detta diskussionsgruppskonto?"
 
@@ -27067,9 +28384,6 @@ msgstr "Sök nu"
 #~ msgid "News Servers"
 #~ msgstr "Diskussionsgruppsservrar"
 
-#~ msgid "Source Information"
-#~ msgstr "Källinformation"
-
 #~ msgid "newswindow1"
 #~ msgstr "newswindow1"
 
@@ -27095,9 +28409,6 @@ msgstr "Sök nu"
 #~ msgid "You may only import to local folders"
 #~ msgstr "Du kan endast importera till lokala mappar"
 
-#~ msgid "_Contact List"
-#~ msgstr "_Kontaktlista"
-
 #~ msgid "Inline Text _File..."
 #~ msgstr "Infoga text_fil..."
 
@@ -27113,15 +28424,9 @@ msgstr "Sök nu"
 #~ msgid "Send _later"
 #~ msgstr "Skicka senar_e"
 
-#~ msgid "Send the message later"
-#~ msgstr "Skicka meddelandet senare"
-
 #~ msgid "_Pilot Settings..."
 #~ msgstr "_Pilotinställningar..."
 
-#~ msgid "Addressbook Settings"
-#~ msgstr "Adressboksinställningar"
-
 #~ msgid "Configuration control for the Evolution Addressbook."
 #~ msgstr "Konfigurationsverktyg för Evolution-adressboken."
 
@@ -27340,9 +28645,6 @@ msgstr "Sök nu"
 #~ msgid "Show contacts matching the following criteria:"
 #~ msgstr "Visa kontakter som matchar följande villkor:"
 
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "_Skapa nya möten med en standardpåminnelse"
-
 #~ msgid "First day of wee_k:"
 #~ msgstr "F_örsta dagen i veckan:"
 
@@ -27497,9 +28799,6 @@ msgstr "Sök nu"
 #~ msgid "Confirm when Expunging a folder"
 #~ msgstr "Bekräfta vid tömning av mapp"
 
-#~ msgid "Default Forward style is: "
-#~ msgstr "Standardstil för vidarebefordran är: "
-
 #~ msgid "Default character encoding: "
 #~ msgstr "Standardteckenkodning: "
 
@@ -27533,9 +28832,6 @@ msgstr "Sök nu"
 #~ msgid "Keyboard Shortcuts"
 #~ msgstr "Tangentbordsgenvägar"
 
-#~ msgid "List of signatures"
-#~ msgstr "Lista med signaturer"
-
 #~ msgid "N_ew..."
 #~ msgstr "N_y..."
 
@@ -27548,9 +28844,6 @@ msgstr "Sök nu"
 #~ msgid "News"
 #~ msgstr "Diskussionsgrupper"
 
-#~ msgid "Prompt when sending messages with an _empty subject"
-#~ msgstr "Fråga då meddelanden skickas med ett _tomt ämne"
-
 #~ msgid "Select Filter Log file..."
 #~ msgstr "Välj en filterloggfil..."
 
@@ -27572,9 +28865,6 @@ msgstr "Sök nu"
 #~ msgid "_Highlight citations with"
 #~ msgstr "Markera _citat med"
 
-#~ msgid "_Log filter actions to:"
-#~ msgstr "_Logga filteråtgärder i:"
-
 #~ msgid "_Mark messages as Read after"
 #~ msgstr "_Markera meddelanden som lästa efter"
 
@@ -27584,9 +28874,6 @@ msgstr "Sök nu"
 #~ msgid "_Organization:"
 #~ msgstr "_Organisation:"
 
-#~ msgid "_Send mail in HTML format by default."
-#~ msgstr "_Skicka brev i HTML-format som standard."
-
 #~ msgid "_Send messages in HTML format by default"
 #~ msgstr "_Skicka meddelanden i HTML-format som standard"
 
@@ -27844,13 +29131,6 @@ msgstr "Sök nu"
 #~ "\n"
 #~ "Unik sträng: "
 
-#~ msgid ""
-#~ "\n"
-#~ "Public Key: "
-#~ msgstr ""
-#~ "\n"
-#~ "Publik nyckel: "
-
 #~ msgid "Waiting for connection to LDAP server..."
 #~ msgstr "Väntar på anslutning till LDAP-servern..."
 
@@ -28355,9 +29635,6 @@ msgstr "Sök nu"
 #~ "Kunde inte öppna filen %s:\n"
 #~ "%s"
 
-#~ msgid "%d/%m/%Y"
-#~ msgstr "%d-%m-%Y"
-
 #~ msgid "%Y/%m/%d"
 #~ msgstr "%Y-%m-%d"
 
@@ -28469,9 +29746,6 @@ msgstr "Sök nu"
 #~ msgid "r"
 #~ msgstr "r"
 
-#~ msgid "s"
-#~ msgstr "s"
-
 #~ msgid "t"
 #~ msgstr "t"
 
@@ -29322,9 +30596,6 @@ msgstr "Sök nu"
 #~ msgid "sign"
 #~ msgstr "signera"
 
-#~ msgid "encrypt"
-#~ msgstr "kryptera"
-
 #~ msgid "PGP"
 #~ msgstr "PGP"
 
@@ -29710,12 +30981,6 @@ msgstr "Sök nu"
 #~ "Observera: Vid konvertering mellan brevlådeformat kommer ett "
 #~ "misslyckande\n"
 
-#~ msgid "Connect to server"
-#~ msgstr "Anslut till server"
-
-#~ msgid "Incoming Mail Server"
-#~ msgstr "Server för inkommande post"
-
 #~ msgid "Outgoing Mail Server"
 #~ msgstr "Server för utgående post"
 
@@ -29992,9 +31257,6 @@ msgstr "Sök nu"
 #~ msgid "Scan folders in \"%s\""
 #~ msgstr "Genomsök mappar i \"%s\""
 
-#~ msgid "Creating \"%s\""
-#~ msgstr "Skapar \"%s\""
-
 #~ msgid "Exception while reporting result to shell component listener."
 #~ msgstr "Undantag vid rapportering av resultat till skalkomponentslyssnaren."
 
@@ -30260,9 +31522,6 @@ msgstr "Sök nu"
 #~ msgid "View message sources from \"%s\""
 #~ msgstr "Visa meddelandekällor från \"%s\""
 
-#~ msgid "Thread message list"
-#~ msgstr "Tråda meddelandelista"
-
 #~ msgid ""
 #~ "This appointment has custom recurrence rules that cannot be edited by "
 #~ "Evolution.\n"
diff --git a/po/tr.po b/po/tr.po
index 9718218c7b..7e1ddd9627 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-06-19 18:09+0000\n"
 "Last-Translator: Görkem Çetin <gorkem@kde.org>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
@@ -28,51 +28,186 @@ msgstr "%s yüklenemedi: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot adres uygulama defteri okunamadı"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Otomatik Tamamlama Dizini"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "_Sertifika No:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Posta hesaplarını buradan yapılandırın"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Bağlantılar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
+msgstr "Evolution Adres Defteri"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Adres defteri menüsü mimarisi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution Adres Defteri adres görüntüleyici"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution Adres Defteri kart görüntüleyici"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook component"
+msgstr "Evolution Adres Defteri bileşeni"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution Adres Defteri dizin görüntüleyici"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution e-posta özet bileşeni."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "E-posta özet bileşen mimarisi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Adres Defteri"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Özellikler..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Sil"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "_Yeniden adlandır"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Yeni Bağlantı:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Bağlantı"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "Yeni bir bağlantı yarat"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Yeni Bağlantı Listesi"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "Yeni Bağlantı _Listesi"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "Yeni bir bağlantı listesi yarat"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Kişisel"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "İş"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "LDAP Sunucusu"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "%s dizini yaratılamadı: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "LDAP sunucuyla bağlantı başarısız oldu"
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "LDAP sunucuyla kimlik denetimi başarısız oldu"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "Root DSE üzerinde tarama yapılamadı"
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "Sunucunun cevabında desteklenen bir arama tabanı bulunamadı"
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Sunucu LDAPv3 şema bilgisini desteklemiyor"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "Şema bilgisini yüklerken hata oluştu"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr "Sunucu geçerli bir şema bilgisi cevabı vermedi"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Hesap Adı:"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Sunucu Adı"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(Evolution'un bu sürümünde LDAP desteklenmiyor)"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Diğer Bağlantılar"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -80,7 +215,7 @@ msgstr ""
 "Bu adres defteri açılamadı. Yeterli izin haklarına sahip olup\n"
 "olmadığınızı ve dosyanın yerini kontrol edin."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -89,7 +224,7 @@ msgstr ""
 "Bu adres defteri açılamadı. Hatalı bir adres girilmiş,\n"
 "ya da LDAP sunucusu erişilemiyor olabilir."
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -101,7 +236,7 @@ msgstr ""
 "programı CVS kaynaklarından alacağınız openLDAP desteği\n"
 "ile kurmalısınız:\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -114,44 +249,43 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Adres defterini açamadım"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP sunucuya anonim bağlantı kuruluyor"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "Kimlik denetimi yapılamadı.\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s%s için parolayı girin (kullanıcı: %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "İsim başlar"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "E-posta başlar"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Kategori"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Herhangi bir alanın içeriği"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Gelişmiş..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -159,7 +293,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -170,89 +304,41 @@ msgstr ""
 "tanımlanmış zaman sınırını aştı. Lütfen aramayı daraltın, ya da bu \n"
 "adres defteri için tanımlanmış süreyi artırın."
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "Bu arama başarısızlıkla sonuçlandı."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Herhangi bir Kategori"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "Takvimin gösterecek olduğu URI"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "_Sertifika No:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "LDAP dizin servislerine erişimi buradan yapılandırın"
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Bağlantılar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "Dizin Servisleri"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolution Adres Defteri"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Evolution Adres Defteri LDAP Yapılandırma Sistemi"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Adres defteri menüsü mimarisi"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution Adres Defteri adres görüntüleyici"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution Adres Defteri kart görüntüleyici"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr "Evolution Adres Defteri bileşeni"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution Adres Defteri dizin görüntüleyici"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution e-posta özet bileşeni."
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -275,6 +361,7 @@ msgstr "_Desteklenen Türleri Denetle "
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -308,8 +395,9 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "LDAP Sunucusu Ekle"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "LDAP Yapılandırma Sihirbazı"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -325,9 +413,9 @@ msgid "Anonymously"
 msgstr "Anonim"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -337,47 +425,48 @@ msgstr ""
 "\n"
 "Lütfen girdiğiniz bilgileri tamamlamak için \"Uygula\" düğmesine tıklayın."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "Bağlantı"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "_DN:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr "LDAP Sunucusunu Düzenle"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
 msgstr "E-posta adresi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "Tamamlandı"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Genel"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "LDAP Yapılandırma Sihirbazı"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "Grup"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Hiç bir zaman"
 
@@ -407,8 +496,8 @@ msgid "S_earch scope: "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Arama"
 
@@ -461,28 +550,32 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 "Son adımda bu LDAP sunucunun ekranda hangi isimle görüntüleneceğini "
 "belirtmelisiniz."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "1. Adım: Sunucu Bilgisi"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "2. Adım: Sunucuya Bağlantı Kuruluyor"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "1. Adım: Sunucu Bilgisi"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "3. Adım: Dizin Aranıyor"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "2. Adım: Sunucuya Bağlantı Kuruluyor"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "4. Adım: Görüntülenecek İsim"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "3. Adım: Dizin Aranıyor"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -494,18 +587,6 @@ msgstr "Desteklenen Arama Tabanları"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"Bir LDAP sunucuyu tanımlarken ilk gerekecek bilgi bu sunucunun adı ve "
-"sizin \n"
-"giriş bilgilerinizdir. Lütfen bu konuda emin değilseniz sistem yöneticinize "
-"danışın."
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -518,7 +599,7 @@ msgstr ""
 "değiştirmeden \n"
 "önce sistem yöneticinize danışın. "
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -526,7 +607,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -536,14 +617,14 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
+#, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "Bu sihirbaz, çevrimiçi dizin servislerine LDAP (Lightweight \n"
 "Directory Access Protocol) yardımıyla bağlantı kurmanıza \n"
@@ -553,33 +634,40 @@ msgstr ""
 "detaylı bilgiye sahip olmalısınız. Lütfen bu bilgiler için \n"
 "gerekiyorsa sistem yöneticiniz ile görüşün."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Bu, LDAP sunucunuzun tam adıdır. Örnek: \"ldap.firmaadi.com.tr\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 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:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 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:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 msgstr "Bu, Evolution dizin listesinde görüntülenecek olan isimdir."
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr "Bu, Evolution dizin listesinde görüntülenecek olan isimdir."
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -610,21 +698,34 @@ msgid "Using email address"
 msgstr "E-posta adresi kullanılarak"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Ne zaman mümkünse"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+"Bir LDAP sunucuyu tanımlarken ilk gerekecek bilgi bu sunucunun adı ve "
+"sizin \n"
+"giriş bilgilerinizdir. Lütfen bu konuda emin değilseniz sistem yöneticinize "
+"danışın."
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "_Görüntülenecek isim:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "İ_ndirme sınırı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -632,54 +733,52 @@ msgstr "İ_ndirme sınırı:"
 msgid "_Edit"
 msgstr "_Düzenle"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "_Giriş yöntemi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "_Port numarası:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "_Arama tabanı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "_Sunucu adı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "_Zaman aşımı süresi (dakika):"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "kart"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr "bağlantı-sekmesi"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr "genel-sekme"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr "arama sekmesi"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "İsim"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution Adres Defteri isim seçim arayüzü"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Tümünü Sil"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Sil"
@@ -706,23 +805,21 @@ msgstr "Bağlantılara Ekle"
 msgid "Unnamed Contact"
 msgstr "İsimsiz Bağlantı"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "İsim"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Kaynak"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Adres Defterinden Bağlantıları Seç"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "Bağlantıyı burada bul:"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution Adres Defteri isim seçim arayüzü"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Bul"
@@ -799,7 +896,8 @@ msgid "D_epartment:"
 msgstr "_Bölüm:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Ayrıntılar"
 
@@ -866,12 +964,12 @@ msgid "_Categories..."
 msgstr "_Kategoriler..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Sil"
@@ -1994,7 +2092,7 @@ msgid "Esq."
 msgstr "Esq."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Tam İsim"
 
@@ -2087,11 +2185,27 @@ msgstr "Bağlantı Listesi Düzenleyici"
 msgid "Save List as VCard"
 msgstr "Listeyi VCard Olarak Kaydet"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Değiştirilen Bağlantı:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Çakışan Bağlantı:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Çift Bağlantı Bulundu"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Değiştirilen bağlantı adresinin adı ya da e-posta adresi zaten var.\n"
+"Yine de eklemek istiyor musunuz?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Yeni Bağlantı:"
@@ -2108,22 +2222,6 @@ msgstr ""
 "Bağlantı adresinin adı ya da e-posta adresi zaten var.\n"
 "Yine de eklemek istiyor musunuz?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Değiştirilen Bağlantı:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Çakışan Bağlantı:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"Değiştirilen bağlantı adresinin adı ya da e-posta adresi zaten var.\n"
-"Yine de eklemek istiyor musunuz?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2222,9 +2320,9 @@ msgstr "Bağlantıyı Gönder"
 msgid "Send Message to Contact"
 msgstr "Bağlantıya İleti Gönder"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Yazdır"
@@ -2246,9 +2344,12 @@ msgstr "Dizine taşı..."
 msgid "Cut"
 msgstr "Kes"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopyala"
 
@@ -2257,16 +2358,8 @@ msgstr "Kopyala"
 msgid "Paste"
 msgstr "Yapıştır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Sil"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "Şimdiki Görünüm"
 
@@ -2279,166 +2372,170 @@ msgid ""
 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:2
 msgid "Assistant"
 msgstr "Yardımcı"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "İşyeri Faksı"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "İş Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "2. İş Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Geri Arama Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Araç Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategoriler"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Şirket Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Bölüm"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "E-posta"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "2. E-posta Adresi"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "3. E-posta Adresi"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Tam İsim"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Farklı Dosyala"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "Web Sayfası"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Ev Adresi"
+#, fuzzy
+msgid "Given Name"
+msgstr "Alan Adı"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Ev Faksı"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Ev Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "2. Ev Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Ürdün"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Yönetici"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Cep Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Lakap"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Not"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Ofis"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Kurum"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Diğer Adres"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Başka Fakslar"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Diğer Telefonlar"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Çağrı Cihazı"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "İlk Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Uzmanlık alanı"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Radyo"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Görev"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Eş"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Sıfat"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Unst"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Web Sayfası"
 
@@ -2531,11 +2628,19 @@ msgstr "Üyeler"
 msgid "Job Title"
 msgstr "_Meslek tanımı:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Ev Adresi"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Ev Adresi"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Diğer Adres"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2548,112 +2653,109 @@ msgstr "Ev Faksı"
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Başarıldı"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Bilinmeyen hata"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Depo çevrimdışı"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "İzin yok"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Kart bulunamadı"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Bu kart numarası var"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Protokol desteklenmiyor"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "İptal Edildi"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "Kimlik Denetimi Başarısız."
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "Kimlik Denetimi İsteniyor"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS mevcut değil"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "Adres defteri bulunamadı"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Diğer hata"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Değişiklikleri kaydetmek istiyor musunuz?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr "_Sil"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Liste eklenirken hata oluştu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Kart eklenirken hata oluştu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Liste düzenlenirken hata oluştu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Kartlar düzenlenirken bir hata oluştu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Listeyi silerken bir hata oluştu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Kartı silerken bir hata oluştu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2663,7 +2765,7 @@ msgstr ""
 "açılması gerekiyor. Gerçekten tüm bu kartları \n"
 "görmek istiyor musunuz?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2672,49 +2774,49 @@ msgstr ""
 "%s dosyası mevcut\n"
 "Üzerine yazmak istiyor musunuz?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "Üzerine yaz"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "%s kaydedilirken hata: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "kart.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Kartı taşı:"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kartı kopyala:"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Kartları taşı:"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kartları kopyala:"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Çoklu VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "%s için VCard"
@@ -2909,7 +3011,7 @@ msgstr "Marjin"
 msgid "Number of columns:"
 msgstr "Sütun sayısı:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Seçenekler"
 
@@ -3096,18 +3198,18 @@ msgstr "İsimsiz Liste"
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "wombat sunucusu başlatılamadı"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Wombat başlatılamadı"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Pilot'tan takvim uygulama bloğu okunamadı"
 
@@ -3115,24 +3217,83 @@ msgstr "Pilot'tan takvim uygulama bloğu okunamadı"
 msgid "Default Priority:"
 msgstr "Öntanımlı Öncelik:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilot ToDO uygulama bloğu okunamadı"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Takvim ve Görevler"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Takvim"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution Takvim ve Görevler"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution Takvim yapılandırma denetimi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Evolution Takvim görüntüleyici"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution Takvim/Görev düzenleyici"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Evolution Görev izleyici"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolution Takvim ve Görev bileşeni"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolution Test Bileşeni"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Görevler"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution Takvim alarm bildirim servisi"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Başlangıç:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Bitiş:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Evolution Alarmı"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "%s tarihinde Alarm"
@@ -3197,43 +3358,172 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Tekrar sorma."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution Takvim alarm bildirim servisi"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo'yu başlatamadım"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Gnome-vfs başlatılamıyor"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Alarm bilgilendirme servis mimarisi oluşturamadım"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "geçersiz saat"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "iCalendar Hatası"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Bugün tamamlanması gereken görevlerin rengi"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Bugün tamamlanması gereken görevlerin rengi"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "_Hafta ve ay görünümlerinde randevu bitiş saatlerini göster"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Yazdırılacak olan takvimi önizler"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "Öğ_eleri silmeden önce sor"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "Öğ_eleri silmeden önce sor"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Biten görevleri sil"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Gün gezgininde tarih numaralarını göster"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Özet içeriği"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Tanım içeriği"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Açıklama içeriği"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Eşleme yok"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3245,81 +3535,110 @@ msgstr ""
 "\n"
 "Gerçekten bu görevleri silmek istiyor musunuz?"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "küçük"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "gün"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%d %B %A %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%d %b %a"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%d %b %a %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Bu takvimi yazdır"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Yeni Kaledonya"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "Yeni randevu"
+
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "_Randevu"
+
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Yeni bir randevu oluştur"
+
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "Yeni toplantı"
+
+#: calendar/gui/calendar-component.c:640
+msgid "M_eeting"
+msgstr "_Toplantı"
+
+#: calendar/gui/calendar-component.c:641
 #, fuzzy
-msgid "Rename"
-msgstr "_Yeniden adlandır"
+msgid "Create a new meeting request"
+msgstr "Yeni bir toplantı isteği oluştur"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Yeni Tüm Gün Randevusu"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Kişisel"
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr "_Tüm Gün Randevusu"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "İş"
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Yeni bir randevu oluştur"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3436,7 +3755,7 @@ msgstr "Gönder:"
 msgid "With these arguments:"
 msgstr "Bu argümanlarla:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -3452,6 +3771,10 @@ msgstr "saat"
 msgid "minutes"
 msgstr "dakika"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3484,8 +3807,8 @@ msgstr "Bir E-posta Gönder"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Özet:"
 
@@ -3514,7 +3837,7 @@ msgstr "randevu sonu"
 msgid "hour(s)"
 msgstr "saat"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "dakika"
 
@@ -3568,7 +3891,7 @@ msgstr "Gün"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Cuma"
 
@@ -3582,7 +3905,7 @@ msgstr "Dakika"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Pazartesi"
 
@@ -3592,7 +3915,7 @@ msgstr "_Paz"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Cumartesi"
 
@@ -3606,7 +3929,7 @@ msgstr "Gün gezgininde tarih numaralarını göster"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Pazar"
 
@@ -3624,7 +3947,7 @@ msgstr "Görev Listesi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Perşembe"
 
@@ -3642,7 +3965,7 @@ msgstr "Zaman biçimi:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Salı"
 
@@ -3652,12 +3975,12 @@ msgstr "_Hafta başı:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Çarşamba"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Çalışma Haftası"
 
@@ -3694,7 +4017,7 @@ msgid "_Fri"
 msgstr "_Cum"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Genel"
 
@@ -3734,80 +4057,80 @@ msgstr "Ç_ar"
 msgid "before every appointment"
 msgstr "her randevudan önce"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Gerçekten bu toplantıyı iptal edip silmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Gerçekten bu görevi iptal edip silmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Olay silindi."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Bu görev silindi."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 #, fuzzy
 msgid "This journal entry has been deleted."
 msgstr "Olay silindi."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Değişiklikler yaptınız. Bu değişiklikleri unutup, düzenleyiciyi kapatmak "
 "istiyor musunuz?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Hiç değişiklik yapılmadı. Düzenleyici kapatılsın mı?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Bu olay değiştirildi."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Görev değiştirildi."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 #, fuzzy
 msgid "This journal entry has been changed."
 msgstr "Görev değiştirildi."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Hiç değişiklik yapılmadı. Düzenleyici güncellensin mi?"
@@ -3817,165 +4140,170 @@ msgstr "%s  Hiç değişiklik yapılmadı. Düzenleyici güncellensin mi?"
 msgid "Validation error: %s"
 msgstr "Onaylama hatası: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Tamamlanan "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Tamamlanan "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 #, fuzzy
 msgid " (Due "
 msgstr "Tarihe göre "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Tarihe göre "
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "Öğe güncellenemedi"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Randevuyu Düzenle"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Randevu - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Görev - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Özet yok"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Farklı kaydet..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Bu veriyi almak için hedef dizin seçin"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Gerçekten '%s' randevusunu silmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Gerçekten bu randevuyu silmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Gerçekten %s görevini silmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Gerçekten bu görevi silmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "`%s' başlıksız günlük girdisini silmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Bu başlıksız günlük girdisini silmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Gerçekten %d randevuyu silmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Gerçekten %d görevi silmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Gerçekten %d günlük girdisini silmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Corba hatası nedeniyle bu öğe silinemedi"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "İzin verilmediği için bu olay silinemedi."
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "İzin verilmediği için bu görev silinemedi."
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "İzin verilmediği için bu günlük bilgisi silinemedi."
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "İzin verilmediği için bu öğe silinemedi."
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Corba hatası nedeniyle bu öğe silinemedi"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Corba hatası nedeniyle bu öğe silinemedi"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Katılımcı bilgileri geçersiz bir durum nedeniyle güncellenemedi!\n"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Corba hatası nedeniyle bu öğe silinemedi"
@@ -3992,43 +4320,43 @@ msgstr "Dağıt:"
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Randevu"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Hatırlatıcı"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Tekrarlama"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Zaman Düzenleme"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Toplantı"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "Başlangıç tarihi yanlış"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "Bitiş tarihi yanlış"
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "Başlangıç tarihi yanlış"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "Bitiş tarihi yanlış"
 
@@ -4098,31 +4426,31 @@ msgid "_Start time:"
 msgstr "B_aşlangıç tarihi:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Yok"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr "Seçilen organizatörün bir e-posta adresi bulunmuyor."
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "Bir düzenleyen kişi olmak zorunda."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "En az bir katılan olmalıdır."
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Dağıt..."
 
@@ -4164,21 +4492,15 @@ msgid "Member"
 msgstr "Üye"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Görev"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Durum"
@@ -4198,6 +4520,7 @@ msgid "_Invite Others..."
 msgstr "_Başkalarını Davet Et..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4230,6 +4553,7 @@ msgid "Could not create directory for new calendar"
 msgstr "%s dizini yaratılamadı: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "Bir düzenleyen kişi olmak zorunda."
@@ -4259,33 +4583,58 @@ msgstr "Takvim bilgisi"
 msgid "Calendar Name"
 msgstr "Takvim"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "%s dizini yaratılamadı: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Takvim bilgisi"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Görev Listesi"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Görev Listesi"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Görev Listesi"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Bu ve Bundan Sonraki Tekrarlamalar"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr "Bu ve Bundan Sonraki Tekrarlamalar"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr "Tüm Tekrarlamalar"
 
@@ -4333,10 +4682,15 @@ msgstr "gün"
 msgid "on the"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "tekrarlar"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Tarih/Zaman:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "_Ekle"
@@ -4401,7 +4755,7 @@ msgstr "hafta"
 msgid "year(s)"
 msgstr "yıl"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
@@ -4411,31 +4765,31 @@ msgstr ""
 "\n"
 "Değişiklikleri kaydetmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "_Değişiklikleri Sil"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 msgid "Save Event"
 msgstr "Olayı Kaydet"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Toplantı bilgisi oluşturuldu. Gönderilsin mi?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Toplantı bilgisi değiştirildi. Güncel bir sürümü gönderilsin mi?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "Görev bilgisi oluşturuldu. Gönderilsin mi?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "Görev bilgisi değiştirildi. Güncel bir sürümü gönderilsin mi?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Tamamlanma tarihi yanlış"
 
@@ -4445,43 +4799,43 @@ msgid "% _Complete"
 msgstr "Biten %"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Tamamlandı"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Yüksek"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "İşlemde"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Düşük"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Başlamadı"
 
@@ -4490,7 +4844,7 @@ msgid "Progress"
 msgstr "İşlem"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Tanımsız"
 
@@ -4512,21 +4866,21 @@ msgstr "_Durum:"
 msgid "_Web Page:"
 msgstr "W_eb sayfası adresi:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Temel"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Görevlendirme"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "Bitiş tarihi hatalı"
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4534,9 +4888,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "_Gizli"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Açıklama:"
 
@@ -4641,26 +4995,21 @@ msgstr "%s sunucu %s"
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Genel"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Özel"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Gizli"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategoriler"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4673,28 +5022,26 @@ msgid "Start Date"
 msgstr "Başlangıç Tarihi"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Özet"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "rengi ile tanımla"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Randevu"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Boş"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Meşgul"
 
@@ -4706,7 +5053,7 @@ msgstr "K"
 msgid "S"
 msgstr "G"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "D"
 
@@ -4714,7 +5061,7 @@ msgstr "D"
 msgid "W"
 msgstr "B"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4724,7 +5071,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4732,7 +5079,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Evet"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4740,17 +5087,17 @@ msgstr "Hayır"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
@@ -4762,181 +5109,179 @@ msgstr "Tekrarlama"
 msgid "Assigned"
 msgstr "Görevlendirildi"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Öğeler güncelleniyor"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Seçilen bağlantılar siliniyor"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Öğeler güncelleniyor"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Yeni _Randevu..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Y_eni Tüm Gün Olayı"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "Yeni Toplantı"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Yeni Görev"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Yazdır..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Yapıştır"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "_Bugüne Git"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "_Güne Git..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Boş/Meşgul Bilgisini Yayınla"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "_Ayarlar..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Aç"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Farklı Kaydet..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Kopyala"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "_Toplantı Tarihi Ayarla..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "_iCalendar olarak Yönlendir..."
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "_Bu Oluşumu Sil"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "_Tüm Oluşumları Sil"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "_Ayarlar..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "%0"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "%10"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "%20"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "%30"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "%40"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "%50"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "%60"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "%70"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "%80"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "%90"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "%100"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "İ_letiyi Aç "
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "_Görev Ata"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "i_Calendar Olarak Yönlendir"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "_Bitmiş Olarak İşaretle"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Seçilen Görevleri Bitmiş Olarak İşaretle"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "_Seçilen Görevleri Sil"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Görev eklemek için tıklayın"
@@ -4950,8 +5295,8 @@ msgstr "Biten %"
 msgid "Alarms"
 msgstr "Uyarılar"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Tamamlandı"
 
@@ -4980,18 +5325,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%d/%m/%Y %A %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%d/%m/%Y %A %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5010,7 +5355,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%d %B %A"
 
@@ -5023,125 +5368,125 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "öö"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "ös"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "Her gün"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "Her %d gün"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "Her hafta"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "Her %d hafta"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, fuzzy, c-format
 msgid "Every %d weeks on "
 msgstr "%d hafta"
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " ve "
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "her ay"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr "her %d ayda"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "Her yıl"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "Her %d yıl"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>Başlangıç:</b> "
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Bitiş: </b>"
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>Tamamlanan:</b> "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>Son tarih:</b> "
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "iCalendar Bilgisi"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "iCalendar Hatası"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Bilinmeyen kişi"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5149,320 +5494,319 @@ 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:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Hiçbiri</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "Konum: "
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Durum:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Onaylandı"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Girişimli"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Reddedildi"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Bir eylem seçin:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Güncelle"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Tamam"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Onayla"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "Girişimli"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Reddet"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Boş/Meşgul Bilgisi Gönder"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Cevaplayan Bilgisini Güncelle"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Güncel Bilgiyi Gönder"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "İptal"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b>, toplantı bilgisi gönderdi."
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Toplantı Bilgisi"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Toplantı Taslağı"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Toplantı Güncellemesi"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Toplantı Güncelleme Bilgisi İsteği"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, 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:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Toplantı Yanıtı"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, 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:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Toplantı İptali"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, 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:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Hatalı Toplantı İletisi"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Görev Bilgisi"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, 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:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Görev Taslağı"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, 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:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Görev Güncellemesi"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, 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:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Güncel Görev Bilgisi İsteği"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, 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:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Görev Yanıtı"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, 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:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Görev İptali"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Hatalı Görev İletisi"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, 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:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Boş/Meşgul Bilgisi"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, 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:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Boş/Meşgul İsteği"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, 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:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Boş/Meşgul Cevabı"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Hatalı Boş/Meşgul İletisi"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr "Bu mesaj düzgün değil"
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "Bu iletide desteklenmeyen bilgiler var."
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 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:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr "Bu eklentide görüntülenebilir takvim öğeleri bulunmuyor"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "Takvim dosyası güncellenemedi!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Güncelleme tamamlandı\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 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:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 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:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr "CORBA sisteminde bir hata oluştu\n"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr "Öğe bulunamadı\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Katılımcı bilgileri güncellendi\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "Katılımcı bilgileri güncellenemedi!\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Bitiş Tamamlandı"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Öğe gönderildi!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Öğe gönderilemedi!\n"
 
@@ -5622,7 +5966,7 @@ msgstr "%d %b %Y %a"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -5686,49 +6030,44 @@ msgstr "Toplantı b_aşlama saati :"
 msgid "Meeting _end time:"
 msgstr "Toplantı _bitiş saati:"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "_Başlangıç Tarihi:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "_Tarihe Göre:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "Ö_ncelik:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Sayfa"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "%s tarihinde görevler açılıyor"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "%s içindeki görevler yüklenemedi."
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s' yüklemek için gereken yöntem desteklenmiyor"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "'%s' içinde bir dizin açılması için yeterli izniniz yok"
 
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5737,48 +6076,39 @@ msgstr ""
 "'%s' hatası:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "Görevler tamamlanıyor..."
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "Seçilen öğeler siliniyor..."
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "Siliniyor"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Görevler"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Takvim"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s' dizini açılamadı."
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s' açmak için gereken yöntem desteklenmiyor"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "%s için alarm ekleniyor"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5786,7 +6116,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5794,58 +6124,11 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Turin"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Takvim ve Görevler"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Takvim"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution Takvim ve Görevler"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution Takvim yapılandırma denetimi"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution Takvim görüntüleyici"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution Takvim/Görev düzenleyici"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution Görev izleyici"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolution Takvim ve Görev bileşeni"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolution Test Bileşeni"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Nisan"
@@ -5902,296 +6185,332 @@ msgstr "Ekim"
 msgid "September"
 msgstr "Eylül"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Bir düzenleyen kişi olmak zorunda."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "En az bir katılımcı olmak zorunda"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Olay bilgisi"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Görev bilgisi"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Boş/Meşgul bilgisi"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Takvim bilgisi"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Güncellendi"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Tazele"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Boş/Meşgul bilgisi (%s -> %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "iCalendar bilgisi"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Bu olayda bir katılımcı olarak görünmeniz gerekiyor."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "8."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "39."
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Pz"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Pt"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Sa"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Ça"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Pe"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Cu"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Ct"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Seçili gün (%d %b %a %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%d %b %a"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%d %a %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%d %b %a %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Seçili hafta (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Seçili ay (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Seçili yıl (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Görev"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Durum: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Öncelik: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Biten Yüzde: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategoriler: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Bağlantılar: "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Yazdırma Önizleme"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Öğeyi Yazdır"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Yazdırma Ayarları"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Bu kısayolu yeniden isimlendir"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Görev Listesi"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Yeni görev"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Görev"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Yeni bir görev oluştur"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "Gösterilecek görevler dizininin URI'si"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6203,11 +6522,11 @@ msgstr ""
 "\n"
 "Gerçekten bu görevleri silmek istiyor musunuz?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Tekrar sorma."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "Yazdırma Görevleri"
 
@@ -6236,15 +6555,15 @@ msgstr "iCalendar dosyaları (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar dosyaları (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "Hatırlatıcı!!"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "Takvim Olayları"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6252,7 +6571,7 @@ msgstr ""
 "Evolution, Gnome Takvim dosyaları buldu.\n"
 "Bunların Evolution'a aktarılmasını istiyor musunuz?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Gnome Takvimi"
 
@@ -7785,28 +8104,28 @@ msgstr "Pacific/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacific/Yap"
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "Bu şifreleme ile imza desteklenmiyor"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "Bu şifreleme ile onaylama desteklenmiyor"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Bu şifre ile şifreleme desteklenmiyor"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Bu şifreleme ile geriye dönük şifreleme desteklenmiyor"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 #, fuzzy
 msgid "You may not import keys with this cipher"
 msgstr "Bu şifreleme ile geriye dönük şifreleme desteklenmiyor"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 #, fuzzy
 msgid "You may not export keys with this cipher"
 msgstr "Bu şifreleme ile geriye dönük şifreleme desteklenmiyor"
@@ -7856,86 +8175,86 @@ msgstr "'%s' dizinine kaydediliyor"
 msgid "You must be working online to complete this operation"
 msgstr "Bu işlemi bitirmek için İnternet bağlantısı sağlamalısınız"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "%s iletisi önbelleğe yazılamadı: %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "%s iletisi önbelleğe yazılamadı: %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "%s adrsinden karşılama mesajı alınamadı: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Dizinler eşzamanlı hale getiriliyor"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "%s filtresini ayrıştırırken hata oldu: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "%s filtresini çalıştırırken hata oldu: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Spool dizini açılamadı"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Spool dizini işlenemedi"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%%%d) iletisi alınıyor"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "İleti açılamadı"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "%d iletisinde hata"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Dizin eşzamanlı hale getiriliyor"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d/%d ileti alınıyor"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d/%d iletisinde hata"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "İletinin alınmasında hata oluştu"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "%s filtre taramasını çalıştırırken hata oldu: %s"
@@ -7967,35 +8286,35 @@ msgstr "(hepsini-eşle) boolean sonuç içermelidir"
 msgid "Performing query on unknown header: %s"
 msgstr "Bilinmeyen başlık üzerinde arama yapılıyor: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Desteklenmeyen işlem: mesaja ekle: %s için"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Desteklenmeyen işlem: ifade ile ara: %s için"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Desteklenmeyen işlem: uid ile ara: %s için"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "İletiler taşınıyor"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr "İletiler kopyalanıyor"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "%d ileti alınıyor"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8006,45 +8325,45 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "İptal edildi."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "POP sunucusundan beklenmeyen cevap: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr "Veri sunulmadı"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8055,48 +8374,58 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "%s verisi üzerinde GPG işlemi uygulanamadı: %s\n"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Veri yazılamadı: %s."
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg çalıştırılamadı: %s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr "gpg çalıştırılamadı."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr ""
+
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Veri yazılamadı: %s."
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+msgid "Encrypted content"
+msgstr ""
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "%s üzerindeki POP sunucusundan iletiler alınamadı: "
@@ -8197,15 +8526,15 @@ msgstr "Geçici mektup dosyasına yazarken hata: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Geçici mektup dosyasına yazarken hata: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "ayrıştırma hatası"
 
@@ -8515,12 +8844,12 @@ msgstr "Sanal dizin e-posta sağlayıcısı"
 msgid "For reading mail as a query of another set of folders"
 msgstr "diğer bir dizin listesinden alınan iletileri okumak için"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "`%s' protokolü için alıcı yok"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8529,71 +8858,82 @@ msgstr ""
 "%s dizini yaratılamadı:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Lütfen parolanızı girin: "
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Tanımsız"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "İmzayi düzenle"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "İmzayi düzenle"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Yapılandırma Veritabanı bulunamadı"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "Sertifika Otoritesi Güvenilir Değil"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "İmzayı kaydet"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Ayrıştırma hatası"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Sunucu: %s, Tür: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Dizin alınamadı: Gerçersiz"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Dizin oluşturulamadı: Geçersiz işlem"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Çöp"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "Haziran"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr ""
@@ -8800,7 +9140,7 @@ msgid ""
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL açılamadı: %s"
@@ -8819,22 +9159,22 @@ msgstr "Bu isimle bir ileti yok: %s (%s)"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "%s dizini silinemedi. Geçersiz işlem"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "%s dizini silinemedi: Böyle bir dizin yok"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "%s dizininin adı değiştirilemedi: Geçersiz işlem"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "%s dizininin adı değiştirilemedi: Bu isimde bir dizin yok"
@@ -8914,7 +9254,7 @@ msgstr "İleti alınamadı: %s"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -8928,7 +9268,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "İleti bulunmuyor"
@@ -8966,54 +9306,71 @@ msgid "Failed to cache %s: %s"
 msgstr "%s önbelleğe atılamadı: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Sunucuya bağlantı kuruluyor..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "LDAP sunucuyla bağlantı başarısız oldu"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr ""
+"\n"
+"Açıklama: "
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Yeni iletiler denetleniyor"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 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:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Dizinler"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Sadece üye olunan dizinleri göster"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "İsim alanı"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Bu sunucudaki GELEN kutusunda bulunan yeni iletilere filtreleri uygula"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "Yeni iletilerin denetlenme aralığı: "
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP sunucuları ileti alma ve göndermede kullanmak için"
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Parola"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9270,7 +9627,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "%s dizininin adı %s olarak değiştirilemedi: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "'%s' adı değiştirilemedi: %s"
@@ -9388,29 +9745,29 @@ msgstr "Yeni iletiler denetleniyor"
 msgid "Storing folder"
 msgstr "'%s' dizinine kaydediliyor"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s üzerinde dizin kilitlemesi yaratılamadı: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "%s posta kutusu açılamadı: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "İleti aktarımı iptal edildi"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "İleti mbox dosyasına eklenemedi (%s): %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9419,11 +9776,11 @@ msgstr ""
 "%s iletisi %s dizininden alınamadı\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Dizin onarılamayacak şekilde bozulmuş."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "İletiler düzenlenemiyor: İleti kutusu bozulmuş olabilir."
 
@@ -9491,12 +9848,17 @@ msgstr "%s dizini yaratılamadı: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "%s dizini alınamadı: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "Bu kart numarası var"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "%s dizininin adı %s olarak değiştirilemedi: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Bu dizin adı geçersiz: %s"
@@ -9540,7 +9902,7 @@ msgstr "Kaynak dizin %s açılamadı: %s"
 msgid "Could not close temp folder: %s"
 msgstr "geçici dizin kapatılamadı: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Dizinin adı değiştirilemedi: %s"
@@ -9825,7 +10187,7 @@ msgstr "%s günden sonra sil"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -9912,7 +10274,7 @@ 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:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9965,7 +10327,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Sendmail üzerinden ileti gönderimi"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10131,7 +10493,7 @@ msgstr "%s üzerinden STMP ileti gönderimi"
 msgid "Cannot send message: sender address not valid."
 msgstr "İleti gönderilemiyor: gönderen adresi geçersiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Gönderilen iletiler"
 
@@ -10253,7 +10615,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "ek"
 
@@ -10298,14 +10660,14 @@ msgstr "MIME türü:"
 msgid "Suggest automatic display of attachment"
 msgstr "Eklentinin otomatik gösterimini öner"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "İleti göndermeden önce kendinize\n"
 "ait bir kimlik oluşturmalısınız."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Adres defteri için buraya tıklayın"
 
@@ -10316,45 +10678,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Cevapla:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Gönderen:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Konu:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Alıcı:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "İletinin gönderildiği kişiler"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Bilgi:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "İletinin kopyasının gönderilecek olunduğu adresler"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Gizli:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10365,16 +10727,21 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "Git"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 #, fuzzy
 msgid "Posting destination"
 msgstr "Açıklama yok"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "İletiyi bir dosya ekle"
+
 #: composer/e-msg-composer-select-file.c:119
 #, fuzzy
 msgid "Attach file(s)"
@@ -10410,22 +10777,22 @@ msgstr "Dosya var. Üzerine yazılsın mı?"
 msgid "Error saving file: %s"
 msgstr "%s dosyasını kaydederken hata oldu"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "`%s' dosyasını yüklerken hata oldu"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Dosyaya erişirken hata oldu: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "%s üzerindeki POP sunucusundan iletiler alınamadı: "
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10434,7 +10801,7 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10443,7 +10810,7 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10452,7 +10819,7 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10461,7 +10828,7 @@ msgstr ""
 "İletilerin otomatik kaydında hata: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10469,7 +10836,7 @@ msgstr ""
 "Evolution, önceki oturumlardan kaydedilmemiş dosyalar saptadı.\n"
 "Bunları kurtarmak istiyor musunuz?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10480,34 +10847,34 @@ msgstr ""
 "\n"
 "Değişiklikleri kaydetmek istiyor musunuz?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Uyarı: İleti Değiştirildi"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Dosyayı aç"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "İmza:"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "Otomatik"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Bir ileti yaz"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10519,7 +10886,7 @@ msgstr ""
 "Lütfen sistemde gtkhtml ve libgtkhtml programlarının\n"
 "kurulu olduğunu denetleyin.\n"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10528,18 +10895,20 @@ msgstr ""
 "E-posta düzenleme penceresi açılmadı, çünkü adınızı ve\n"
 "e-posta bilgilerinizi girmediniz."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr "<b>(Burada düzenlenmesi mümkün olmayan bir bilgi vardır.)<b>"
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Evolution kitlesel işlemler uygulaması"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10783,13 +11152,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -10915,7 +11284,7 @@ msgstr "Sonra"
 msgid "You must specify a folder."
 msgstr "Bu dizin adı belirtmelisiniz."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Dizini Seçin"
@@ -10929,24 +11298,24 @@ msgstr ""
 "`%s' düzgün deyiminde hata var:\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Önemli"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "Yapılacaklar"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Sonra"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Test"
 
@@ -11040,7 +11409,7 @@ msgstr "önce"
 msgid "months"
 msgstr "ay"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "saniye"
 
@@ -11138,7 +11507,7 @@ msgstr "Deyim"
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "Etiket"
 
@@ -11210,121 +11579,127 @@ msgid "Source Account"
 msgstr "Kaynak Hesap"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Cumartesi"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Özel başlık"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "İşlemeyi Durdur"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Konu"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "Durum belirt"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "içerir"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "içermez"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "sonlanmaz"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "bulunmaz"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 #, fuzzy
 msgid "does not return"
 msgstr "bulunmaz"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "benzemez"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "başlamaz"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "biter"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "bulunur"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 #, fuzzy
 msgid "is Flagged"
 msgstr "İşaretli"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 #, fuzzy
 msgid "is after"
 msgstr "sonra"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "is before"
 msgstr "önce"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "büyük"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "küçük"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 #, fuzzy
 msgid "is not Flagged"
 msgstr "İşaretli"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "değil"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "eşittir"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 #, fuzzy
 msgid "returns greater than"
 msgstr "büyük"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 #, fuzzy
 msgid "returns less than"
 msgstr "küçük"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 #, fuzzy
 msgid "returns"
 msgstr "Burns"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "benzer"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "başlayan"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
@@ -11350,20 +11725,86 @@ msgstr "Kural adı:"
 msgid "Score Rules"
 msgstr "Puan Kuralları"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Bu vfolder adını değiştirmelisiniz."
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 #, fuzzy
 msgid "You need to to specify at least one folder as a source."
 msgstr "Kaynak için en az bir dizin belirtmelisiniz."
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 #, fuzzy
 msgid "VFolder source"
 msgstr "vFolder Kaynakları"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Düzenleyici Tercihleri"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "İleti tercihleri, güvenlik ve diğer ayarları buradan yapılandırın"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "İmla denetimi, imza ve metin düzenleyiciyi buradan yapılandırın"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Posta hesaplarını buradan yapılandırın"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "E-posta özet bileşen mimarisi"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Evolution e-posta programı."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Evolution e-posta programı."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "E-posta özet bileşen mimarisi"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution e-posta dizin görüntüleme bileşeni."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolution e-posta özet bileşeni."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "İleti"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "E-posta Hesapları"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "E-posta Tercihleri"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Gerçekten bu hesabı silmek istiyor musunuz?"
@@ -11405,7 +11846,7 @@ msgid "Protocol"
 msgstr "Protokol"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr "İsimsiz"
 
@@ -11429,21 +11870,17 @@ msgstr "Betik imzası girin"
 msgid "Signature(s)"
 msgstr "İmza(lar)"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
-#, fuzzy
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "HTML biçimli bir ileti gönderiyorsunuz. Ancak aşağıdaki alıcılar, HTML "
 "biçimli iletiler almak istemiyorlar:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Yine de gönderilsin mi?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11451,17 +11888,17 @@ msgstr ""
 "Bu iletinin konusu yok.\n"
 "Yine de gönderilsin mi?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Bu ileti sadece gizli (Bcc) alıcıları içeriyor."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11471,11 +11908,11 @@ msgstr ""
 "getirebilir.\n"
 "Yine de göndereyim mi?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Bu e-postayı göndermek için alıcısını belirtmeniz gereklidir."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11487,190 +11924,401 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Arama sonucundan  _Sanal Dizin Yarat..."
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "İleti"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<bir dizin seçmek için tıklayın>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr ""
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Yeni Bir Dizin Yarat"
 
-#: mail/em-folder-selector.c:267
-#, fuzzy
-msgid "Folder _name"
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Dizinin nerede yaratılacağını belirtin:"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
 msgstr "Dizin _adı:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Geçici dizin yaratılamadı: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Geçici dizin yaratılamadı: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "%s geçici dizini yaratılamadı: %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "geçici dizin kapatılamadı: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Yükleniyor..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Dizini seçin"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Yeni bir dizin yarat"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "`%s' dizini silinemedi: %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Gerçekten \"%s\" dizini silinsin mi?"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Sil: \"%s\""
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "\"%s\" dizinini yeniden adlandır:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+#, fuzzy
+msgid "Rename Folder"
+msgstr "Dizini yeniden adlandır"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Yazıtipi Özellikleri"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Özellikler"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "_Dizin Adı:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Göster"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Yeni Pencerede Aç"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Taşı"
+
+#: mail/em-folder-tree.c:1500
+msgid "_New Folder..."
+msgstr "_Yeni Dizin..."
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "_Yeniden adlandır"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "Ö_zellikler..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "Yeni İleti Olarak _Düzenle..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "_Yazdır"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Gönderene Cevapla"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "_Listeye Cevapla"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "_Herkese Cevapla"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "_Yönlendir"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Tamamlandı"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "_Bayrağı Temizle"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "_Okunmuş Olarak İşaretle"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "Oku_nmamış Olarak İşaretle"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Ö_nemli Olarak İşaretle"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "Ö_nemsiz Olarak İşaretle"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Oku_nmamış Olarak İşaretle"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Ö_nemli Olarak İşaretle"
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "_Silme"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "_Dizine Taşı..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "D_izine Kopyala..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "_Göndereni Adres Defterine Ekle"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "_Filtreleri Uygula"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "_Bu İletiden Bir Kural Yarat"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "_Konuya Göre VFolder"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "_Gönderene Göre VFolder"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "_Alıcılara Göre VFolder"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "_E-posta Listesi Üzerinde VFolder"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "_Gönderene Göre VFolder"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "_Konuya Göre Filtrele"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "_Gönderene Göre Filtrele"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "_Alıcılara Göre Filtrele"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "_E-posta Listesine Göre Filtrele"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "_Gönderene Göre Filtrele"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Öntanımlı"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "İletiyi Yazdır"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Adresi Kopyala"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Eşleşenler:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Görevlendirildi"
+
+#: mail/em-format-html-display.c:597
+#, fuzzy
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr ""
+"Bu ileti dijital olarak imzalanmış, fakat güvenli olduğu kanıtlanmamıştır."
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "İmzayi düzenle"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "İmzayi düzenle"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Kesintiye uğradı"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
 msgstr ""
-"Bu ileti dijital olarak imzalanmıştır ve güvenlidir. Daha fazla bilgi için "
-"kilit simgesi üzerine tıklayın."
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "PGP Şifre"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "MIME iletisi açılamadı: Kaynak kodu gösteriliyor."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Desteklenmeyen şema"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Sertifika imzası açılamadı"
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "İzle"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Gizle"
@@ -11680,185 +12328,207 @@ msgstr "Gizle"
 msgid "Page %d of %d"
 msgstr "Sayfa: %d / %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "%s numaralı ileti alınıyor"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Bozuk harici gövde"
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP adresine bağ (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "%s yerel dosyasına bağ (\"%s\" adresinde geçerli)"
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Yerel dosyaya bağ (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Uzak veri adresine bağ (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Bilinmeyen harici veriye bağ (\"%s\" türünde)"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-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/em-format-html.c:906 mail/em-format.c:1217
-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/em-format-html.c:930 mail/em-format.c:1190
-#, fuzzy
-msgid "No signature present"
-msgstr "HTML imza dosyası:"
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "GNOME başlatılamıyor"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Desteklenmeyen şema"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME iletisi açılamadı: Kaynak kodu gösteriliyor."
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "İletiler taşınıyor"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Gönderen"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Yanıtla"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Alıcı"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Bilgi"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Gizli"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "E-postalayıcı"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Tarih"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "%s ek"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "MIME iletisi açılamadı: Kaynak kodu gösteriliyor."
+msgid "Session not initialised"
+msgstr "GNOME başlatılamıyor"
+
+#: mail/em-format.c:1210
+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/em-format.c:1212
+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/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Bekleniyor..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "%s adresine ping gönderiliyor"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "%s önbelleğe atılamadı: %s"
 
-#: mail/em-popup.c:593
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "%s iletisi önbelleğe yazılamadı: %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "'%s' makinesi bulunamadı: %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Farklı Kaydet..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Gönderene Cevapla"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Bağlantıyı Tarayıcıda Aç"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "İletiyi _listeye gönder..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Adres Defterine Ekle"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "%s içinde aç..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "Sunucu LDAPv3 şema bilgisini desteklemiyor"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Üye ol"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Dizin"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Lütfen bir sunucu seçiniz."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Hiç sunucu seçilmedi"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Bu mesajı bir daha gösterme."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11867,27 +12537,27 @@ msgstr ""
 "Filtre bilgisini yüklerken hata oluştu:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Filtreler"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Yönlendirilmiş İleti"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "bilinmeyen gönderici"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%d-%m-%Y %A günü saat %H:%M sularında, %%s dedi ki:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -11896,7 +12566,7 @@ msgstr ""
 "İleti alınamadı: %s\n"
 "  %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -11905,25 +12575,26 @@ msgstr ""
 "%s isimli bir dosya zaten var.\n"
 "Üzerine yazılsın mı?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "İleti"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "İletiyi Farklı Kaydet..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Geçici dizin yaratılamadı: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Addres"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -11933,105 +12604,404 @@ msgstr ""
 "\n"
 "Devam etmek istiyor musunuz?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Düzenleyici Tercihleri"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/em-utils.c:2288
+#, fuzzy
 msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "İleti tercihleri, güvenlik ve diğer ayarları buradan yapılandırın"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Bu işlem \"silinmiş\" olarak işaretlenen tüm e-postaları diskten \n"
+"tamamen silecektir. Eğer devam ederseniz, bu dosyaları geri \n"
+"getiremezsiniz.\n"
+"\n"
+"Devam etmek istiyor musunuz?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "İmla denetimi, imza ve metin düzenleyiciyi buradan yapılandırın"
+#: mail/evolution-mail.schemas.in.in.h:1
+#, fuzzy
+msgid "Automatic link recognition"
+msgstr "_Yeni iletileri otomatik denetle:"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Posta hesaplarını buradan yapılandırın"
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "_Yeni iletileri otomatik denetle:"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:6
 #, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
+msgid "Default charset in which to compose messages"
+msgstr "İletinin öntanımlı konusu."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:7
 #, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "E-posta özet bileşen mimarisi"
+msgid "Default charset in which to compose messages."
+msgstr "İletinin öntanımlı konusu."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
-msgid "Evolution Mail component"
-msgstr "Evolution e-posta programı."
+msgid "Default charset in which to display messages"
+msgstr "Görüntülenen ileti içinde bir metin ara"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Evolution e-posta programı."
+msgid "Default charset in which to display messages."
+msgstr "Görüntülenen ileti içinde bir metin ara"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "E-posta özet bileşen mimarisi"
+msgid "Default forward style"
+msgstr "Öntanımlı _Yönlendirme biçemi: "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution e-posta dizin görüntüleme bileşeni."
+msgid "Default reply style"
+msgstr "Öntanımlı _Yönlendirme biçemi: "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Evolution e-posta özet bileşeni."
+msgid "Empty Trash folders on exit"
+msgstr "Programdan çı_karken çöp dizinini sil"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Programdan çı_karken çöp dizinini sil"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+#, fuzzy
+msgid "Height of the message-list pane"
+msgstr "Bu iletiyi sonra gönder"
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "E-posta Hesapları"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "E-posta Tercihleri"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
 
-#: mail/importers/elm-importer.c:105
-msgid "Evolution is importing your old Elm mail"
-msgstr "Evolution, eski Elm iletilerinizi alıyor"
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
-msgid "Importing..."
-msgstr "Alınıyor..."
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
-msgid "Please wait"
-msgstr "Lütfen bekleyiniz"
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, fuzzy, c-format
-msgid "Importing %s as %s"
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
 msgstr ""
-"%s alınıyor.\n"
-"%s başlatılıyor"
 
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "%s taranıyor"
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "Filtre eylemlerini buraya kaydet:"
 
-#: mail/importers/elm-importer.c:547
+#: mail/evolution-mail.schemas.in.in.h:28
+#, fuzzy
+msgid "Log filter actions to the specified log file."
+msgstr "Filtre eylemlerini buraya kaydet:"
+
+#: mail/evolution-mail.schemas.in.in.h:29
+#, fuzzy
+msgid "Logfile to log filter actions"
+msgstr "Filtre eylemlerini buraya kaydet:"
+
+#: mail/evolution-mail.schemas.in.in.h:30
+#, fuzzy
+msgid "Logfile to log filter actions."
+msgstr "Filtre eylemlerini buraya kaydet:"
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Yeni Posta Bildirimi"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Yeni Posta Bildirimi"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
-"Evolution, Elm ileti dosyaları buldu.\n"
-"Bunları Evolution'a aktarmak ister misiniz?"
 
-#: mail/importers/elm-importer.c:568
-msgid "Elm"
-msgstr "Elm"
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr "HTML iletileri istemeyen bağlantılara ileti gönderirken beni _uyar"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "Sadece _Bcc alıcıların tanımlı olduğu iletileri gönderirken beni uyar"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "İ_letiyi her zaman HTML olarak gönder."
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "İ_letiyi her zaman HTML olarak gönder."
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "_Canlandırmalı resimleri göster"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "_Canlandırmalı resimleri göster"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "İletiyi normal biçemde göster"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "Önizleme _Panosu"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "Y_eni ileti geldiğinde müzik çal"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "İmla _Denetimi"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "_Terminal Yazıtipi:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "Yazdırmak için HTML değişken aralıklı yazıtipini seçin"
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Konumlandırılan İleti listesi"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Konumlandırılan İleti listesi"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "_Bunu öntanımlı hesabım yap"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "_Değişken genişlik:"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 #, fuzzy
@@ -12065,6 +13035,46 @@ msgstr ""
 msgid "Evolution Pine importer"
 msgstr "Evolution e-posta programı."
 
+#: mail/importers/elm-importer.c:105
+msgid "Evolution is importing your old Elm mail"
+msgstr "Evolution, eski Elm iletilerinizi alıyor"
+
+#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
+#: mail/importers/pine-importer.c:115
+msgid "Importing..."
+msgstr "Alınıyor..."
+
+#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
+#: mail/importers/pine-importer.c:117
+msgid "Please wait"
+msgstr "Lütfen bekleyiniz"
+
+#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
+#: mail/importers/pine-importer.c:288
+#, fuzzy, c-format
+msgid "Importing %s as %s"
+msgstr ""
+"%s alınıyor.\n"
+"%s başlatılıyor"
+
+#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
+#: mail/importers/pine-importer.c:425
+#, c-format
+msgid "Scanning %s"
+msgstr "%s taranıyor"
+
+#: mail/importers/elm-importer.c:547
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution, Elm ileti dosyaları buldu.\n"
+"Bunları Evolution'a aktarmak ister misiniz?"
+
+#: mail/importers/elm-importer.c:568
+msgid "Elm"
+msgstr "Elm"
+
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -12106,12 +13116,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution, Netscape verilerini alıyor."
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Çöp"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "E-posta filtreleri taranıyor"
@@ -12120,7 +13124,7 @@ msgstr "E-posta filtreleri taranıyor"
 msgid "Scanning directory"
 msgstr "Dizin taranıyor"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Aktarma işlemi başlıyor"
 
@@ -12195,23 +13199,23 @@ msgid "You have not filled in all of the required information."
 msgstr "Gerekli tüm bilgiler verilmedi."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution Hesap Düzenleyici"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Makina:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "_Kullanıcı adı:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Yol:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "İki hesabı aynı isimlerle oluşturamazsınız."
 
@@ -12220,35 +13224,35 @@ msgstr "İki hesabı aynı isimlerle oluşturamazsınız."
 msgid "Mail to %s"
 msgstr "%s adresine postala"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Konu: %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "%s'ten E-posta"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s posta listesi"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Cevaplanan"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Filtre Kuralı Ekle"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "Bu filtre kural(lar)ı:\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12256,144 +13260,30 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "Bağlanıyor..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Bu dizinde ileti bulunamaz."
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Yeni İleti"
 
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Paylaşımlı dizin açılamadı: %s"
-
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Geçici dizin yaratılamadı: %s"
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "_İletiyi Gönder"
 
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "%s geçici dizini yaratılamadı: %s"
-
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "geçici dizin kapatılamadı: %s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "Yeni bir e-posta hazırla"
 
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Bu veriyi almak için hedef dizin seçin"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Bu veriyi almak için hedef dizin seçin"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Yeni bir dizin yarat"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Dizinin nerede yaratılacağını belirtin:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "`%s' dizini silinemedi: %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Gerçekten \"%s\" dizini silinsin mi?"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Sil: \"%s\""
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "\"%s\" dizinini yeniden adlandır:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-#, fuzzy
-msgid "Rename Folder"
-msgstr "Dizini yeniden adlandır"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Bu dizin adı geçersiz: %s"
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Yazıtipi Özellikleri"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Özellikler"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "_Dizin Adı:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Göster"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Yeni Pencerede Aç"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Taşı"
-
-#: mail/mail-component.c:2087
-msgid "_New Folder..."
-msgstr "_Yeni Dizin..."
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "_Yeniden adlandır"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "Ö_zellikler..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Kimlik"
 
@@ -12454,11 +13344,11 @@ msgstr ""
 "olacaktır. Lütfenaşağıdaki boşluğa bu hesap için bir ad veriniz. Bu isim, "
 "sadece görüntüleme amaçlı olarak kullanılacaktır."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Servis Denetleniyor"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Sunucuya bağlantı kuruluyor..."
 
@@ -12541,26 +13431,35 @@ msgid "C_olors"
 msgstr "_Renkler"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Yeni iletilerin denetlenmesi"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "_Yazarken imla denetimi yap"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Yeni iletilerin denetlenmesi"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "_Hatalı yazılan kelimelerin rengi:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "İleti Düzenleme"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Yapılandırma"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12576,276 +13475,281 @@ msgstr ""
 "\n"
 "Ayarlarınızı kaydetmek için \"Uygula\" düğmesine tıklayın."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "Ö_ntanımlı"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Öntanımlı Davranış"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "Ö_ntanımlı karakter kodlaması:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Silinen Postalar"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Bu _hesabı kullanırken her zaman giden iletileri imzala"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "İleti açılamadı"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "_Toplantı isteklerini imzalama (Outlook uyumluluğu için)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Tamamlandı"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "_Taslaklar dizini:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "_Etkinleştir"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "E-posta Hesapları"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "_E-posta adresi:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "Programdan çı_karken çöp dizinini sil"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Sertifika No:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Evolution Hesap Sihirbazı"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Komut Çalıştır..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "_Eş aralıklı:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "<< Daha Az Seçenek"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "Yazıtipi Özellikleri"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "İ_letileri HTML biçimle"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "Cevapları her zaman "
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Bağlantılı"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Etiketler ve Renkler"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Yüklenen Resimler"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "E-posta Yapılandırması"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Posta Kutusu konumu"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "İleti Düzenleyici"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "İleti Görünümü"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 msgid "Message Fonts"
 msgstr "İleti Yazıtipi"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Yeni Posta Bildirimi"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Not: İlk defa bağlanıncaya kadar size herhangi bir parola sorulmayacaktır."
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Seçimlik Bilgi"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "_Kurum:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Anahtar Numarası:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Bir renk seçin"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Sadece _Bcc alıcıların tanımlı olduğu iletileri gönderirken beni uyar"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Yazdırılan Yazıtipleri"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail dizini "
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Quote original message"
 msgstr "İleti açılamadı"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Quoted"
 msgstr "Not"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "_Bu parolayı hatırla"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "Cevapla:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Alınan İletiler"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "_Alma Seçenekleri"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "_Bu parolayı hatırla"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "İstenen Bilgiler"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "Öntanımlı Değerlere Geri Dön"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "_Güvenlik"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "Güvenli MIME (SMIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr "HTML eşaralıklı yazıtipini seçin"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr "Yazdırma için HTML eşaralıklı yazıtipini seçin"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr "HTML değişken aralıklı yazıtipini seçin"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr "Yazdırmak için HTML değişken aralıklı yazıtipini seçin"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "İleti Gönderiliyor"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "_Gönderilen iletiler dizini:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Gönderilen ve Taslak İletileri"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "S_unucu kimlik denetimi istiyor"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Sunucu Yapılandırması"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Su_nucu Türü: "
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Yapılandırma Veritabanı bulunamadı"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "_Dosya adı belirtin"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "İmla _Denetimi"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Standart UNIX posta kutusu dosyası"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12855,7 +13759,7 @@ msgstr ""
 "kullanılacaktır. \"İsim\" başlığı altında\n"
 "girilen kısım sadece görünüm amaçlıdır."
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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 "
@@ -12865,7 +13769,7 @@ msgstr ""
 "belirtmenizi sağlar. Buradaki liste, sözlüğü sistem kurulan dillerin "
 "oluşturduğu listedir."
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12873,11 +13777,15 @@ msgstr ""
 "Bu hesaba erişebileceğiniz bir isim verin.\n"
 "Örneğin: \"İş hesabım\" ya da \"Kişisel\" gibi."
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "_Değişken genişlik:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12887,169 +13795,178 @@ msgstr ""
 "\n"
 "Devam etmek için \"İleri\" düğmesine tıklayın."
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "_İmza Ekle"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "_Resimleri her zaman ağdan indir"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Bu _hesabı kullanırken her zaman giden iletileri imzala"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "_Kimlik Denetim Türü: "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "_Kimlik denetim türü: "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr "Yeni iletilerin denetlenme aralığı: "
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "_Gülme simgelerini otomatik ekle"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "_Yeni ileti geldiği zaman biple"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "_Bir dizini silmeden önce onayla"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "Ö_ntanımlı imza:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "Ön_tanımlılar"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Yeni ileti geldiğinde beni uyarma"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "_Etkinleştir"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "Yö_nlendirme türü:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "_Tam isim:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "_HTML İleti"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "_Kimlik"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Haziran"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "_Gönderici adres defterinde ise resimleri yükle"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "_Bunu öntanımlı hesabım yap"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "İ_letileri"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "İ_sim:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "R_esimleri hiç bir zaman ağdan indirme"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "Y_eni ileti geldiğinde müzik çal"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 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:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "İ_letileri konusuz gönderirken beni uyar"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "_Alınan İletiler"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "_Cevaplama yöntemi:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "Ö_ntanımlı değerlere geri dön"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Betik:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Sil..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "Gönderilen İ_letiler"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "_Canlandırmalı resimleri göster"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "İm_zalar"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr "_Standart Yazıtipi:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr "_Terminal Yazıtipi:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "_Güvenli bağlantı (SSL) kullan:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr "_Diğer uygulamalarla aynı yazıtipini kullan"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "açıklama"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr "%s adresine ping gönderiliyor"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13058,7 +13975,7 @@ msgstr ""
 "'%s' sırasında hata:\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13067,7 +13984,7 @@ msgstr ""
 "İşlem sırasında hata:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Çalışıyor"
 
@@ -13079,118 +13996,118 @@ msgstr "Dizin filtreleniyor"
 msgid "Fetching Mail"
 msgstr "İleti Alınıyor"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "%s geçici mektup dosyasını oluştururken hata: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "%s geçici mektup dosyasını oluştururken hata: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" gönderiliyor"
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d ileti gönderiliyor"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "%d/%d iletide hata"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Tamamlandı."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "İletiler dizine kaydediliyor"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "İletiler %s'e taşınıyor"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "İletiler %s'e kopyalanıyor"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" içinde dizinler taranıyor"
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Yönlendirilmiş iletiler"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s dizini açılıyor"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "%s deposu açılıyor"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s dizini siliniyor"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "'%s' dizinine kaydediliyor"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Dizin tazeleniyor"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Dizin siliniyor"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Yerel Dizinler"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s numaralı ileti alınıyor"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d ileti alınıyor"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d ileti kaydediliyor"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13199,7 +14116,7 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13208,11 +14125,11 @@ msgstr ""
 "İletilerin kaydında hata: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Ek kaydediliyor"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13221,21 +14138,25 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Veri yazılamadı: %s."
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s bağlantısı kesiliyor"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s adresine bağlantı kuruluyor"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Küçük/büyük Harfe Duyarlı"
@@ -13252,60 +14173,75 @@ msgstr "Bul:"
 msgid "Search"
 msgstr "Ara"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "İmzayi düzenle"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "İstisnalar"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Hesap Bilgisi"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "İptal ediliyor..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Sunucu: %s, Tür: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Yol: %s, Tür: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Tür: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "İletileri Al ve Gönder"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Hepsini İptal Et"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Güncelleniyor..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Bekleniyor..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Kullanıcı işlemi iptal etti."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s İçin Parolayı Girin"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Parolayı Girin"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "_Bu parolayı hatırla"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Bu oturumun sonuna kadar girilen parolayı hatırla"
 
@@ -13344,26 +14280,31 @@ msgstr "Bu imza için bir isim girin."
 msgid "Name:"
 msgstr "İsim:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Yönlendirilmiş ileti - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Yönlendirilmiş ileti"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "%s dizini açılıyor"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "VDizin yaratılıyor: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "\"%s\" içinde dizinler taranıyor"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13372,88 +14313,88 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "VDizin"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "vDizinler"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "VDizin Düzenle"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Yeni VDizin"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Görünmeyen"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Görünen"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Cevaplanan"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Çoklu Görülmeyen İleti"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Çoklu İletiler"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "En Düşük"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Düşük"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Yüksek"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "En Yüksek"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Bugün %l:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Dün %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %l %M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "İleti listesi oluşturuluyor"
 
@@ -13510,11 +14451,11 @@ msgstr "Yönlendir"
 msgid "No Response Necessary"
 msgstr "Cevaba Gerek Yok"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Cevapla"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Herkese cevapla"
 
@@ -13570,41 +14511,139 @@ msgstr "_Üye ol"
 msgid "_Unsubscribe"
 msgstr "Ü_yelikten çık"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Evolution kabuğu."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Dizin Ayarları"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "380"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Bu kısayol grubunu yeniden isimlendir"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Dizin çubuğunu göster/gizle"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Kısayol çubuğunu gizle"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Öntanımlı Öncelik:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Öntanımlı Öncelik:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "İleti yapılandırma arayüzü"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
 msgstr ""
-"Dizin aktarılamadı:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Dizin Ekle"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Taslaklar"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Gelen"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Giden"
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "Öntanımlı görevler dizini açılıyor"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Öntanımlı görevler dizini açılıyor"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Öntanımlı görevler dizini açılıyor"
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Gönderilen"
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Öntanımlı görevler dizini açılıyor"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Dizin çubuğunu göster/gizle"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Kısayol çubuğunu göster/gizle"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "E-posta"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Dosyalar düzgün bir şekilde güncellenemedi"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13615,7 +14654,7 @@ msgstr ""
 "\n"
 "Hata: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13624,7 +14663,7 @@ msgstr ""
 "Dosyalar aşağıdaki dizine kopyalanırken hata oluştu\n"
 "`%s'."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13635,7 +14674,7 @@ msgstr ""
 "Evolution kullanıcı dosyalarının yüklenmesi\n"
 "bunu silmelisiniz."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13736,10 +14775,11 @@ msgstr ""
 "Dizin yeniden adlandırılamadı:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+msgid "The specified folder name is not valid: %s"
+msgstr "Bu dizin adı geçersiz: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -13763,19 +14803,15 @@ msgstr ""
 "Belirlenen dizin yaratılamadı:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Yeni Bir Dizin Yarat"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(isimsiz)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Çalıştırılacak olan aktarım programının türünü seçiniz:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13789,11 +14825,11 @@ msgstr ""
 "Eğer dosya türünü bilmiyorsanız \"Otomatik\" seçeneğini işaretleyin. Bu "
 "durumda Evolution dosya türünü bulmaya çalışacaktır."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Aktarmak istediğiniz bilgi kaynaklarını seçin:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13801,7 +14837,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13810,21 +14846,21 @@ msgstr ""
 "%s alınıyor\n"
 "%d öğesi alınıyor."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "Aktarıcıyı seçin"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "%s dosyası bulunamadı."
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Evolution Hatası"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -13833,11 +14869,11 @@ msgstr ""
 "Bunu açabilecek hiç bir filtre bulunamadı:\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Alınıyor"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -13846,17 +14882,17 @@ msgstr ""
 "%s alınıyor.\n"
 "%s başlatılıyor"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "%s başlatırken hata oluştu"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "%s yüklenirken hata oluştu"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13865,35 +14901,35 @@ msgstr ""
 "%s alınıyor\n"
 "1. öğe alınıyor."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Otomatik"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Dosya adı:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Bir dosya seçin"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Dosya türü:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Eski programlardan veri ve ayarları aktar"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Sadece tek bir dosya aktar"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -13901,48 +14937,28 @@ msgstr ""
 "Lütfen bekleyiniz...\n"
 "Mevcut ayarlar aranıyor"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Akıllı Aktarımcılar Başlatılıyor"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "%s bilgileri: "
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Bu veriyi almak için hedef dizin seçin"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Aktar"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Bağlantılar kesiliyor..."
 
-#: shell/e-shell-offline-sync.c:163
-#, fuzzy, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"'%s' sırasında hata:\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-#, fuzzy
-msgid "Syncing Folder"
-msgstr "Dizin eşzamanlı hale getiriliyor"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "\"%s\" senkronize ediliyor (%d / %d) ..."
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Evolution Ayarları"
@@ -13977,7 +14993,7 @@ msgstr "Paylaşımlı dizin açılamadı: %s"
 msgid "Cannot find the specified shared folder."
 msgstr "Belirlenen paylaşımlı dizin açılamadı."
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -13986,17 +15002,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Yardımcı"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Yeni"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Dizin adı belirtilmedi"
@@ -14054,64 +15064,51 @@ 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:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "Ç_evrimiçi Çalış"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "Çe_vrimdışı Çalış"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Çevrimdışı Çalış"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(dizin gösterilmiyor)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Hiçbiri)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 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:2090
+#: shell/e-shell-window.c:331
 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:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution çevrimdışı çalışıyor. Bu düğmeye tıklayarak çevrimiçi "
 "çalışmasını sağlayın."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Geçersiz argümanlar"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "OAF'a kayıt yapılamadı"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Yapılandırma Veritabanı bulunamadı"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Genel hata"
 
@@ -14224,74 +15221,18 @@ msgstr "_Sil"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Bu kısayolu kısayol çubuğundan sil"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Kısayolları kaydederken hata oldu."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Gelen"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Kısayollar"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Hata yok"
-
-#: 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:575
-msgid "The specified folder type is not valid"
-msgstr "Belirtilen dizin türü geçerli değildir"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "G/Ç hatası"
-
-#: 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:581
-msgid "The folder is not empty"
-msgstr "Dizin boş değil"
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "Belirtilen dizin bulunamadı"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "Fonksiyon desteklenmiyor"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "İşlem desteklenmiyor"
-
-#: 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:593
-msgid "The specified folder cannot be modified or removed"
-msgstr "Belirtilen dizin düzenlenemedi ya da silinemedi"
-
-#: shell/e-storage.c:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr ""
-
-#: shell/e-storage.c:597
-msgid "Cannot create a folder with that name"
-msgstr "Bu isimde bir dizin yaratılamadı"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr ""
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Denetim kutusu"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14302,6 +15243,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%%%d tamamlandı)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Yeni"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr ""
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14339,74 +15291,6 @@ msgstr ""
 "Etkinleştirme sisteminden gelen mesaj:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "CORBA hatası"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Kesintiye uğradı"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Geçersiz argüman"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Bunun bir sahibi zaten var"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Sahibi yok"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Bulunamadı"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Desteklenmeyen tür"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Desteklenmeyen şema"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Desteklenmeyen işlem"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "İç hata"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Bulunur"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "Geçersiz URI"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Alt dizinler"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Hiç boş alan kalmadı"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr ""
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Test türü"
-
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr "Evolution Test Bileşeni"
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr "Etkin Bağlantılar"
@@ -14437,10 +15321,6 @@ msgstr "İ_leti:"
 msgid "_Tasks:"
 msgstr "_Görevler:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr "Dizin _adı:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder _type:"
 msgstr "Dizin _türü:"
@@ -14502,24 +15382,6 @@ msgstr ""
 "\n"
 "Ayarları kaydetmek için \"Uygula\" düğmesine tıklayın."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Evolution kabuğu."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-#, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "E-posta özet bileşen mimarisi"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Dizin Ayarları"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "\"Aktar\" düğmesine tıklayarak dosyaları Evolution'a aktarın."
@@ -14557,7 +15419,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Alıcılar"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Aktar"
 
@@ -14573,16 +15435,16 @@ msgstr "Tekrar sorma"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution, aşağıdaki dosyalardan veri alabilir:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Evolution'dan çıkılıyor..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14602,73 +15464,114 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Teşekkürler. Ximian Evolution Grubu\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr "Tekrar sorma"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ximian Evolution Kabuğuna erişilemedi."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ximian Evolution Kabuğu başlatılamadı: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Çevrimdışı çalışmaya başla"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Çevrimiçi çalışmaya başla"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr "Tüm Evolution bileşenlerini kapat"
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Tüm hata ayıklama verilerini bir dosyaya yazdır."
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Aktarıcıyı seçin"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Sertifika No:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "İşlem"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Deyim"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "E-posta Adresi:"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"Sertifikanın süresi dolmuş:%s\n"
+"Veren: %s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14726,91 +15629,379 @@ msgid "Backup All"
 msgstr "Blackpool"
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "_Sertifika No:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Sertifika Otoritesi Güvenilir Değil"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "_Sertifika No:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Ortak İsim"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "_Sertifika No:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "_Düzenle"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Sertifika denetlenemedi."
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Deyim"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Kurum"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Bölüm"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Göster"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "_Sertifika No:"
+
+#: smime/gui/smime-ui.glade.h:42
+#, fuzzy
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr "Geçersiz Sertifika Otoritesi (CA)"
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "_Sertifika No:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Aktar"
+msgid "Certificate already exists"
+msgstr "Bu kart numarası var"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Vermont"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "K"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "Tamam"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "K"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "_Sertifika No:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "_Sertifika No:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "Sertifika Otoritesi Güvenilir Değil"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "ID"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+#, fuzzy
+msgid "Subject Public Key Info"
+msgstr ""
+"\n"
+"Genel Anahtar: "
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Konu: %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Spool dizini işlenemedi"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "Geçersiz Sertifika Otoritesi (CA)"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Geçersiz Sertifika Otoritesi (CA)"
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Bilgi Yok"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "ek"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "_Sertifika No:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Curitiba"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "North Carolina"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Deyim"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s sunucu %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Sertifika imza hatası"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "_Ekle"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Konu: %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Sertifika imza hatası"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "%s İçin Parolayı Girin"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "_Sertifika No:"
 
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
@@ -14861,7 +16052,7 @@ msgstr "Seçimi kopyala"
 msgid "Copy to Folder..."
 msgstr "Dizine Kopyala..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Seçimi kes"
 
@@ -14877,7 +16068,7 @@ msgstr "Bağlantıları Başka Bir Dizine Taşı"
 msgid "Move to Folder..."
 msgstr "Dizine Taşı..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Panoyu yapıştır"
 
@@ -14885,8 +16076,8 @@ msgstr "Panoyu yapıştır"
 msgid "Previews the contacts to be printed"
 msgstr "Yazdırılacak olan bağlantıları önizler"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Yazdırma Ö_nizlemesi"
@@ -14931,13 +16122,13 @@ msgstr "Yüklemeyi Durdur"
 msgid "View the current contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "_Eylemler"
 
@@ -14967,141 +16158,110 @@ msgstr "B_ağlantıya İleti Gönder..."
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "Yeni bir tüm gün randevusu oluştur"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Yeni bir randevu oluştur"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "Yeni bir dizin yarat"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Yeni bir toplantı isteği oluştur"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Yeni bir görev oluştur"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Gün"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Tüm oluşumları sil"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Randevuyu sil"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Bu oluşumu sil"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Bu oluşumu sil"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Git"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Geri git"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "İleri git"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "_Tarihe Git"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Belirli bir tarihe git"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Bugüne git"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "Liste"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Ay"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Yeni _Randevu"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Yeni Kaledonya"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Yeni Toplantı"
-
-#: ui/evolution-calendar.xml.h:27
-msgid "New _Task"
-msgstr "Yeni _Görev"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Yazdırılacak olan takvimi önizler"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Bu takvimi yazdır"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Bu takvim için Boş/Meşgul bilgisini yayınla"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Bourges"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Randevu ve olayların bulunduğu genel dizin"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Ayrıntıları Göster"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Bir gün göster"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Bir ay göster"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Bir hafta göster"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Çalışma günlerini göster"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Hafta"
 
@@ -15166,7 +16326,7 @@ msgstr "Bu öğeyi diske kaydet"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Dosya"
 
@@ -15384,7 +16544,7 @@ msgstr "_Tümünü Okunmuş Olarak İşaretle"
 msgid "Mark all visible messages as read"
 msgstr "Tüm görünen iletileri okunmuş olarak işaretle"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Paste message(s) from the clipboard"
 msgstr "İletiyi panoya yapıştır"
@@ -15441,16 +16601,6 @@ msgstr "S_eçimi Tersine Çevir"
 msgid "_Threaded Message List"
 msgstr "_Konumlandırılan İleti Listesi"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Bu pencereyi kapat"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "_Kapat"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "Gö_ndereni Adres Defterine Ekle"
@@ -15610,264 +16760,289 @@ msgstr "Seçilen iletiyi birisine eklenti olarak yönlendir"
 msgid "Increase the text size"
 msgstr "Metin boyunu büyüt"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Resimleri _Yükle"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Ön_emli Olarak İşaretle"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Oku_nmamış Olarak İşaretle"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Ö_nemsiz Olarak İşaretle"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark the selected message(s) as having been read"
 msgstr "Seçili iletileri okunmuş olarak işaretle"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark the selected message(s) as important"
 msgstr "Seçili iletileri önemli olarak işaretle"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Seçili iletileri önemsiz olarak işaretle"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Seçili iletileri okunmamış olarak işaretle"
+
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Seçili iletileri okunmamış olarak işaretle"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Seçili iletileri önemsiz olarak işaretle"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Seçili iletileri silmek için işaretle"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Taşı"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
 msgid "Move selected message(s) to another folder"
 msgstr "Seçili iletileri başka bir dizine taşı"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "İleri"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "_Sonraki Önemli İleti"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "S_onraki Konum"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "Sonraki O_kunmamış İleti"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Bulunamadı"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Seçilen iletiyi yeni bir pencerede aç"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Seçilen iletiyi düzenleyicide yeniden göndermek üzere aç"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Asıl Boyut"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "Ö_nceki Okunmamış İleti"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Bir Yanıt Gönder"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "Ö_nceki Önemli İleti"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Yazdırılacak İletiyi Önizle"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Geri"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Bu iletiyi yazdır"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Seçilen iletiyi birisine yönlendir"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Metni orjinal boyuna getir"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "İle_tide Ara..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "_Daha küçük"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "İletiyi bir dosyaya kaydet"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Görüntülenen ileti içinde bir metin ara"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "Set up the page settings for your current printer"
 msgstr "Güncel yazıcı için sayfa ayarlarını yap"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "İleti _Kaynağını Göster"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "_Kapsamlı Başlıkları Göster"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Görüntülenen ileti içinde bir metin ara"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "İletiyi normal biçemde göster"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "İletiyi tüm başlıklarıyla göster"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "İletinin kaynağını göster"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "Metin _Boyu"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Seçilen iletiyi silme"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "_E-posta Listesine Göre VFolder..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "_Gönderene Göre VFolder..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "_Alıcılara Göre VFolder..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "_Konuya Göre VFolder..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "_Ekli"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "Dizine _Kopyala"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "İ_letiden Bir Filtre Yarat"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "İletiyi _Yönlendir"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "_Git"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "_Bağlantılı"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "_Daha büyük"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "İleti _Görünümü"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "Dizine _Taşı"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "_Sonraki İleti"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "Normal _Gösterim"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "İ_letiyi Aç "
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "Ö_nceki İleti"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "Y_eniden Gönder..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "_Araçlar"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "_Silme"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Bu pencereyi kapat"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "_Kapat"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Ekle"
@@ -16146,12 +17321,13 @@ msgid "Change Evolution's settings"
 msgstr "Evolution ayarlarını değiştir"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "Çı_k"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Yeni bir toplantı isteği oluştur"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "Evolution _Penceresi"
+msgid "E_xit"
+msgstr "Çı_k"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16163,61 +17339,75 @@ msgstr "Diğer programlardan veri al"
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "Evolution _Penceresi"
+msgid "Open a new window"
+msgstr "Yeni Pencerede Aç"
 
 #: ui/evolution.xml.h:11
 msgid "Pi_lot Settings..."
 msgstr "_Pilot Ayarları..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Al / Gönder"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "Kuyruktaki iletileri gönder ve yeni iletileri al"
+
+#: ui/evolution.xml.h:14
 msgid "Set up Pilot configuration"
 msgstr "Pilot ayarlarını düzenle"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Ximian Evolution hakkında bilgi ver"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Hata Raporu Gönder"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "_Hata Raporu Gönder"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddy kullanarak bir hata raporu gönderin"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Aç/kapat"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Çevrimiçi/çevrimdışı çalış."
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _SSS"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "Ximian _Evolution Hakkında..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "_Yardım"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "_Al..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Yeni"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Gönder / Al"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "Ş_imdi Bul"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Yazdırma Özeti"
@@ -16345,12 +17535,12 @@ msgstr "Görünümleri Tanımla..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "PSÇPCCP"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -16483,7 +17673,7 @@ msgstr "_Ara"
 msgid "_Find Now"
 msgstr "Ş_imdi Bul"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "_Temizle"
 
@@ -16499,24 +17689,255 @@ msgstr "Alt öğe no"
 msgid "Text"
 msgstr "Metin"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Temizle"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Şimdi Bul"
 
+#~ msgid "Account Name"
+#~ msgstr "Hesap Adı:"
+
+#~ msgid "Server Name"
+#~ msgstr "Sunucu Adı"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "(Evolution'un bu sürümünde LDAP desteklenmiyor)"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Diğer Bağlantılar"
+
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "LDAP dizin servislerine erişimi buradan yapılandırın"
+
+#~ msgid "Directory Servers"
+#~ msgstr "Dizin Servisleri"
+
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Evolution Adres Defteri LDAP Yapılandırma Sistemi"
+
+#~ msgid "Add LDAP Server"
+#~ msgstr "LDAP Sunucusu Ekle"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "4. Adım: Görüntülenecek İsim"
+
+#~ msgid "Find contact in"
+#~ msgstr "Bağlantıyı burada bul:"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Bağlantı eklemek buraya tıklayın *"
+
+#~ msgid "Business Address"
+#~ msgstr "İşyeri Adresi"
+
+#~ msgid "Department"
+#~ msgstr "Bölüm"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "Web Sayfası"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Uzmanlık alanı"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "%s tarihinde görevler açılıyor"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Yine de gönderilsin mi?"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Şimdiki e-posta işlemini iptal et"
+#~ msgid "Folder _name"
+#~ msgstr "Dizin _adı:"
+
+#~ 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."
+
+#, fuzzy
+#~ msgid "No signature present"
+#~ msgstr "HTML imza dosyası:"
+
+#~ msgid "Connecting..."
+#~ msgstr "Bağlanıyor..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Bu dizinde ileti bulunamaz."
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Paylaşımlı dizin açılamadı: %s"
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Bu veriyi almak için hedef dizin seçin"
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Dizin aktarılamadı:\n"
+#~ "%s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "Dizin Ekle"
+
+#~ msgid "Drafts"
+#~ msgstr "Taslaklar"
+
+#~ msgid "Outbox"
+#~ msgstr "Giden"
+
+#~ msgid "Sent"
+#~ msgstr "Gönderilen"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "'%s' sırasında hata:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Syncing Folder"
+#~ msgstr "Dizin eşzamanlı hale getiriliyor"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "\"%s\" senkronize ediliyor (%d / %d) ..."
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(dizin gösterilmiyor)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(Hiçbiri)"
+
+#~ msgid "No error"
+#~ msgstr "Hata yok"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Aynı isimli bir dizin zaten var"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Belirtilen dizin türü geçerli değildir"
+
+#~ msgid "I/O error"
+#~ msgstr "G/Ç hatası"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Dizin yaratmak için gerekli disk alanı yok"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Dizin boş değil"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Belirtilen dizin bulunamadı"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Fonksiyon desteklenmiyor"
+
+#~ msgid "Operation not supported"
+#~ msgstr "İşlem desteklenmiyor"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Bu kayıtta belirtilen tip desteklenmiyor"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Belirtilen dizin düzenlenemedi ya da silinemedi"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Bu isimde bir dizin yaratılamadı"
+
+#~ msgid "Checkbox"
+#~ msgstr "Denetim kutusu"
+
+#~ msgid "CORBA error"
+#~ msgstr "CORBA hatası"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Geçersiz argüman"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Bunun bir sahibi zaten var"
+
+#~ msgid "No owner"
+#~ msgstr "Sahibi yok"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Desteklenmeyen tür"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Desteklenmeyen şema"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Desteklenmeyen işlem"
+
+#~ msgid "Internal error"
+#~ msgstr "İç hata"
+
+#~ msgid "Exists"
+#~ msgstr "Bulunur"
+
+#~ msgid "Invalid URI"
+#~ msgstr "Geçersiz URI"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Alt dizinler"
+
+#~ msgid "No space left"
+#~ msgstr "Hiç boş alan kalmadı"
+
+#~ msgid "Test type"
+#~ msgstr "Test türü"
+
+#~ msgid "Evolution Test Component"
+#~ msgstr "Evolution Test Bileşeni"
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Alan Adı"
+#~ msgid "import"
+#~ msgstr "Aktar"
 
-#~ msgid "Family Name"
-#~ msgstr "Tam İsim"
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Yeni bir tüm gün randevusu oluştur"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Yeni _Randevu"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Yeni Toplantı"
+
+#~ msgid "New _Task"
+#~ msgstr "Yeni _Görev"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "Evolution _Penceresi"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "Evolution _Penceresi"
+
+#~ msgid "Toggle"
+#~ msgstr "Aç/kapat"
+
+#~ msgid "Clear"
+#~ msgstr "Temizle"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Şimdiki e-posta işlemini iptal et"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -16609,9 +18030,6 @@ msgstr "Şimdi Bul"
 #~ msgid "VCard (.vcf, .gcrd)"
 #~ msgstr "VCard (.vcf, .gcrd)"
 
-#~ msgid "Loading..."
-#~ msgstr "Yükleniyor..."
-
 #~ msgid "Searching..."
 #~ msgstr "Aranıyor..."
 
@@ -16663,10 +18081,6 @@ msgstr "Şimdi Bul"
 #~ msgstr "EBook yüklenmedi\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "Bu kart numarası var"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "İşlem iptal edildi"
 
@@ -16870,9 +18284,6 @@ msgstr "Şimdi Bul"
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
 #~ msgid "Birth date"
 #~ msgstr "Doğum tarihi"
 
@@ -16885,9 +18296,6 @@ msgstr "Şimdi Bul"
 #~ msgid "Arbitrary"
 #~ msgstr "Rastgele"
 
-#~ msgid "ID"
-#~ msgstr "ID"
-
 #~ msgid "Last Use"
 #~ msgstr "Son Kullanım"
 
@@ -16900,9 +18308,6 @@ msgstr "Şimdi Bul"
 #~ msgid "Folder containing contact information"
 #~ msgstr "Bağlantı bilgisini içeren dizin"
 
-#~ msgid "LDAP Server"
-#~ msgstr "LDAP Sunucusu"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "Bağlantı bilgisini içeren LDAP sunucusu"
 
@@ -16912,18 +18317,6 @@ msgstr "Şimdi Bul"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Bağlantı bilgisini içeren ortak dizin"
 
-#~ msgid "_Contact"
-#~ msgstr "_Bağlantı"
-
-#~ msgid "Create a new contact"
-#~ msgstr "Yeni bir bağlantı yarat"
-
-#~ msgid "New Contact List"
-#~ msgstr "Yeni Bağlantı Listesi"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "Yeni bir bağlantı listesi yarat"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "Dizin tarayıcısının göstereceği URI"
 
@@ -16939,9 +18332,6 @@ msgstr "Şimdi Bul"
 #~ msgid "Is New Card"
 #~ msgstr "Yeni bir Kart"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "Kart yok"
 
@@ -16987,30 +18377,6 @@ msgstr "Şimdi Bul"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "Yapılacaklar öğesini içeren genel dizin"
 
-#~ msgid "New appointment"
-#~ msgstr "Yeni randevu"
-
-#~ msgid "_Appointment"
-#~ msgstr "_Randevu"
-
-#~ msgid "New meeting"
-#~ msgstr "Yeni toplantı"
-
-#~ msgid "M_eeting"
-#~ msgstr "_Toplantı"
-
-#~ msgid "New task"
-#~ msgstr "Yeni görev"
-
-#~ msgid "_Task"
-#~ msgstr "_Görev"
-
-#~ msgid "New All Day Appointment"
-#~ msgstr "Yeni Tüm Gün Randevusu"
-
-#~ msgid "All _Day Appointment"
-#~ msgstr "_Tüm Gün Randevusu"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "Öğe güncellenemedi"
 
@@ -17055,9 +18421,6 @@ msgstr "Şimdi Bul"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "%s tarihinde takvim açılıyor"
 
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Öntanımlı görevler dizini açılıyor"
-
 #~ msgid "Please enter your password for %s"
 #~ msgstr "%s için parolanızı girin"
 
@@ -17083,10 +18446,6 @@ msgstr "Şimdi Bul"
 #~ "Evolution, GnomeCard dosyaları buldu.\n"
 #~ "Bunların Evolution'a aktarılmasını istiyor musunuz?"
 
-#, fuzzy
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "İleti yapılandırma arayüzü"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "İletileri içeren dizin"
 
@@ -17102,9 +18461,6 @@ msgstr "Şimdi Bul"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Sanal Çöp dizini"
 
-#~ msgid "Properties..."
-#~ msgstr "Özellikler..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Bu dizinin özelliklerini değiştir"
 
@@ -17115,15 +18471,6 @@ msgstr "Şimdi Bul"
 #~ msgstr ""
 #~ "Henüz gönderilmemiş iletileriniz var. Yine de çıkmak istiyor musunuz?"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Yeni İleti"
-
-#~ msgid "_Mail Message"
-#~ msgstr "_İletiyi Gönder"
-
-#~ msgid "Compose a new mail message"
-#~ msgstr "Yeni bir e-posta hazırla"
-
 #~ msgid "New Message Post"
 #~ msgstr "Yeni İleti"
 
@@ -18931,9 +20278,6 @@ msgstr "Şimdi Bul"
 #~ msgid "Cumberland"
 #~ msgstr "Cumberland"
 
-#~ msgid "Curitiba"
-#~ msgstr "Curitiba"
-
 #~ msgid "Curitiba Apt"
 #~ msgstr "Curitiba Apt"
 
@@ -21925,9 +23269,6 @@ msgstr "Şimdi Bul"
 #~ msgid "North Bend"
 #~ msgstr "North Bend"
 
-#~ msgid "North Carolina"
-#~ msgstr "North Carolina"
-
 #~ msgid "North Conway"
 #~ msgstr "North Conway"
 
@@ -23539,9 +24880,6 @@ msgstr "Şimdi Bul"
 #~ msgid "State College"
 #~ msgstr "State College"
 
-#~ msgid "Stauning"
-#~ msgstr "Stauning"
-
 #~ msgid "Staunton"
 #~ msgstr "Staunton"
 
@@ -24130,9 +25468,6 @@ msgstr "Şimdi Bul"
 #~ msgid "United Arab Emirates "
 #~ msgstr "United Arab Emirates "
 
-#~ msgid "Unst"
-#~ msgstr "Unst"
-
 #~ msgid "Upington"
 #~ msgstr "Upington"
 
@@ -24241,12 +25576,6 @@ msgstr "Şimdi Bul"
 #~ msgid "Veracruz"
 #~ msgstr "Veracruz"
 
-#~ msgid "Vermillion"
-#~ msgstr "Vermillion"
-
-#~ msgid "Vermont"
-#~ msgstr "Vermont"
-
 #~ msgid "Vernal"
 #~ msgstr "Vernal"
 
@@ -24774,9 +26103,6 @@ msgstr "Şimdi Bul"
 #~ msgid " F"
 #~ msgstr " F"
 
-#~ msgid " C"
-#~ msgstr " C"
-
 #~ msgid "knots"
 #~ msgstr "knot"
 
@@ -25382,10 +26708,6 @@ msgstr "Şimdi Bul"
 #~ msgstr "Dondurucu yağmur"
 
 #, fuzzy
-#~ msgid "Spray"
-#~ msgstr "Cumartesi"
-
-#, fuzzy
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Yer yer kar yağışı"
 
@@ -25715,19 +27037,6 @@ msgstr "Şimdi Bul"
 #~ msgid "Open this folder in an other window"
 #~ msgstr "Bu dizini yeni bir pencerede aç"
 
-#~ msgid "Send / Receive"
-#~ msgstr "Al / Gönder"
-
-#, fuzzy
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Kuyruktaki iletileri gönder ve yeni iletileri al"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Dizin çubuğunu göster/gizle"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Kısayol çubuğunu göster/gizle"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Seçili dizini göster"
 
@@ -25755,9 +27064,6 @@ msgstr "Şimdi Bul"
 #~ msgid "_Rename..."
 #~ msgstr "Y_eniden İsimlendir..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Gönder / Al"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "_Kısayol Çubuğu"
 
@@ -25798,10 +27104,6 @@ msgstr "Şimdi Bul"
 #~ msgid "Font Preferences"
 #~ msgstr "Yazıtipi Tercihleri"
 
-#, fuzzy
-#~ msgid "Automatically _detect links"
-#~ msgstr "_Yeni iletileri otomatik denetle:"
-
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 
@@ -25897,18 +27199,12 @@ msgstr "Şimdi Bul"
 #~ msgid "1234"
 #~ msgstr "1234"
 
-#~ msgid "380"
-#~ msgstr "380"
-
 #~ msgid "666"
 #~ msgstr "666"
 
 #~ msgid "<- _Remove"
 #~ msgstr "<- _Sil"
 
-#~ msgid "<< Fewer Options"
-#~ msgstr "<< Daha Az Seçenek"
-
 #~ msgid "Associated LDAP Attribute"
 #~ msgstr "Verilen LDAP Özniteliği"
 
@@ -26365,9 +27661,6 @@ msgstr "Şimdi Bul"
 #~ msgid "Send _later"
 #~ msgstr "_Sonra gönder"
 
-#~ msgid "Send the message later"
-#~ msgstr "Bu iletiyi sonra gönder"
-
 #, fuzzy
 #~ msgid "HTML"
 #~ msgstr "H_TML"
@@ -26544,13 +27837,6 @@ msgstr "Şimdi Bul"
 
 #~ msgid ""
 #~ "\n"
-#~ "Comment: "
-#~ msgstr ""
-#~ "\n"
-#~ "Açıklama: "
-
-#~ msgid ""
-#~ "\n"
 #~ "E-mail:\n"
 #~ msgstr ""
 #~ "\n"
@@ -26565,13 +27851,6 @@ msgstr "Şimdi Bul"
 
 #~ msgid ""
 #~ "\n"
-#~ "Public Key: "
-#~ msgstr ""
-#~ "\n"
-#~ "Genel Anahtar: "
-
-#~ msgid ""
-#~ "\n"
 #~ "Telephone:"
 #~ msgstr ""
 #~ "\n"
@@ -26695,9 +27974,6 @@ msgstr "Şimdi Bul"
 #~ msgid "DATA response error: message termination: %s: mail not sent"
 #~ msgstr "DATA gönderimi zaman aşımına uğradı: %s: ileti gönderilmedi"
 
-#~ msgid "Default Forward style is: "
-#~ msgstr "Öntanımlı _Yönlendirme biçemi: "
-
 #~ msgid "Edit..."
 #~ msgstr "Düzenle..."
 
@@ -26770,9 +28046,6 @@ msgstr "Şimdi Bul"
 #~ msgid "NT Login"
 #~ msgstr "NT Girişi"
 
-#~ msgid "New Contact _List"
-#~ msgstr "Yeni Bağlantı _Listesi"
-
 #~ msgid "New _Contact"
 #~ msgstr "Yeni _Bağlantı"
 
@@ -26876,18 +28149,12 @@ msgstr "Şimdi Bul"
 #~ msgid "_End of day:"
 #~ msgstr "_Gün bitimi:"
 
-#~ msgid "_Log filter actions to:"
-#~ msgstr "Filtre eylemlerini buraya kaydet:"
-
 #~ msgid "_Message Recipients:"
 #~ msgstr "_Alıcılar"
 
 #~ msgid "_Organization:"
 #~ msgstr "_Kurum:"
 
-#~ msgid "_Send mail in HTML format by default."
-#~ msgstr "İ_letiyi her zaman HTML olarak gönder."
-
 #~ msgid "_Server Type: "
 #~ msgstr "Su_nucu Türü: "
 
diff --git a/po/uk.po b/po/uk.po
index 07d6409ea3..f26a430221 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0.5\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-04-02 10:54--500\n"
 "Last-Translator: Yuriy Syrota <yuri@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -30,51 +30,190 @@ msgstr "Не вдалося завантажити %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Не вдалося зчитати блок адреса програми \"Пілот\""
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Теки автозавершення"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "Ідентифікатор сертифіката:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Налаштовування поштових рахунків"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Контакти"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Переглядач мінікартки адресної книги Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Переглядач мінікартки адресної книги Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Переглядач мінікартки адресної книги Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Переглядач мінікартки адресної книги Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Перевірочний компонент Evolutuion."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Переглядач мінікартки адресної книги Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Компонент поштового виконавчого зведення Evolutuion."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Адресна книга"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Властивості..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Стерти"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "Перейменувати"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Новий контакт:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Контакт"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "Створити новий контакт"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Новий список контактів"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "Новий список контактів"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "Створити новий список контактів"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Особисте"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Робота"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "Сервер LDAP"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Не вдалося створити каталог %s: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "Неможливо з'єднатись з сервером LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "На вдалося пройти автентифікацію на сервері LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "Неможливо виконати запит на Кореневому DSE"
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "Відповідь сервера не містить підтримуваних баз пошуку"
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Цей сервер не підтримує схему інформації LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "Помилка при отриманні схеми інформації"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr "Відповідь сервера не містить підтримуваної схеми інформації"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Назва рахунку"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Назва сервера"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "Evolution було скомпільовано без підтримки LDAP"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Інші контакти"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -82,7 +221,7 @@ msgstr ""
 "Неможливо відкрити книгу адрес. Перевірте чи існує згаданий шлях,\n"
 "та чи ви маєте потрібні права доступу до нього."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -91,7 +230,7 @@ msgstr ""
 "Не вдається відкрити книгу адрес. Це означає, що або ви\n"
 "вказали неправильний URI, або не працює сервер LDAP"
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -103,7 +242,7 @@ msgstr ""
 "встановити LDAP з указаного нижче посилання, а потім\n"
 "скомпілювати версію Evolution з CVS.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -116,44 +255,43 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Не вдалося відкрити адресну книгу"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "Анонімний доступ до сервера LDAP"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "Неможливо автентифікуватися.\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sВведіть пароль для %s (користувач %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "Ім'я починається з"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "Поштова адреса починається з"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Категорія - "
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Будь-яке поле містить"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Додатково..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -165,7 +303,7 @@ msgstr ""
 "відобразити. Зробіть ваш запит більш специфічним або підвищить\n"
 "обмеження у властивостях серверу цієї книги адрес."
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -176,95 +314,41 @@ msgstr ""
 "встановлене для цієї книги адрес. Зробіть ваш запит більш \n"
 "специфічним або підвищить обмеження у властивостях серверу цієї книги адрес."
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Механізм цієї книги адрес не спроможний проаналізувати цей запит."
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Механізм цієї книги адрес відмовився виконати цей запит."
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "Цей запит не було завершено відповідним чином."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Будь-яка категорія"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "URI, який відобразить календар"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "Ідентифікатор сертифіката:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "Налаштування доступу до серверів каталогів LDAP"
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Контакти"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "Сервери каталогів"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Переглядач мінікартки адресної книги Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Інтерфейс вибору імені у книзі адрес Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Переглядач мінікартки адресної книги Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Переглядач мінікартки адресної книги Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Переглядач мінікартки адресної книги Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Перевірочний компонент Evolutuion."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Переглядач мінікартки адресної книги Evolution"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Компонент поштового виконавчого зведення Evolutuion."
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -287,6 +371,7 @@ msgstr " Показати підтримувані бази "
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -320,8 +405,9 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "Додати cервер LDAP"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "Майстер налаштовування LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -337,9 +423,9 @@ msgid "Anonymously"
 msgstr "Анонімно"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -349,51 +435,52 @@ msgstr ""
 "\n"
 "Натисніть \"Завершити\" щоб зберегти вказані параметри."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "З'єднання"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "Відокремлене _ім'я:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr "Змінити сервер LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address:"
 msgstr "Електронна адреса:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 "Для автентифікації на сервері Evolution буде використовувати це відокремлене "
 "ім'я"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Для автентифікації на сервері Evolution буде використовувати електрону адресу"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "Завершено"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Загальне"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "Майстер налаштовування LDAP"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "Групове"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Ніколи"
 
@@ -422,8 +509,8 @@ msgid "S_earch scope: "
 msgstr "Простір по_шуку: "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Пошук"
 
@@ -482,28 +569,32 @@ msgstr ""
 "для виконання пошуку в LDAP, створення та виправлення контактів. "
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 "Вказання відображуваного імені є останнім короком у налаштовуванні сервера "
 "LDAP."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "Крок 1: Інформація про сервер"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "Крок 2: З'єднання з сервером"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "Крок 1: Інформація про сервер"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "Крок 3: Пошук каталогу"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Крок 2: З'єднання з сервером"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "Крок 4: Ім'я для відображення"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Крок 3: Пошук каталогу"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -515,17 +606,6 @@ msgstr "Підтримувані бази пошуку"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"Перший крок у налаштовуванні сервера LDAP — вказати його назву та інформацію "
-"про підключення\n"
-"до нього. Якщо ви не впевнені — зверніться до системного адміністратора."
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -538,7 +618,7 @@ msgstr ""
 "параметри,\n"
 "зверніться до системного адміністратора."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -550,7 +630,7 @@ msgstr ""
 "залишите це поле порожнім - пошук виконуватиметься з кореневого елементу "
 "сервера."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -566,15 +646,14 @@ msgstr ""
 "Простір пошуку \"Один рівень\" включає тільки елементи, які знаходяться на "
 "один рівень нижче\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
 #, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "Цей майстер допоможе вам отримати доступ до служби каталогів,\n"
 "використовуючи сервери LDAP (Lightweight Directory Access Protocol). \n"
@@ -584,13 +663,13 @@ msgstr ""
 "допомога\n"
 "для отримання цієї інформації."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Повна назва вашого сервера LDAP. Наприклад, \"ldap.mycompany.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -600,7 +679,7 @@ msgstr ""
 "великого\n"
 "значення сповільнить роботу записної книжки."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -610,7 +689,7 @@ msgstr ""
 "оберете тут \"Ел.адреса\" ви мусите мати анонімний доступ до вашого сервера "
 "LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -619,6 +698,15 @@ msgstr ""
 "Назва цього сервера, що буде показана в вашому списку тек Evolution.\n"
 "Воно використовується тільки для показу."
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Назва цього сервера, що буде показана в вашому списку тек Evolution.\n"
+"Воно використовується тільки для показу."
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -647,21 +735,33 @@ msgid "Using email address"
 msgstr "Використовувати електронну адресу:"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Усякий раз коли можливо"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+"Перший крок у налаштовуванні сервера LDAP — вказати його назву та інформацію "
+"про підключення\n"
+"до нього. Якщо ви не впевнені — зверніться до системного адміністратора."
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "_Назва для відображення:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "_Межа завантаження:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -669,57 +769,56 @@ msgstr "_Межа завантаження:"
 msgid "_Edit"
 msgstr "_Редагування"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "Сп_осіб реєстрації:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "_Порт:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "База по_шуку:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "Назва _сервера:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "За_тримка (в хвилинах):"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "картки"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Повторне встановлення з'єднання з %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid "general-tab"
 msgstr "Загальне"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "searching-tab"
 msgstr "Пошук"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Ім'я"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
+msgstr "Інтерфейс вибору імені у книзі адрес Evolution"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Видалити все"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Видалити"
@@ -746,24 +845,21 @@ msgstr "Додати до контактів"
 msgid "Unnamed Contact"
 msgstr "Неназваний контакт"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Ім'я"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Джерело"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Вибрати контакти з книги адрес"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "Знайти контакт у"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Інтерфейс вибору імені у книзі адрес Evolution"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Знайти"
@@ -843,7 +939,8 @@ msgid "D_epartment:"
 msgstr "Відділ:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Подробиці"
 
@@ -913,12 +1010,12 @@ msgid "_Categories..."
 msgstr "Категорії..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "Стерти"
@@ -2050,7 +2147,7 @@ msgid "Esq."
 msgstr ""
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Повне ім'я"
 
@@ -2146,11 +2243,27 @@ msgstr "Редактор списків контактів"
 msgid "Save List as VCard"
 msgstr "Зберегти список як VCard"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Змінений контакт:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Конфліктний контакт:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Виявлено дубльований контакт"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Змінена назва чи електронна адреса цього контакту\n"
+"існує у вже теці.  Бажаєте додати його все одно?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Новий контакт:"
@@ -2167,22 +2280,6 @@ msgstr ""
 "Назва чи електронна адреса цього контакту вже існує\n"
 "у цій теці.  Чи хочете ви додати його все одно?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Змінений контакт:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Конфліктний контакт:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"Змінена назва чи електронна адреса цього контакту\n"
-"існує у вже теці.  Бажаєте додати його все одно?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2281,9 +2378,9 @@ msgstr "Переслати контакт"
 msgid "Send Message to Contact"
 msgstr "Відіслати повідомлення за контактом"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Друкувати"
@@ -2305,9 +2402,12 @@ msgstr "Перенести в теку..."
 msgid "Cut"
 msgstr "Вирізати"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Скопіювати"
 
@@ -2316,16 +2416,8 @@ msgstr "Скопіювати"
 msgid "Paste"
 msgstr "Вставити"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Стерти"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "Поточний вигляд"
 
@@ -2341,166 +2433,170 @@ msgstr ""
 "Щоб використовувати її знову потрібно перезавантажити Evolution"
 
 #: 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:2
 msgid "Assistant"
 msgstr "Помічник"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Робочий факс"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Робочий телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Робочий телефон 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Зворотній дзвінок"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Автомобільний телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Категорії"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Телефон компанії"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Відділ"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "Ел.пошта"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "Ел.пошта 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "Ел.пошта 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Прізвище"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Файл як"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "URL зайнятості"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Домашня адреса"
+#, fuzzy
+msgid "Given Name"
+msgstr "Назва поля"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Домашній факс"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Домашній телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Домашній телефон 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Йорданія"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Керівник"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Мобільний телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Прізвисько"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Примітки"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Офіс"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Організація"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Інша адреса"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Інший факс"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Інший телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Пейджер"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Основний телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Професія"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Радіо"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Роль"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Дружина"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Телекс"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Титул"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Не прочитано"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Сайт"
 
@@ -2592,11 +2688,19 @@ msgstr "Члени"
 msgid "Job Title"
 msgstr "Посада:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Домашня адреса"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Домашня адреса"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Інша адреса"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2609,112 +2713,109 @@ msgstr "Домашній факс"
 msgid "Blog"
 msgstr "Болонья"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Успішно"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Невідома помилка"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Репозиторій поза мережею"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Доступ заборонено"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Картки не знайдено"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Ідентифікатор картки вже існує"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Протокол не підтримується"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Скасовано"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "Збій автентифікації."
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "Вимагається автентифікація"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS недоступна"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "Адресна книга не існує"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Інша помилка"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Ви хочете змінити зміни?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr "_Скасувати"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Помилка додавання списку"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Помилка додавання картки"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Помилка модифікування списку"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Помилка модифікації картки"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Помилка видалення списку"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Помилка видалення картки"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2723,7 +2824,7 @@ msgstr ""
 "При відкритті картки %d  буде також відкрито нове вікно %d.\n"
 "Ви справді бажаєте відкрити всі ці картки?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2732,49 +2833,49 @@ msgstr ""
 "%s вже існує\n"
 "Хочете переписати?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "Переписати"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Помилка запису %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "список"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Перенести картку у"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Скопіювати картку у"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Перенести картки у"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Копіювати картки у"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Декілька VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "vCard для %s"
@@ -2969,7 +3070,7 @@ msgstr "Поля"
 msgid "Number of columns:"
 msgstr "Кількість стовпчиків:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Параметри"
 
@@ -3156,18 +3257,18 @@ msgstr "Неназваний список"
 msgid "Split Multi-Day Events:"
 msgstr "Розділити багатоденні події:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Не вдалося запустити сервер Wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Не вдалось запустити Wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Не вдалося зчитати програмний блок календаря з \"Пілота\""
 
@@ -3175,24 +3276,89 @@ msgstr "Не вдалося зчитати програмний блок кал�
 msgid "Default Priority:"
 msgstr "Типовий пріоритет:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Неможливо зчитати програмний блок завдань \"Пілота\""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Календар та завдання"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Календар"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Налаштуйте ваш часовий пояс, Календар та Список завдань "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Календар та завдання"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Переглядач iTip/iMip з календарю Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Переглядач iTip/iMip з календарю Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Переглядач iTip/iMip з календарю Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Сигнал Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Компонент відображення поштової теки Evolutuion."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Перевірочний компонент Evolutuion."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Завдання"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Конструктор для послуги сповіщення"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Початок:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Закінчення:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Сигнал Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Сповіщення на %s"
@@ -3267,44 +3433,172 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Не запитуйте мене знову про цю програму."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Конструктор для послуги сповіщення"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Не вдалось ініціалізувати Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Не вдалось ініціалізувати gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Не вдалося створити фабрику послуги сповіщення"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "неправильний час"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "Помилка iCalendar"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Кольори для сьогоднішніх завдань"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Кольори для сьогоднішніх завдань"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "_Показати час завершення зустрічей при перегляді тижню та місяцю"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Переглянути календар, що буде надруковано"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "Питати підтвердження при видаленні елементів"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "Питати підтвердження при видаленні елементів"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Стерти виконані завдання"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Показати номера тижнів у навігаторі дат"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Зведення містить"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Опис містить"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Коментар містить"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Інше"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3316,81 +3610,111 @@ msgstr ""
 "\n"
 "Дійсно стерти ці завдання?"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "повертає менше ніж"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "діб"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Надрукувати цей календар"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Нова Каледонія"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "Нова зустріч"
+
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "_Зустріч"
+
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Створити нову зустріч"
+
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "Нове засідання"
+
+#: calendar/gui/calendar-component.c:640
 #, fuzzy
-msgid "Rename"
-msgstr "Перейменувати"
+msgid "M_eeting"
+msgstr "Засідання"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:641
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Створити новий запит на засідання"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Особисте"
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Нова щоденна зустріч"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Робота"
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr "_Щоденна зустріч"
+
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Створити нову зустріч"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3511,7 +3835,7 @@ msgstr "Відправити"
 msgid "With these arguments:"
 msgstr "З цими аргументами:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr ""
 
@@ -3527,6 +3851,10 @@ msgstr "години"
 msgid "minutes"
 msgstr "хвилини"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3560,8 +3888,8 @@ msgstr "Відіслати пошту"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Зведення:"
 
@@ -3590,7 +3918,7 @@ msgstr "кінець зустрічі"
 msgid "hour(s)"
 msgstr "годин(а)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "хвилин"
 
@@ -3644,7 +3972,7 @@ msgstr "Дні"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "П'ятниця"
 
@@ -3658,7 +3986,7 @@ msgstr "Хвилини"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Понеділок"
 
@@ -3668,7 +3996,7 @@ msgstr "_Ндл"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Субота"
 
@@ -3682,7 +4010,7 @@ msgstr "Показати номера тижнів у навігаторі да�
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Неділя"
 
@@ -3700,7 +4028,7 @@ msgstr "Список завдань"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Четвер"
 
@@ -3718,7 +4046,7 @@ msgstr "Формат часу:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Вівторок"
 
@@ -3728,12 +4056,12 @@ msgstr "_Тиждень починається:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Середа"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Робочий тиждень"
 
@@ -3770,7 +4098,7 @@ msgid "_Fri"
 msgstr "Птн"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "Загальне"
 
@@ -3810,7 +4138,7 @@ msgstr "Срд"
 msgid "before every appointment"
 msgstr "Перед початком кожної зустрічі"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
@@ -3818,11 +4146,11 @@ msgstr ""
 "Ви намагаєтесь видалити засідання, бажаєте відправити повідомлення про "
 "відміну?"
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Ви впевнені, що хочете відмінити та видалити це засідання?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
@@ -3830,11 +4158,11 @@ msgstr ""
 "Ви намагаєтесь видалити назначене завдання, бажаєте відіслати повідомлення "
 "про відміну?"
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Ви впевнені, що хочете відмінити та видалити це завдання?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -3842,50 +4170,50 @@ msgstr ""
 "Ви намагаєтесь видалити журнальний запис, який вже опубліковано, бажаєте "
 "відіслати повідомлення про відміну?"
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Ви впевнені, що хочете відмінити та видалити цей запис в журналі?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Цю подію було видалено."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Це завдання було видалено."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Цей журнальний запис було видалено."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Ви внесли зміни. Забути ці зміни та закрити вікно редагування?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Ви не зробили змін, закрити вікно редагування?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Цю подію було змінено."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Це завдання було змінено."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Цей журнальний запис було змінено."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Ви внесли зміни. Забути ці зміни та оновити вікно редагування?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Ви не зробили змін, поновити вікно редагування?"
@@ -3895,169 +4223,174 @@ msgstr "%s  Ви не зробили змін, поновити вікно ре�
 msgid "Validation error: %s"
 msgstr "Помилка під час перевірки: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " до "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Виконано "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Виконано "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Обумовлені завдання"
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Обумовлені завдання "
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "Не вдалося оновити об'єкт!"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Виправити зустріч"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Зустріч - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Завдання - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Журнальний запис - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Немає зведення"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Зберегти як..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 #, fuzzy
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Внесені в цей елемент зміни може бути скасовано, якщо прийде оновлення по ел."
 "пошті"
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Неможливо отримати поточну версію!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Вибрати теку призначення для імпорту цих даних"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Ви впевнені, що хочете стерти зустріч \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Ви впевнені, що хочете стерти цю неназвану зустріч?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Ви впевнені, що хочете стерти завдання \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Ви впевнені, що хочете стерти це неназване завдання?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Ви впевнені, що хочете стерти запис в журналі \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Ви впевнені, що хочете стерти цей неназваний запис в журналі?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Ви впевнені, що хочете стерти %d зустрічей?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Ви впевнені, що хочете стерти %d завдань?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Ви впевнені, що хочете стерти %d записів в журналі?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 #, fuzzy
 msgid "The item could not be deleted due to a corba error"
 msgstr "Елемент не може бути відіслано!\n"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 #, fuzzy
 msgid "The task could not be deleted because permission was denied"
 msgstr "Неможливо оновити стан учасника, бо поточний стан не правильний!\n"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Елемент не може бути відіслано!\n"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Елемент не може бути відіслано!\n"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Неможливо оновити стан учасника, бо поточний стан не правильний!\n"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Елемент не може бути відіслано!\n"
@@ -4074,43 +4407,43 @@ msgstr "Доручити:"
 msgid "Enter Delegate"
 msgstr "Ввести делегата"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Зустріч"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Нагадування"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Повторення"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Планування"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Засідання"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "Неправильна дата початку"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "Неправильна дата закінчення"
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "Неправильний час початку:"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "Неправильний час закінчення"
 
@@ -4180,31 +4513,31 @@ msgid "_Start time:"
 msgstr "Час _початку:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Немає"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "Потрібно вказати організатора."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "Потрібен хоча б один учасник."
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "Доручити..."
 
@@ -4245,21 +4578,15 @@ msgid "Member"
 msgstr "Член"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Зацікавлена персона"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Роль"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Стан"
@@ -4279,6 +4606,7 @@ msgid "_Invite Others..."
 msgstr "Запросити інших..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4311,6 +4639,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Не вдалося створити каталог %s: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "Потрібно вказати організатора."
@@ -4340,32 +4669,57 @@ msgstr "Календарна інформація"
 msgid "Calendar Name"
 msgstr "Календар"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Не вдалося створити каталог %s: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Календарна інформація"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Список завдань"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Список завдань"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Список завдань"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 msgid "This and Prior Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr ""
 
@@ -4414,10 +4768,15 @@ msgstr "день"
 msgid "on the"
 msgstr "у"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "випадки"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Дата й час:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "Додати"
@@ -4482,7 +4841,7 @@ msgstr "тижнів"
 msgid "year(s)"
 msgstr "років"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 #, fuzzy
 msgid ""
 "This event has been changed, but has not been saved.\n"
@@ -4493,32 +4852,32 @@ msgstr ""
 "\n"
 "Бажаєте зберегти зміни?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "Скасувати зміни"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 #, fuzzy
 msgid "Save Event"
 msgstr "Календарні події"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Створено інформацію про засідання. Надіслати її?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Змінилась інформація про засідання. Надіслати оновлену версію?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "Створено інформацію про призначення завдання. Надіслати її?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "Змінилась інформація про завдання. Надіслати оновлену версію?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Неправильна дата виконання"
 
@@ -4528,43 +4887,43 @@ msgid "% _Complete"
 msgstr "% виконання:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Завершено"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Високий"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "Виконується"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Низький"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Звичайний"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Не розпочато"
 
@@ -4573,7 +4932,7 @@ msgid "Progress"
 msgstr "Поступ"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Невизначено"
 
@@ -4595,21 +4954,21 @@ msgstr "Стан:"
 msgid "_Web Page:"
 msgstr "Адреса сторінки WWW:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Основні"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Призначення"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "Неправильна дата виконання"
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4617,9 +4976,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "Кон_фіденційне"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Опис:"
 
@@ -4724,26 +5083,21 @@ msgstr "%s на %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s для невідомого типу перемикача"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Загальне"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Приватне"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Конфіденційне"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Категорії"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4756,28 +5110,26 @@ msgid "Start Date"
 msgstr "Дата початку"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Зведення"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "колір"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Зустріч"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Вільний"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Зайнятий"
 
@@ -4789,7 +5141,7 @@ msgstr "Пн"
 msgid "S"
 msgstr "Пд"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "Сх"
 
@@ -4797,7 +5149,7 @@ msgstr "Сх"
 msgid "W"
 msgstr "Зх"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4807,7 +5159,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4815,7 +5167,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Так"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4823,17 +5175,17 @@ msgstr "Ні"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Невідоме"
 
@@ -4845,181 +5197,179 @@ msgstr "Періодично"
 msgid "Assigned"
 msgstr "Прив'язано"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Оновити об'єкти"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Стерти вибрані об'єкти"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Оновити об'єкти"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Нова зустріч..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Нова щоденна подія"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "Нове засідання"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Нове завдання"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "Друкувати..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "Вставити"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Сьогодні"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "Перейти на дату..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "Опублікувати інформацію про зайнятість"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "_Параметри..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "Відкрити"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Зберегти як..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "Скопіювати"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "За_планувати зустріч..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "Переслати як i_Calendar"
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Стерти цей екземпляр"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Стерти всі екземпляри"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "_Параметри..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "Відкрити повідомлення"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "_Призначити завдання"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "Переслати як i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "Позначити як виконане"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Позначити вибрані завдання як _виконані"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "Стерти вибрані завдання"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Клацніть щоб додати завдання"
@@ -5033,8 +5383,8 @@ msgstr "% виконання:"
 msgid "Alarms"
 msgstr "Сповіщення"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Виконано"
 
@@ -5063,18 +5413,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d.%m.%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5093,7 +5443,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5106,125 +5456,125 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "дп"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "пп"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr "Так. (Складна періодичність)"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "Кожен день"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "Кожні %d дні(в)"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "Кожного тижня"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "Кожні %d тижні(в)"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr "Кожного тижня у "
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Кожні %d тижні(в) у "
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " та "
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr "%s днів з "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s з "
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "кожного місяця"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr "кожні %d місяці(в)"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "Кожен рік"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "Кожні %d роки(ів)"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr " усього з %d разів"
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ", закінчуючи "
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>Починається:</b> "
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Закінчується:</b> "
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>Виконано:</b> "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>Обумовлена дата:</b> "
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "Інформація iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "Помилка iCalendar"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Невідома персона"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5232,318 +5582,317 @@ msgstr ""
 "<br> Будь ласка перегляньте наступну інформацію, потім оберіть дію з "
 "нижнього меню."
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Немає</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "Розташування:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Стан:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Прийнято"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Експериментальний"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Відхилено"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Обрати дію:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Оновити"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Гаразд"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Прийнято"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Прийняти для проби"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Відхилено"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Опублікувати інформацію про зайнятість"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Оновити стан учасників"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Надіслати останню інформацію"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> опублікував відомості про засідання."
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Інформація про засідання"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> запитує присутність %s на засіданні."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> запитує вашу присутність на засіданні."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "План засідання"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> бажає прийняти участь у засіданні."
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Оновлення засідання"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> бажає отримати останню інформацію про засідання"
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Запит на оновлення засідання"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> відповів на запит про участь у засіданні."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Відповідь про засідання"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> скасував засідання."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Скасування засідання"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> надіслав незрозуміле повідомлення."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Неправильне повідомлення про засідання"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> опублікував відомості про завдання."
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Інформація про завдання"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> пропонує %s виконати завдання."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> пропонує вам виконати завдання."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "План завдання"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> бажає прийняти участь у виконанні завдання."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Оновлення завдання"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> бажає отримувати останню інформацію про завдання."
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Запит на оновлення завдання"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> відповів на призначення завдання."
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Відповідь по завданню"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> скасував завдання."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Скасування завдання"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Неправильне повідомлення про завдання"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> опублікував відомості про зайнятість."
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Інформація про зайнятість"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> запитує відомості про зайнятість."
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Відповісти про зайнятість"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> відповів про зайнятість."
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Відповісти про зайнятість"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Неправильне повідомлення про зайнятість"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr "Повідомлення сформовано неправильно"
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "Повідомлення містить тільки відповіді, що підтримуються"
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Долучений файл не містить правильно сформованого повідомлення"
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr "Долучений файл не містить елементів календаря, які можна переглянути"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "Неможливо оновити календарний файл!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Оновлення виконано\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Неможливо оновити стан учасника, бо елемент вже не існує"
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Об'єкт є неправильним і не може бути оновлений\n"
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Ця відповідь не від поточного учасника. Додати його як учасника?"
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Неможливо оновити стан учасника, бо поточний стан не правильний!\n"
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr "Трапилась помилка в системі CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr "Неможливо знайти об'єкт\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Ви не маєте прав для оновлення календарю\n"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Стан учасника оновлено!\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "Неможливо оновити стан учасника!\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Видалення завершено"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Елемент відіслано!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Елемент не може бути відіслано!\n"
 
@@ -5703,7 +6052,7 @@ msgstr "%a %d.%m.%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
@@ -5767,49 +6116,44 @@ msgstr "Час початку зібрання:"
 msgid "Meeting _end time:"
 msgstr "Час завершення зібрання:"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "Дата по_чатку:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "Дата ви_конання:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "Пріоритет:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Сторінка"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Відкривання завдань на %s"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Не вдалося завантажити завдання в \"%s\""
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Метод, необхідний для завантаження \"%s\", не підтримується"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Ви не маєте дозволу для відкриття теки в `%s'"
 
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5818,48 +6162,39 @@ msgstr ""
 "Помилка на %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "Завершення завдання..."
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "Стирання вибраних об'єктів"
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "Викреслення"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Завдання"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Календар"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Не вдалося відкрити теку в \"%s\""
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Метод, необхідний для завантаження \"%s\", не підтримується"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Додавання сповіщення для %s"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5870,7 +6205,7 @@ msgstr ""
 "%s.\n"
 "Щоб використовувати його знову потрібно перезавантажити Evolution"
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5881,63 +6216,11 @@ msgstr ""
 "%s.\n"
 "Щоб використовувати його знову потрібно перезавантажити Evolution"
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Турін"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Календар та завдання"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Календар"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Налаштуйте ваш часовий пояс, Календар та Список завдань "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Календар та завдання"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Переглядач iTip/iMip з календарю Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Переглядач iTip/iMip з календарю Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Переглядач iTip/iMip з календарю Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Сигнал Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Компонент відображення поштової теки Evolutuion."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Перевірочний компонент Evolutuion."
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Квітень"
@@ -5994,296 +6277,332 @@ msgstr "Жовтень"
 msgid "September"
 msgstr "Вересень"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Потрібно вказати організатора."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Потрібен хоча б один учасник"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Інформація про подію"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Інформація про завдання"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Інформація про журнал"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Інформація про зайнятість"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Календарна інформація"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Оновлено"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Оновити"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "Контрпропозиція"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Інформація про зайнятість (%s до %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "Інформація iCalendar"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Ви маєте бути відвідувачем події."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Ндл"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Пнд"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Втр"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Срд"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Чтв"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Птн"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Сбт"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Поточний день (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Вибраний тиждень (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Вибраний місяць (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Вибраний рік (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Завдання"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Стан: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Пріоритет: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Відсоток виконання: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Категорії: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Контакти:"
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Перегляд друку"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Надрукувати елемент"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Параметри друку"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Перейменувати цей ярлик"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Список завдань"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Нове завдання"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "Завдання"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Створити нову завдання"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "URI, що буде показано у теці завдань"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6295,11 +6614,11 @@ msgstr ""
 "\n"
 "Дійсно стерти ці завдання?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Не питати знову."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "Надрукувати завдання"
 
@@ -6331,15 +6650,15 @@ msgstr "Календарне повідомлення"
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "Нагадування!"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "Календарні події"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6347,7 +6666,7 @@ msgstr ""
 "Evolution знайшов файли  Gnome Calendar.\n"
 "Бажаєте імпортувати їх у Evolution?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Календар GNOME"
 
@@ -7880,27 +8199,27 @@ msgstr "Тихий океан/Волліс"
 msgid "Pacific/Yap"
 msgstr "Тихий океан/Яп"
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "Підписування не підтримується цим шифром"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "Перевірка не підтримується цим шифром"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Шифрування не підтримується цим шифром"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Розшифрування не підтримується цим шифром"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr "Ви не можете імпортувати ключі цим шифром"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr "Ви не можете експортувати ключі цим шифром"
 
@@ -7952,86 +8271,86 @@ msgstr "Готуємо теку '%s' для переходу в режим offli
 msgid "You must be working online to complete this operation"
 msgstr "Ви маєте працювати в мережі для завершення цієї операції"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Неможливо створити канал до '%s': %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Неможливо створити дочірній процес '%s': %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Отримано неправильний потік повідомлень з %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Синхронізація тек"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Помилка аналізу фільтра: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Помилка виконання фільтра: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Не вдалося відкрити буферну теку"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Не вдалося обробити буферну теку"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Отримання повідомлення %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Неможливо відкрити повідомлення"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Збій на повідомленні %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Синхронізація теки"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Отримання повідомлення %d з %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Збій на повідомленні %d з %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Неможливо знайти повідомлення"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr "Неправильні аргументи до (system-flag)"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr "Неправильні аргументи до (user-tag)"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Помилка виконання фільтрованого пошуку: %s: %s"
@@ -8063,36 +8382,36 @@ msgstr "(співпадають всі) потребує єдиного логі
 msgid "Performing query on unknown header: %s"
 msgstr "Виконання запиту на невідомий заголовок: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Операція не підтримується: додавання повідомлення: для %s"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Операція не підтримується: пошук за виразом: для %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Операція не підтримується: пошук за ідентифікаторами користувачів: для %s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Перенесення повідомлень"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr "Копіювання повідомлень"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Отримання %d повідомлень"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8103,15 +8422,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr "Неможливо проаналізувати запит паролю gpg."
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8120,30 +8439,30 @@ msgstr ""
 "Потрібен пароль, щоб відкрити ключ для \n"
 "користувача: \"%s\""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Відмінено."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Неможливо відкрити секретний ключ: отримано 3 неправильних пароля."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Неочікувана відповідь від GnuPG: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr "Нема даних"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Неможливо зашифрувати: не визначено жодного отримувачів"
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8154,51 +8473,65 @@ msgstr ""
 "\n"
 "%.*s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Збій GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Не вдалось записати дані: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Неможливо виконати gpg: %s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr "Неможливо виконати gpg."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "Цю частину повідомлення підписано цифровим підписом"
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr ""
+"Неможливо перевірити підпис повідомлення: не вдалося створити тимчасовий "
+"файл: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Неможливо перевірити підпис повідомлення: не вдалося створити тимчасовий "
 "файл: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Не вдалось записати дані: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Цю частину повідомлення підписано цифровим підписом"
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Тіло містить"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Неможливо отримати повідомлення від редактора"
@@ -8297,15 +8630,15 @@ msgstr "Помилка запису пошти у тимчасовий файл:
 msgid "Error copying mail temp file: %s"
 msgstr "Помилка копіювання тимчасового поштового файлу: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Неможливо декодувати секцію MIME: помилка протоколу"
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "Неможливо декодувати секцію MIME: неправильна структура"
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "помилка аналізу"
 
@@ -8623,12 +8956,12 @@ msgstr "Постачальник віртуальних папок ел.пошт
 msgid "For reading mail as a query of another set of folders"
 msgstr "Для читання пошти як запиту до іншого набору тек "
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Постачальника протоколу `%s' не знайдено"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8637,71 +8970,82 @@ msgstr ""
 "Не вдалося створити каталог %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Введіть пароль для %s"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Невизначено"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Редагувати підпис"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Редагувати підпис"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Не знайдено конфігураційної бази даних"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "Сертифікат не має довіри"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Зберегти підпис"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Помилка аналізу"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Сервер: %s, Тип: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Не вдалося отримати теку: неприпустима операція у цьому сховище"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Не вдалося створити теку: неприпустима операція у цьому сховище"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Смітник"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "Червень"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "Неможливо отримати сертифікат відправника."
@@ -8910,7 +9254,7 @@ msgstr ""
 "Вийшов строк дії списку скасування сертифікатів: %s\n"
 "Подавець: %s"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Неможливо проаналізувати URL \"%s\""
@@ -8929,22 +9273,22 @@ msgstr "Неправильне повідомлення %s в %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Неможливо скопіювати або перенести повідомлення до Віртуальної Теки"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Неможливо стерти теку: %s: неправильна операція"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Неможливо стерти теку: %s: немає такої теки"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Неможливо перейменувати теку: %s: неправильна операція"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Неможливо перейменувати теку: %s: немає такої теки"
@@ -9024,7 +9368,7 @@ msgstr "Неможливо знайти повідомлення: %s"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9038,7 +9382,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Неправильне повідомлення"
@@ -9076,55 +9420,70 @@ msgid "Failed to cache %s: %s"
 msgstr "Неможливо зберегти %s: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "З'єднання з сервером..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Неможливо з'єднатись з сервером LDAP"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "Компанія"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Перевіряти нову пошту"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Check for new messages in all folders"
 msgstr "Перевіряти нову пошту в усіх теках"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Теки"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Показувати лише підписані теки"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "Замінити запропонований сервером простір назв тек"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Простір назв"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 "Застосувати фільтри до нових повідомлень у теці \"Вхідні\" на цьому сервері"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "Автоматично перевіряти нову пошту"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Для зчитування та збереження пошти на серверах IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Пароль"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Під'єднуватись до IMAP серверу з використанням незашифрованого паролю."
@@ -9376,7 +9735,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Не вдалося перейменувати теку \"%s\" на \"%s\": %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Не вдалося перейменувати теку \"%s\": %s"
@@ -9491,29 +9850,29 @@ msgstr "Перевірка нових повідомлень"
 msgid "Storing folder"
 msgstr "Збереження теки"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Неможливо заблокувати теку на %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Неможливо відкрити поштову скриньку: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "Додавання пошти відмінено"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Неможливо додати повідомлення до файлу Mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9522,11 +9881,11 @@ msgstr ""
 "Неможливо отримати повідомлення \"%s\" з теки \"%s\"\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Схоже тека непоправно зіпсована."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Збій побудови повідомлення: зіпсовано поштову скриньку?"
 
@@ -9594,12 +9953,17 @@ msgstr "Не вдалося створити каталог %s: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "Не вдалося отримати теку: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "Ідентифікатор картки вже існує"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Не вдалося перейменувати теку \"%s\" на \"%s\": %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Вказана назва теки не правильна: %s"
@@ -9643,7 +10007,7 @@ msgstr "Не вдалося закрити вихідну теку %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Не вдалося закрити тимчасову теку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Не вдалося перейменувати теку: %s"
@@ -9930,7 +10294,7 @@ msgstr "Стирати по завершенню %s днів"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -10019,7 +10383,7 @@ msgid "No such folder `%s'."
 msgstr "Теки \"%s\" не існує."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10073,7 +10437,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Відправлення пошти через програму sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10240,7 +10604,7 @@ msgstr "Постачання пошти SMTP через %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Неможливо відіслати повідомлення: неправильна адреса відправника."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Відсилання повідомлення"
 
@@ -10363,7 +10727,7 @@ msgstr "%.0fМб"
 msgid "%.0fG"
 msgstr "%.0fГб"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "долучення"
 
@@ -10408,14 +10772,14 @@ msgstr "Тип MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Показувати долучення автоматично"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Вам потрібно налаштувати користувача\n"
 "перш ніж ви зможете створити повідомлення."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Клацніть тут щоб викликати адресну книгу"
 
@@ -10426,45 +10790,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Відповідати на:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Від:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Тема:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "До:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Введіть адресатів повідомлення"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Введіть адресатів, що отримають копію повідомлення"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10475,14 +10839,19 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Надіслати до:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr "Адреса призначення"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Долучити файл до повідомлення"
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Долучити файл(и)"
@@ -10518,21 +10887,21 @@ msgstr "Файл існує, переписати?"
 msgid "Error saving file: %s"
 msgstr "Помилка збереження файлу: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Помилка завантаження файлу: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Помилка доступу до файлу: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Неможливо отримати повідомлення від редактора"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10541,7 +10910,7 @@ msgstr ""
 "Неможливо встановити позицію у файлі: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10550,7 +10919,7 @@ msgstr ""
 "Неможливо обрізати файл: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10559,7 +10928,7 @@ msgstr ""
 "Неможливо скопіювати дескриптор файлу: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10568,7 +10937,7 @@ msgstr ""
 "Помилка автозбереження файлу: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10576,7 +10945,7 @@ msgstr ""
 "Ximian Evolution знайшов незбереженні файли попереднього сеансу.\n"
 "Бажаєте спробувати їх відновити?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10587,28 +10956,28 @@ msgstr ""
 "\n"
 "Бажаєте зберегти зміни?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Увага: змінене повідомлення"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Відкрити файл"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "Підпис:"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "Згенеровано автоматично"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Підготувати повідомлення"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10616,7 +10985,7 @@ msgstr ""
 "Не вдалося створити вікно редагування:\n"
 "Неможливо активувати керуючий елемент обрання адреси."
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10628,7 +10997,7 @@ msgstr ""
 "Будь ласка, впевніться що у вас встановлено\n"
 "коректну версію gtkhtml та libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10636,7 +11005,7 @@ msgstr ""
 "Не вдалося створити вікно редактора:\n"
 "Неможливо активувати компонент HTML-редактора."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10645,11 +11014,13 @@ msgstr ""
 "відредагувати.)<b>"
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Набір програм для групової роботи Evolution"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10903,13 +11274,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11028,7 +11399,7 @@ msgstr "Тоді"
 msgid "You must specify a folder."
 msgstr "Необхідно вказати теку."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Вибір теки"
@@ -11042,24 +11413,24 @@ msgstr ""
 "Помилка у регулярному виразі \"%s\":\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Важливо"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "Потрібно зробити"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Пізніше"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Тест"
 
@@ -11159,7 +11530,7 @@ msgstr "тому"
 msgid "months"
 msgstr "місяців"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "секунд"
 
@@ -11256,7 +11627,7 @@ msgstr "Вираз"
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "Позначка"
 
@@ -11326,112 +11697,118 @@ msgid "Source Account"
 msgstr "Обліковий рахунок відправника"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Бризки"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Особливий заголовок"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Зупинити обробку"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Тема"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "Скинути стан:"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "містить"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "не містить"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "не закінчується на"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "не існує"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "does not return"
 msgstr "не повертається"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "не схоже на"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "не починається з"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "закінчується на"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "існує"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr "Відмічено"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr "після"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "is before"
 msgstr "перед"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "більше"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "менше"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr "не відмічено"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "не співпадає з"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "співпадає з"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr "повертає більше ніж"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr "повертає менше ніж"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr "повертає"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "схоже на"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "починається на"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Ім'я правили '%s' на є унікальним, виберіть інше."
@@ -11456,18 +11833,85 @@ msgstr "Назва правила"
 msgid "Score Rules"
 msgstr "Правила підрахунку"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Віртуальній теці необхідно дати назву."
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr "Ви повинні вказати хоча б одну теку у якості джерела"
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 msgid "VFolder source"
 msgstr "Джерело вірт.папок"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Вподобання редактора"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Налаштовування вподобань, включаючи безпеку та відображення повідомлень"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Налаштовування перевірки правопису, підписів та редактора повідомлень"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Налаштовування поштових рахунків"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Редактор облікових рахунків Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Редактор пошти Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Редактор пошти Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Редактор пошти Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Компонент відображення поштової теки Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Компонент поштового виконавчого зведення Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Пошта"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Поштові Рахунки"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "Вподобання пошти"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Ви впевнені, що хочете стерти цей рахунок?"
@@ -11509,7 +11953,7 @@ msgid "Protocol"
 msgstr "Протокол"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr "Без назви"
 
@@ -11533,20 +11977,17 @@ msgstr "Додати цифровий підпис скрипту"
 msgid "Signature(s)"
 msgstr "Підписи"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "Ви надсилаєте повідомлення у HTML форматі. Будь ласка, впевніться, що\n"
 "наступні одержувачі бажають та мають змогу приймати пошту у форматі HTML:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Відіслати все одно?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11554,7 +11995,7 @@ msgstr ""
 "Це повідомлення не має теми.\n"
 "Справді відіслати?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11563,11 +12004,11 @@ msgstr ""
 "налаштований приховувати адреси, це повідомлення буде містити тільки "
 "одержувачів прихованої копії."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Це повідомлення містить тільки одержувачів прихованої копії."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11577,11 +12018,11 @@ msgstr ""
 "Apparently-To .\n"
 "Надіслати все одно?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Щоб надіслати це повідомлення потрібно вказати отримувачів."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11593,191 +12034,408 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Створити віртуальну теку з пошуку..."
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "Пошта"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<клацніть тут для вибору теки>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" у \"%s\""
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Створити нову теку"
+
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Вкажіть, де створити теку:"
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
-msgid "Folder _name"
+msgid "Folder _name:"
 msgstr "Назва теки:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Неможливо створити тимчасовий каталог: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Неможливо створити тимчасовий каталог: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Неможливо створити тимчасовий файл \"%s\": %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Не вдалося закрити тимчасову теку: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Завантаження..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Вибрати теку"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Створити нову теку"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Не вдалось стерти теку \"%s\": %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Дійсно видалити теку \"%s\"?"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Стерти \"%s\""
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Перейменувати теку \"%s\" на:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+#, fuzzy
+msgid "Rename Folder"
+msgstr "Перейменувати теку"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Властивості шрифту"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Властивості"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "Назва _теки:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Вигляд"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Відкрити у новому вікні"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Перенести"
+
+#: mail/em-folder-tree.c:1500
+#, fuzzy
+msgid "_New Folder..."
+msgstr "Нова тека"
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "Перейменувати"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "Властивості..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "Виправити як нове повідомлення..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "Друкувати"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "Відповісти відправнику"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Відповісти у список"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Відповісти всім"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "Переслати"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Завершено"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Очистити"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Позначити прочитаним"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "Позначити як непрочитане"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Позначити як важливе"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "Позначити як неважливе"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Позначити як непрочитане"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Позначити як важливе"
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "Відновити"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "Перенести в теку..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "Скопіювати в теку..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "Додати відправника в адресну книгу"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "Застосувати фільтри"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "Створити правило з повідомлення"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "Віртуальна теку по темі"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "Віртуальна тека відправника"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "Віртуальна тека отримувачів"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "Фільтр списку листування"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "Віртуальна тека відправника"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Фільтр теми"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Фільтр відправника"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Фільтр отримувачів"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Фільтр списку розсилки"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Фільтр відправника"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Типово"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Надрукувати повідомлення"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Скопіювати посилання"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Відповідності:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Прив'язано"
+
+#: mail/em-format-html-display.c:597
+#, fuzzy
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr ""
+"Це повідомлення підписано цифровим підписом, але перевірку ідентичності не "
+"складено."
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Редагувати підпис"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Редагувати підпис"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+#, fuzzy
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"Вхідний маркер input_token містить неправильний підпис або підпис який не "
+"може бути перевірено."
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Перервано"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
 msgstr ""
-"Це повідомлення підписано цифровим підписом. Додаткову інформацію можна "
-"отримати,якщо клацнути на піктограмі із замком."
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "Шифрування PGP"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Неможливо розібрати MIME повідомлення. Показується як є."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Схема не підтримується"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Неможливо перевірити підпис листа"
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Вбудований перегляд"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Прибрати"
@@ -11787,186 +12445,209 @@ msgstr "Прибрати"
 msgid "Page %d of %d"
 msgstr "Сторінка %d з %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Отримання повідомлення %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Частину external-body сформовано неправильно."
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Вказівник на сайт FTP (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Вказівник на локальний файл (%s) на сайті \"%s\""
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Вказівник на локальний файл (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Вказівник на віддалені дані (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Вказівник на невідомі зовнішні дані (типу \"%s\")"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-"Це повідомлення підписано цифровим підписом, але перевірку ідентичності не "
-"складено."
-
-#: mail/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-"Це повідомлення підписано цифровим підписом, перевірку ідентичності складено."
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-msgid "No signature present"
-msgstr ""
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Не вдалось ініціалізувати Bonobo"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Схема не підтримується"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Неможливо розібрати MIME повідомлення. Показується як є."
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Перенесення повідомлень"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Від"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Відповідати на"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "До"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Копія:"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Прих.копія:"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "Поштова програма"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Дата"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "долучення %s"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Неможливо розібрати MIME повідомлення. Показується як є."
+msgid "Session not initialised"
+msgstr "Не вдалось ініціалізувати Bonobo"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+"Це повідомлення підписано цифровим підписом, перевірку ідентичності складено."
+
+#: mail/em-format.c:1212
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"Це повідомлення підписано цифровим підписом, але перевірку ідентичності не "
+"складено."
+
+#: mail/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Очікування..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Зондування %s"
 
-#: mail/em-popup.c:593
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Неможливо зберегти %s: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Неможливо створити канал до '%s': %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Не вдалось розв'язати назву машини \"%s\": %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Зберегти як..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Відповісти відправнику"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Відкрити посилання у переглядачі веб"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Відіслати повідомлення у список..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Додати відправника в адресну книгу"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Відкрити в %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "Цей сервер не підтримує схему інформації LDAPv3"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Підписатися"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Тека"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Будь ласка, виберіть сервер."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Не було вибрано сервера"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Більше не показувати це повідомлення."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11975,27 +12656,27 @@ msgstr ""
 "Помилка при завантаженні інформації фільтру:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Фільтри"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Переслане повідомлення"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "невідомий відправник"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%a, %Y-%m-%d у %H:%M, %%s написав:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12004,7 +12685,7 @@ msgstr ""
 "Неможливо записати в \"%s\"\n"
 " %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12013,25 +12694,26 @@ msgstr ""
 "\"%s\" вже існує\n"
 "Хочете переписати?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Повідомлення"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Зберегти повідомлення як..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Неможливо створити тимчасовий каталог: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Адреса"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12040,104 +12722,401 @@ msgstr ""
 "\n"
 "Дійсно стерти ці повідомлення?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Вподобання редактора"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/em-utils.c:2288
+#, fuzzy
 msgid ""
-"Configure mail preferences, including security and message display, here"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
 msgstr ""
-"Налаштовування вподобань, включаючи безпеку та відображення повідомлень"
+"Ця операція назавжди зітре всі повідомлення, позначені як стерті.\n"
+"Якщо продовжите: ви не зможете відновити ці повідомлення.\n"
+"\n"
+"Дійсно стерти ці повідомлення?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Налаштовування перевірки правопису, підписів та редактора повідомлень"
+#: mail/evolution-mail.schemas.in.in.h:1
+#, fuzzy
+msgid "Automatic link recognition"
+msgstr "Автоматично знаходити зв'язки"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Налаштовування поштових рахунків"
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "Автоматично знаходити зв'язки"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:6
 #, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
+msgid "Default charset in which to compose messages"
+msgstr "Початкова тема повідомлення."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:7
 #, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Редактор облікових рахунків Evolution"
+msgid "Default charset in which to compose messages."
+msgstr "Початкова тема повідомлення."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
-msgid "Evolution Mail component"
-msgstr "Редактор пошти Evolutuion."
+msgid "Default charset in which to display messages"
+msgstr "Шукати у тексті відображеного повідомлення"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Редактор пошти Evolutuion."
+msgid "Default charset in which to display messages."
+msgstr "Шукати у тексті відображеного повідомлення"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Редактор пошти Evolutuion."
+msgid "Default forward style"
+msgstr "Стиль пересилання:"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Компонент відображення поштової теки Evolutuion."
+msgid "Default reply style"
+msgstr "Стиль відповіді:"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Компонент поштового виконавчого зведення Evolutuion."
+msgid "Empty Trash folders on exit"
+msgstr "Спорожнити теку смітника на виході"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Спорожнити теку смітника на виході"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "Поштові Рахунки"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "Вподобання пошти"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
 
-#: mail/importers/elm-importer.c:105
-msgid "Evolution is importing your old Elm mail"
-msgstr "Evolution імпортує вашу пошту з Elm"
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
-msgid "Importing..."
-msgstr "Імпортування..."
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
-msgid "Please wait"
-msgstr "Будь ласка, зачекайте"
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Імпортування %s як %s"
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
 
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Сканування %s"
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "Виконати дії"
 
-#: mail/importers/elm-importer.c:547
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Сповіщення про нову пошту"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Сповіщення про нову пошту"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
-"Evolution знайшов поштові файли Elm\n"
-"Чи бажаєте ви імпортувати їх у Evolution?"
 
-#: mail/importers/elm-importer.c:568
-msgid "Elm"
-msgstr "Elm"
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr "Попереджувати при надсиланні HTML повідомлень тим, хто їх не бажає"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr ""
+"Попереджувати при надсиланні повідомлень, де визначені тільки отримувачі "
+"прихованої копії"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "Надіслати ел.пошту у HTML?"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "Надіслати ел.пошту у HTML?"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "Показувати анімовані малюнки"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "Показувати анімовані малюнки"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Показати повідомлення у звичайному стилі"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "Панель _перегляду"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "Відтворити звуковий файл при отриманні нової пошти"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "Перевірка правопису"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "Оригінальний контакт:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "Вибрати для друку шрифт HTML змінної ширини"
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Розбитий на гілки список повідомлень"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Розбитий на гілки список повідомлень"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "Зробити це моїм типовим рахунком"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "Змінної ширини:"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 #, fuzzy
@@ -12171,6 +13150,44 @@ msgstr ""
 msgid "Evolution Pine importer"
 msgstr "Редактор пошти Evolutuion."
 
+#: mail/importers/elm-importer.c:105
+msgid "Evolution is importing your old Elm mail"
+msgstr "Evolution імпортує вашу пошту з Elm"
+
+#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
+#: mail/importers/pine-importer.c:115
+msgid "Importing..."
+msgstr "Імпортування..."
+
+#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
+#: mail/importers/pine-importer.c:117
+msgid "Please wait"
+msgstr "Будь ласка, зачекайте"
+
+#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
+#: mail/importers/pine-importer.c:288
+#, c-format
+msgid "Importing %s as %s"
+msgstr "Імпортування %s як %s"
+
+#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
+#: mail/importers/pine-importer.c:425
+#, c-format
+msgid "Scanning %s"
+msgstr "Сканування %s"
+
+#: mail/importers/elm-importer.c:547
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution знайшов поштові файли Elm\n"
+"Чи бажаєте ви імпортувати їх у Evolution?"
+
+#: mail/importers/elm-importer.c:568
+msgid "Elm"
+msgstr "Elm"
+
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -12232,12 +13249,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution імпортує ваші старі дані Netscape"
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Смітник"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Сканування поштових фільтрів"
@@ -12246,7 +13257,7 @@ msgstr "Сканування поштових фільтрів"
 msgid "Scanning directory"
 msgstr "Сканування каталогу"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Початок імпортування"
 
@@ -12321,23 +13332,23 @@ msgid "You have not filled in all of the required information."
 msgstr "Ви ще не ввели потрібну інформацію."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Редактор облікових рахунків Evolution"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "Сервер:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "Ім'я користувача:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "Шлях:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Не можна створювати два облікових рахунки з спільним ім'ям."
 
@@ -12346,35 +13357,35 @@ msgstr "Не можна створювати два облікових раху�
 msgid "Mail to %s"
 msgstr "Пошта до %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Тема - %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Пошта від %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "Список розсилки %s"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Відповісти"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Додати правило фільтрування"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "Наступне(і) правила фільтру:\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12385,145 +13396,30 @@ msgstr ""
 "    \"%s\"\n"
 "та її було оновлено."
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "З'єднання..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Ця тека не може містити повідомлення."
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Нове поштове повідомлення"
 
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Не вдалося відкрити загальну теку: %s"
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "Поштове повідомлення"
 
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Неможливо створити тимчасовий каталог: %s"
-
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Неможливо створити тимчасовий файл \"%s\": %s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "Створити нове поштове повідомлення"
 
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Не вдалося закрити тимчасову теку: %s"
-
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Вибрати теку призначення для імпорту цих даних"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Вибрати теку призначення для імпорту цих даних"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Створити нову теку"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Вкажіть, де створити теку:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Не вдалось стерти теку \"%s\": %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Дійсно видалити теку \"%s\"?"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Стерти \"%s\""
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Перейменувати теку \"%s\" на:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-#, fuzzy
-msgid "Rename Folder"
-msgstr "Перейменувати теку"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Вказана назва теки не правильна: %s"
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Властивості шрифту"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Властивості"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "Назва _теки:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Вигляд"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Відкрити у новому вікні"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Перенести"
-
-#: mail/mail-component.c:2087
-#, fuzzy
-msgid "_New Folder..."
-msgstr "Нова тека"
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "Перейменувати"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "Властивості..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Назва"
 
@@ -12583,11 +13479,11 @@ msgstr ""
 "Введіть назву цього рахунку у нижньому полі. Ця назва буде використовуватись "
 "тільки для показу."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Перевірка служби"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "З'єднання з сервером..."
 
@@ -12669,26 +13565,35 @@ msgid "C_olors"
 msgstr "_Кольори"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Перевірка нової пошти"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "Перевіряти правопис під час набору повідомлення"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Перевірка нової пошти"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "Колір для слів з помилками"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Компонування повідомлень"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Конфігурація"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12704,279 +13609,284 @@ msgstr ""
 "\n"
 "Щоб зберегти інформацію натисніть \"Завершити\"."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "Типово"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Типова поведінка"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "Типове кодування символів: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Видалення пошти"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr ""
 "Завжди підписувати повідомлення при використанні цього облікового рахунку"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "Не цитувати оригінальне повідомлення"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 "Не підписувати запрошення на засідання (для сумісності з Outlook "
 "compatibility)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Виконано"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "Тека _чернеток:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "Увімкнути"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "Поштові Рахунки"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "Електронна адреса:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "Спорожнити теку смітника на виході"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "Ідентифікатор сертифіката:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Асистент з Облікових рахунків Evolution"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Виконати команду..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "Фіксованої ширини:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "Фільтри"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "Властивості шрифту"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "Форматувати повідомлення в HTML"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "Висвітлювати цитування за допомогою"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "В тілі"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Позначки і кольори"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Завантаження зображень"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Конфігурація пошти"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Розміщення поштової скриньки"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Редактор повідомлень"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Відображення повідомлень"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Fonts"
 msgstr "Повідомлення містить"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Сповіщення про нову пошту"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Зауважте: вас не буде запитано про пароль до моменту першого сеансу зв'язку "
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Необов'язкова інформація"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "Ор_ганізація:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "Ідентифікатор ключа PGP/GPG:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Вибір кольору"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Попереджувати при надсиланні повідомлень, де визначені тільки отримувачі "
 "прихованої копії"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Шрифти для друкування"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "Цитувати оригінальне повідомлення"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Процитовано"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "Запам'ятати цей пароль"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "Відповідати до:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Отримання пошти"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "Параметри отримання"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "Запам'ятати цей пароль"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Необхідна інформація"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "Типово"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "Безпека"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "Безпечний MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr "Вибрати шрифт HTML фіксованої ширини"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr "Вибрати для друкування шрифт HTML фіксованої ширини"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr "Вибрати шрифт HTML змінної ширини"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr "Вибрати для друку шрифт HTML змінної ширини"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Відсилання пошти"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Тека надісланих повідомлень:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Надіслані повідомлення та чернетки"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Сервер вимагає автентифікації"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Конфігурація сервера"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Тип сервера: "
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Не знайдено конфігураційної бази даних"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "Зазначте ім'я файлу:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "Перевірка правопису"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Стандартний Unix mbox"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12986,7 +13896,7 @@ msgstr ""
 "цифрового підпису. Зазначене вами ім'я буде використане\n"
 "тільки для відображення."
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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 "
@@ -12995,7 +13905,7 @@ msgstr ""
 "Ця сторінка допомагає налаштувати параметри перевірки правопису та мови. "
 "Список мов відображує тільки ті мови, для яких встановлено словники."
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13003,11 +13913,15 @@ msgstr ""
 "Введіть ім'я з яким ви бажаєте посилатися на цей рахунок.\n"
 "Наприклад: \"Робота\" або \"Особисте\""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "Змінної ширини:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13017,173 +13931,182 @@ msgstr ""
 "\n"
 "Натисніть \"Далі\" для продовження"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "_Додати підпис"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "Завжди завантажувати зображення"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 "Завжди підписувати повідомлення при використанні цього облікового рахунку"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "Тип автентифікації: "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "Тип автентифікації: "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "Автоматично перевіряти нову пошту"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "Автоматично вставляти картинки з смайликами"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "Звуковий сигнал для нової пошти"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "Підтвердження при викреслені теки"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "Типовий підпис:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "Типово"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "Не сповіщувати про нову пошту"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "Увімкнути"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "Стиль пересилання:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "Повне ім'я:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "В HTML"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "Назва"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Червень"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "Завантажувати зображення, якщо відправник у адресній книзі"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "Зробити це моїм типовим рахунком"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "Позначати повідомлення як \"Прочитані\" через"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "Ім'я:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "Ніколи не завантажувати зображення"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "Відтворити звуковий файл при отриманні нової пошти"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Попереджувати при надсиланні HTML повідомлень тим, хто їх не бажає"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Попереджувати при надсиланні повідомлень з порожньою темою"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "Отримання пошти"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "Стиль відповіді:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "Типово"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Скрипт:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Стерти..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "Відсилання пошти"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "Показувати анімовані малюнки"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Підписи"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Standard Font:"
 msgstr "Стандартний Unix mbox"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Terminal Font:"
 msgstr "Оригінальний контакт:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "Використовувати безпечне з'єднання (SSL):"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "опис"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr "Зондування %s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13192,7 +14115,7 @@ msgstr ""
 "Помилка під час \"%s\":\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13201,7 +14124,7 @@ msgstr ""
 "Помилка під час здійснення операції:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Робота"
 
@@ -13213,118 +14136,118 @@ msgstr "Фільтрування теки"
 msgid "Fetching Mail"
 msgstr "Отримання пошти"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Не вдалося зберегти пошту в тимчасовому файлі %s: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Не вдалося зберегти пошту в тимчасовому файлі %s: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Відсилання \"%s\""
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Відсилання повідомлення %d з %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Збій на повідомленні %d з %d"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Виконано."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Збереження повідомлення у теці"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Перенесення повідомлень у %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копіювання повідомлень у %s"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканування тек в \"%s\""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Переслані повідомлення"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Відкривання теки %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "Відкриття сховища %s"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Видалення теки %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Збереження теки \"%s\""
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Оновлення теки"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Викреслення теки"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Імпортування %s як %s"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Локальні теки"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Отримання повідомлення %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Отримання %d повідомлень"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Збереження %d повідомлень"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13333,7 +14256,7 @@ msgstr ""
 "Неможливо створити файл виводу: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13342,11 +14265,11 @@ msgstr ""
 "Помилка при збереженні до: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Збереження долучення"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13355,21 +14278,25 @@ msgstr ""
 "Неможливо створити файл виводу: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Не вдалось записати дані: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Закриття з'єднання з %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Повторне встановлення з'єднання з %s"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Регістрова чутливість"
@@ -13386,60 +14313,75 @@ msgstr "Знайти:"
 msgid "Search"
 msgstr "Пошук"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Редагувати підпис"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Винятки"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Інформація про рахунок"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Скасування..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Сервер: %s, Тип: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Шлях: %s, Тип: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Відіслати й отримати пошту"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Скасувати все"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Оновлення..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Очікування..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Користувач скасував операцію."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Введіть пароль для %s"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Ввід пароля"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "Запам'ятати цей пароль"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr "Пам'ятати цей пароль до закінчення поточного сеансу"
 
@@ -13478,26 +14420,31 @@ msgstr "Введіть ім'я для цього підпису."
 msgid "Name:"
 msgstr "Ім'я:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Переслане повідомлення %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Переслане повідомлення"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Відкривання теки %s"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Встановлення вірт.теки: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Оновлення вірт.тек для uri: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13510,88 +14457,88 @@ msgstr ""
 "    \"%s\"\n"
 "та її було оновлено."
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "Вірт.теки"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "Вірт.теки"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Виправлення віртуальної теки"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Спроба редагувати неіснуючої вірт.теки '%s'"
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Нова віртуальна тека"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Не прочитано"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Прочитано"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Дано відповідь"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Декілька непереглянутих повідомлень"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Декілька повідомлень"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Найнижче"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Нижче"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Вище"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Найвище"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Сьогодні %I:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Вчора %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Створення списку повідомлень"
 
@@ -13648,11 +14595,11 @@ msgstr "Переслати"
 msgid "No Response Necessary"
 msgstr "Відповідь не вимагається"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Відповісти"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Відповісти всім"
 
@@ -13707,41 +14654,140 @@ msgstr "Підписатися"
 msgid "_Unsubscribe"
 msgstr "Відписатися"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr "Налаштовування властивостей спеціальних тек та оффлайн-тек"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Оболонка Evolutuion."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Параметри теки"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "80%"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Перейменувати цю групу ярликів"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Перемикнути стан показу панелі тек"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Прибрати панель ярликів"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Типовий пріоритет:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Типовий пріоритет:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Інтерфейс конфігурації пошти"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+#, fuzzy
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "Показувати долучення в тілі без обумовлення."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
 msgstr ""
-"Не вдалось перенести теку:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Додати теку"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Чернетки"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Вхідні"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Вихідні"
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "Відкриття типової теки завдань"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Відкриття типової теки завдань"
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Відіслано"
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Відкриття типової теки завдань"
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Відкриття типової теки завдань"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Перемикнути стан показу панелі тек"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Перемикнути стан показу панелі ярликів"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "Ел.пошта"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Не вдалося коректно поновити файли"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13752,7 +14798,7 @@ msgstr ""
 "%s\n"
 "Помилка: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13761,7 +14807,7 @@ msgstr ""
 "Сталася помилка під час копіювання файлів у\n"
 "`%s'."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13771,7 +14817,7 @@ msgstr ""
 "Файл \"%s\" не є каталогом.\n"
 "Щоб дозволити встановлення файлів користувача Evolution,пересуньте його."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13872,10 +14918,11 @@ msgstr ""
 "Неможливо змінити назву теки:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+msgid "The specified folder name is not valid: %s"
+msgstr "Вказана назва теки не правильна: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -13899,19 +14946,15 @@ msgstr ""
 "Неможливо створити вказану теку:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Створити нову теку"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Без імені)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Оберіть тип імпортера для виконання:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13924,11 +14967,11 @@ msgstr ""
 "Якщо тип вам невідомий, ви можете вибрати \"Автоматично\" та Evolution "
 "намагатиметься його визначити."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Вкажіть інформацію яку бажаєте імпортувати:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13936,7 +14979,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13945,21 +14988,21 @@ msgstr ""
 "Імпортування %s\n"
 "Імпортування елемента %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "Виберіть імпортер"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "Файлу %s не існує"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Помилка Evolution"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -13968,11 +15011,11 @@ msgstr ""
 "Немає імпортеру здатного обробити\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Імпортування"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -13981,17 +15024,17 @@ msgstr ""
 "Імпортування %s.\n"
 "Запуск %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Помилка запуску %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Помилка завантаження %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14000,35 +15043,35 @@ msgstr ""
 "Імпортування %s\n"
 "Імпортується елемент 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Назва файлу:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Вибрати файл"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Тип файлу:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Імпортувати дані й параметри з старіших програм"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Імпорт одного файлу"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -14036,47 +15079,28 @@ msgstr ""
 "Будь ласка зачекайте...\n"
 "Йде сканування наявних установок"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Запуск інтелектуального імпортера"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "Від %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Вибрати теку призначення для імпорту цих даних"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Імпорт"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Закриття з'єднань..."
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Помилка під час синхронізації \"%s\":\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "Синхронізація теки"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Синхронізація \"%s\" (%d з %d) ..."
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Параметри Evolution"
@@ -14111,7 +15135,7 @@ msgstr "Не вдалося відкрити загальну теку: %s"
 msgid "Cannot find the specified shared folder."
 msgstr "Неможливо знайти зазначену загальну теку."
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14120,17 +15144,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Помічник"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Новий"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Не вказано назви теки."
@@ -14188,64 +15206,51 @@ msgstr "Створити новий ярлик"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Вкажіть теку на яку буде вказувати етикетка:"
 
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "Працювати у мережі"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "Працювати автономно"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Робота не на лінії"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Жодної теки не відображено)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Немає)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution у мережевому режимі. Клацніть на цю кнопку для переходу до "
 "автономної роботи."
 
-#: shell/e-shell-view.c:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution у процесі переходу до автономної роботи."
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution зараз у автономному режимі. Клацніть на цю кнопку для "
 "переходу до роботи у мережі."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Неправильні аргументи"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Неможливо зареєструватись на OAF"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Не знайдено конфігураційної бази даних"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Загальна помилка"
 
@@ -14361,74 +15366,18 @@ msgstr "Видалити"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Видалити цей ярлик з панелі ярликів"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Помилка збереження ярликів."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Вхідні"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Ярлики"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Без помилок"
-
-#: shell/e-storage.c:573
-msgid "A folder with the same name already exists"
-msgstr "Тека з цією назвою вже існує"
-
-#: shell/e-storage.c:575
-msgid "The specified folder type is not valid"
-msgstr "Вказаний тип теки не правильний"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "Помилка вводу/виводу"
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr "Не вистачає місця для створення теки"
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr "Тека не порожня"
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "Вказаної теки не знайдено"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "Функцію не реалізовано для цього сховища"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "Операція не підтримується"
-
-#: shell/e-storage.c:591
-msgid "The specified type is not supported in this storage"
-msgstr "Вказаний тип не підтримується сховищем"
-
-#: shell/e-storage.c:593
-msgid "The specified folder cannot be modified or removed"
-msgstr "Вказану теку не можна змінити чи видалити"
-
-#: shell/e-storage.c:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "Неможливо зробити теку підтекою власної підтеки"
-
-#: shell/e-storage.c:597
-msgid "Cannot create a folder with that name"
-msgstr "Неможливо створити теку з цією назвою"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Ця операція не може бути виконана в режимі оффлайн"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr ""
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14439,6 +15388,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% виконано)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Новий"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "\"%s\" у \"%s\""
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14476,74 +15436,6 @@ msgstr ""
 "Помилка від системи активації:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "Помилка CORBA"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Перервано"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Неправильний аргумент"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Вже має власника"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Не має власника"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Не знайдено"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Не підтримуваний тип"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Схема не підтримується"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Операція не підтримується"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Внутрішня помилка"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Існує"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "Неправильний URI"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Має підтеки"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Не залишилося вільного простору"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "Старого власника знищено"
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Тип перевірки"
-
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr "Перевірочний компонент Evolutuion."
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "Active Connections"
@@ -14574,11 +15466,6 @@ msgstr "Пошта"
 msgid "_Tasks:"
 msgstr "_Завдання:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-#, fuzzy
-msgid "Folder _name:"
-msgstr "Назва теки:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 #, fuzzy
 msgid "Folder _type:"
@@ -14644,23 +15531,6 @@ msgstr ""
 "\n"
 "Щоб зберегти налаштовування клацніть кнопку \"Завершити\"."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "Налаштовування властивостей спеціальних тек та оффлайн-тек"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Оболонка Evolutuion."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Параметри теки"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Клацніть \"Імпорт\" для початку імпортування файлу в Evolution. "
@@ -14698,7 +15568,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Імпортери"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Імпорт"
 
@@ -14714,16 +15584,16 @@ msgstr "Більше не запитувати"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution може імпортувати дані з таких файлів:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Evolution завершує роботу..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14759,7 +15629,7 @@ msgstr ""
 "Сподіваємось вам сподобається результат нашої праці та\n"
 "ми із нетерпінням чекаємо на ваші внески!\n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -14767,36 +15637,48 @@ msgstr ""
 "Дякуємо\n"
 "Команда розробників Ximian Evolution\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr "Більше не казати"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Неможливо зв'язатись з оболонкою Ximian Evolutuion."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Неможливо ініціалізувати оболонку Ximian Evolutuion: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Починати в режимі оффлайн"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Починати в режимі онлайн"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Записувати інформацію налагодження всіх компонентів у файл."
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14805,31 +15687,60 @@ msgstr ""
 "%s: --online та --offline не можуть бути використані разом.\n"
 "  Use %s --help для більш докладної інформації.\n"
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Виберіть імпортер"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "Ідентифікатор сертифіката:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "Поступ"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Вираз"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Електронна адреса:"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"Строк дії сертифікату вийшов: %s\n"
+"Подавець: %s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14887,91 +15798,373 @@ msgid "Backup All"
 msgstr "Блекпул"
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "Ідентифікатор сертифіката:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Сертифікат не має довіри"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "Ідентифікатор сертифіката:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Загальна назва"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "Ідентифікатор сертифіката:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "_Редагування"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Збір перевірки сертифікатів."
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Вираз"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Організація"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Організаційна одиниця"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Вигляд"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "Ідентифікатор сертифіката:"
+
+#: smime/gui/smime-ui.glade.h:42
+#, fuzzy
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr "Неправильне повноваження сертифіката (CA)"
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "Ідентифікатор сертифіката:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Імпорт"
+msgid "Certificate already exists"
+msgstr "Ідентифікатор картки вже існує"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d.%m.%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Питання"
+
+#: smime/lib/e-cert.c:488
+msgid "Version 1"
+msgstr ""
+
+#: smime/lib/e-cert.c:491
+msgid "Version 2"
+msgstr ""
+
+#: smime/lib/e-cert.c:494
+msgid "Version 3"
+msgstr ""
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "Пн"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "Гаразд"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "Пн"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "Ідентифікатор сертифіката:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "Ідентифікатор сертифіката:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "Сертифікат не має довіри"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "Iдентиф"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Тема - %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Не вдалося обробити буферну теку"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "Неправильне повноваження сертифіката (CA)"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Неправильне повноваження сертифіката (CA)"
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Параметри"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Немає інформації"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "долучення"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "Ідентифікатор сертифіката:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Хорватія"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "Півн. Кароліна"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Вираз"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s на %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Помилка підпису сертифікату"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "Вставити"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Тема - %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Помилка підпису сертифікату"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Введіть пароль для %s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "Ідентифікатор сертифіката:"
 
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
@@ -15022,7 +16215,7 @@ msgstr "Скопіювати вибране"
 msgid "Copy to Folder..."
 msgstr "Скопіювати до теки..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Вирізати вибране"
 
@@ -15038,7 +16231,7 @@ msgstr "Перенести контакти в іншу теку..."
 msgid "Move to Folder..."
 msgstr "Перенести до теки..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Вставити вміст кишені"
 
@@ -15046,8 +16239,8 @@ msgstr "Вставити вміст кишені"
 msgid "Previews the contacts to be printed"
 msgstr "Переглянути контакти, що буде надруковано"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Перегляд друку"
@@ -15092,13 +16285,13 @@ msgstr "Зупинити завантаження"
 msgid "View the current contact"
 msgstr "Переглянути поточний контакт."
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "Дії"
 
@@ -15128,146 +16321,114 @@ msgstr "Відіслати повідомлення за контактом..."
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "Створити нову щоденну зустріч"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Створити нову зустріч"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "Створити нову теку"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Створити новий запит на засідання"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Створити нову завдання"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "День"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 #, fuzzy
 msgid "Delete All Occurrences"
 msgstr "Стерти всі екземпляри"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Стерти зустріч"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "Стерти цей екземпляр"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "Стерти цей екземпляр"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Перейти"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Перейти назад"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Перейти вперед"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Перейти до дати"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Перейти до вказаної дати"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Сьогодні"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "Список"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Місяць"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Нова зустріч"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Нова Каледонія"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Нове засідання"
-
-#: ui/evolution-calendar.xml.h:27
-#, fuzzy
-msgid "New _Task"
-msgstr "Нове завдання"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Переглянути календар, що буде надруковано"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Надрукувати цей календар"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Опублікувати інформацію про зайнятість для цього календаря"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Сторінка"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr ""
 "Тека загального користування, що містить інформацію про зустрічі та події"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Показати подробиці"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Показати один день"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Показати один місяць"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Показати один тиждень"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Показати робочий тиждень"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Тиждень"
 
@@ -15332,7 +16493,7 @@ msgstr "Зберегти цей елемент на диску"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "Файл"
 
@@ -15554,7 +16715,7 @@ msgstr "Позначити всі про_читаними"
 msgid "Mark all visible messages as read"
 msgstr "Позначити всі видимі повідомлення як прочитані"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "Вставити повідомлення у кишеню"
 
@@ -15610,16 +16771,6 @@ msgstr "Інвертувати вибір"
 msgid "_Threaded Message List"
 msgstr "Розбитий на гілки список повідомлень"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Закрити це вікно"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "За_крити"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "Додати відправника в адресну книгу"
@@ -15779,258 +16930,283 @@ msgstr "Переслати вибране повідомлення до кого
 msgid "Increase the text size"
 msgstr "Збільшити розмір тексту"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Завантажити зображення"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Позначити як важливі"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Позначити непрочитаним"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Позначити як неважливі"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "Позначити вибрані повідомлення як прочитані"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "Позначити вибрані повідомлення як важливі"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Позначити вибрані повідомлення як неважливі"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Позначити вибрані повідомлення як непрочитані"
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Позначити вибрані повідомлення як непрочитані"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Позначити вибрані повідомлення як неважливі"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Позначити вибрані повідомлення до видалення"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Перенести"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "Перенести вибрані повідомлення у іншу теку"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Далі"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "Наступне важливе повідомлення"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "Наступна гілка"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "Наступне непрочитане повідомлення"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Не знайдено"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Відкрити вибране повідомлення у новому вікні"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 "Відкрити вибране повідомлення у редакторі для його повторного надсилання"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Оригінальний розмір"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "Попереднє непрочитане повідомлення"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Надіслати відповідь"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr "Надіслати відповідь на повідомлення в загальну теку"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "Попереднє важливе повідомлення"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Переглянути повідомлення, що буде надруковано"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Попереднє"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Надрукувати це повідомлення"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "Перенаправити"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Перенаправити вибране повідомлення до когось"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Повернути оригінальний розмір тексту"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "Пошук повідомлення..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "Менше"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Зберегти повідомлення як текстовий файл"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Шукати у тексті відображеного повідомлення"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr "Налаштовування параметрів сторінки для вашого поточного принтера"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Показувати повні заголовки"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Показати повні заголовки"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Шукати у тексті відображеного повідомлення"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Показати повідомлення у звичайному стилі"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Показати повідомлення з поштовими заголовками"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Показати повний вигідний текст повідомлення"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "Розмір тексту"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Відновити вибрані повідомлення"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "Віртуальна тека за списком листування..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "Віртуальна тека за відправником..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "Віртуальна тека за отримувачами..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "Віртуальна тека за темою..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "До_лучити"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "С_копіювати у теку"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "С_творити фільтр з повідомлення"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "Пе_реслати повідомлення"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "Перейти _до"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "В _тілі"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "_Більше"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "_Показати повідомлення"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "Пере_нести в теку"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "_Наступне повідомлення"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "_Звичайне відображення"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "Відкрити повідомлення"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "_Попереднє повідомлення"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "Про_цитовано"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "Надіслати повтор_но..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "_Інструменти"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "Відновити"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Закрити це вікно"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "За_крити"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Долучити"
@@ -16309,12 +17485,13 @@ msgid "Change Evolution's settings"
 msgstr "Змінити налаштовування Evolutuion."
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "Вийти"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Створити новий запит на засідання"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "Вікно Evolution"
+msgid "E_xit"
+msgstr "Вийти"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16326,61 +17503,74 @@ msgstr "Імпорт даних з інших програм"
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "Вікно Evolution"
+msgid "Open a new window"
+msgstr "Відкрити у новому вікні"
 
 #: ui/evolution.xml.h:11
 msgid "Pi_lot Settings..."
 msgstr "Установки пілота..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Відіслати / отримати"
+
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr "Відіслати повідомлення з черги та отримати нові"
+
+#: ui/evolution.xml.h:14
 msgid "Set up Pilot configuration"
 msgstr "Налаштувати Пілот"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Показати інформацію про Ximian Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Підготувати звіт про помилку"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "Відіслати звіт про помилку"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Відіслати звіт про помилку за допомогою Bug Buddy"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Перемикнути"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Перемикнути стан роботи на лінії"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "Часті запитання щодо Ximian Evolution"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "Про Ximian Evolution..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "Довідка"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "Імпорт..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "Новий"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "Відіслати / отримати"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "З_найти зараз"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Надрукувати зведення"
@@ -16511,12 +17701,12 @@ msgstr "Визначити відображення"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "ПВСЧПСН"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -16649,7 +17839,7 @@ msgstr "Пошук"
 msgid "_Find Now"
 msgstr "З_найти зараз"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "О_чистити"
 
@@ -16665,24 +17855,257 @@ msgstr "ID піделементу"
 msgid "Text"
 msgstr "Тест"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Очистити"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Знайти зараз"
 
+#~ msgid "Account Name"
+#~ msgstr "Назва рахунку"
+
+#~ msgid "Server Name"
+#~ msgstr "Назва сервера"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "Evolution було скомпільовано без підтримки LDAP"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Інші контакти"
+
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "Налаштування доступу до серверів каталогів LDAP"
+
+#~ msgid "Directory Servers"
+#~ msgstr "Сервери каталогів"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Скасувати поточну поштову операцію"
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Інтерфейс вибору імені у книзі адрес Evolution"
+
+#~ msgid "Add LDAP Server"
+#~ msgstr "Додати cервер LDAP"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Крок 4: Ім'я для відображення"
+
+#~ msgid "Find contact in"
+#~ msgstr "Знайти контакт у"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Клацніть тут щоб додати контакт *"
+
+#~ msgid "Business Address"
+#~ msgstr "Робоча адреса"
+
+#~ msgid "Department"
+#~ msgstr "Відділ"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "URL зайнятості"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Професія"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Відкривання завдань на %s"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Відіслати все одно?"
+
+#, fuzzy
+#~ msgid "Folder _name"
+#~ msgstr "Назва теки:"
+
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "Це повідомлення підписано цифровим підписом. Додаткову інформацію можна "
+#~ "отримати,якщо клацнути на піктограмі із замком."
+
+#~ msgid "Connecting..."
+#~ msgstr "З'єднання..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Ця тека не може містити повідомлення."
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Не вдалося відкрити загальну теку: %s"
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Вибрати теку призначення для імпорту цих даних"
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не вдалось перенести теку:\n"
+#~ "%s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "Додати теку"
+
+#~ msgid "Drafts"
+#~ msgstr "Чернетки"
+
+#~ msgid "Outbox"
+#~ msgstr "Вихідні"
+
+#~ msgid "Sent"
+#~ msgstr "Відіслано"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Помилка під час синхронізації \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "Синхронізація теки"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Синхронізація \"%s\" (%d з %d) ..."
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Жодної теки не відображено)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(Немає)"
+
+#~ msgid "No error"
+#~ msgstr "Без помилок"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Тека з цією назвою вже існує"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Вказаний тип теки не правильний"
+
+#~ msgid "I/O error"
+#~ msgstr "Помилка вводу/виводу"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Не вистачає місця для створення теки"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Тека не порожня"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Вказаної теки не знайдено"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Функцію не реалізовано для цього сховища"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Операція не підтримується"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Вказаний тип не підтримується сховищем"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Вказану теку не можна змінити чи видалити"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "Неможливо зробити теку підтекою власної підтеки"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Неможливо створити теку з цією назвою"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Ця операція не може бути виконана в режимі оффлайн"
+
+#~ msgid "CORBA error"
+#~ msgstr "Помилка CORBA"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Неправильний аргумент"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Вже має власника"
+
+#~ msgid "No owner"
+#~ msgstr "Не має власника"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Не підтримуваний тип"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Схема не підтримується"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Операція не підтримується"
+
+#~ msgid "Internal error"
+#~ msgstr "Внутрішня помилка"
+
+#~ msgid "Exists"
+#~ msgstr "Існує"
+
+#~ msgid "Invalid URI"
+#~ msgstr "Неправильний URI"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Має підтеки"
+
+#~ msgid "No space left"
+#~ msgstr "Не залишилося вільного простору"
+
+#~ msgid "Old owner has died"
+#~ msgstr "Старого власника знищено"
+
+#~ msgid "Test type"
+#~ msgstr "Тип перевірки"
+
+#~ msgid "Evolution Test Component"
+#~ msgstr "Перевірочний компонент Evolutuion."
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "Імпорт"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Створити нову щоденну зустріч"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Нова зустріч"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Нове засідання"
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Назва поля"
+#~ msgid "New _Task"
+#~ msgstr "Нове завдання"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "Вікно Evolution"
 
-#~ msgid "Family Name"
-#~ msgstr "Прізвище"
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "Вікно Evolution"
+
+#~ msgid "Toggle"
+#~ msgstr "Перемикнути"
+
+#~ msgid "Clear"
+#~ msgstr "Очистити"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Скасувати поточну поштову операцію"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -16774,9 +18197,6 @@ msgstr "Знайти зараз"
 #~ msgid "Evolution VCard importer"
 #~ msgstr "Редактор пошти Evolutuion."
 
-#~ msgid "Loading..."
-#~ msgstr "Завантаження..."
-
 #~ msgid "Searching..."
 #~ msgstr "Пошук..."
 
@@ -16828,10 +18248,6 @@ msgstr "Знайти зараз"
 #~ msgstr "Неможливо завантажити EBook\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "Ідентифікатор картки вже існує"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Операцію скасовано"
 
@@ -16981,9 +18397,6 @@ msgstr "Знайти зараз"
 #~ msgid "Callback"
 #~ msgstr "Зворотній дзвінок"
 
-#~ msgid "Company"
-#~ msgstr "Компанія"
-
 #~ msgid "Comp"
 #~ msgstr "Комп."
 
@@ -17048,9 +18461,6 @@ msgstr "Знайти зараз"
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#~ msgid "Phone"
-#~ msgstr "Телефон"
-
 #~ msgid "Birth date"
 #~ msgstr "Дата народження"
 
@@ -17060,9 +18470,6 @@ msgstr "Знайти зараз"
 #~ msgid "Arbitrary"
 #~ msgstr "Довільний"
 
-#~ msgid "ID"
-#~ msgstr "Iдентиф"
-
 #~ msgid "Last Use"
 #~ msgstr "Востаннє використано"
 
@@ -17075,9 +18482,6 @@ msgstr "Знайти зараз"
 #~ msgid "Folder containing contact information"
 #~ msgstr "Тека, що містить контактну інформацію"
 
-#~ msgid "LDAP Server"
-#~ msgstr "Сервер LDAP"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "Сервер LDAP, що містить контактну інформацію"
 
@@ -17087,18 +18491,6 @@ msgstr "Знайти зараз"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Публічна тека, що містить інформацію про контакти"
 
-#~ msgid "_Contact"
-#~ msgstr "_Контакт"
-
-#~ msgid "Create a new contact"
-#~ msgstr "Створити новий контакт"
-
-#~ msgid "New Contact List"
-#~ msgstr "Новий список контактів"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "Створити новий список контактів"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "URI, що буде показано переглядачем тек"
 
@@ -17114,9 +18506,6 @@ msgstr "Знайти зараз"
 #~ msgid "Is New Card"
 #~ msgstr "Є нова картка"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "Немає карток"
 
@@ -17162,31 +18551,6 @@ msgstr "Знайти зараз"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "Тека загального користування, що містить елементи \"Виконати\""
 
-#~ msgid "New appointment"
-#~ msgstr "Нова зустріч"
-
-#~ msgid "_Appointment"
-#~ msgstr "_Зустріч"
-
-#~ msgid "New meeting"
-#~ msgstr "Нове засідання"
-
-#, fuzzy
-#~ msgid "M_eeting"
-#~ msgstr "Засідання"
-
-#~ msgid "New task"
-#~ msgstr "Нове завдання"
-
-#~ msgid "_Task"
-#~ msgstr "Завдання"
-
-#~ msgid "New All Day Appointment"
-#~ msgstr "Нова щоденна зустріч"
-
-#~ msgid "All _Day Appointment"
-#~ msgstr "_Щоденна зустріч"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "Не вдалося поновити неправильний об'єкт"
 
@@ -17232,9 +18596,6 @@ msgstr "Знайти зараз"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "Відкривання календаря на %s"
 
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Відкриття типової теки завдань"
-
 #~ msgid "Evaluation of the search expression did not yield a boolean value"
 #~ msgstr "Виконання пошуку не дало логічного значення"
 
@@ -17275,10 +18636,6 @@ msgstr "Знайти зараз"
 #~ "Evolution знайшов файли GnomeCard.\n"
 #~ "Чи бажаєте ви імпортувати їх у Evolution?"
 
-#, fuzzy
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Інтерфейс конфігурації пошти"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "Тека, що містить пошту"
 
@@ -17294,9 +18651,6 @@ msgstr "Знайти зараз"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Віртуальна тека смітника"
 
-#~ msgid "Properties..."
-#~ msgstr "Властивості..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Змінити властивості цієї теки"
 
@@ -17306,15 +18660,6 @@ msgstr "Знайти зараз"
 #~ msgid "You have unsent messages, do you wish to quit anyway?"
 #~ msgstr "Ви скинули повідомлення, бажаєте вийти все одно?"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Нове поштове повідомлення"
-
-#~ msgid "_Mail Message"
-#~ msgstr "Поштове повідомлення"
-
-#~ msgid "Compose a new mail message"
-#~ msgstr "Створити нове поштове повідомлення"
-
 #~ msgid "New Message Post"
 #~ msgstr "Надіслати нове повідомлення"
 
@@ -18674,9 +20019,6 @@ msgstr "Знайти зараз"
 #~ msgid "North Bend"
 #~ msgstr "Північний Бенд"
 
-#~ msgid "North Carolina"
-#~ msgstr "Півн. Кароліна"
-
 #~ msgid "North Dakota"
 #~ msgstr "Півн. Дакота"
 
@@ -19152,10 +20494,6 @@ msgstr "Знайти зараз"
 #~ msgstr "Дата виконання:"
 
 #, fuzzy
-#~ msgid "Stauning"
-#~ msgstr "Параметри"
-
-#, fuzzy
 #~ msgid "Staverton"
 #~ msgstr "Параметри"
 
@@ -19502,10 +20840,6 @@ msgstr "Знайти зараз"
 #~ msgstr "Об'єднані Арабські Емірати"
 
 #, fuzzy
-#~ msgid "Unst"
-#~ msgstr "Не прочитано"
-
-#, fuzzy
 #~ msgid "Uruapan"
 #~ msgstr "Японія"
 
@@ -19831,9 +21165,6 @@ msgstr "Знайти зараз"
 #~ msgid " F"
 #~ msgstr " F"
 
-#~ msgid " C"
-#~ msgstr " C"
-
 #~ msgid "knots"
 #~ msgstr "вузол (1,87км/год)"
 
@@ -20422,9 +21753,6 @@ msgstr "Знайти зараз"
 #~ msgid "Drifting haze"
 #~ msgstr "Дрейфуючий туман"
 
-#~ msgid "Spray"
-#~ msgstr "Бризки"
-
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Бризки на околицях"
 
@@ -20718,18 +22046,6 @@ msgstr "Знайти зараз"
 #~ "Видалити теку, яку було додано командою \"Відкрити теки інших користувачів"
 #~ "\""
 
-#~ msgid "Send / Receive"
-#~ msgstr "Відіслати / отримати"
-
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Відіслати повідомлення з черги та отримати нові"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Перемикнути стан показу панелі тек"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Перемикнути стан показу панелі ярликів"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Показати вибрану теки"
 
@@ -20757,9 +22073,6 @@ msgstr "Знайти зараз"
 #~ msgid "_Rename..."
 #~ msgstr "Перейменувати..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "Відіслати / отримати"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "Панель ярликів"
 
@@ -20772,9 +22085,6 @@ msgstr "Знайти зараз"
 #~ msgid "Error"
 #~ msgstr "Помилка"
 
-#~ msgid "Question"
-#~ msgstr "Питання"
-
 #, fuzzy
 #~ msgid "Evolution Addressbook local file backend"
 #~ msgstr "Переглядач мінікартки адресної книги Evolution"
@@ -20808,9 +22118,6 @@ msgstr "Знайти зараз"
 #~ msgid "Font Preferences"
 #~ msgstr "Вподобання шрифтів"
 
-#~ msgid "Automatically _detect links"
-#~ msgstr "Автоматично знаходити зв'язки"
-
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 
diff --git a/po/vi.po b/po/vi.po
index e4246e7e57..cc81165350 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution VERSION\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-02-23 08:29+0700\n"
 "Last-Translator: pclouds <pclouds@gmx.net>\n"
 "Language-Team: GnomeVI <gnomevi-list@lists.sourceforge.net>\n"
@@ -28,51 +28,191 @@ msgstr "Không thể nạp %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Không thể đọc khối ứng dụng địa chỉ của pilot"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Thư mục tự động hoàn chỉnh"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "_ID Chứng nhận:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Cấu hình tài khoản thư ở đây"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Liên lạc"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Sửa Sổ địa chỉ"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Factory popup địa chỉ của Sổ địa chỉ"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Bộ xem Minicard sổ địa chỉ evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Bộ xem Minicard sổ địa chỉ evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Thành phần kiểm tra Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Bộ xem Minicard sổ địa chỉ evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Thành phần tóm tắt thư của Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Factory Điều khiển cấu hình Tóm tắt Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Sổ địa chỉ"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Thuộc tính..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Xoá"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "Đổi tên"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Liên lạc mới:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Liên lạc"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "Tạo liên lạc mới"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Danh sách liên lạc mới"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "_Danh sách liên lạc mới"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "Tạo danh sách liên lạc mới"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Cá nhân"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Công việc"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "LDAP Server"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Không thể tạo thư mục %s: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "Lỗi kết nối tới LDAP server."
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "Lỗi xác thực với LDAP server"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "Không thể thực hiện truy vấn tại Root DSE"
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "Server trả lời không hỗ trợ cơ sở tìm kiếm"
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Server này không hỗ trợ thông tin schema LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "Lỗi nhận thông tin schema"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 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:1636
-msgid "Account Name"
-msgstr "Tên tài khoản"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Tên server"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-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-storage.c:178
-msgid "Other Contacts"
-msgstr "Liên lạc khác"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -80,7 +220,7 @@ msgstr ""
 "Không thể mở sổ địa chỉ này. Vui lòng kiểm tra lại đường dẫn có tồn tại\n"
 "hay không và bạn có quyền truy cập vào đường dẫn đó hay không."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -90,7 +230,7 @@ msgstr ""
 "do bạn đã nhập sai URI, hoặc là do LDAP server \n"
 "không hoạt động."
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -102,7 +242,7 @@ msgstr ""
 "lại chương trình từ mã nguồn sau khi nhận OpenLDAP từ địa chỉ\n"
 "dưới đây.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -116,44 +256,43 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Không thể mở sổ địa chỉ"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "Truy cập vô danh tới LDAP server"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "Lỗi xác thực.\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sNhập mật khẩu cho %s (người dùng %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "Tên bắt đầu bằng"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "Thư bắt đầu bằng"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Phân loại "
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Bất kỳ trường nào chứa"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Nâng cao..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -165,7 +304,7 @@ msgstr ""
 "xác hơn hoặc tăng giới hạn kết quả trong Thông số server thư\n"
 "mục cho sổ địa chỉ này."
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -176,95 +315,41 @@ msgstr ""
 "do bạn cấu hình cho sổ địa chỉ này. Vui lòng tìm kiếm chính xác hơn hoặc\n"
 "tăng giới hạn thời gian trong thông số server thư mục cho sổ địa chỉ này."
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Backend cho sổ địa chỉ này không thể phân tích truy vấn này."
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Backend cho sổ địa chỉ này không thể thực hiện truy vấn này."
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "Truy vấn không hoàn tất."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Bất kỳ phân loại nào"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "URI mà lịch sẽ hiển thị"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "_ID Chứng nhận:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "Cấu hình truy cập tới LDAP server ở đây"
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Liên lạc"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "Server thư mục"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Sửa Sổ địa chỉ"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Giao diên chọn tên sổ địa chỉ của Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Factory popup địa chỉ của Sổ địa chỉ"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Bộ xem Minicard sổ địa chỉ evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Bộ xem Minicard sổ địa chỉ evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Thành phần kiểm tra Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Bộ xem Minicard sổ địa chỉ evolution"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Thành phần tóm tắt thư của Evolution."
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -287,6 +372,7 @@ msgstr "  _Hiện cơ sở được hỗ trợ "
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -321,8 +407,8 @@ msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Add LDAP Server"
-msgstr "LDAP Server"
+msgid "Addressbook Creation Assistant"
+msgstr "Phụ tá cấu hình LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -338,9 +424,9 @@ msgid "Anonymously"
 msgstr "Vô danh"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -350,49 +436,50 @@ msgstr ""
 "\n"
 "Vui lòng nhấn nút \"Hoàn tất\" để lưu thiết lập bạn đã nhập ở đây."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "Đang kết nối"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "Tên _phân biệt:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Edit LDAP Server"
 msgstr "LDAP Server"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address:"
 msgstr "Địa chỉ _email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution sẽ dùng DN này để xác thực bạn với server"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr "Evolution dùng địa chỉ email này để xác thực bạn với server"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "Hoàn tất"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Chung"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "Phụ tá cấu hình LDAP"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "Nhóm"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Không bao giờ"
 
@@ -419,8 +506,8 @@ msgid "S_earch scope: "
 msgstr "_Phạm vị tìm: "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Đang tìm"
 
@@ -473,26 +560,30 @@ msgstr ""
 "cho tìm kiếm LDAP, cũng như tạo và sửa các liên lạc."
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 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:48
-msgid "Step 1: Server Information"
-msgstr "Bước 1: Thông tin server"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "Bước 2: Kết nối tới server"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "Bước 1: Thông tin server"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "Bước 3: Tìm thư mục"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Bước 2: Kết nối tới server"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "Bước 4: Tên hiển thị"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Bước 3: Tìm thư mục"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -504,18 +595,6 @@ msgstr "Cơ sở tìm được hỗ trợ"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"Bước đầu tiên trong cấu hình LDAP server là để cho biết tên của nó, và "
-"thông\n"
-"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:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -526,7 +605,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:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -536,7 +615,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:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -551,15 +630,14 @@ msgstr ""
 "mục\n"
 "nằm trong cơ sở tìm.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
 #, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "Trợ tá này giúp bạn truy cập dịch vụ thư mục trực tuyến dùng\n"
 "LDAP server (Giao thức truy cập thư mục hạng nhẹ - Lightweight\n"
@@ -568,20 +646,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:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 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:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 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:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -590,7 +668,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:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -600,6 +678,16 @@ msgstr ""
 "Evolution.\n"
 "Chỉ được dùng với mục đích hiển thị thôi."
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Đây là tên, cho server này, sẽ được hiển thị trong danh sách thư mục "
+"Evolution.\n"
+"Chỉ được dùng với mục đích hiển thị thôi."
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -628,21 +716,34 @@ msgid "Using email address"
 msgstr "Dùng địa chỉ email"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: 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:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+"Bước đầu tiên trong cấu hình LDAP server là để cho biết tên của nó, và "
+"thông\n"
+"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:85
 msgid "_Display name:"
 msgstr "Tên _hiển thị:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "_Ngưỡng tải về:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -650,54 +751,53 @@ msgstr "_Ngưỡng tải về:"
 msgid "_Edit"
 msgstr "_Sửa"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "Cách đăng _nhập:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "_Số hiệu cổng:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "_Cơ sở tìm:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "Tên Ser_ver:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "Thời _hạn (phút):"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "card"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr "searching-tab"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Tên"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
+msgstr "Giao diên chọn tên sổ địa chỉ của Evolution."
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Loại bỏ tất cả"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Loại bỏ"
@@ -726,24 +826,21 @@ msgstr "Thêm vào liên lạc"
 msgid "Unnamed Contact"
 msgstr "Liên lạc vô danh"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Tên"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Nguồn"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 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:647
-msgid "Find contact in"
-msgstr "Tìm liên lạc trong"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Giao diên chọn tên sổ địa chỉ của Evolution."
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Tìm"
@@ -823,7 +920,8 @@ msgid "D_epartment:"
 msgstr "Cơ _quan:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Chi tiết"
 
@@ -893,12 +991,12 @@ msgid "_Categories..."
 msgstr "_Phân loại.."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Xóa"
@@ -2028,7 +2126,7 @@ msgid "Esq."
 msgstr "Esq."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Tên đầy đủ"
 
@@ -2123,11 +2221,27 @@ 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/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Liên lạc đã đổi:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Liên lạc xung đột:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Phát hiện liên lạc trùng"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Tên hoặc email đã thay đổi của liên lạc này đã có rồi.\n"
+"Bạn có muốn thêm nữa không?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Liên lạc mới:"
@@ -2144,22 +2258,6 @@ msgstr ""
 "Tên hoặc địa chỉ email của liên lạc này đã có rồi.\n"
 "Bạn có muốn thêm nó nữa?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Liên lạc đã đổi:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Liên lạc xung đột:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"Tên hoặc email đã thay đổi của liên lạc này đã có rồi.\n"
-"Bạn có muốn thêm nữa không?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2258,9 +2356,9 @@ msgstr "Chuyển tiếp liên lạc"
 msgid "Send Message to Contact"
 msgstr "Gửi thông điệp cho liên lạc"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "In"
@@ -2282,9 +2380,12 @@ msgstr "Chuyển tới thư mục..."
 msgid "Cut"
 msgstr "Cắt"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Sao chép"
 
@@ -2293,16 +2394,8 @@ msgstr "Sao chép"
 msgid "Paste"
 msgstr "Dán"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Xoá"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "Khung xem hiện thời"
 
@@ -2318,166 +2411,170 @@ msgstr ""
 "đã 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:2
 msgid "Assistant"
 msgstr "Phụ tá"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Fax Kinh doanh"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Điện thoại kinh doanh"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Điện thoại kinh doanh 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Số gọi lại"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Điện thoại xe"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Phân loại"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Điện thoại công ty"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Cơ quan"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "Email 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "Email 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Tên gia đình"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Tập tin là"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "URL rảnh"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Địa chỉ nhà"
+#, fuzzy
+msgid "Given Name"
+msgstr "Tên trường"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Fax ở Nhà"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Điện thoại nhà"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Điện thoại nhà 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Điện thoại"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Jordan"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Quản lý"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Điện thoại di động"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Tên hiệu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Ghi chú"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Văn phòng"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Tổ chức"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Địa chỉ khác"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Fax khác"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Điện thoại khác"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Bộ dàn trang"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Điện thoại chính"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Giáo sư"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Rađiô"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Vai trò"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Vợ/Chồng"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Tựa đề"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Unst"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Web Site"
 
@@ -2570,11 +2667,19 @@ msgstr "Thành viên"
 msgid "Job Title"
 msgstr "Tên n_ghề:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Địa chỉ nhà"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Địa chỉ nhà"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Địa chỉ khác"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2587,112 +2692,109 @@ msgstr "Fax ở Nhà"
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Thành công"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Lỗi lại"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Kho ngoại tuyến"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Không đủ quyền truy cập"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Không có card"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Card ID đã tồn tại"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Chưa hỗ trợ giao thức này"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Bị hủy bỏ"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "Xác thực thất bại"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "Yêu cầu xác thực"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "Không có TLS"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "Sổ địa chỉ không tồn tại"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Lỗi khác"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Bạn có muốn lưu các thay đổi không?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr "_Hủy"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Lỗi khi thêm danh sách"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Lỗi khi thêm card"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Lỗi khi sửa đổi danh sách"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Lỗi khi sửa đổi card"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Lỗi khi loại bỏ danh sách"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Lỗi khi loại bỏ card"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2701,7 +2803,7 @@ msgstr ""
 "Việc mở %d card sẽ mở %d cửa sổ mới cùng lúc.\n"
 "Bạn có thật sự muốn hiển thị mọi tấm card này không?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2710,49 +2812,49 @@ msgstr ""
 "%s đã tồn tại.\n"
 "Bạn có muốn ghi đè lên nó?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "Ghi đè"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Lỗi lưu %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "danh sách"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Chuyển Card tới"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Chép Card tới"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Chuyển các Card tới"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Chép các Card tới"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Nhiều VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard cho %s"
@@ -2948,7 +3050,7 @@ msgstr "Biên"
 msgid "Number of columns:"
 msgstr "Số cột:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Tùy chọn"
 
@@ -3135,18 +3237,18 @@ msgstr "Danh sách vô danh"
 msgid "Split Multi-Day Events:"
 msgstr "Tácg sự kiện nhiều ngày:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Không thể khởi động wombat server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Không thể khởi động wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Không thể đọc khối ứng dụng lịch của pilot"
 
@@ -3154,24 +3256,90 @@ msgstr "Không thể đọc khối ứng dụng lịch của pilot"
 msgid "Default Priority:"
 msgstr "Độ ưu tiên mặc định:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Không thể đọc khối ứng dụng ToDo của pilot"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Công việc và Lịch"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Lịch"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Cấu hình múi giờ, lịch và danh sách công việc ở đây "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Công việc và Lịch"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Factory Điều khiển cấu hình Tóm tắt Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Bộ xem lịch iTip/iMip Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Bộ xem lịch iTip/iMip Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Bộ soạn tin Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Bộ soạn tin Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Thành phần hiển thị thư mục của Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Thành phần kiểm tra Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Công việc"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Factory Dịch vụ báo động"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Bắt đầu:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Kết thúc:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Báo động Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Báo động khi %s"
@@ -3246,44 +3414,173 @@ msgstr ""
 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/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Factory Dịch vụ báo động"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Không thể khởi động Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Không thể khởi động gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Không thể tạo factory Dịch vụ thông báo"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "thời gian không hợp lệ"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "Lỗi iCalendar"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Màu công việc trong ngày"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Màu công việc trong ngày"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "_Hiện thời điểm kết thúc cuộc hẹn trong tuần và trong tháng"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Xem trước lịch cần in"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#, fuzzy
+msgid "Units of default reminder"
+msgstr "Tạo cuộc hẹn mới với bộ _nhắc nhở mặc định"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "Hỏi xác thực khi _xóa mục"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "Hỏi xác thực khi _xóa mục"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Xoá công việc được chọn"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Hiện số tuần trong bộ duyệt ngày"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Tóm tắt chứa"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Mô tả chứa"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Ghi chú chứa"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Không khớp"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3295,81 +3592,111 @@ msgstr ""
 "\n"
 "Bạn có thật sự muốn xóa những công việc này không?"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "trả về nhỏ hơn"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "ngày"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "In lịch"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "New Caledonia"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "Cuộc hẹn mới"
+
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "_Cuộc hẹn"
+
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Tạo cuộc hẹn mới"
+
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "Cuộc họp mới"
+
+#: calendar/gui/calendar-component.c:640
 #, fuzzy
-msgid "Rename"
-msgstr "Đổi tên"
+msgid "M_eeting"
+msgstr "Cuộc họp"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:641
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Tạo yêu cầu cuộc họp mới"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Cá nhân"
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Cuộc hẹn nguyên ngày mới"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Công việc"
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr "Cuộc hẹn n_guyên ngày"
+
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Tạo cuộc hẹn mới"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3490,7 +3817,7 @@ msgstr "Gửi"
 msgid "With these arguments:"
 msgstr "Với tham số này:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr ""
 
@@ -3506,6 +3833,10 @@ msgstr "giờ"
 msgid "minutes"
 msgstr "phút"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3539,8 +3870,8 @@ msgstr "Gửi thư"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Tóm tắt:"
 
@@ -3569,7 +3900,7 @@ msgstr "kết thúc cuộc hẹn"
 msgid "hour(s)"
 msgstr "giờ"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "phút"
 
@@ -3623,7 +3954,7 @@ msgstr "Ngày"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Thứ Sáu"
 
@@ -3637,7 +3968,7 @@ msgstr "Phút"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Thứ Hai"
 
@@ -3647,7 +3978,7 @@ msgstr "_CN"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Thứ Bảy"
 
@@ -3661,7 +3992,7 @@ 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:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Chủ nhật"
 
@@ -3679,7 +4010,7 @@ msgstr "Danh sách công việc"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Thứ Năm"
 
@@ -3697,7 +4028,7 @@ msgstr "Dạng thức thời gian:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Thứ Ba"
 
@@ -3707,12 +4038,12 @@ msgstr "Tuần _bắt đầu:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Thứ Tư"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Tuần làm việc"
 
@@ -3749,7 +4080,7 @@ msgid "_Fri"
 msgstr "_Sáu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Chung"
 
@@ -3789,7 +4120,7 @@ msgstr "_Tư"
 msgid "before every appointment"
 msgstr "trước khi mỗi cuộc hẹn"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
@@ -3797,11 +4128,11 @@ msgstr ""
 "Sự kiện này sẽ bị xóa khỏi cuộc họp, bạn có muốn gửi thông báo hủy sự kiện "
 "này không?"
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Bạn có chắc muốn hủy bỏ và xoá cuộc họp này?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
@@ -3809,64 +4140,64 @@ 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:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Bạn có chắc muốn hủy bỏ và xóa công việc này?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Bạn có chắc muốn hủy bỏ và xóa mục nhật ký này?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Sự kiện đã bị xóa."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Công việc đã bị xóa."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Mục nhật ký đã bị xóa"
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Bạn đã tạo ra một vài thay đổi. Bỏ qua những thay đổi này và đóng bộ "
 "biên soạn?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Bạn chưa thay đổi gì, đóng bộ biên soạn?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Sự kiện này đã thay đổi."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Công việc này đã thay đổi."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Mục nhật ký này đã thay đổi."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Bạn đã tạo ra vài thay đổi. Bỏ qua những thay đổi này và cập nhật bộ "
 "biên soạn?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Bạn chưa thay đổi gì, cập nhật bộ biên soạn?"
@@ -3876,170 +4207,175 @@ msgstr "%s  Bạn chưa thay đổi gì, cập nhật bộ biên soạn?"
 msgid "Validation error: %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " tới "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Đã hoàn thành "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Đã hoàn thành "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Đến hạn "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Đến hạn "
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "Không thể cập nhật đối tượng"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Sửa cuộc hẹn"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cuộc hẹn - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Công việc - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Mục nhật ký - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Không có tóm tắt"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Lưu là..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 #, fuzzy
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Thay đổi trên mục này có thể bị hủy nếu bản cập nhật đến qua đường email"
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Không thể lấy phiên bản hiện thời!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Chọn một thư mục đích để nhập dữ liệu này"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Bạn có chắc muốn xóa cuộc hẹn `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Bạn có chắc muốn xóa cuộc hẹn vô danh này?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Bạn có chắc muốn xóa công việc `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Bạn có chắc muốn xóa công việc vô danh này?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Bạn có chắc muốn xóa mục nhật ky1 `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Bạn có chắc muốn xóa mục nhật ký này?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Bạn có chắc muốn xóa %d cuộc hẹn?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Bạn có chắc muốn xóa %d công việc?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Bạn có chắc muốn xóa %d mục nhật ký?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 #, fuzzy
 msgid "The item could not be deleted due to a corba error"
 msgstr "Không thể gửi!\n"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 #, fuzzy
 msgid "The task could not be deleted because permission was denied"
 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/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Không thể gửi!\n"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Không thể gửi!\n"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 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/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Không thể gửi!\n"
@@ -4056,43 +4392,43 @@ msgstr "Ủy nhiệm cho:"
 msgid "Enter Delegate"
 msgstr "Nhập người đại diện"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Cuộc hẹn"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Bộ nhắc nhở"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Đệ quy"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Lập lịch biểu"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Cuộc họp"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "Ngày bắt đầu sai"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "Ngày kết thúc sai"
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "Thời điểm đầu sai"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "Thời điểm kết thúc sai"
 
@@ -4162,31 +4498,31 @@ msgid "_Start time:"
 msgstr "Thời điểm đầ_u:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Không"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "Cần một tổ chức."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 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:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "Ủ_y nhiệm cho..."
 
@@ -4227,21 +4563,15 @@ msgid "Member"
 msgstr "Thành viên"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Vai trò"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Trạng thái"
@@ -4261,6 +4591,7 @@ msgid "_Invite Others..."
 msgstr "_Mời người khác..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4293,6 +4624,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Không thể tạo thư mục %s: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "Phải chọn một tổ chức."
@@ -4322,34 +4654,59 @@ msgstr "Thông tin lịch"
 msgid "Calendar Name"
 msgstr "Lịch"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Không thể tạo thư mục %s: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Thông tin lịch"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Danh sách công việc"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Danh sách công việc"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Danh sách công việc"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Đảo Wallis và Futuna"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 #, fuzzy
 msgid "This and Future Instances"
 msgstr "Đảo Wallis và Futuna"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 #, fuzzy
 msgid "All Instances"
 msgstr "Alliance"
@@ -4398,10 +4755,15 @@ msgstr "ngày"
 msgid "on the"
 msgstr "lúc"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "lần"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Ngày/Giờ:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "T_hêm"
@@ -4466,7 +4828,7 @@ msgstr "tuần"
 msgid "year(s)"
 msgstr "năm"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 #, fuzzy
 msgid ""
 "This event has been changed, but has not been saved.\n"
@@ -4477,32 +4839,32 @@ msgstr ""
 "\n"
 "Bạn có muốn lưu các thay đổi không?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "_Hủy thay đổi"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 #, fuzzy
 msgid "Save Event"
 msgstr "Sự kiện lịch"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Thông tin cuộc họp đã được tại. Gửi nó đi chứ?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Thông tin cuộc họp đã thay đổi. Gửi bản cập nhật?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "Thông tin công việc đã được tạo. Gửi nó đi chứ?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "Thông tin công việc đã thay đổi. Gửi bản cập nhật?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Ngày hoàn thành sai"
 
@@ -4512,43 +4874,43 @@ msgid "% _Complete"
 msgstr "% hoàn tất"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Hoàn thành"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Cao"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "Đang làm"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Thấp"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Bình thường"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Chưa bắt đầu"
 
@@ -4557,7 +4919,7 @@ msgid "Progress"
 msgstr "Tiến trình"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Chưa biết"
 
@@ -4579,21 +4941,21 @@ msgstr "_Trạng thái:"
 msgid "_Web Page:"
 msgstr "Địa chỉ _Web:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Cơ bản"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Phân công"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "Ngày đến hạn sai"
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4601,9 +4963,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "Tin tưởn_g"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Mô tả"
 
@@ -4708,26 +5070,21 @@ msgstr "%s tại %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s cho loại trigger lạ"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Công cộng"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Riêng tư"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Tin tưởng"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Phân loại"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4740,28 +5097,26 @@ msgid "Start Date"
 msgstr "Ngày bắt đầu"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Tóm tắt"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "màu"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Cuộc hẹn"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Rảnh"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Bận"
 
@@ -4773,7 +5128,7 @@ msgstr "B"
 msgid "S"
 msgstr "N"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "Đ"
 
@@ -4781,7 +5136,7 @@ msgstr "Đ"
 msgid "W"
 msgstr "T"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4791,7 +5146,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4799,7 +5154,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Có"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4807,17 +5162,17 @@ msgstr "Không"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Lạ"
 
@@ -4829,181 +5184,179 @@ msgstr "Đệ quy"
 msgid "Assigned"
 msgstr "Đã gán"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Đang cập nhật đối tượng"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Đang xóa đối tượng được chọn"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Đang cập nhật đối tượng"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Cuộc hẹn mớ_i..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Sự _kiện mọi ngày mới"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "Cuộc họp mới"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Công việc mới"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_In..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Dán"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Đi tới ngày _hôm nay"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "Đi tới _ngày..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Công bố thông tin bận/rảnh"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "T_hiết lập..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Mở"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Lư_u là..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Sao chép"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "Lập lịch _cuộc họp..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "_Chuyển như iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "_Xóa lần này"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Xóa _mọi lần"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "T_hiết lập..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Mở thông điệp"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "_Gán công việc"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "_Chuyển như iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "Đánh dấu _hoàn tất"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Đánh _dấu công việc hoàn tất"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "Xóa côn_g việc được chọn"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Nhấn để thêm công việc"
@@ -5017,8 +5370,8 @@ msgstr "% hoàn tất"
 msgid "Alarms"
 msgstr "Báo động"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Hoàn tất"
 
@@ -5047,18 +5400,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5077,7 +5430,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5090,447 +5443,446 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr "Có. (Truy hồi phức)"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "Mỗi ngày"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "Mỗi %d ngày"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "Mỗi tuần"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "Mỗi %d tuần"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr "Mỗi tuần lúc "
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Mỗi %d tuần lúc "
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " và "
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr "%s ngày của "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s của "
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "mỗi tháng"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr "mỗi %d tháng"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "mỗi năm"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "Mỗi %d năm"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr " tổng cộng %d lần"
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ", kết thúc lúc "
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>Bắt đầu:</b> "
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Kết thúc:</b>"
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>Hoàn tất:</b>"
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>Tới hạn:</b>"
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "Thông tin iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "Lỗi iCalendar"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Người lạ"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 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:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Không</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "Địa điểm:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Trạng thái:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Chấp nhận"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Tạm chấp nhận"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Từ chối"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Chọn hành động:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Cập nhật"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Đồng ý"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Chấp nhận"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Tạm chấp nhận"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Từ chối"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Gửi thông tin Rảnh/Bận"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Cập nhật trạng thái trả lời"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Gửi thông tin mới nhất"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Bỏ"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, 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:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Thông tin cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> yêu cầu sự hiện diện của %s tại cuộc họp."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Đề nghị cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Cập nhật cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Yêu cầu cập nhật cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, 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:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Trả lời họp"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, 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:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Hủy bỏ cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, 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:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Thông điệp lạ về cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Thông tin công việc"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> yêu cầu %s để thực hiện công việc."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, 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:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Đề nghị công việc"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, 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:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Cập nhật công việc"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, 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:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Yêu cầu cập nhật công việc"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, 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:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Trả lời công việc"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, 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:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Hủy bỏ công việc"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Thông điệp lạ về công việc"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, 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:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Thông tin bận/rảnh"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, 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:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Yêu cầu thông tin bận/rảnh"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, 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:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Trả lời thông tin bận/rảnh"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Thông điệp bận/rảnh sai"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 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:1552
+#: calendar/gui/e-itip-control.c:1550
 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:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 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:1614
+#: calendar/gui/e-itip-control.c:1612
 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:1853
+#: calendar/gui/e-itip-control.c:1851
 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:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Hoàn tất cập nhật\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 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:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 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:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Hồi đáp này đến từ một người dự hiện thời. Thêm người này như là người tham "
 "dự nhé?"
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 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:1942
+#: calendar/gui/e-itip-control.c:1940
 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:1945
+#: calendar/gui/e-itip-control.c:1943
 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:1948
+#: calendar/gui/e-itip-control.c:1946
 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:1951
+#: calendar/gui/e-itip-control.c:1949
 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:1954
+#: calendar/gui/e-itip-control.c:1952
 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:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Hoàn tất loại bỏ"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Đã gửi!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Không thể gửi!\n"
 
@@ -5690,7 +6042,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -5754,49 +6106,44 @@ 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:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "Ngày _bắt đầu:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "N_gày đến hạn:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "Độ ư_u tiên:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Trang"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Đang mở công việc tại %s"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, 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:779
+#: calendar/gui/e-tasks.c:725
 #, 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:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, 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:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5805,48 +6152,39 @@ msgstr ""
 "Lỗi tại %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "Đang hoàn tất công việc..."
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "Đang xóa đối tượng được chọn..."
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "Đang xóa"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Công việc"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Lịch"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, 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:1752
+#: calendar/gui/gnome-cal.c:1751
 #, 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'"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Đang thêm báo động cho %s"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5857,7 +6195,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:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5868,64 +6206,11 @@ 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:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Turin"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Công việc và Lịch"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Lịch"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Cấu hình múi giờ, lịch và danh sách công việc ở đây "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Công việc và Lịch"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Factory Điều khiển cấu hình Tóm tắt Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Bộ xem lịch iTip/iMip Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Bộ xem lịch iTip/iMip Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Bộ soạn tin Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Bộ soạn tin Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Thành phần hiển thị thư mục của Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Thành phần kiểm tra Evolution"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Tháng Tư"
@@ -5982,296 +6267,332 @@ msgstr "Tháng Mười"
 msgid "September"
 msgstr "Tháng Chín"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Phải chọn một tổ chức."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Cần ít nhất một người tham dự."
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Thông tin sự kiện"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Thông tin công việc"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Thông tin nhật ký"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Thông tin rảnh/bận"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Thông tin lịch"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Đã cập nhật"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Cập nhật"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "Phản đề nghị"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, 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:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "Thông tin iCalendar"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Bạn phải là người tham dự sự kiện."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "CN"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Hai"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Ba"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Tư"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Năm"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Sáu"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Bảy"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Ngày được chọn (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Tuần được chọn (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Tháng được chọn (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Năm được chọn (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Công việc"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Trạng thái: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Độ ưu tiên: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Phần trăm hoàn thành: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Phân loại: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Liên lạc: "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Xem thử bản in"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "In một mục"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Thiết lập in"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Đổi tên lối tắt"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Danh sách công việc"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Công việc mới"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "Nhiệm _vụ"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Tạo công việc mới"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 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:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6283,11 +6604,11 @@ 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:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Đừng hỏi tôi lần nữa"
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "In công việc"
 
@@ -6319,15 +6640,15 @@ msgstr "Thông điệp lịch"
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "Bộ nhắc nhở!!"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "Sự kiện lịch"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6335,7 +6656,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:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Lịch Gnome"
 
@@ -7868,27 +8189,27 @@ msgstr "Thái Bình Dương/Wallis"
 msgid "Pacific/Yap"
 msgstr "Thái Bình Dương/Yap"
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "Loại mã này không hỗ trợ ký tên"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "Loại mã này không hỗ trợ xác minh"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Loại mã này không hỗ trợ mã hóa"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Loại mã này không hỗ trợ giải mã"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr "Bạn không thể nhập khóa bằng loại mã này"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr "Bạn không thể xuất khóa bằng loại mã này"
 
@@ -7940,86 +8261,86 @@ msgstr "Đang chuẩn bị thư mục '%s' để dùng ngoại tuyến"
 msgid "You must be working online to complete this operation"
 msgstr "Bạn phải đang hoạt động trực tuyến mới có thể hoàn tất thao tác này."
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Lỗi tạo ống dẫn tới '%s': %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Lỗi tạo tiến trình con '%s': %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Nhận luồng thông điệp không hợp lệ từ %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Đồng bộ thư mục"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, 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:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Lỗi thực hiện bộ lọc: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Không thể mở thư mục spool"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Không thể xử lý thư mục spool"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Đang lấy thông diệp %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Không thể mở thông điệp"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Lỗi trên thông điệp %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Đang đồng bộ thư mục"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, 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:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Lỗi tại thông điệp %d trên %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Lỗi nhận thông điệp"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr "Đối số không hợp lệ (system-flag)"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr "Đối số không hợp lệ (user-tag)"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Lỗi thực hiện tìm kiếm bộ lọc: %s: %s"
@@ -8051,35 +8372,35 @@ msgstr "(khớp tất cả) yêu cầu một kết quả đơn"
 msgid "Performing query on unknown header: %s"
 msgstr "Đang thực hiện truy vấn trên header lạ: %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Tháo tác chưa hỗ trợ: nối dài thông điệp: cho %s"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Thao tác chưa hỗ trợ: tìm theo biểu thức: cho %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 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:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Đang di chuyển thông điệp"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr "Đang chép thông điệp"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Đang nhận %d thông điệp"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8090,15 +8411,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr "Lỗi phân tích chỉ dẫn GPG UserID."
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 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:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8107,30 +8428,30 @@ msgstr ""
 "Bạn cần passphrase để mở khóa cho người \n"
 "dùng: \"%s\""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Đã hủy"
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 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:787
+#: camel/camel-gpg-context.c:794
 #, 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:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr "Chưa cung cấp dữ liệu"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 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:1114
+#: camel/camel-gpg-context.c:1121
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8141,49 +8462,61 @@ msgstr ""
 "\n"
 "%.*s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "GPG gặp lỗi %s: %s\n"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Không thể ghi dữ liệu: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Lỗi thực hiện GPG: %s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr "Lỗi thực hiện GPG."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "Đây là phần thông điệp có chữ ký số"
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr "Không thể xác minh chữ ký thông điệp: không thể tạo tập tin tạm: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, 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"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Không thể ghi dữ liệu: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Đây là phần thông điệp có chữ ký số"
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Nội dung phần thân index"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Không thể nhận thông điệp từ trình biên soạn"
@@ -8282,15 +8615,15 @@ msgstr "Lỗi ghi tập tin mail tạm: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Lỗi sao chép tập tin mail tạm: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Lỗi giải mã phần MIME: lỗi giao thức"
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "Lỗi giải mã phần MIME: cấu trúc sai"
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "lỗi phân tích"
 
@@ -8606,12 +8939,12 @@ msgstr "Bộ cung cấp thư mục ảo"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Để đọc mail như là một truy vấn của một tập các thư mục khác"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Không có bên nào cung cấp giao thức `%s'"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8620,71 +8953,82 @@ msgstr ""
 "Không thể tạo thư mục %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Vui lòng nhập passphrase %s của bạn cho %s"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Chưa biết"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Sửa chữ ký"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Sửa chữ ký"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Chứng nhận tự ký trong chuỗi"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "Chứng nhận không đáng tin"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Lưu chữ ký"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Lỗi phân tích"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Server: %s, Kiểu: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Không thể lấy thư mục: thao tác không hợp lệ trên thiết bị lưu trữ"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Không thể tạo thư mục: Thao tác không hợp lệ trên thiết bị lưu trữ"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Rác"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "Tháng Sáu"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr ""
@@ -8887,7 +9231,7 @@ msgid ""
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Không thể phân tích URL `%s'"
@@ -8906,22 +9250,22 @@ msgstr "Không có thông điệp %s trong %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Không thể sao chép hoặc di chuyển thông điệp vào Thư mục Ảo"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Không thể xoá thư mục: %s: Thao tác không hợp lệ"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Không thể xóa thư mục: %s: Không có thư mục như vậy"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Không thể đổi tên thư mục: %s: Thao tác không hợp lệ"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Không thể đổi tên thư mục: %s: Không có thư mục này"
@@ -9001,7 +9345,7 @@ msgstr "Không thể nhận thông điệp: %s"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9015,7 +9359,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Không có thông điệp như vậy"
@@ -9053,56 +9397,73 @@ msgid "Failed to cache %s: %s"
 msgstr "Lỗi cache %s: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Đang kết nối tới server..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Lỗi kết nối tới LDAP server."
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr ""
+"\n"
+"Ghi chú: "
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Kiểm tra tìm thư mới"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 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:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Thư mục"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Chỉ hiện những thư mục đăng ký"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Vùng tên"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 "Áp dụng bộ lọc đối với những thông điệp mới trong thư mục INBOX trên server "
 "này"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Tự động kiểm tra có thư mới"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Để đọc và lưu thư trên IMAP server."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9354,7 +9715,7 @@ 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:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Không thể đổi tên '%s': %s"
@@ -9469,29 +9830,29 @@ msgstr "Đang kiểm tra thông điệp mới"
 msgid "Storing folder"
 msgstr "Đang lưu thư mục"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: 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"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Không thể mở hộp thư: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "Quá trình nối thêm mail đã bị hủy"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Không thể nối thêm thông điệp vào tập tin mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9500,11 +9861,11 @@ msgstr ""
 "Không thể lấy thông điệp: %s từ thư mục%s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Thư mục này có vẽ đã bị hư và không thể được phục hồi."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Lỗi khởi tạo thông điệp: Hộp thư đã bị hỏng?"
 
@@ -9572,12 +9933,17 @@ msgstr "Không thể tạo thư mục %s: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "Không thể lấy thư mục: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "Card ID đã tồn tại"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Không thể đổi tên thư mục %s thành %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Tên thư mục xác định không hợp lệ: %s"
@@ -9621,7 +9987,7 @@ msgstr "Không thể đóng thư mục nguồn %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Không thể đóng thư mục temp: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Không thể đổi tên thư mục: %s"
@@ -9901,7 +10267,7 @@ msgstr "Xoá sau %s ngày"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -9989,7 +10355,7 @@ 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:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10042,7 +10408,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Gửi thư thông qua chương trình sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10208,7 +10574,7 @@ msgstr "Gửi thư (SMTP) thông qua %s"
 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:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Đang gửi thông điệp"
 
@@ -10329,7 +10695,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "đồ đính kèm"
 
@@ -10374,14 +10740,14 @@ 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:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Bạn cần cấu hình một tài khoản trước\n"
 "khi có thể biên soạn thư."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Nhấn vào đây để xem sổ địa chỉ"
 
@@ -10392,45 +10758,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Trả lời cho:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Từ:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Chủ đề:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Tới:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Nhập người nhận thông điệp"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "CC:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Nhập địa chỉ sẽ nhận một bản sao của thông điệp"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10441,14 +10807,19 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Gửi tới:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr "Đích gửi đến"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Đính kèm tập tin vào thông điệp"
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Đính kèm tập tin"
@@ -10484,21 +10855,21 @@ msgstr "Tập tin đã tồn tại, ghi đè chứ?"
 msgid "Error saving file: %s"
 msgstr "Lỗi lưu tập tin: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Lỗi nạp tập tin: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Lỗi truy cập tập tin: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 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:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10507,7 +10878,7 @@ msgstr ""
 "Không thể tìm trong tập tin: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10516,7 +10887,7 @@ msgstr ""
 "Không thể cắt tập tin: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10525,7 +10896,7 @@ msgstr ""
 "Không thể chép bộ mô tả tập tin: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10534,7 +10905,7 @@ msgstr ""
 "Lỗi tự động lưu thông điệp: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10542,7 +10913,7 @@ msgstr ""
 "Ximian Evolution đã tìm thấy các tập tin chưa được lưu từ session trước.\n"
 "Bạn có muốn phục hồi chúng không?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10553,28 +10924,28 @@ msgstr ""
 "\n"
 "Bạn có muốn lưu các thay đổi?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Cảnh báo: Thông điệp đã thay đổi"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Mở tập tin"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "Chữ ký:"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "Tự phát sinh"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Biên soạn thông điệp"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10582,7 +10953,7 @@ msgstr ""
 "Không thể tạo cửa sổ biên soạn:\n"
 "Không thể kích hoạt bộ chọn địa chỉ."
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10594,7 +10965,7 @@ msgstr ""
 "Vui lòng kiểm tra xem GtkHTML và libGtkHTML\n"
 "có được cài đặt đúng phiên bản chưa.\n"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10602,7 +10973,7 @@ msgstr ""
 "Không thể tạo cửa sổ biên soạn:\n"
 "Không thể kích hoạt bộ biên soạn HTML."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10611,11 +10982,13 @@ msgstr ""
 "chỉnh)</b>"
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Bộ phần mềm nhóm Evolution"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10862,13 +11235,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -10993,7 +11366,7 @@ msgstr "Thì"
 msgid "You must specify a folder."
 msgstr "Bạn phải xác định thư mục."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Chọn thư mục"
@@ -11007,24 +11380,24 @@ msgstr ""
 "Lỗi trong biểu thức chính quy '%s':\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Quan trọng"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "Cần làm"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Sau đó"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Kiểm tra"
 
@@ -11124,7 +11497,7 @@ msgstr "trước"
 msgid "months"
 msgstr "tháng"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "giây"
 
@@ -11221,7 +11594,7 @@ msgstr "Biểu thức"
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "Nhãn"
 
@@ -11291,112 +11664,118 @@ msgid "Source Account"
 msgstr "Tài khoản nguồn"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Bụi nước"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Header xác định"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Dừng tiến trình"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Chủ đề"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "Bỏ đặt trạng thái"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "chứa"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "không chứa"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "không kết thúc bằng"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "không tồn tại"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "does not return"
 msgstr "không trả về"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "không giống với"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "không bắt đầu bằng"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "kết thúc bằng"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "tồn tại"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr "được đặt cờ"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr "sau"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "is before"
 msgstr "trước"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "lớn hơn"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "nhỏ hơn"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr "không được đặt cờ"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "không phải"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "bằng"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr "trả về lớn hơn"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr "trả về nhỏ hơn"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr "trả về"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "giống như"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "bắt đầu bằng"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Tên quy tắt '%s' bị trùng, hãy chọn tên khác."
@@ -11421,18 +11800,86 @@ msgstr "Tên quy tắt"
 msgid "Score Rules"
 msgstr "Tính điểm quy tắc"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Bạn phải đặt tên cho vfolder này."
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr "Bạn cần chọn ít nhất một thư mục làm nguồn."
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 msgid "VFolder source"
 msgstr "Nguồn VFolder"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Thông số bộ soạn thảo"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Cấu hình thông số thư tín, bao gồm tính bảo mật và hiển thị thông điệp, ở "
+"đây."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Cấu hình kiểm tra chính tả, chữ ký, và bộ soạn thảo thông điệp ở đây"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Cấu hình tài khoản thư ở đây"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Factory Điều khiển cấu hình Tóm tắt Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Bộ soạn thư của Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Bộ soạn thư của Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Factory Điều khiển cấu hình Tóm tắt Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Thành phần hiển thị thư mục của Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Thành phần tóm tắt thư của Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Thư"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Tài khoản thư"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "Thông số thư"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Bạn có muốn xóa tài khoản này?"
@@ -11474,7 +11921,7 @@ msgid "Protocol"
 msgstr "Giao thức"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr "Vô danh"
 
@@ -11498,20 +11945,17 @@ msgstr "Thêm chữ ký tay"
 msgid "Signature(s)"
 msgstr "Chữ ký"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "Bạn đang gửi một lá thư dùng dạng thức HTML. Vui lòng đảm bảo rằng những\n"
 "người nhận sau có thể nhận thư HTML:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Gửi bất cứ giá nào?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11519,7 +11963,7 @@ msgstr ""
 "Thông điệp này chưa có chủ đề.\n"
 "Bạn thật sự muốn gửi chứ?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11527,11 +11971,11 @@ msgstr ""
 "Vì danh sách liên lạc bạn đang gửi được cấu hình để ẩn các địa chỉ trong "
 "danh sách, thông điệp này sẽ chỉ điền người nhận vào trường Bcc."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Thông điệp chỉ có người nhận trong Bcc."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11541,11 +11985,11 @@ msgstr ""
 "Apparently-To.\n"
 "Gửi bất kỳ giá nào?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Bạn phải chọn người nhận để có thể gửi thông điệp này."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11557,187 +12001,404 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Tạo thư mục ả_o từ kết quả tìm kiếm..."
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "Thư"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<nhấn đây để chọn thư mục>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" trong \"%s\""
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Tạo thư mục mới"
+
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Xác định nơi tạo thư mục:"
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
-msgid "Folder _name"
+msgid "Folder _name:"
 msgstr "Tên thư mục:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Không thể tạo thư mục tạm: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Không thể tạo thư mục tạm: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Không thể tạo thư mục tạm '%s': %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Không thể đóng thư mục temp: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Đang nạp..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Chọn thư mục"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Tạo thư mục mới"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Không thể xóa thư mục `%s': %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Bạn thật sự muốn xóa thư mục \"%s\" chứ?"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Xoá \"%s\""
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Đổi tên thư mục \"%s\" thành:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+#, fuzzy
+msgid "Rename Folder"
+msgstr "Đổi tên thư mục"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Thuộc tính font"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Thuộc tính"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "Tên thư _mục:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Xem"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Mở trong cửa sổ mới"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Di chuyển"
+
+#: mail/em-folder-tree.c:1500
+#, fuzzy
+msgid "_New Folder..."
+msgstr "Thư mục mớ_i"
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "Đổi tên"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "Thuộc tính..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "_Hiệu chỉnh như thông điệp mới..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "_In"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "T_rả lời người gửi"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Trả lời _danh sách"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Trả lời _mọi người"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "_Chuyển tiếp"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "Xó_a cờ"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Đánh dấu đã đọ_c"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "Đánh dấu c_hưa đọc"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Đánh dấu _quan trọng"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "Đánh dấu _Không quan trọng"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Đánh dấu c_hưa đọc"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Đánh dấu _quan trọng"
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "_Chuyển tới thư mục..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "C_hép vào thư mục..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "Thêm người _gửi vào sổ địa chỉ"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "Áp dụng _bộ lọc"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "Tạo _quy tắc từ thông điệp"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "VFolder trên _chủ đề"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "VFolder trên _người gửi"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "VFolder trên n_gười nhận"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "VFolder trên Mailing _List"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "VFolder trên _người gửi"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Lọc theo _chủ đề"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Lọc theo _người gửi"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Lọc theo n_gười nhận"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Lọc _Mailing list"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Lọc theo _người gửi"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Mặc định"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "In thông điệp"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Sao chép vị trí liên kết"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Khớp:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Đã gán"
+
+#: mail/em-format-html-display.c:597
+#, fuzzy
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr "Thông điệp này dùng chữ ký số nhưng không thể được xác thực."
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Sửa chữ ký"
+
+#: mail/em-format-html-display.c:598
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr "Thông điệp này dùng chữ ký số. Nhấn biểu tượng khóa để biết thêm."
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Sửa chữ ký"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:600
+#, fuzzy
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"Tham số input_token chứa chữ ký không hợp lệ, hoặc chữ ký không được xác "
+"nhận."
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Đã ngắt"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "Mã hóa PGP"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Không thể phân tích thông điệp MIME. Đang hiện thị mã thô."
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Lược đồ không hỗ trợ"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Không thể giải mã chữ ký chứng nhận"
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Xem Inline"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Ẩn"
@@ -11747,184 +12408,206 @@ msgstr "Ẩn"
 msgid "Page %d of %d"
 msgstr "Trang %d trên %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Đang nhận thông điệp %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Trỏ tới địa chỉ FTP (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, 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/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Trỏ tới tập tin cục bộ (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Trỏ tới tập tin từ xa (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, 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/em-format-html.c:905 mail/em-format.c:1219
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "Thông điệp này dùng chữ ký số nhưng không thể được xác thực."
-
-#: mail/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Thông điệp này dùng chữ ký số và đã được xác thực."
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-#, fuzzy
-msgid "No signature present"
-msgstr "tập tin chữ ký HTML:"
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Không thể khởi động GNOME"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Lược đồ không hỗ trợ"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 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/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Đang di chuyển thông điệp"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Từ"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Trả lời cho"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Tới"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Ngày"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "%s đồ đính kèm"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Không thể phân tích thông điệp MIME. Đang hiện thị mã thô."
+msgid "Session not initialised"
+msgstr "Không thể khởi động GNOME"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Thông điệp này dùng chữ ký số và đã được xác thực."
+
+#: mail/em-format.c:1212
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr "Thông điệp này dùng chữ ký số nhưng không thể được xác thực."
+
+#: mail/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Đang chờ..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Đang \"ping\" %s"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Lỗi cache %s: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Lỗi tạo ống dẫn tới '%s': %s"
 
-#: mail/em-popup.c:593
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Lỗi tạo ống dẫn tới '%s': %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Lưu là..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "T_rả lời người gửi"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Mở liên kết bằng trình duyệt"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Gửi _thông điệp cho danh sách..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Têm sổ địa chỉ"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Mở bằng %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "Server này không hỗ trợ thông tin schema LDAPv3"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Đăng ký"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Thư mục"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Vui lòng chọn một server."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Chưa chọn server"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Đừng hiện thông báo này lần nữa."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11933,27 +12616,27 @@ msgstr ""
 "Lỗi khi nạp thông tin bộ lọc:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Bộ lọc"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Thông điệp chuyển tiếp"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "người gửi lạ"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Vào ngày %a, %d/%m/%Y lúc %H:%M, %s viết rằng:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -11962,7 +12645,7 @@ msgstr ""
 "Không thể lưu vào `%s'\n"
 "  %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -11971,25 +12654,26 @@ msgstr ""
 "`%s' đã tồn tại.\n"
 "Bạn có muốn ghi đè lên nó không?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Thông báo"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Lưu thông điệp là..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Không thể tạo thư mục tạm: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Địa chỉ"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -11998,105 +12682,398 @@ msgstr ""
 "\n"
 "Bạn có thật sự muốn xóa những thông điệp này không?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Thông số bộ soạn thảo"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/em-utils.c:2288
+#, fuzzy
 msgid ""
-"Configure mail preferences, including security and message display, here"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
 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."
+"Thao tác này sẽ xóa vĩnh viễn mọi thông điệp được đánh dấu xóa. \n"
+"Nếu bạn tiếp tục, bạn sẽ không thể phục hồi những thông điệp này.\n"
+"\n"
+"Bạn có thật sự muốn xóa những thông điệp này không?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Cấu hình kiểm tra chính tả, chữ ký, và bộ soạn thảo thông điệp ở đây"
+#: mail/evolution-mail.schemas.in.in.h:1
+#, fuzzy
+msgid "Automatic link recognition"
+msgstr "Tự động _xác định liên kết"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Cấu hình tài khoản thư ở đây"
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "Tự động _xác định liên kết"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:6
 #, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
+msgid "Default charset in which to compose messages"
+msgstr "Cắt thông điệp đã chọn"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:7
 #, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Factory Điều khiển cấu hình Tóm tắt Evolution."
+msgid "Default charset in which to compose messages."
+msgstr "Cắt thông điệp đã chọn"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
-msgid "Evolution Mail component"
-msgstr "Bộ soạn thư của Evolution."
+msgid "Default charset in which to display messages"
+msgstr "Tìm text trong thân thông điệp hiển thị"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Bộ soạn thư của Evolution."
+msgid "Default charset in which to display messages."
+msgstr "Tìm text trong thân thông điệp hiển thị"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Factory Điều khiển cấu hình Tóm tắt Evolution."
+msgid "Default forward style"
+msgstr "Kiểu chuyển tiếp mặc định là: "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Thành phần hiển thị thư mục của Evolution."
+msgid "Default reply style"
+msgstr "Kiểu chuyển tiếp mặc định là: "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Thành phần tóm tắt thư của Evolution."
+msgid "Empty Trash folders on exit"
+msgstr "_Xóa thư mục Rác khi thoát"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "_Xóa thư mục Rác khi thoát"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+#, fuzzy
+msgid "Height of the message-list pane"
+msgstr "Sẽ gửi thông điệp sau"
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "Tài khoản thư"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "Thông số thư"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
 
-#: mail/importers/elm-importer.c:105
-msgid "Evolution is importing your old Elm mail"
-msgstr "Evolution đang nhập các thư cũ (dạng Elm)"
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
-msgid "Importing..."
-msgstr "Đang nhập..."
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
-msgid "Please wait"
-msgstr "Vui lòng chờ"
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Đang nhập %s như là %s"
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
 
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Đang quét %s"
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "Thực hiện hành động"
 
-#: mail/importers/elm-importer.c:547
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "New Mail Notify sound file"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
+msgid "New Mail Notify type"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
-"Evolution đã tìm thấy các tập tin thư dạng Elm.\n"
-"Bạn có muốn nhập nó vào Evolution?"
 
-#: mail/importers/elm-importer.c:568
-msgid "Elm"
-msgstr "Elm"
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr "_Nhắc khi gửi thư HTML cho các liên lạc không muốn nhận HTML"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "_Nhắc khi gửi thư mà chỉ có người nhận _Bcc"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "_Gửi thư mặc định dùng dạng HTML"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "_Gửi thư mặc định dùng dạng HTML"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "_Hiện hoạt cảnh"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "_Hiện hoạt cảnh"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Hiện thông điệp theo cách bình thường"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "Khung xem thử"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "_Chơi nhạc khi có thư mới"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "_Kiểm tra chính tả"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "Liên lạc gốc:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "Chọn font HTML độ rộng thay đổi để in"
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Danh sách thông điệp theo nhánh"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Danh sách thông điệp theo nhánh"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "Chọn làm tài khoản _mặc định"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "Độ rộng _thay đổi:"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 #, fuzzy
@@ -12130,6 +13107,44 @@ msgstr ""
 msgid "Evolution Pine importer"
 msgstr "Bộ soạn thư của Evolution."
 
+#: mail/importers/elm-importer.c:105
+msgid "Evolution is importing your old Elm mail"
+msgstr "Evolution đang nhập các thư cũ (dạng Elm)"
+
+#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
+#: mail/importers/pine-importer.c:115
+msgid "Importing..."
+msgstr "Đang nhập..."
+
+#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
+#: mail/importers/pine-importer.c:117
+msgid "Please wait"
+msgstr "Vui lòng chờ"
+
+#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
+#: mail/importers/pine-importer.c:288
+#, c-format
+msgid "Importing %s as %s"
+msgstr "Đang nhập %s như là %s"
+
+#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
+#: mail/importers/pine-importer.c:425
+#, c-format
+msgid "Scanning %s"
+msgstr "Đang quét %s"
+
+#: mail/importers/elm-importer.c:547
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution đã tìm thấy các tập tin thư dạng Elm.\n"
+"Bạn có muốn nhập nó vào Evolution?"
+
+#: mail/importers/elm-importer.c:568
+msgid "Elm"
+msgstr "Elm"
+
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -12171,12 +13186,6 @@ msgstr ""
 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
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Rác"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Đang quét bộ lọc thư"
@@ -12185,7 +13194,7 @@ msgstr "Đang quét bộ lọc thư"
 msgid "Scanning directory"
 msgstr "Đang quét thư mục"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Đang nhập"
 
@@ -12261,23 +13270,23 @@ msgid "You have not filled in all of the required information."
 msgstr "Bạn chưa điền đủ các thông tin yêu cầu."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Bộ hiệu chỉnh tài khoản"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Máy chủ:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "_Tên người dùng:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "Đường _dẫn:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 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."
 
@@ -12286,35 +13295,35 @@ msgstr "Bạn không thể tạo hai tài khoản trùng tên."
 msgid "Mail to %s"
 msgstr "Gửi thư tới %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Chủ để là %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Thừ từ %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s mailing list"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Trả lời cho"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Thêm quy tắc lọc"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "Quy tắc lọc sau:\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12322,145 +13331,30 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "Đang kết nối..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Thư mục này chứa các thông điệp."
-
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Không thể mở thư mục chia sẽ: %s."
-
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Không thể tạo thư mục tạm: %s"
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Thông điệp thư mới"
 
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Không thể tạo thư mục tạm '%s': %s"
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "Thông điệp thư"
 
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Không thể đóng thư mục temp: %s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "Biên soạn thông điệp mới"
 
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Chọn một thư mục đích để nhập dữ liệu này"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Chọn một thư mục đích để nhập dữ liệu này"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Tạo thư mục mới"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Xác định nơi tạo thư mục:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Không thể xóa thư mục `%s': %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Bạn thật sự muốn xóa thư mục \"%s\" chứ?"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Xoá \"%s\""
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Đổi tên thư mục \"%s\" thành:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-#, fuzzy
-msgid "Rename Folder"
-msgstr "Đổi tên thư mục"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Tên thư mục xác định không hợp lệ: %s"
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Thuộc tính font"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Thuộc tính"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "Tên thư _mục:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Xem"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Mở trong cửa sổ mới"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Di chuyển"
-
-#: mail/mail-component.c:2087
-#, fuzzy
-msgid "_New Folder..."
-msgstr "Thư mục mớ_i"
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "Đổi tên"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "Thuộc tính..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Thực thể"
 
@@ -12521,11 +13415,11 @@ msgstr ""
 "tạo nên một tài khoản thư tín Evolution. Vui lòng nhập tên tài khoản này vào "
 "khoảng trắng dưới đây. Tên này sẽ chỉ được dùng để hiển thị thôi."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Đang kiểm tra dịch vụ"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Đang kết nối tới server..."
 
@@ -12607,26 +13501,35 @@ msgid "C_olors"
 msgstr "_Màu sắc"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Kiểm tra thư mới"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "Kiểm tra chính tả khi đang _gõ"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Kiểm tra thư mới"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "Màu từ gõ _sai:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Đang soạn thông điệp"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Cấu hình"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12641,273 +13544,278 @@ msgstr ""
 "\n"
 "Hãu nhấn \"Áp dụng\" để lưu các thiết lập."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "_Mặc định"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Hành vi mặc định"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "_Bảng mã mặc định:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Đang xóa thư"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 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:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "Không trích dẫn thông điệp gốc"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Xong"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "Thư mục _nháp:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "_Bật"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "Tài khoản email"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "Địa chỉ _email:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "_Xóa thư mục Rác khi thoát"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_ID Chứng nhận:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Phụ tá tài khoản Evolution"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Thực hiện lệnh..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "Độ rộng _cứng:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "<< Ít tùy chọn hơn"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "Thuộc tính font"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "Định dạng thông điệp bằng _HTML"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "Điểm sang _trích dẫn bằng"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Nhãn và màu"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Đang nạp ảnh"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Cấu hình thư"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Địa điểm hộp thư"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Bộ soạn thảo thông điệp"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Hiển thị thông điệp"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Fonts"
 msgstr "Thông điệp chứa"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Thông tin tùy chọn"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "Tổ _chức:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "_Khóa ID PGP/GPG:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Chọn màu"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "_Nhắc khi gửi thư mà chỉ có người nhận _Bcc"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Font in"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "Trích dẫn thông điệp gốc"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "_Nhớ mật khẩu này"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Đang nhận email"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "Tùy chọn _nhận"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "_Nhớ mật khẩu này"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Thông tin yêu cầu"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "Phục hồi mặc định"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "_Bảo mật"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME bảo mật (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr "Chọn font HTML độ rộng cứng"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr "Chọn font html độ rộng cứng để in"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr "Chọn font HTML độ rộng thay đổi"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr "Chọn font HTML độ rộng thay đổi để in"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Đang gửi email"
 
-#: mail/mail-config.glade.h:107
+#: 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:108
+#: 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:109
+#: 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:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Cấu hình server"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "_Kiểu server:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Chứng nhận tự ký trong chuỗi"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "Xác định _tên tập tin:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "_Kiểm tra chính tả"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Dạng thức Unix mbox chuẩn"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12917,7 +13825,7 @@ msgstr ""
 "Tên bạn xác định sẽ chỉ được dùng cho mục đích\n"
 "hiển thị."
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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 "
@@ -12926,7 +13834,7 @@ msgstr ""
 "Trang này cho phép bạn cấu hình hành vi kiểm tra chính tả và ngôn ngữ để "
 "kiểm tra. Danh sách ngôn ngữ phản ánh chỉ những ngôn ngữ bạn có cài đặt."
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12934,11 +13842,15 @@ 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:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "Độ rộng _thay đổi:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12948,172 +13860,181 @@ msgstr ""
 "\n"
 "Hãy nhấn \"Kế tiếp\" để bắt đầu."
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "Thêm chữ _ký"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "_Luôn nạp ảnh từ mạng"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 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:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "_Loại xác thực: "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "_Loại xác thực: "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "_Tự động kiểm tra có thư mới"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "_Tự động chèn ảnh smiley"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "_Kêu bíp khi có thư mới"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "_Xác nhận khi xóa thư mục"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "_Chữ ký mặc định:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "_Mặc định"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 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:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "_Bật"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "Phong cách _chuyển tiếp:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "_Họ và tên:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "Thư _HTML"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "_Thực thể"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Tháng Sáu"
+
+#: mail/mail-config.glade.h:156
 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:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "Chọn làm tài khoản _mặc định"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "Đánh dấu sẽ đọ_c sau"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Tên:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "_Không bao giờ nạp ảnh từ mạng"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "_Chơi nhạc khi có thư mới"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 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:159
+#: mail/mail-config.glade.h:165
 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:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "_Nhận thư"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "_Phong cách trả lời:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "Phục hồi _mặc định"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Script:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "Xóa..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "Đan_g gửi thư"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "_Hiện hoạt cảnh"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Chữ ký"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Standard Font:"
 msgstr "Sand Point"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Terminal Font:"
 msgstr "Liên lạc gốc:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "Dùng kết nối _an toàn (SSL):"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "mô tả"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr "Đang \"ping\" %s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13122,7 +14043,7 @@ msgstr ""
 "Lỗi khi '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13131,7 +14052,7 @@ msgstr ""
 "Lỗi khi đang thực hiện thao tác:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Đang làm việc"
 
@@ -13143,118 +14064,118 @@ msgstr "Đang lọc thư mục"
 msgid "Fetching Mail"
 msgstr "Đang lấy thư"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Lỗi lưu mail vào tập tin tạm %s: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Lỗi lưu mail vào tập tin tạm %s: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Đang gửi \"%s\""
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Đang gửi thông điệp %d trên %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Lỗi thông điệp %d trên %d"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Hoàn tất."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Đang lưu thông điệp vào thư mục"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Đang chuyển thông điệp tới %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Đang chép thông điệp vào %s"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Đang quét thư mục trong \"%s\""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Thông điệp chuyển tiếp"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Đang mở thư mục %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "Đang mở kho %s"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Đang gở bỏ thư mục %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Đang lưu thư mục %s"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Đang cập nhật thư mục"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Đang bỏ thư mục"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Đang nhập %s như là %s"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Thư mục cục bộ"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Đang nhận thông điệp %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Đang nhận %d thông điệp"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Đang lưu %d thông điệp"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13263,7 +14184,7 @@ msgstr ""
 "Không thể tạo tập tin output: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13272,11 +14193,11 @@ msgstr ""
 "Lỗi khi lưu thông điệp vào: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Đang lưu đồ đính kèm"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13285,21 +14206,25 @@ msgstr ""
 "Không thể tạo tập tin output: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Không thể ghi dữ liệu: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Đang ngắt kết nối từ %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Đang tái kết nối tới %s"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Phân biệt hoa/thường"
@@ -13316,60 +14241,75 @@ msgstr "Tìm:"
 msgid "Search"
 msgstr "Tìm"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Sửa chữ ký"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Ngoại lệ"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Thông tin tài khoản"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Đang hủy bỏ..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Kiểu: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Đường dẫn: %s, Kiểu: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Kiểu: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Gửi và nhận thư"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Hủy tất cả"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Đang cập nhập..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Đang chờ..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Người dùng đã hủy bỏ tác vụ."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Nhập mật khẩu cho %s"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Nhập mật khẩu"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "_Nhớ mật khẩu này"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 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"
 
@@ -13408,26 +14348,31 @@ msgstr "Nhập tên cho chữ ký này."
 msgid "Name:"
 msgstr "Tên:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Thông điệp chuyển tiếp - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Thông điệp chuyển tiếp"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Đang mở thư mục %s"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Thiết lập vfolder: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Đang cập nhật vfolder cho URI: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13436,88 +14381,88 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "vFolders"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Sửa VFolder"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Đang thử hiệu chỉnh thư mục ảo '%s' - không tồn tại."
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "VFolder mới"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Chưa xem"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Đã xem"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Đã trả lời"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Nhiều thông điệp chưa xem"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Nhiều thông điệp"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Thấp nhất"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Thấp"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Cao hơn"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Cao nhất"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Hôm nay %l:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Hôm qua %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Đang tạo danh sách thông điệp"
 
@@ -13573,11 +14518,11 @@ msgstr "Chuyển tiếp"
 msgid "No Response Necessary"
 msgstr "Không cần thiết trả lời"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Trả lời"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Trả lời tất cả"
 
@@ -13630,41 +14575,139 @@ msgstr "Đăng _ký"
 msgid "_Unsubscribe"
 msgstr "_Bỏ đăng ký"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr "Cấu hình thư mục đặc biệt và hành vi thư mục ngoại tuyến ở đây"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Vỏ bọc Evolution"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Thư lập thư mục"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "380"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Đổi tên nhóm lối tắt này"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Bật tắt hiện thanh thư mục"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Ẩn Thanh lối tắt"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Độ ưu tiên mặc định:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Độ ưu tiên mặc định:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Giao diện cấu hình mail."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
 msgstr ""
-"Không thể chuyển thư mục:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Thêm thư mục"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Nháp"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Thư mục nhận"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Thư mục gửi"
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "Đang mở thư mục công việc mặc định"
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Đã gửi"
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Đang mở thư mục công việc mặc định"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Đang mở thư mục công việc mặc định"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Đang mở thư mục công việc mặc định"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Bật tắt hiện thanh thư mục"
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Bật tắt hiện thanh lối tắt"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "Email"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Không thể cập nhật tập tin một cách đúng đắn"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13675,7 +14718,7 @@ msgstr ""
 "%s\n"
 "Lỗi: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13684,7 +14727,7 @@ msgstr ""
 "Xảy ra lỗi khi đang chép tập tin vào\n"
 "`%s'."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13695,7 +14738,7 @@ msgstr ""
 "Vui lòng chuyển nó sang chỗ khác để có thể cài đặt các tập tin người dùng "
 "của Evolution."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13794,10 +14837,11 @@ msgstr ""
 "Không thể đổi tên thư mục:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+msgid "The specified folder name is not valid: %s"
+msgstr "Tên thư mục xác định không hợp lệ: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -13821,19 +14865,15 @@ msgstr ""
 "Không thể tạo thư mục đã cho:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Tạo thư mục mới"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Không tựa)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Chọn kiểu bộ nhập cần chạy:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13847,11 +14887,11 @@ msgstr ""
 "Bạn có thể chọn \"Tự động\" nếu bạn không biết, và Evolution sẽ thử tự tìm "
 "cách hoạt động."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 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:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13859,7 +14899,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13868,21 +14908,21 @@ msgstr ""
 "Đang nhập %s\n"
 "Đang nhập mục %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "Chọn bộ nhập"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "Tập tin %s không tồn tại"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Lỗi Evolution"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -13891,11 +14931,11 @@ msgstr ""
 "Không có bộ nhập nào có thể xử lý\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Đang nhập"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -13904,17 +14944,17 @@ msgstr ""
 "Đang nhập %s.\n"
 "Đang khởi động %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Lỗi khởi động %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Lỗi nạp %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13923,35 +14963,35 @@ msgstr ""
 "Đang nhập %s\n"
 "Đang nhập mục 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Tự động"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Tên tập tin:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Chọn tập tin"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Kiểu tập tin:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 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:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Nhập tập tin đơn"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -13959,47 +14999,28 @@ msgstr ""
 "Vui lòng chờ...\n"
 "Đang quét tìm thiết lập hiện có"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Đang khởi động bộ nhập thông minh"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "Từ %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 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:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Nhập"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Đang đóng kết nối..."
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Lỗi đồng bộ \"%s\":\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "Đồng bộ thư mục"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Đang đồng bộ \"%s\" (%d trên %d) ..."
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Thiết lập Evolution"
@@ -14035,7 +15056,7 @@ msgstr "Không thể mở thư mục chia sẽ: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Không tìm thấy thư mục chia sẽ xác định."
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14044,17 +15065,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "Phụ tá"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Mới"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Chưa có tên thư mục."
@@ -14114,63 +15129,50 @@ msgstr "Tạo lối tắt mới"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Chọn thư mục bạn muốn lối tắt chỉ đến:"
 
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "_Trực tuyến"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "_Ngoại tuyến"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Ngoại tuyến"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Chưa hiển thị thư mục)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Không)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 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:2090
+#: shell/e-shell-window.c:331
 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:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution đang ngoại tuyến. Nhấn nút này để chuyển sang trực tuyến."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Đối số không hợp lệ"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Không thể đăng ký với OAF"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 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:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Lỗi chung chung"
 
@@ -14286,74 +15288,18 @@ msgstr "Đổi tên"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Đổi tên lối tắt từ Thanh lối tắt"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Lỗi lưu lối tắt"
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Thư mục nhận"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Lối tắt"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Không có lỗi"
-
-#: 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:575
-msgid "The specified folder type is not valid"
-msgstr "Kiểu thư mục không hợp lệ"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "Lỗi I/O"
-
-#: 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:581
-msgid "The folder is not empty"
-msgstr "Thư mục không rỗng"
-
-#: 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: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:589
-msgid "Operation not supported"
-msgstr "Chưa hỗ trợ tác vụ"
-
-#: 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: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: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: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: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"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Ô kiểm"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14364,6 +15310,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% hoàn tất)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Mới"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "\"%s\" trong \"%s\""
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14401,74 +15358,6 @@ msgstr ""
 "Lỗi từ hệ thống kích hoạt:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "Lỗi CORBA"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Đã ngắt"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Đối số không hợp lệ"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Đã có chủ sở hữu"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Không có chủ sở hữu"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Không tìm thấy"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Kiểu chưa hỗ trợ"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Lược đồ không hỗ trợ"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Thao tác chưa hỗ trợ"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Lỗi nội tại"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Tồn tại"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "URI sai"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Có thư mục con"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Không còn chỗ"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "Chủ sở hữu cũ đã chết"
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Kiểu kiểm tra:"
-
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr "Thành phần kiểm tra Evolution"
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "Active Connections"
@@ -14498,11 +15387,6 @@ msgstr "_Thư:"
 msgid "_Tasks:"
 msgstr "_Công việc:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-#, fuzzy
-msgid "Folder _name:"
-msgstr "Tên thư mục:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 #, fuzzy
 msgid "Folder _type:"
@@ -14567,24 +15451,6 @@ msgstr ""
 "\n"
 "Hãy nhấn nút \"Kết thúc\" để lưu các thiết lập của bạn."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "Cấu hình thư mục đặc biệt và hành vi thư mục ngoại tuyến ở đây"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Vỏ bọc Evolution"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-#, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Factory Điều khiển cấu hình Tóm tắt Evolution."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Thư lập thư mục"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Nhấn \"Nhập\" để bắt đầu nhập các tập tin vào Evolution."
@@ -14623,7 +15489,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Bộ nhập"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Nhập"
 
@@ -14639,16 +15505,16 @@ msgstr "Đừng hỏi tôi lần nữa"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution có thể nhập dữ liệu từ các tập tin sau:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Evolution đang thoát..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14680,7 +15546,7 @@ msgstr ""
 "Chúng tôi hy vọng bạn thích kết quả của quá trình làm việc của chúng tôi,\n"
 "và chúng tôi háo hức chờ đời sự đóng góp của bạn!\n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -14688,36 +15554,48 @@ msgstr ""
 "Xin cám ơn\n"
 "Nhóm Ximian Evolution\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr "Đừng nói điều này lần nữa"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Không thể truy cập Vỏ bọc Ximian Evolution"
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Không thể khởi động Vỏ bọc Ximian Evolution: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Khởi động trong chế độ ngoại tuyến"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Khởi động trong chế độ trực tuyến"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Gửi thông tin debug của mọi thành phần vào tập tin."
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14726,31 +15604,60 @@ msgstr ""
 "%s: --online và --offline không thể được dùng chung.\n"
 "  Hãy dùng %s --help để biết thêm thông tin.\n"
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Chọn bộ nhập"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_ID Chứng nhận:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "Tiến trình"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Biểu thức"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Địa chỉ _email:"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"Chứng nhận quá hạn: %s\n"
+"Đối tượng: %s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14808,91 +15715,378 @@ msgid "Backup All"
 msgstr "Blackpool"
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "_ID Chứng nhận:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Chứng nhận không đáng tin"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "_ID Chứng nhận:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Tên chung"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "_ID Chứng nhận:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "_Sửa"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Lỗi xác minh chứng nhận."
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Biểu thức"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Tổ chức"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Đơn vị tổ chức"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Xem"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "_ID Chứng nhận:"
+
+#: smime/gui/smime-ui.glade.h:42
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "_ID Chứng nhận:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Nhập"
+msgid "Certificate already exists"
+msgstr "Card ID đã tồn tại"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Vermont"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "B"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "Đồng ý"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "B"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "_ID Chứng nhận:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "_ID Chứng nhận:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "Chứng nhận không đáng tin"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "ID"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+#, fuzzy
+msgid "Subject Public Key Info"
+msgstr ""
+"\n"
+"Khoá chung: "
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Chủ để là %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Không thể xử lý thư mục spool"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "Chứng nhận không đáng tin"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Lỗi xác minh chứng nhận."
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Không có thông tin"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "đồ đính kèm"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "_ID Chứng nhận:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Curitiba"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "North Carolina"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Biểu thức"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s tại %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Lỗi chữ ký chứng nhận"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "_Chèn"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Chủ để là %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Lỗi chữ ký chứng nhận"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Nhập mật khẩu cho %s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "_ID Chứng nhận:"
 
 #: tools/evolution-launch-composer.c:324
 #, fuzzy
@@ -14946,7 +16140,7 @@ msgstr "Sao chép vùng chọn"
 msgid "Copy to Folder..."
 msgstr "Chép vào thư mục..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Cắt vùng chọn"
 
@@ -14962,7 +16156,7 @@ msgstr "Chuyển liên lạc tới thư mục khác..."
 msgid "Move to Folder..."
 msgstr "Chuyển tới thư mục..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Dán vào clipboard"
 
@@ -14970,8 +16164,8 @@ msgstr "Dán vào clipboard"
 msgid "Previews the contacts to be printed"
 msgstr "Xem trước liên lạc cần in"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Xem thử bản in"
@@ -15016,13 +16210,13 @@ msgstr "Ngưng nạp"
 msgid "View the current contact"
 msgstr "Xem liên lạc hiện thời"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "_Hành động"
 
@@ -15052,144 +16246,113 @@ msgstr "_Gửi thông điệp tới liên lạc..."
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "Tạo cuộc hẹn nguyên ngày mới"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Tạo cuộc hẹn mới"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "Tạo thư mục mới"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Tạo yêu cầu cuộc họp mới"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Tạo công việc mới"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Ngày"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 #, fuzzy
 msgid "Delete All Occurrences"
 msgstr "Xóa _mọi lần"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Xoá cuộc hẹn"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "_Xóa lần này"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "_Xóa lần này"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Đi vào"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Đi lùi"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Đi tới"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Đi tới ngày"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Đi tới ngày xác định"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Đi tới ngày hôm nay"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "Danh sách"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Tháng"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Cuộc _hẹn mới"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "New Caledonia"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Cuộc họp mới"
-
-#: ui/evolution-calendar.xml.h:27
-msgid "New _Task"
-msgstr "Nhiệm _vụ mới"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Xem trước lịch cần in"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "In lịch"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Bourges"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Thư mục công cộng chứa các cuộc hẹn và sự kiện"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Xem chi tiết"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Xem một ngày"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Xem một tháng"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Xem một tuần"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Xem tuần làm việc"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Tuần"
 
@@ -15254,7 +16417,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:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Tập tin"
 
@@ -15476,7 +16639,7 @@ msgstr "Đánh dấu đã đọc tất cả"
 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 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "Dán thông điệp từ clipboard"
 
@@ -15532,16 +16695,6 @@ msgstr "Đảo vùng chọn"
 msgid "_Threaded Message List"
 msgstr "Danh sách thông điệp nhánh"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Đóng cửa sổ này"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "Đón_g"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "Thêm người _gửi vào sổ địa chỉ"
@@ -15699,257 +16852,282 @@ msgstr "Chuyển tiếp thông điệp được chọn tới người khác như
 msgid "Increase the text size"
 msgstr "Tăng cỡ text"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Nạp ả_nh"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Đánh dấu _Quan trọng"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Đánh dấu c_hưa đọc"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Đánh dấu _Không quan trọng"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "Đánh dấu đã đọc cho thông điệp được chọn"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "Đánh dấu quan trọng cho thông điệp được chọn"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Đánh dấu không quan trọng cho thông điệp được chọn"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Đánh dấu chưa đọc cho thông điệp được chọn"
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Đánh dấu chưa đọc cho thông điệp được chọn"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Đánh dấu không quan trọng cho thông điệp được chọn"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Đánh dấu xoá cho thông điệp được chọn"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Di chuyển"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "Chuyển thông điệp được chọn tới thư mục khác"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Kế tiếp"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "Thông điệp quan trọng _kế"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "Nhánh _kế"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "Thông điệp chưa đọc _kế"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Không tìm thấy"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Mở thông điệp được chọn trong cửa sổ mới"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Mở thông điệp được chọn trong bộ soạn thảo và gửi lại"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Kích thước _gốc"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "Thông điệp chưa đọc t_rước"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Gửi trả lời"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr "Gửi trả lời thông điệp trong thư mục Công cộng"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "Thông điệp quan trọng t_rước"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Xem trước thông điệp cần in"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Trước đó"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "In thông điệp"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "Chuyển _hướng"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Chuyển hướng (bounce) thông điệp được chọn tới người khác"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Phục hồi kích thước text gốc"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "Tì_m thông điệp..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "_Nhỏ hơn"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Lưu thông điệp như là text"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 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:86
+#: ui/evolution-mail-message.xml.h:92
 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:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Xem _mã nguồn của thư"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Hiện toàn bộ _header"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Tìm text trong thân thông điệp hiển thị"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Hiện thông điệp theo cách bình thường"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Hiện thông điệp với phần header"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Hiện thông điệp thô (chưa xử lý)"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "_Cỡ text"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "VFolder trên Mailing _List..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "VFolder trên Người _gửi..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "VFolder trên _Người nhận..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "VFolder trên _Chủ đề..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "Đính _kèm"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "_Sao chép vào thư mục"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "_Tạo bộ lọc từ thông điệp"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "Chuyển _tiếp thông điệp"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "Đ_i tới"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "_Lớn hơn"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "_Hiển thị thông điệp"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Chuyển vào thư mục"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "Thông điệp _kế"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "Hiển thị _bình thường"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "_Mở thông điệp"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "Thông điệp t_rước"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "_Quoted"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "Gửi _lại..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "_Công cụ"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr ""
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Đóng cửa sổ này"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "Đón_g"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Đính kèm"
@@ -16228,12 +17406,13 @@ msgid "Change Evolution's settings"
 msgstr "Đổi thiết lập Evolution"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "T_hoát"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Tạo yêu cầu cuộc họp mới"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "_Cửa sổ Evolution"
+msgid "E_xit"
+msgstr "T_hoát"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16245,61 +17424,74 @@ msgstr "Nhập dữ liệu từ chương trình khác"
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "_Cửa sổ Evolution"
+msgid "Open a new window"
+msgstr "Mở trong cửa sổ mới"
 
 #: ui/evolution.xml.h:11
 msgid "Pi_lot Settings..."
 msgstr "Thiết lập Pi_lot..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Gửi / Nhận"
+
+#: ui/evolution.xml.h:13
+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:14
 msgid "Set up Pilot configuration"
 msgstr "Thiết lập cấu hình Pilot"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Hiện thông tin về Ximian Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Gửi báo cáo lỗi"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "_Gửi báo cáo lỗi"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Báo cáo lỗi, dùng Bug Buddy"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Bật tắt"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Bật tắt hoạt động ngoại tuyến"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "_Giới thiệu Ximian Evolution..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "Trợ _giúp"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "_Nhập..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "Mớ_i"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Gửi / Nhận"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "Tìm n_gay"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "In tóm tắt"
@@ -16430,12 +17622,12 @@ msgstr "Định nghĩa khung xem"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "HBTNSBC"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -16568,7 +17760,7 @@ msgstr "_Tìm"
 msgid "_Find Now"
 msgstr "Tìm n_gay"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "_Xóa"
 
@@ -16584,24 +17776,262 @@ msgstr "ID mục con"
 msgid "Text"
 msgstr "Văn bản"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Xóa"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Tìm ngay"
 
+#~ msgid "Account Name"
+#~ msgstr "Tên tài khoản"
+
+#~ msgid "Server Name"
+#~ msgstr "Tên server"
+
+#~ 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"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Liên lạc khác"
+
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "Cấu hình truy cập tới LDAP server ở đây"
+
+#~ msgid "Directory Servers"
+#~ msgstr "Server thư mục"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Hủy tác vụ mail hiện thời"
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Giao diên chọn tên sổ địa chỉ của Evolution."
+
+#, fuzzy
+#~ msgid "Add LDAP Server"
+#~ msgstr "LDAP Server"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Bước 4: Tên hiển thị"
+
+#~ msgid "Find contact in"
+#~ msgstr "Tìm liên lạc trong"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Nhấn vào đây để thêm liên lạc *"
+
+#~ msgid "Business Address"
+#~ msgstr "Địa chỉ kinh doanh"
+
+#~ msgid "Department"
+#~ msgstr "Cơ quan"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "URL rảnh"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Giáo sư"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Đang mở công việc tại %s"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Gửi bất cứ giá nào?"
+
+#, fuzzy
+#~ msgid "Folder _name"
+#~ msgstr "Tên thư mục:"
+
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr "Thông điệp này dùng chữ ký số. Nhấn biểu tượng khóa để biết thêm."
+
+#, fuzzy
+#~ msgid "No signature present"
+#~ msgstr "tập tin chữ ký HTML:"
+
+#~ msgid "Connecting..."
+#~ msgstr "Đang kết nối..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Thư mục này chứa các thông điệp."
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Không thể mở thư mục chia sẽ: %s."
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Chọn một thư mục đích để nhập dữ liệu này"
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Không thể chuyển thư mục:\n"
+#~ "%s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "Thêm thư mục"
+
+#~ msgid "Drafts"
+#~ msgstr "Nháp"
+
+#~ msgid "Outbox"
+#~ msgstr "Thư mục gửi"
+
+#~ msgid "Sent"
+#~ msgstr "Đã gửi"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Lỗi đồng bộ \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "Đồng bộ thư mục"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Đang đồng bộ \"%s\" (%d trên %d) ..."
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Chưa hiển thị thư mục)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(Không)"
+
+#~ msgid "No error"
+#~ msgstr "Không có lỗi"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Thư mục cùng tên đã tồn tại"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Kiểu thư mục không hợp lệ"
+
+#~ msgid "I/O error"
+#~ msgstr "Lỗi I/O"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Không đủ chỗ để tạp thư mục"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Thư mục không rỗng"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Không tìm thấy thư mục"
+
+#~ 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"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Chưa hỗ trợ tác vụ"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Kho chứa này chưa hộ trợ kiểu đã cho"
+
+#~ 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ỏ"
+
+#~ 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ó"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Không thể tạo thư mục với tên đó"
+
+#~ 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"
+
+#~ msgid "Checkbox"
+#~ msgstr "Ô kiểm"
+
+#~ msgid "CORBA error"
+#~ msgstr "Lỗi CORBA"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Đối số không hợp lệ"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Đã có chủ sở hữu"
+
+#~ msgid "No owner"
+#~ msgstr "Không có chủ sở hữu"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Kiểu chưa hỗ trợ"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Lược đồ không hỗ trợ"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Thao tác chưa hỗ trợ"
+
+#~ msgid "Internal error"
+#~ msgstr "Lỗi nội tại"
+
+#~ msgid "Exists"
+#~ msgstr "Tồn tại"
+
+#~ msgid "Invalid URI"
+#~ msgstr "URI sai"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Có thư mục con"
+
+#~ msgid "No space left"
+#~ msgstr "Không còn chỗ"
+
+#~ msgid "Old owner has died"
+#~ msgstr "Chủ sở hữu cũ đã chết"
+
+#~ msgid "Test type"
+#~ msgstr "Kiểu kiểm tra:"
+
+#~ msgid "Evolution Test Component"
+#~ msgstr "Thành phần kiểm tra Evolution"
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Tên trường"
+#~ msgid "import"
+#~ msgstr "Nhập"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Tạo cuộc hẹn nguyên ngày mới"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Cuộc _hẹn mới"
 
-#~ msgid "Family Name"
-#~ msgstr "Tên gia đình"
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Cuộc họp mới"
+
+#~ msgid "New _Task"
+#~ msgstr "Nhiệm _vụ mới"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "_Cửa sổ Evolution"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "_Cửa sổ Evolution"
+
+#~ msgid "Toggle"
+#~ msgstr "Bật tắt"
+
+#~ msgid "Clear"
+#~ msgstr "Xóa"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Hủy tác vụ mail hiện thời"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -16686,9 +18116,6 @@ msgstr "Tìm ngay"
 #~ msgid "Evolution VCard importer"
 #~ msgstr "Bộ soạn thư của Evolution."
 
-#~ msgid "Loading..."
-#~ msgstr "Đang nạp..."
-
 #~ msgid "Searching..."
 #~ msgstr "Đang tìm..."
 
@@ -16740,10 +18167,6 @@ msgstr "Tìm ngay"
 #~ msgstr "Không nạp được EBook\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "Card ID đã tồn tại"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Thao tác bị hủy bỏ"
 
@@ -16958,9 +18381,6 @@ msgstr "Tìm ngay"
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#~ msgid "Phone"
-#~ msgstr "Điện thoại"
-
 #~ msgid "Birth date"
 #~ msgstr "Ngày sinh"
 
@@ -16973,18 +18393,12 @@ msgstr "Tìm ngay"
 #~ msgid "Arbitrary"
 #~ msgstr "Tổng quát"
 
-#~ msgid "ID"
-#~ msgstr "ID"
-
 #~ msgid "Cursor could not be loaded\n"
 #~ msgstr "Không thể nạp con trỏ\n"
 
 #~ msgid "Folder containing contact information"
 #~ msgstr "Thư mục chứa thông tin liên lạc"
 
-#~ msgid "LDAP Server"
-#~ msgstr "LDAP Server"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "LDAP server chứa thông tin liên lạc"
 
@@ -16994,18 +18408,6 @@ msgstr "Tìm ngay"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Thư mục công cộng chứa thông tin liên lạc"
 
-#~ msgid "_Contact"
-#~ msgstr "_Liên lạc"
-
-#~ msgid "Create a new contact"
-#~ msgstr "Tạo liên lạc mới"
-
-#~ msgid "New Contact List"
-#~ msgstr "Danh sách liên lạc mới"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "Tạo danh sách liên lạc mới"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "URI sẽ được Bộ duyệt thư mục hiển thị"
 
@@ -17021,9 +18423,6 @@ msgstr "Tìm ngay"
 #~ msgid "Is New Card"
 #~ msgstr "Là card mới"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "Không có card"
 
@@ -17069,31 +18468,6 @@ msgstr "Tìm ngay"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "Thư mục công cộng chứa các mục to-do"
 
-#~ msgid "New appointment"
-#~ msgstr "Cuộc hẹn mới"
-
-#~ msgid "_Appointment"
-#~ msgstr "_Cuộc hẹn"
-
-#~ msgid "New meeting"
-#~ msgstr "Cuộc họp mới"
-
-#, fuzzy
-#~ msgid "M_eeting"
-#~ msgstr "Cuộc họp"
-
-#~ msgid "New task"
-#~ msgstr "Công việc mới"
-
-#~ msgid "_Task"
-#~ msgstr "Nhiệm _vụ"
-
-#~ msgid "New All Day Appointment"
-#~ msgstr "Cuộc hẹn nguyên ngày mới"
-
-#~ msgid "All _Day Appointment"
-#~ msgstr "Cuộc hẹn n_guyên ngày"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "Không thể cập nhật đối tượng không hợp lệ"
 
@@ -17139,9 +18513,6 @@ msgstr "Tìm ngay"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "Đang mở lịch tại %s"
 
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Đang mở thư mục công việc mặc định"
-
 #~ 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"
 
@@ -17179,10 +18550,6 @@ msgstr "Tìm ngay"
 #~ "Evolution đã tìm thấy những tập tin GnomeCard.\n"
 #~ "Bạn có muốn nhập nó vào Evolution?"
 
-#, fuzzy
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Giao diện cấu hình mail."
-
 #~ msgid "Folder containing mail"
 #~ msgstr "Thư mục đang chứa thư"
 
@@ -17198,9 +18565,6 @@ msgstr "Tìm ngay"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Thư mục Thùng rác ảo"
 
-#~ msgid "Properties..."
-#~ msgstr "Thuộc tính..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Thay đổi thuộc tính thư mục này"
 
@@ -17210,15 +18574,6 @@ msgstr "Tìm ngay"
 #~ 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ứ?"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Thông điệp thư mới"
-
-#~ msgid "_Mail Message"
-#~ msgstr "Thông điệp thư"
-
-#~ msgid "Compose a new mail message"
-#~ msgstr "Biên soạn thông điệp mới"
-
 #~ msgid "New Message Post"
 #~ msgstr "Tạo thông báo mới"
 
@@ -19024,9 +20379,6 @@ msgstr "Tìm ngay"
 #~ msgid "Cumberland"
 #~ msgstr "Cumberland"
 
-#~ msgid "Curitiba"
-#~ msgstr "Curitiba"
-
 #~ msgid "Curitiba Apt"
 #~ msgstr "Curitiba Apt"
 
@@ -22018,9 +23370,6 @@ msgstr "Tìm ngay"
 #~ msgid "North Bend"
 #~ msgstr "North Bend"
 
-#~ msgid "North Carolina"
-#~ msgstr "North Carolina"
-
 #~ msgid "North Conway"
 #~ msgstr "North Conway"
 
@@ -23632,9 +24981,6 @@ msgstr "Tìm ngay"
 #~ msgid "State College"
 #~ msgstr "State College"
 
-#~ msgid "Stauning"
-#~ msgstr "Stauning"
-
 #~ msgid "Staunton"
 #~ msgstr "Staunton"
 
@@ -24223,9 +25569,6 @@ msgstr "Tìm ngay"
 #~ msgid "United Arab Emirates "
 #~ msgstr "United Arab Emirates "
 
-#~ msgid "Unst"
-#~ msgstr "Unst"
-
 #~ msgid "Upington"
 #~ msgstr "Upington"
 
@@ -24334,12 +25677,6 @@ msgstr "Tìm ngay"
 #~ msgid "Veracruz"
 #~ msgstr "Veracruz"
 
-#~ msgid "Vermillion"
-#~ msgstr "Vermillion"
-
-#~ msgid "Vermont"
-#~ msgstr "Vermont"
-
 #~ msgid "Vernal"
 #~ msgstr "Vernal"
 
@@ -24869,9 +26206,6 @@ msgstr "Tìm ngay"
 #~ msgid " F"
 #~ msgstr " F"
 
-#~ msgid " C"
-#~ msgstr " C"
-
 #~ msgid "knots"
 #~ msgstr "knots"
 
@@ -25481,9 +26815,6 @@ msgstr "Tìm ngay"
 #~ msgid "Freezing haze"
 #~ msgstr "Mù kèm gió buốt"
 
-#~ msgid "Spray"
-#~ msgstr "Bụi nước"
-
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Bụi nước trong vùng phụ cận"
 
@@ -25850,18 +27181,6 @@ msgstr "Tìm ngay"
 #~ msgid "Remove a folder added with \"Open Other User's Folder\""
 #~ msgstr "Loại bỏ thư mục được thêm bằng\"Mở thư mục của người dùng khác\""
 
-#~ msgid "Send / Receive"
-#~ msgstr "Gửi / Nhận"
-
-#~ 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"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Bật tắt hiện thanh thư mục"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Bật tắt hiện thanh lối tắt"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Xem thư mục được chọn"
 
@@ -25889,9 +27208,6 @@ msgstr "Tìm ngay"
 #~ msgid "_Rename..."
 #~ msgstr "Đổi _tên..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Gửi / Nhận"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "Thanh _lối tắt"
 
@@ -25936,9 +27252,6 @@ msgstr "Tìm ngay"
 #~ msgid "Font Preferences"
 #~ msgstr "Thông số font"
 
-#~ msgid "Automatically _detect links"
-#~ msgstr "Tự động _xác định liên kết"
-
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 
@@ -26020,18 +27333,12 @@ msgstr "Tìm ngay"
 #~ msgid "1234"
 #~ msgstr "1234"
 
-#~ msgid "380"
-#~ msgstr "380"
-
 #~ msgid "666"
 #~ msgstr "666"
 
 #~ msgid "<- _Remove"
 #~ msgstr "<- _Loại bỏ"
 
-#~ msgid "<< Fewer Options"
-#~ msgstr "<< Ít tùy chọn hơn"
-
 #~ msgid "Add (or Edit) Attribute Mappings"
 #~ msgstr "Thêm (hoặc Sửa) ánh xạ thuộc tính"
 
@@ -26820,25 +28127,11 @@ msgstr "Tìm ngay"
 
 #~ msgid ""
 #~ "\n"
-#~ "Comment: "
-#~ msgstr ""
-#~ "\n"
-#~ "Ghi chú: "
-
-#~ msgid ""
-#~ "\n"
 #~ "Unique String: "
 #~ msgstr ""
 #~ "\n"
 #~ "Chuỗi duy nhất: "
 
-#~ msgid ""
-#~ "\n"
-#~ "Public Key: "
-#~ msgstr ""
-#~ "\n"
-#~ "Khoá chung: "
-
 #~ msgid "Error in search expression."
 #~ msgstr "Lỗi trong biểu thức tìm kiếm"
 
@@ -26851,9 +28144,6 @@ msgstr "Tìm ngay"
 #~ msgid "New _Contact"
 #~ msgstr "Liên lạc mớ_i"
 
-#~ msgid "New Contact _List"
-#~ msgstr "_Danh sách liên lạc mới"
-
 #~ msgid "A_uthenticate with server using:"
 #~ msgstr "_Yêu cầu xác thực với server bằng:"
 
@@ -26931,9 +28221,6 @@ msgstr "Tìm ngay"
 #~ msgid "British Virgin Islands"
 #~ msgstr "Đảo British Virgin"
 
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "Tạo cuộc hẹn mới với bộ _nhắc nhở mặc định"
-
 #~ msgid "First day of wee_k:"
 #~ msgstr "Ngày đầu của tuần:"
 
@@ -27183,9 +28470,6 @@ msgstr "Tìm ngay"
 #~ msgid "Composer"
 #~ msgstr "Bộ soạn thư"
 
-#~ msgid "Default Forward style is: "
-#~ msgstr "Kiểu chuyển tiếp mặc định là: "
-
 #~ msgid "Edit..."
 #~ msgstr "Sửa..."
 
@@ -27204,9 +28488,6 @@ msgstr "Tìm ngay"
 #~ msgid "_Organization:"
 #~ msgstr "_Tổ chức:"
 
-#~ msgid "_Send mail in HTML format by default."
-#~ msgstr "_Gửi thư mặc định dùng dạng HTML"
-
 #~ msgid "_Server Type: "
 #~ msgstr "_Kiểu server: "
 
@@ -27309,9 +28590,6 @@ msgstr "Tìm ngay"
 #~ msgid "Send _later"
 #~ msgstr "Gửi _sau"
 
-#~ msgid "Send the message later"
-#~ msgstr "Sẽ gửi thông điệp sau"
-
 #~ msgid "Configure the task view's settings"
 #~ msgstr "Cấu hình thiết lập khung công việc"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 701e3854cb..9c100f4a1c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-09-07 11:09+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -32,51 +32,184 @@ msgstr "无法装入 %s：%s"
 msgid "Could not read pilot's Address application block"
 msgstr "无法读入 Pilot 的地址应用程序块"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "自动完成文件夹"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "证书 ID(_C)："
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "在这里配置您的电子邮件账号"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "联系人"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
+msgstr "Evolution 地址簿"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution 地址簿地址弹出框"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution 地址簿地址查看器"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution 地址簿卡片查看器"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook component"
+msgstr "Evolution 地址簿组件"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution 地址簿文件夹查看器"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution 邮件首选项控件"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution 文件夹配置控件"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "地址簿"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "属性..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "删除"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "重命名(_R)"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "新联系人："
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "联系人(_C)"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "创建一个新联系人"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "新建联系人列表"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "新建联系人列表"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "创建一个新的联系人列表"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "个人"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "工作"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "LDAP 服务器"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "无法创建目录 %s：%s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "连接 LDAP 服务器失败"
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "LDAP 服务器认证失败"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "无法在根 DSE 上执行查询"
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "服务器响应为没有支持的搜索起点"
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "此服务器不支持 LDAPv3 schema 信息"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "检索 schema 信息错误"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr "服务器没有响应有效的 schema 信息"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "帐号名"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "服务器名"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "在本次 Evolution 创建中未打开 LDAP 支持"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "其他联系人"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -84,7 +217,7 @@ msgstr ""
 "我们无法打开此地址簿。请检查路径是否存在\n"
 "以及您是否有足够的权限访问它。"
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -94,7 +227,7 @@ msgstr ""
 "您输入了错误的 URI，也可能是因为\n"
 "LDAP 服务器已经关闭。"
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -106,7 +239,7 @@ msgstr ""
 "以下链接获取 OpenLDAP，然后从程序的 CVS 源代码\n"
 "重新编译程序。\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -120,44 +253,43 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "无法打开地址簿"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "匿名访问 LDAP 服务器"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "认证失败。\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s为 %s 输入口令 (用户 %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "姓名以此开头"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "邮件以此开头"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "类别为"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "任何域含有"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "高级..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -168,7 +300,7 @@ msgstr ""
 "Evolution 配置要显示的数目。请在搜索的时候指定更加严格的\n"
 "搜索条件，或者在此地址簿的目录服务器参数中将结果限制调高。"
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -179,88 +311,41 @@ msgstr ""
 "请在搜索的时候指定更加严格的搜索条件，或者在此地址簿的目录服务器参数\n"
 "中将时间限制调高。"
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "此地址簿的后端无法解析此查询。"
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "此地址簿的后端拒绝执行此查询。"
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "此查询未成功完成。"
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "任何类别"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "日历将显示的 URI"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "证书 ID(_C)："
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "在此配置对 LDAP 目录服务器的访问"
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "联系人"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "目录服务器"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolution 地址簿"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Evolution 的地址簿 LDAP 配置控件"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution 地址簿地址弹出框"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution 地址簿地址查看器"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution 地址簿卡片查看器"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr "Evolution 地址簿组件"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution 地址簿文件夹查看器"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution 邮件首选项控件"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -283,6 +368,7 @@ msgstr " 显示支持的基础(_H) "
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -316,8 +402,9 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "添加 LDAP 服务器"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "LDAP 配置助手"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -333,9 +420,9 @@ msgid "Anonymously"
 msgstr "匿名"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -344,47 +431,48 @@ msgstr ""
 "\n"
 "请单击“完成”按钮保存您在此输入的设置。"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "连接"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "已识别的姓名(_D)："
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr "编辑 LDAP 服务器"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
 msgstr "电子邮件地址："
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution 将使用此已识别的名字在服务器上对您进行认证"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr "Evolution 将使用此电子邮件地址在服务器上对您进行认证"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "已完成"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "常规"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "LDAP 配置助手"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "组"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "从不"
 
@@ -410,8 +498,8 @@ msgid "S_earch scope: "
 msgstr "搜索范围(_E)："
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "搜索"
 
@@ -462,26 +550,30 @@ msgstr ""
 "选择此选项可让您更改 Evolution 对 LDAP 搜索及创建和编辑联系人所用的默认设置。"
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr "指定显示名称是配置 LDAP 服务器所需的最后一个步骤。"
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "第一步：服务器信息"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "第二步：连接服务器"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "第一步：服务器信息"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "第三步：搜索目录"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "第二步：连接服务器"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "第四步：显示姓名"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "第三步：搜索目录"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -493,16 +585,6 @@ msgstr "支持的搜索起点"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"配置 LDAP 服务器的第一个步骤是提供其名称，以及您的登录信息。\n"
-"如果您对这些信息不太了解，请询问您的系统管理员。"
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -512,7 +594,7 @@ msgstr ""
 "本页中的选项控制了在您的搜索中应当包含多少项，以及搜索将花费的时间。\n"
 "如果您需要更改这些选项，请询问您的系统管理员。"
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -522,7 +604,7 @@ msgstr ""
 "搜索基础是您搜索开始项的可识别名称(DN)。如果您将此处留空，搜索将从目\n"
 "录树的根开始。"
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -535,27 +617,27 @@ msgstr ""
 "指定的搜索基础下所属的全部项。搜索范围若为“一级”，则只会包含您指定的搜\n"
 "索基础之下一级的项目。\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
+#, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "此助手将帮助您使用 LDAP(轻量级目录访问协议)服务器访问在线目录服务。\n"
 "\n"
 "添加新的 LDAP 服务器需要关于服务器的一些专业化信息。如果您对这些信\n"
 "息不太了解的话，请询问您的系统管理员。"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "这是您的 LDAP 服务器的完整名字。例如，“ldap.mycompany.com”。"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -564,7 +646,7 @@ msgstr ""
 "这是可下载条目的最大数量。将此数值设定\n"
 "得太大将导致地址簿变慢。"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -573,7 +655,7 @@ msgstr ""
 "这是 evolution 用来认证您的方法。请注意若在此设定为“电子邮件地址”则需要您具有"
 "对 ldap 服务器的匿名访问权限。"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -582,6 +664,15 @@ msgstr ""
 "这是此服务器在 Evolution 文件夹列表中显示的名称。\n"
 "它只用于显示。"
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"这是此服务器在 Evolution 文件夹列表中显示的名称。\n"
+"它只用于显示。"
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -609,21 +700,32 @@ msgid "Using email address"
 msgstr "使用电子邮件地址"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "可能时"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+"配置 LDAP 服务器的第一个步骤是提供其名称，以及您的登录信息。\n"
+"如果您对这些信息不太了解，请询问您的系统管理员。"
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "显示名称(_D)："
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "下载上限(_D)："
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -631,54 +733,52 @@ msgstr "下载上限(_D)："
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "登录方式(_L)："
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "端口号(_P)："
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "搜索起点(_S)："
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "服务器名(_S)："
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "超时(分钟)(_T)："
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "卡片"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr "连接-页"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr "常规-页"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr "搜索-页"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "姓名"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution 的地址簿名称选择界面"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "全部删除"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "删除"
@@ -705,23 +805,21 @@ msgstr "添加到联系人"
 msgid "Unnamed Contact"
 msgstr "未命名的联系人"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "姓名"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "来源"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "从地址簿中选择联系人"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "在其中查找联系人"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution 的地址簿名称选择界面"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "查找"
@@ -798,7 +896,8 @@ msgid "D_epartment:"
 msgstr "部门(_E)："
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "细节"
 
@@ -862,12 +961,12 @@ msgid "_Categories..."
 msgstr "类别(_C)..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "删除(_D)"
@@ -1986,7 +2085,7 @@ msgid "Esq."
 msgstr "先生"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "全名"
 
@@ -2079,11 +2178,27 @@ msgstr "联系人列表编辑器"
 msgid "Save List as VCard"
 msgstr "将列表保存为 VCard"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "被改变的联系人："
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "冲突的联系人："
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "复制检测到的联系人"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"改变后的电子邮件或姓名已经在本文件夹中存在了。\n"
+"您一定要添加吗？"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "新联系人："
@@ -2100,22 +2215,6 @@ msgstr ""
 "此联系人的姓名或地址已经在本文件夹中存在了。\n"
 "您一定要添加吗？"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "被改变的联系人："
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "冲突的联系人："
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"改变后的电子邮件或姓名已经在本文件夹中存在了。\n"
-"您一定要添加吗？"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2214,9 +2313,9 @@ msgstr "转发联系人"
 msgid "Send Message to Contact"
 msgstr "给联系人发邮件"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "打印"
@@ -2238,9 +2337,12 @@ msgstr "移动到文件夹..."
 msgid "Cut"
 msgstr "剪切"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "复制"
 
@@ -2249,16 +2351,8 @@ msgstr "复制"
 msgid "Paste"
 msgstr "粘贴"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "删除"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "当前视图"
 
@@ -2273,166 +2367,170 @@ msgstr ""
 "的地址簿后端已经崩溃。您需要重新启动 Evolution 才能再次使用该后端"
 
 #: 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:2
 msgid "Assistant"
 msgstr "助手"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 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:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "商务传真"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "商务电话"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "商务电话 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "回拨电话"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "车载电话"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "类别"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "公司电话"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "部门"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "电子邮件"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "电子邮件 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "电子邮件 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "姓"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "存档为"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "忙闲 URL"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "家庭地址"
+#, fuzzy
+msgid "Given Name"
+msgstr "域名"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "家庭传真"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "家庭电话"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "家庭电话 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "电话"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "约旦"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "经理"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "移动电话"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "昵称"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "注释"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "办公室"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "组织"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "其它地址"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "其它传真"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "其它电话"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "寻呼机"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "主要电话"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "职业"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "收音机"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "角色"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "配偶"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "电传"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "头衔"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Unst"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "网站"
 
@@ -2525,11 +2623,19 @@ msgstr "成员"
 msgid "Job Title"
 msgstr "职称(_J)："
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "家庭地址"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "家庭地址"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "其它地址"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2542,112 +2648,109 @@ msgstr "家庭传真"
 msgid "Blog"
 msgstr "博罗尼亚"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "成功"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "未知的错误"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "仓库离线"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "没有权限"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "找不到卡片"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "卡片 ID 已经存在"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "不支持的协议"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "已经取消"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "认证失败"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "必须认证"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS 不可用"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "地址簿不存在"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "其它错误"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "您希望保存修改吗？"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr "丢弃(_D)"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "添加列表错误"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "添加卡片错误"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "修改列表错误"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "修改卡片错误"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "删除列表错误"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "删除卡片错误"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2656,7 +2759,7 @@ msgstr ""
 "打开 %d 张卡片将同时打开 %d 个新窗口。\n"
 "您真的想要显示所有卡片吗？"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2665,49 +2768,49 @@ msgstr ""
 "%s 已经存在\n"
 "您打算覆盖它吗？"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "覆盖"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "保存 %s 出错：%s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "列表"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "将卡片移动到"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "将卡片复制到"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "将卡片移动到"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "将卡片复制到"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "多个 VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "%s 的 VCard"
@@ -2902,7 +3005,7 @@ msgstr "边界"
 msgid "Number of columns:"
 msgstr "列数："
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "选项"
 
@@ -3089,18 +3192,18 @@ msgstr "未命名的列表"
 msgid "Split Multi-Day Events:"
 msgstr "分割多日事件："
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "无法启动 wombat 服务器"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "无法启动 wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "无法读入 Pilot 日历应用程序块"
 
@@ -3108,24 +3211,83 @@ msgstr "无法读入 Pilot 日历应用程序块"
 msgid "Default Priority:"
 msgstr "默认优先级："
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "无法读入 Pilot ToDo 应用程序块"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "日历和任务"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "日历"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "在此配置您的时区、日历和任务列表 "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution 日历和任务"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution 日历配置控件"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution 日历调度邮件查看器"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Evolution 日历查看器"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution 日历/任务新闻编辑器"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Evolution 任务查看器"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolution 日历和任务组件"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolution 测试组件"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "任务"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution 日历提醒通知服务"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "开始："
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "结束："
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Evolution 提醒"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "在 %s 时提醒"
@@ -3199,43 +3361,172 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "不要再次询问此问题。"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution 日历提醒通知服务"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "无法初始化 Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "无法创始化 gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "无法创建提醒服务车间"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "无效时间"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "iCalendar 错误"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "今天到期任务的颜色"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "今天到期任务的颜色"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "在周视图和月视图中显示约会结束时间(_S)"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "预览将要打印的日历"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "删除项时要求确认(_A)"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "删除项时要求确认(_A)"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "删除已完成的任务"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "在日期浏览器中显示周数(_N)"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "概要含有"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "描述含有"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "注释含有"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "无匹配"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3246,81 +3537,110 @@ msgstr ""
 "\n"
 "确实删除这些任务吗？"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "返回小于"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "天数"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%Y年%m月%d日%A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%m月%d日%A"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%Y年%m月%d日%A"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%Y年%m月%d日"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%m月%d日"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "打印此日历"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "新喀里多尼亚"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "新建约会"
+
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "约会(_A)"
+
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "创建新约会"
+
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "新闻会议"
+
+#: calendar/gui/calendar-component.c:640
+msgid "M_eeting"
+msgstr "会议(_E)"
+
+#: calendar/gui/calendar-component.c:641
 #, fuzzy
-msgid "Rename"
-msgstr "重命名(_R)"
+msgid "Create a new meeting request"
+msgstr "创建一条新任务请求"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "新建全天约会"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "个人"
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr "全天约会(_D)"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "工作"
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "创建新约会"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3437,7 +3757,7 @@ msgstr "发送给："
 msgid "With these arguments:"
 msgstr "使用这些参数："
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -3453,6 +3773,10 @@ msgstr "小时"
 msgid "minutes"
 msgstr "分钟"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3485,8 +3809,8 @@ msgstr "发送电子邮件"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "概要："
 
@@ -3515,7 +3839,7 @@ msgstr "约会结束"
 msgid "hour(s)"
 msgstr "小时"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "分钟"
 
@@ -3569,7 +3893,7 @@ msgstr "天数"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "星期五"
 
@@ -3583,7 +3907,7 @@ msgstr "分钟"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "星期一"
 
@@ -3593,7 +3917,7 @@ msgstr "周日(_U)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "星期六"
 
@@ -3607,7 +3931,7 @@ msgstr "在日期浏览器中显示周数(_N)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "星期日"
 
@@ -3625,7 +3949,7 @@ msgstr "任务列表"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "星期四"
 
@@ -3643,7 +3967,7 @@ msgstr "时间格式："
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "星期二"
 
@@ -3653,12 +3977,12 @@ msgstr "一周开始(_E)："
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "星期三"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "一周工作日"
 
@@ -3695,7 +4019,7 @@ msgid "_Fri"
 msgstr "周五(_F)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "常规(_G)"
 
@@ -3735,76 +4059,76 @@ msgstr "周三(_W)"
 msgid "before every appointment"
 msgstr "在每次约会前"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr "即将删除的事件是一个会议，您是否想要发送一条取消通告？"
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "您真的要取消并删除此会议吗？"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr "即将删除的任务已被指派，您是否想要要发送一条取消通告？"
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "您真的要取消并删除此任务吗？"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr "即将删除的日历项已公布，您是否想要发送一条取消通告？"
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "您真的想要取消并删除该日志条目吗？"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "该事件已经被删除。"
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "该任务已经被删除。"
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "该日志条目已经被删除。"
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  您已经做了修改。放弃这些修改并关闭编辑器吗？"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  您还没有进行修改，关闭编辑器吗？"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "该事件已经被更改。"
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "该任务已经被更改。"
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "该日志条目已经被更改。"
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  您已经做出了修改。放弃这些修改并更新编辑器吗？"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  您还没有进行修改，更新编辑器吗？"
@@ -3814,164 +4138,169 @@ msgstr "%s  您还没有进行修改，更新编辑器吗？"
 msgid "Validation error: %s"
 msgstr "校验错误：%s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " 到 "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (完成 "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "已完成 "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (预定 "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "预定 "
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "无法更新对象"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "编辑约会"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "约会 - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "任务 - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "日志条目 - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "没有概要"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "另存为..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "如果更新到达的话，对此项目的更改将被丢弃"
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "无法获取当前版本！"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "为导入的数据选择目标文件夹"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "您真的想要删除约会“%s”吗？"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "您真的想要删除此无标题约会吗？"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "您真的想要删除任务“%s”吗？"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "您真的想要删除此无标题任务吗？"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "您真的想要删除日志条目“%s”吗？"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "您真的想要删除此无标题日志条目吗？"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "您真的想要删除 %d 个约会吗？"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "您真的想要删除 %d 个任务吗？"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "您真的想要删除 %d 个日志条目吗？"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "无法删除事件，原因是 corbat 错误"
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "无法删除任务，原因是 corbat 错误"
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "无法删除日记条目，原因是 corbat 错误"
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "无法删除项目，原因是 corbat 错误"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "无法删除事件，原因是权限被禁止"
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "无法删除任务，原因是权限被禁止"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "无法删除日记条目，原因是权限被禁止"
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "无法删除项目，原因是权限被禁止"
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "无法删除事件，原因是 corbat 错误"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "无法删除任务，原因是 corbat 错误"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "无法删除日记条目，原因是 corbat 错误"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "无法删除项目，原因是 corbat 错误"
@@ -3988,43 +4317,43 @@ msgstr "授权给："
 msgid "Enter Delegate"
 msgstr "输入代表"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "约会"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "提醒"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "再现"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "调度"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "会议"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "开始日期有错"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "结束日期有错"
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "开始时间有错"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "结束时间有错"
 
@@ -4093,31 +4422,31 @@ msgid "_Start time:"
 msgstr "开始时间(_S)："
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "无"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr "选中的组织者没有帐户了。"
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "需要一名组织者。"
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "需要至少一个参加者。"
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "授权于(_D)..."
 
@@ -4158,21 +4487,15 @@ msgid "Member"
 msgstr "成员"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "角色"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "状态"
@@ -4192,6 +4515,7 @@ msgid "_Invite Others..."
 msgstr "邀请其他人(_I)..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4224,6 +4548,7 @@ msgid "Could not create directory for new calendar"
 msgstr "无法创建目录 %s：%s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "必须设定组织者。"
@@ -4253,33 +4578,58 @@ msgstr "日历信息"
 msgid "Calendar Name"
 msgstr "日历"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "无法创建目录 %s：%s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "日历信息"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "任务列表"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "任务列表"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "任务列表"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr "您即将修改再现事件，请指定您想要修改的具体内容。"
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "您即将修改再现任务，请指定您想要修改的具体内容。"
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr "您即将修改再现日记项，请指定您想要修改的具体内容。"
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr "只是本次"
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "本次和以后各次"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr "本次和以后各次"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr "所有各次"
 
@@ -4327,10 +4677,15 @@ msgstr "天"
 msgid "on the"
 msgstr "在"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "循环"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "日期/时间："
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "添加(_D)"
@@ -4395,7 +4750,7 @@ msgstr "周"
 msgid "year(s)"
 msgstr "年"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
@@ -4405,31 +4760,31 @@ msgstr ""
 "\n"
 "您希望保存改动吗？"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "丢弃修改(_D)"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 msgid "Save Event"
 msgstr "保存事件"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "会议信息已创建。发送此信息吗？"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "会议信息已经改变。发送更新版本吗？"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "任务分配信息已创建。发送此信息吗？"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "任务信息已经改变。发送更新版本？"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "完成日期有错"
 
@@ -4439,43 +4794,43 @@ msgid "% _Complete"
 msgstr "% 完成"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "已完成"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "高"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "正在进行中"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "低"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "中"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "尚未开始"
 
@@ -4484,7 +4839,7 @@ msgid "Progress"
 msgstr "进度"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "未定义"
 
@@ -4506,21 +4861,21 @@ msgstr "状态(_S)："
 msgid "_Web Page:"
 msgstr "网页地址(_W)："
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "基本"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "指派"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "到期日期错误"
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr "到期日期先于开始日期！"
 
@@ -4528,9 +4883,9 @@ msgstr "到期日期先于开始日期！"
 msgid "Con_fidential"
 msgstr "机密(_F)"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "描述："
 
@@ -4635,26 +4990,21 @@ msgstr "在 %2$s 时 %1$s"
 msgid "%s for an unknown trigger type"
 msgstr "%s 为未知触发类型"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "公开"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "保密"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "机密"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "类别"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4667,28 +5017,26 @@ msgid "Start Date"
 msgstr "开始日期"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "概要"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "颜色"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "约会"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "空闲"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "繁忙"
 
@@ -4700,7 +5048,7 @@ msgstr "北"
 msgid "S"
 msgstr "南"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "东"
 
@@ -4708,7 +5056,7 @@ msgstr "东"
 msgid "W"
 msgstr "西"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4718,7 +5066,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4726,7 +5074,7 @@ msgstr ""
 msgid "Yes"
 msgstr "是"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4734,17 +5082,17 @@ msgstr "否"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "未知"
 
@@ -4756,181 +5104,179 @@ msgstr "重复"
 msgid "Assigned"
 msgstr "已委派"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "更新对象"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "删除选中的对象"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "更新对象"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "新建约会(_A)..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "新建全天事件(_E)"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "新会议"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "新建任务"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "打印(_P)..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "粘贴(_P)"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "转到今天(_T)"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "转到日期(_G)..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "发布忙闲信息(_P)"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "设置(_S)..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "打开(_O)"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "另存为(_S)..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: 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-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "复制(_C)"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "调度会议(_S)..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "作为 iCalendar 转发(_F)..."
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "删除此次出现(_O)"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "删除所有出现(_A)"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "设置(_S)..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "打开邮件(_O)"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "委派任务(_A)"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "作为 iCalendar 转发(_F)"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "标记为完成(_M)"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "把任务标记为完成(_M)"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "删除选定的任务(_D)"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "点击以添加任务"
@@ -4944,8 +5290,8 @@ msgstr "% 完成"
 msgid "Alarms"
 msgstr "提醒"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "完成"
 
@@ -4974,18 +5320,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y年%m月%d日%A%H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d %A %p%H:%M:%S"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5004,7 +5350,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%B%d日%A"
 
@@ -5017,442 +5363,441 @@ msgstr "%B%d日"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "上午"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "下午"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr "是(复杂重现)"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "每天"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "每 %d 天"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "每周"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "每 %d 周"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr "每周的"
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr "每 %d 周的"
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " 和 "
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr "第 %s 天属于"
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s 属于"
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "每月"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr "每 %d 个月"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "每年"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "每 %d 年"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr " 总计 %d 次"
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr "，结束于 "
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>开始：</b>"
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>结束：</b>"
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>已完成：</b> "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>到期：</b>"
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "iCalendar 信息"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "iCalendar 错误"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "未知的人"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr "<br> 请查看下列信息，并从下面的菜单中选择一个动作。"
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>无</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "位置："
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "状态："
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "接受"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "暂时接受"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "拒绝"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "选择一项活动："
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "更新"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "确定"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "接受"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "暂时接受"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "拒绝"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "发送忙闲信息"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "更新应答者状态"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "发送最新的信息"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "取消"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> 发布了会议信息。"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "会议信息"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> 请求 %s 参加一个会议。"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> 请求您参加一个会议。"
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "会议建议"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> 希望加入到已存的会议。"
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "会议更新"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> 想收到最新的会议信息。"
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "会议更新请求"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> 已回复一个会议请求。"
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "会议答复"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> 取消了一个会议。"
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "会议取消"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> 发送了一个无法理解的信息。"
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "错误的会议信息"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> 发布了任务信息。"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "任务信息"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> 请求 %s 完成一个任务。"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> 请求您完成一个任务。"
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "任务建议"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s<b> 希望加入到已存在的任务。"
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "任务更新"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> 希望获取最新的任务信息。"
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "任务更新请求"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> 已经回复了任务委派。"
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "任务回复"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> 取消了任务。"
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "任务取消"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "错误的任务邮件"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> 发布了忙闲信息。"
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "忙闲信息"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> 请求您的忙闲信息。"
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "忙/闲请求"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> 应答了忙闲请求。"
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "忙闲应答"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "错误的忙闲信息"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr "邮件的格式可能不正确"
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "邮件只含有不支持的请求。"
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr "附件中没有有效的日历信息"
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr "附件中没有可查看的日历项目"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "无法更新日历文件！\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "更新完成\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "由于条目不再存在而无法更新参与者状态"
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "对象无效，无法更新\n"
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "此响应并非来自当前参与者。将响应者加为参与者吗？"
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "因为无效状态而无法更新参与者状态！\n"
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr "CORBA 系统出错\n"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr "找不到对象\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "您没有适当的权限打开日历\n"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "更新参与者状态\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "无法更新参与者状态！\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "删除完成"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "项目已发送！\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "无法发送项目！\n"
 
@@ -5612,7 +5957,7 @@ msgstr "%Y年%m月%d日%A"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%Y年%m月%d日"
 
@@ -5676,49 +6021,44 @@ msgstr "会议开始时间(_S)："
 msgid "Meeting _end time:"
 msgstr "会议结束时间(_E)："
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "开始日期(_R)："
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "到期日期(_D)："
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "优先级(_P)："
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "页面"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "在 %s 打开任务"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "无法从“%s”中装入任务"
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "不支持装入“%s”必需的方法"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "您没有适当的权限打开“%s”中的文件夹"
 
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5727,48 +6067,39 @@ msgstr ""
 "%s 错误：\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "正在完成的日期..."
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "正在删除选中的对象..."
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "正在销毁"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "任务"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "日历"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "无法打开“%s”中的文件夹"
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "不支持打开“%s”必需的方法"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "添加关于 %s 的提醒"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5778,7 +6109,7 @@ msgstr ""
 "%s\n"
 "的任务后端已经崩溃。您需要重新启动 Evolution 才能再次使用该后端"
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5788,58 +6119,11 @@ msgstr ""
 "%s\n"
 "的日历后端已经崩溃。您需要重新启动 Evolution 才能再次使用该后端"
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "都灵"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "日历和任务"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "日历"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "在此配置您的时区、日历和任务列表 "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution 日历和任务"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution 日历配置控件"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution 日历调度邮件查看器"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution 日历查看器"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution 日历/任务新闻编辑器"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution 任务查看器"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolution 日历和任务组件"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolution 测试组件"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "四月"
@@ -5896,296 +6180,332 @@ msgstr "十月"
 msgid "September"
 msgstr "九月"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "必须设定组织者。"
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "至少需要一个参加者"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "事件信息"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "任务信息"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "日志信息"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "忙闲信息"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "日历信息"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "更新"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "刷新"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "投票表决"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "忙闲信息 (%s 到 %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "iCalendar 信息"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "您必须是事件的参与者。"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1日"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2日"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3日"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4日"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5日"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6日"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7日"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8日"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9日"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10日"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11日"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12日"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13日"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14日"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15日"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16日"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17日"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18八日"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19日"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20日"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21日"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22日"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23日"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24日"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25日"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "二十六日"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27日"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28日"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29日"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30日"
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31日"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "日"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "一"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "二"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "三"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "四"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "五"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "六"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "选中的日期 (%Y年%m月%d日%A)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%m月%d日%A"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%Y年%d日%A"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%Y年%m月%d日%A"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "选中的周(%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "选中的月(%Y年%m月)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "选中的年 (%Y年)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "任务"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "状态：%s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "优先级：%s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完成率：%i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL：%s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "类别：%s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "联系人："
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "打印预览"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "打印项"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "打印设置"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "重命名此快捷方式"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "任务列表"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "新建任务"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "任务(_T)"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "创建新任务"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "要显示的任务文件夹的 URI"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6196,11 +6516,11 @@ msgstr ""
 "\n"
 "确实删除这些任务吗？"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "不要再次询问。"
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "打印任务"
 
@@ -6228,15 +6548,15 @@ msgstr "iCalendar 文件(.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar 文件(.vcf)"
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "提醒!!"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "日历事件"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6244,7 +6564,7 @@ msgstr ""
 "Evolution 已找到 Gnome 日历文件。\n"
 "您是否原意把它们导入 Evolution？"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Gnome 日历"
 
@@ -7777,27 +8097,27 @@ msgstr "太平洋/沃利斯"
 msgid "Pacific/Yap"
 msgstr "太平洋/雅浦"
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "该密码不支持签名"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "该密码不支持验证"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "该密码不支持加密"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "该密码不支持解密"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr "您不能用此密码导入密钥"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr "您不能用此密码导出密钥"
 
@@ -7849,86 +8169,86 @@ msgstr "正在准备脱机文件夹“%s”"
 msgid "You must be working online to complete this operation"
 msgstr "您必须在线工作以便完成该操作"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "创建到“%s”的管道失败：%s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "创建子进程“%s”失败：%s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "收到 %s 发来的无效信息流：%s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "同步文件夹"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "解析过滤规则出错：%s：%s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "执行过滤规则错误：%s：%s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "无法打开脱机文件夹"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "无法处理脱机文件夹"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "正在获取邮件 %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "无法打开消息"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "在消息 %d 失败"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "正在同步文件夹"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "正在获取第 %d 个消息，共 %d 个"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "在第 %d 个消息失败，共 %d 个"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "检索消息失败。"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr "(system-flag)参数无效"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr "(user-tag)参数无效"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "执行过滤规则搜索错误：%s：%s"
@@ -7960,35 +8280,35 @@ msgstr "(match-all) 需要一个布尔结果"
 msgid "Performing query on unknown header: %s"
 msgstr "正在对未知的头进行查询：%s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "不支持的操作：附加邮件：附加 %s"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "不支持的操作：按表达式搜索：搜索 %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "不支持的操作：按 uid 搜索：搜索 %s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "正在移动邮件"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr "正在复制邮件"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "正在收取 %d 封邮件"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -7999,15 +8319,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr "解析 gpg userid 提示失败。"
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr "解析 gpg 密码句请求失败。"
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8016,30 +8336,30 @@ msgstr ""
 "您需要一个密码句用来解锁以下用户：\n"
 "“%s”"
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "已取消"
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "解锁密钥失败：给出了 3 个错误的密码句。"
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "来自 GnuPG 的意外应答：%s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr "未提供数据"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "加密失败：没有指定有效的收件人。"
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8050,49 +8370,61 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "GPG %s 失败：%s\n"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "无法写数据：%s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "执行 gpg 失败：%s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr "执行 gpg 失败。"
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "这是消息的数字签名部分"
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr "无法校验邮件签名：无法创建临时文件：%s"
+
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "无法校验邮件签名：无法创建临时文件：%s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "无法写数据：%s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "这是消息的数字签名部分"
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "索引邮件体内容"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "无法从编辑器检索邮件"
@@ -8191,15 +8523,15 @@ msgstr "写入邮件临时文件错误：%s"
 msgid "Error copying mail temp file: %s"
 msgstr "复制邮件临时文件错误：%s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "解密 MIME 部分失败：协议错误"
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "解密 MIME 部分失败：无效的结构"
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "解析错误"
 
@@ -8504,12 +8836,12 @@ msgstr "虚拟文件夹电子邮件提供者"
 msgid "For reading mail as a query of another set of folders"
 msgstr "关于将读入邮件作为对另一组文件夹的查询"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "协议“%s”没有可用的提供者"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8518,71 +8850,82 @@ msgstr ""
 "无法创建目录 %s：\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "为 %s 输入密码"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "未定义"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "编辑签名"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "编辑签名"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "链中的自签名证书"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "不信任的证书"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "保存签名"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "解析错误"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "服务器：%s，类型：%s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "无法获取文件夹：对该存储的无效操作"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "无法创建文件夹：对该存储的无效操作"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "回收站"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "六月"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "无法获取发行者的证书"
@@ -8791,7 +9134,7 @@ msgstr ""
 "证书撤销列表已过期：%s\n"
 "发行者：%s"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "无法解析 URL “%s”"
@@ -8810,22 +9153,22 @@ msgstr "在 %2$s 中没有消息 %1$s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "无法将消息移动或复制到虚拟文件夹中"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "无法删除文件夹：%s：无效操作"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "无法删除文件夹：%s：没有该文件夹"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "无法重命名文件夹：%s：无效操作"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "无法重命名文件夹：%s：没有该文件夹"
@@ -8905,7 +9248,7 @@ msgstr "无法检索邮件：%s"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -8919,7 +9262,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "没有该邮件"
@@ -8957,54 +9300,69 @@ msgid "Failed to cache %s: %s"
 msgstr "缓冲 %s 失败：%s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "正在连接服务器..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "连接 LDAP 服务器失败"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "公司"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "正在检查新邮件"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Check for new messages in all folders"
 msgstr "在所有文件夹中检查新邮件"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "文件夹"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "只显示订约了的文件夹"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "覆盖服务器提供的文件夹命名空间"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "命名空间"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "应用过滤规则到本服务器上收件箱中的新邮件"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "自动检查邮件的间隔(_A)"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP 服务器上的邮件的读写。"
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "密码"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。"
@@ -9255,7 +9613,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "无法将文件夹 %s 改名为 %s：%s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "无法重命名“%s”：%s"
@@ -9370,29 +9728,29 @@ msgstr "正在检查新邮件"
 msgid "Storing folder"
 msgstr "存储文件夹"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "无法在 %s 创建文件夹锁：%s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "无法打开邮件箱：%s：%s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "邮件追加取消"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "无法将邮件附加到邮件箱文件：%s：%s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9401,11 +9759,11 @@ msgstr ""
 "无法从文件夹 %2$s 获取邮件：%1$s\n"
 "  %3$s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "文件夹好像已经被不可恢复地破坏了。"
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "邮件构造失败：邮件箱已损坏？"
 
@@ -9473,12 +9831,17 @@ msgstr "无法创建目录 %s：%s"
 msgid "Cannot create folder: %s: %s"
 msgstr "无法获取文件夹：%s：%s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "卡片 ID 已经存在"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "无法将文件夹 %s 改名为 %s：%s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "指定的文件夹名称不合法：%s"
@@ -9522,7 +9885,7 @@ msgstr "无法关闭来源文件夹 %s：%s"
 msgid "Could not close temp folder: %s"
 msgstr "无法关闭临时文件夹：%s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "无法重命名文件夹：%s"
@@ -9807,7 +10170,7 @@ msgstr "%s 天之后删除"
 msgid "Disable support for all POP3 extensions"
 msgstr "禁用所有 POP3 扩展的支持"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -9893,7 +10256,7 @@ msgid "No such folder `%s'."
 msgstr "没有文件夹“%s”。"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9945,7 +10308,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "通过 sendmail 程序发送邮件"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10111,7 +10474,7 @@ msgstr "通过 %s 发送 SMTP 邮件"
 msgid "Cannot send message: sender address not valid."
 msgstr "无法发送邮件：发件人地址不合法。"
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "正在发送邮件"
 
@@ -10232,7 +10595,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "附件"
 
@@ -10276,11 +10639,11 @@ msgstr "MIME 类型："
 msgid "Suggest automatic display of attachment"
 msgstr "建议自动显示附件"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 msgid "You need to configure an account before you can compose mail."
 msgstr "在您可以撰写邮件之前您需要配置一个帐户。"
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "点击此处以使用地址簿"
 
@@ -10291,45 +10654,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "回复到："
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "发件人："
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "主题："
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "收信人："
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "输入邮件的收件人"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "抄送："
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "输入将接收该邮件副本的收件人地址"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "暗中抄送："
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10338,14 +10701,19 @@ msgstr "输入将接收该邮件副本，但不出现在收件人列表中的收
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "投递到："
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr "投递目的"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "把文件附件到邮件"
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "添加附件"
@@ -10380,21 +10748,21 @@ msgstr "文件存在，覆盖它？"
 msgid "Error saving file: %s"
 msgstr "保存文件错误：%s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "读入文件错误：%s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "访问文件错误：%s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "无法从编辑器检索邮件"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10403,7 +10771,7 @@ msgstr ""
 "无法搜索文件：%s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10412,7 +10780,7 @@ msgstr ""
 "无法截断文件：%s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10421,7 +10789,7 @@ msgstr ""
 "无法复制文件描述符：%s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10430,7 +10798,7 @@ msgstr ""
 "自动存储邮件错误：%s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10438,7 +10806,7 @@ msgstr ""
 "Ximian Evolution 发现上次会话含有未保存的文件。\n"
 "您是否希望恢复它们？"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10449,28 +10817,28 @@ msgstr ""
 "\n"
 "您是否希望保存修改？"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "警告：已改动的邮件"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "打开文件"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "签名："
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "自动生成的"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "撰写邮件"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10478,7 +10846,7 @@ msgstr ""
 "无法创建撰写窗口：\n"
 "无法激活地址选择控制。"
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10490,7 +10858,7 @@ msgstr ""
 "请确定您的 gtkhtml 和 libgtkhtml 所安装的版\n"
 "本正确。\n"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10498,18 +10866,20 @@ msgstr ""
 "无法创建撰写窗口：\n"
 "无法激活 HTML 编辑器组件。"
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr "<b>(编写器含有不可编辑的非文本消息体。)<b>"
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Evolution 群件套件"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10758,13 +11128,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -10883,7 +11253,7 @@ msgstr "则"
 msgid "You must specify a folder."
 msgstr "您必须指定文件夹。"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "选择文件夹"
@@ -10897,24 +11267,24 @@ msgstr ""
 "常规表达式错误 “%s”：\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "重要"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "待办"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "稍候"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "测试"
 
@@ -11008,7 +11378,7 @@ msgstr "过去"
 msgid "months"
 msgstr "月"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "秒"
 
@@ -11105,7 +11475,7 @@ msgstr "表达式"
 msgid "Follow Up"
 msgstr "跟随"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "标签"
 
@@ -11175,112 +11545,118 @@ msgid "Source Account"
 msgstr "来源帐号"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "冰雾"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "指定邮件头"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "停止处理"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "主题"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "未设置状态"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "含有"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "不含有"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "不以之结尾"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "不存在"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "does not return"
 msgstr "不返回"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "听起来不像"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "不以之开始"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "以之结束"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "存在"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr "有标志"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr "以后"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "is before"
 msgstr "以前"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "大于"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "小于"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr "未标志"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "不是"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "是"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr "返回大于"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr "返回小于"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr "返回"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "听起来象"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "以之开始"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "规则名“%s”不唯一，请另外选择一个名称。"
@@ -11305,18 +11681,77 @@ msgstr "规则名"
 msgid "Score Rules"
 msgstr "计分规则"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "您必须为该虚拟文件夹命名。"
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr "您至少需要把一个文件夹指定为源。"
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 msgid "VFolder source"
 msgstr "虚拟文件夹来源"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "编写器首选项"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "在此配置邮件首选项，包括安全和邮件显示"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "在此配置拼写检查、签名和邮件编写器"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "在这里配置您的电子邮件账号"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolution 邮件"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution 邮件账户配置控制"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Evolution 邮件组件"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Evolution 邮件撰写器"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution 邮件撰写控件"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution 邮件文件夹查看器"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution 邮件首选项控件"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "邮件"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "邮件帐号"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "邮件首选项"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "您确信您要删除该帐号吗？"
@@ -11358,7 +11793,7 @@ msgid "Protocol"
 msgstr "协议"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr "未命名"
 
@@ -11382,18 +11817,15 @@ msgstr "添加脚本签名"
 msgid "Signature(s)"
 msgstr "签名"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr "您即将发送 HTML 格式的邮件。请确定下列收件人愿意接收 HTML 邮件：\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "仍然发送？"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11401,7 +11833,7 @@ msgstr ""
 "该消息没有主题。\n"
 "确实要发送？"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11409,11 +11841,11 @@ msgstr ""
 "由于您正在发送的邮件的接收人列表被配置为隐藏列表的地址，该消息将只含有密件抄"
 "送收件人。"
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "该邮件只含有密件抄送收件人。"
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11422,11 +11854,11 @@ msgstr ""
 "邮件服务器可能会以添加 Apparent-To 头而使收件人可见。\n"
 "仍然发送？"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "您必须指定收件人以便发送该消息。"
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11438,187 +11870,399 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "根据搜索创建虚拟文件夹(_V)..."
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "邮件"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<点击这里以便选择文件夹>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "“%2$s”中的“%1$s”"
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "创建新文件夹"
 
-#: mail/em-folder-selector.c:267
-#, fuzzy
-msgid "Folder _name"
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "指定在哪里创建文件夹："
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
 msgstr "文件夹名称(_N)："
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "无法创建临时目录：%s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "无法创建临时目录：%s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "无法创建临时文件“%s”：%s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "无法关闭临时文件夹：%s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "装入..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "选择文件夹"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "创建新文件夹"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "无法删除文件夹“%s”：%s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "您真的要删除文件夹“%s”吗？"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "删除“%s”"
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "把文件夹“%s”重命名为："
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+msgid "Rename Folder"
+msgstr "重命名文件夹"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr "已经存在名为“%s”的文件夹。请使用不同的名称。"
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "字体属性"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "属性"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "文件夹名称(_F)："
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "查看(_V)"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "在新窗口中打开"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "移动"
+
+#: mail/em-folder-tree.c:1500
+msgid "_New Folder..."
+msgstr "新建文件夹(_N)..."
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "重命名(_R)"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "属性(_P)..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "作为新邮件进行编辑(_E)..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "打印(_P)"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "回复发件人(_R)"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "回复邮件列表(_L)"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "回复所有人(_A)"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "转发(_F)"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr "跟随(_W)..."
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr "已完成标志(_G)"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "清除标志(_E)"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "标记为已读(_K)"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "标记为未读(_U)"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "标记为重要(_I)"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "标记为不重要(_M)"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "标记为未读(_U)"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "标记为重要(_I)"
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "取消删除(_N)"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "移动到文件夹(_V)..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "复制到文件夹(_C)..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "将发件人添加到地址簿(_B)"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "应用过滤规则(_Y)"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "从邮件创建规则(_T)"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "基于主题的虚拟文件夹(_S)"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "基于发件人的虚拟文件夹(_N)"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "基于收件人的虚拟文件夹(_R)"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "基于邮件列表的虚拟文件夹(_L)"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "基于发件人的虚拟文件夹(_N)"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "基于主题过滤(_J)"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "基于发件人过滤(_D)"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "基于收件人过滤(_C)"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "基于邮件列表过滤(_M)"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "基于发件人过滤(_D)"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "默认"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "打印消息"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "复制链接位置"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "匹配："
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "已委派"
+
+#: mail/em-format-html-display.c:597
+#, fuzzy
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr "该邮件有数字签名，但不能证实是可信的。"
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "编辑签名"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "编辑签名"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+#, fuzzy
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr "input_token 包含无效的签名，或者无法验证签名。"
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "被中断"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr "该邮件有数字签名。单击锁图标以获得更多信息。"
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "PGP 加密"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "无法解析 MIME 邮件。显示源文本。"
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "不支持的方案"
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "无法校验叶子签名"
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "嵌入视图"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "隐藏"
@@ -11628,184 +12272,207 @@ msgstr "隐藏"
 msgid "Page %d of %d"
 msgstr "第 %d 页，共 %d 页"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "正在收取邮件 %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "格式不正确的 external-body 部分。"
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "指向 FTP 站点 (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "指向本地文件 (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "指向远程数据 (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "指向未知的外部数据 (“%s”类型)"
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "该邮件有数字签名，但不能证实是可信的。"
-
-#: mail/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "该邮件有数字签名，并被证实为可信。"
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-msgid "No signature present"
-msgstr ""
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "无法初始化 Bonobo"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "不支持的方案"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "无法解析 MIME 邮件。显示源文本。"
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "正在移动邮件"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "发件人"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "回复至"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "收件人"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "抄送"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "密件抄送"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "邮件程序"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "日期"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "%s 附件"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "无法解析 MIME 邮件。显示源文本。"
+msgid "Session not initialised"
+msgstr "无法初始化 Bonobo"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "该邮件有数字签名，并被证实为可信。"
+
+#: mail/em-format.c:1212
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr "该邮件有数字签名，但不能证实是可信的。"
+
+#: mail/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "正在等待..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "正在查验 %s"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "缓冲 %s 失败：%s"
 
-#: mail/em-popup.c:593
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "创建到“%s”的管道失败：%s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "解析主机“%s”：%s"
+
+#: mail/em-popup.c:599
 #, fuzzy
 msgid "Save As..."
 msgstr "另存为(_A)..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "回复发件人(_R)"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "把邮件发送到列表(_M)..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "将发件人添加到地址簿"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "在 %s 中打开..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "此服务器不支持 LDAPv3 schema 信息"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "订阅"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "文件夹"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "请选择服务器。"
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "没有选定服务器"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "不再显示此信息。"
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11814,27 +12481,27 @@ msgstr ""
 "装入过滤规则信息错误：\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "过滤规则"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "转发的邮件"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "未知的发件人"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "在%Y年%m月%d日的%H:%M，%%s写道："
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -11843,7 +12510,7 @@ msgstr ""
 "无法保存到“%s”\n"
 " %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -11852,25 +12519,26 @@ msgstr ""
 "%s 已经存在。\n"
 "您打算覆盖它吗？"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "邮件"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "邮件另存为..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "无法创建临时目录：%s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "地址"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -11879,58 +12547,425 @@ msgstr ""
 "\n"
 "确实删除这些邮件吗？"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "编写器首选项"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/em-utils.c:2288
+#, fuzzy
 msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "在此配置邮件首选项，包括安全和邮件显示"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"该操作将永久删除所有标记为完成的邮件。\n"
+"如果您继续，您将无法恢复这些邮件。\n"
+"\n"
+"确实删除这些邮件吗？"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "在此配置拼写检查、签名和邮件编写器"
+#: mail/evolution-mail.schemas.in.in.h:1
+msgid "Automatic link recognition"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "在这里配置您的电子邮件账号"
+#: mail/evolution-mail.schemas.in.in.h:2
+msgid "Automatic smiley recognition"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution 邮件"
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution 邮件账户配置控制"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution 邮件组件"
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution 邮件撰写器"
+#: mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
+msgid "Default charset in which to compose messages"
+msgstr "邮件的默认主题。"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution 邮件撰写控件"
+#: mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
+msgid "Default charset in which to compose messages."
+msgstr "邮件的默认主题。"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution 邮件文件夹查看器"
+#: mail/evolution-mail.schemas.in.in.h:8
+#, fuzzy
+msgid "Default charset in which to display messages"
+msgstr "在显示邮件的邮件体中搜索文本"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution 邮件首选项控件"
+#: mail/evolution-mail.schemas.in.in.h:9
+#, fuzzy
+msgid "Default charset in which to display messages."
+msgstr "在显示邮件的邮件体中搜索文本"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/evolution-mail.schemas.in.in.h:10
+#, fuzzy
+msgid "Default forward style"
+msgstr "转发方式(_F)："
+
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default reply style"
+msgstr "回复风格(_R)："
+
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Empty Trash folders on exit"
+msgstr "退出时清空已删除邮件(_T)"
+
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "退出时清空已删除邮件(_T)"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "邮件帐号"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "邮件首选项"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "执行动作"
+
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "新邮件提醒"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "新邮件提醒"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr "发送给不想接收 HTML 的联系人时提示(_P)"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "发送只有暗送收件人的邮件时提示(_O)"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "发送 HTML 邮件？"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "发送 HTML 邮件？"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "显示动画图像(_S)"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "显示动画图像(_S)"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "以普通样式显示邮件"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "预览板(_P)"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "新邮件到达时播放声音文件(_P)"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "拼写检查(_C)"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "终端字体(_T)："
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "选择用于打印的 HTML 变宽度字体"
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "按线索编排的邮件列表"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "按线索编排的邮件列表"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "使它成为我的默认帐号(_M)"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "变宽(_A)："
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm 导入器"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox 导入器"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape 邮件导入器"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 导入器"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine 导入器"
 
 #: mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
@@ -11970,34 +13005,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm 导入器"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox 导入器"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape 邮件导入器"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 导入器"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine 导入器"
-
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -12053,12 +13060,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution 正在导入您原来的 Netscape 数据"
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "回收站"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "正在扫描过滤器"
@@ -12067,7 +13068,7 @@ msgstr "正在扫描过滤器"
 msgid "Scanning directory"
 msgstr "正在扫描目录"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "开始导入"
 
@@ -12142,23 +13143,23 @@ msgid "You have not filled in all of the required information."
 msgstr "您还没有填写所有必须的信息。"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution 帐号编辑器"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "主机(_H)："
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "用户名(_N)："
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "路径(_P)："
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "您不能以相同的名字创建两个帐号。"
 
@@ -12167,35 +13168,35 @@ msgstr "您不能以相同的名字创建两个帐号。"
 msgid "Mail to %s"
 msgstr "邮寄给 %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "主题是 %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "来自 %s 的邮件"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s 邮件列表"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "已回复"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "添加过滤规则"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "下列过滤器规则：\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12206,143 +13207,30 @@ msgstr ""
 "   “%s”\n"
 "已经被更新。"
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "正在连接..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "该文件夹不能含有邮件。"
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "新建邮件"
 
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "无法打开共享文件夹：%s。"
-
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "无法创建临时目录：%s"
-
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "无法创建临时文件“%s”：%s"
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "邮件(_M)"
 
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "无法关闭临时文件夹：%s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "撰写一封新邮件"
 
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "为导入的数据选择目标文件夹"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "为导入的数据选择目标文件夹"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "创建新文件夹"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "指定在哪里创建文件夹："
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "无法删除文件夹“%s”：%s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "您真的要删除文件夹“%s”吗？"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "删除“%s”"
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "把文件夹“%s”重命名为："
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-msgid "Rename Folder"
-msgstr "重命名文件夹"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "指定的文件夹名称不合法：%s"
-
-#: mail/mail-component.c:1860
-#, fuzzy, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr "已经存在名为“%s”的文件夹。请使用不同的名称。"
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "字体属性"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "属性"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "文件夹名称(_F)："
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "查看(_V)"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "在新窗口中打开"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "移动"
-
-#: mail/mail-component.c:2087
-msgid "_New Folder..."
-msgstr "新建文件夹(_N)..."
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "重命名(_R)"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "属性(_P)..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "标识"
 
@@ -12398,11 +13286,11 @@ msgstr ""
 "您即将完成邮件配置的过程了。您提供的用于收件服务器和发送方式将被组合在一起，"
 "成为 Evolution 的邮件帐户。请在下面输入此帐户的名称。此名称只会用作显示。"
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "检查服务"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "正在连接服务器..."
 
@@ -12484,26 +13372,35 @@ msgid "C_olors"
 msgstr "颜色(_O)"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "检查新邮件"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "在我输入时进行拼写检查(_T)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "检查新邮件"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "给错误拼写的单词上色(_M)："
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "撰写邮件"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "配置"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12518,272 +13415,277 @@ msgstr ""
 "\n"
 "单击“应用”可保存您的设置。"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "默认(_F)"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "默认行为"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "默认字符编码(_E)："
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "删除邮件"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "当使用该帐号时总是发送签名邮件(_A)"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "无法引用原始消息"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "不要签名会议请求(_M)(同 Outlook 兼容)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "完成"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "草稿文件夹(_F)："
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "启用(_N)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "电子邮件"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "电子邮件地址(_A)："
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "退出时清空已删除邮件(_T)"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "证书 ID(_C)："
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Evolution 帐号助手"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "执行命令..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "固定宽度(_X)："
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "过滤规则"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "字体属性"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "用 HTML 格式化邮件(_H)"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "突出显示引用(_Q)"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "嵌入"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "标签和颜色"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "装入图像"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "邮件配置"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "邮件箱位置"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "邮件撰写器"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "邮件显示"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 msgid "Message Fonts"
 msgstr "邮件字体"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "新邮件提醒"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "注意：直到您第一次连接的时候，才会询问密码。"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "可选的信息"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "组织(_G)："
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG 键标识(_K)："
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "选取一种颜色"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "发送只有暗送收件人的邮件时提示(_O)"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "打印用字体"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "引用原始消息"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "引用"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "记住该密码(_M)"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "回复到(_P)："
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "接收电子邮件"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "接收选项(_O)"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "记住此密码(_P)"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "必需的信息"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "恢复默认值"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "安全(_E)"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "安全 MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr "选择 HTML 固定宽度字体"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr "选择用于打印的 HTML 固定宽度字体"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr "选择 HTML 变宽度字体"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr "选择用于打印的 HTML 变宽度字体"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "发送电子邮件"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "已发送邮件文件夹(_M)："
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "已发送和草稿邮件"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "服务器需要认证(_V)"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "服务器配置"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "服务器类型(_T)："
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "链中的自签名证书"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "指定文件名(_F)："
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "拼写检查(_C)"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "标准 Unix mbox"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12792,7 +13694,7 @@ msgstr ""
 "此脚本的输出将用于您的签名。您指定的名称将只会\n"
 "用于显示。"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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 "
@@ -12800,7 +13702,7 @@ msgid ""
 msgstr ""
 "此页面允许您配置拼写检查行为和语言。在此列出的语言反映了您所安装的字典。"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12808,11 +13710,15 @@ msgstr ""
 "输入您想要给此帐户起的名字。\n"
 "如：“工作”或“私人”"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "变宽(_A)："
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12822,169 +13728,178 @@ msgstr ""
 "\n"
 "单击“前进”开始。"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "添加签名(_A)"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "总是离线装入图像(_A)"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr "当使用该帐号时总是发送签名邮件(_A)"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "验证类型(_A)："
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "验证类型(_A)："
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr "自动检查邮件的间隔(_A)"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "自动插入笑脸图像(_A)"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "新邮件到达时鸣笛(_B)"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "当销毁文件夹时进行提示(_C)"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "默认签名(_D)："
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "默认(_D)"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "新邮件到达时不要提醒我(_D)"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "启用(_E)"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "转发方式(_F)："
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "全名(_F)："
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "HTML 邮件(_H)"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "标识(_I)"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "六月"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "如果发件人在地址簿中就装入图像(_L)"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "使它成为我的默认帐号(_M)"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "把邮件标记为已读前等(_M)"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "名称(_N)："
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "从不离线装入图像(_N)"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "新邮件到达时播放声音文件(_P)"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "发送给不想接收 HTML 的联系人时提示(_P)"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "发送空主题行的邮件时提示(_P)"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "接收邮件(_R)"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "回复风格(_R)："
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "恢复默认值(_R)"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "脚本(_S)："
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "删除..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "发送邮件(_S)"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "显示动画图像(_S)"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "签名(_S)"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr "标准字体(_S)："
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr "终端字体(_T)："
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "使用安全连接 (SSL)(_U)："
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr "使用与其它应用程序相同的字体(_U)"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "描述"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr "正在查验 %s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -12993,7 +13908,7 @@ msgstr ""
 "当“%s”时错误：\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13002,7 +13917,7 @@ msgstr ""
 "执行操作时错误：\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "工作"
 
@@ -13014,12 +13929,12 @@ msgstr "过滤文件夹"
 msgid "Fetching Mail"
 msgstr "收取邮件"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "应用寄出过滤器失败：%s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13028,106 +13943,106 @@ msgstr ""
 "追加到 %s：%s 失败\n"
 "转而追加到本地“已发”文件夹。"
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "追加到本地“已发”文件夹失败：%s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "正在发送“%s”"
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "发送第 %d 个邮件，共 %d 个"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "在第 %d 个邮件失败，共 %d 个"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "完成。"
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "把邮件保存到文件夹中"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "把邮件移动到 %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "把邮件复制到 %s"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "正在“%s”中扫描文件夹"
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "转发的邮件"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "正在打开文件夹 %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "正在打开存储 %s"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "正在删除文件夹“%s”"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "正在存储文件夹“%s”"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "正在刷新文件夹"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "正在销毁文件夹"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "正在清空“%s”中的已删除邮件"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "本地文件夹"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "正在收取邮件 %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "正在收取 %d 封邮件"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "正在保存 %d 封邮件"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13136,7 +14051,7 @@ msgstr ""
 "无法创建输出文件：%s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13145,11 +14060,11 @@ msgstr ""
 "在将邮件保存到 %s 时发生错误：\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "正在保存附件"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13158,21 +14073,25 @@ msgstr ""
 "无法创建输出文件：%s：\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "无法写数据：%s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "正在断开与 %s 的连接"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "正在重新连接到 %s"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "区分大小写"
@@ -13190,59 +14109,74 @@ msgstr "查找："
 msgid "Search"
 msgstr "搜索(_S)"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "编辑签名"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "例外"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "帐号信息"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "正在取消..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "服务器：%s，类型：%s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "路径：%s，类型：%s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "类型：%s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "发送和接收邮件"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 msgid "Cancel _All"
 msgstr "全部取消(_A)"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "正在更新..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "正在等待..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "用户己取消操作。"
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "为 %s 输入密码"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "输入密码"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "记住该密码(_R)"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr "在本会话中记住该密码(_R)"
 
@@ -13281,26 +14215,31 @@ msgstr "输入该签名的名字。"
 msgid "Name:"
 msgstr "名称："
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "转发的邮件 - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "转发的邮件"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "正在打开文件夹 %s"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "设置虚拟文件夹：%s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "为 uri: %s 更新虚拟文件夹"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13313,88 +14252,88 @@ msgstr ""
 "   “%s”\n"
 "已经被更新。"
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "虚拟文件夹"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "虚拟文件夹"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "编辑虚拟文件夹"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "试图编辑并不存在的虚拟文件夹“%s”。"
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "新建虚拟文件夹"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "不可见"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "可见"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "已答复"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "多封不可见邮件"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "多封邮件"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "最低"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "较低"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "较高"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "最高"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "今天 %H:%M"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "昨天 %H:%M"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%A %H:%M"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%m月%d日 %H:%M"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%Y年%m月%d日"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "正在生成邮件列表"
 
@@ -13450,11 +14389,11 @@ msgstr "转发"
 msgid "No Response Necessary"
 msgstr "不必回复"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "回复"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "全部回复"
 
@@ -13506,41 +14445,139 @@ msgstr "订阅(_S)"
 msgid "_Unsubscribe"
 msgstr "退订(_U)"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr "在此配置特殊文件夹和脱机文件夹的行为"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Evolution 外壳"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "文件夹设置"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "80%"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "重命名该快捷方式组"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "是否显示文件夹栏"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "隐藏快捷方式栏"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "默认优先级："
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "默认优先级："
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Evolution Mail 配置界面"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+#, fuzzy
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "默认让附件只能嵌入显示。"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
 msgstr ""
-"无法转移文件夹：\n"
-"%s"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "添加文件夹"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "草稿"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "收件箱"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "正在打开默认任务文件夹"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "正在打开默认任务文件夹"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "正在打开默认任务文件夹"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "发件箱"
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "已发送"
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "正在打开默认任务文件夹"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "是否显示文件夹栏"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "是否显示快捷方式栏"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "电子邮件"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "无法正确更新文件"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13551,14 +14588,14 @@ msgstr ""
 "%s\n"
 "错误：%s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr "在把文件复制到“%s”时发生错误。"
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13568,7 +14605,7 @@ msgstr ""
 "文件“%s”不是目录。\n"
 "请移动它以便安装 Evolution 用户文件。"
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13665,10 +14702,11 @@ msgstr ""
 "无法重命名文件夹：\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr "已经存在名为“%s”的文件夹。请使用不同的名称。"
+msgid "The specified folder name is not valid: %s"
+msgstr "指定的文件夹名称不合法：%s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -13692,19 +14730,15 @@ msgstr ""
 "无法创建指定的文件夹：\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "创建新文件夹"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(无标题)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "选择要运行的导入器类型："
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13716,11 +14750,11 @@ msgstr ""
 "\n"
 "如果您不清楚，可以选择“自动”，Evolution 将试图为您确定类型。"
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "请选择您希望导入的信息："
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13731,7 +14765,7 @@ msgstr ""
 "iCalendar。并未发现可导入的设置。如果您想要再试一次，请单击\n"
 "“后退”按钮。\n"
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13740,21 +14774,21 @@ msgstr ""
 "正在导入 %s\n"
 "正在导入项目 %d。"
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "选择导入器"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "文件 %s 不存在"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Evolution 错误"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -13763,11 +14797,11 @@ msgstr ""
 "没有导入器能够处理\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "正在导入"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -13776,17 +14810,17 @@ msgstr ""
 "正在导入 %s。\n"
 "正在启动 %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "启动 %s 错误"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "装入 %s 错误"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13795,35 +14829,35 @@ msgstr ""
 "正在导入 %s\n"
 "正在导入项目 1。"
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "自动"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "文件名："
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "选择一个文件"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "文件类型："
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "从老版程序中导入数据和设置"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "导入单个文件"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -13831,47 +14865,28 @@ msgstr ""
 "请稍候...\n"
 "正在扫描现有设置"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "启动智能导入器"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "从 %s："
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "为导入的数据选择目标文件夹"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "导入"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "正在关闭连接..."
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"同步“%s”时出错：\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "正在同步文件夹"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "正在同步“%s” (%d / %d) ..."
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Evolution 设置"
@@ -13906,7 +14921,7 @@ msgstr "无法打开共享文件夹：%s。"
 msgid "Cannot find the specified shared folder."
 msgstr "无法找到指定的共享文件夹。"
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -13915,17 +14930,11 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "助手"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "新建"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "没有指定文件夹名称。"
@@ -13983,60 +14992,47 @@ msgstr "创建新快捷方式"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "选择您希望快捷方式指向的文件夹："
 
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "在线工作(_W)"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "离线工作(_W)"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "离线工作"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(未显示文件夹)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(无)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr "Ximian Evolution 目前在线。点击该按钮则离线工作。"
 
-#: shell/e-shell-view.c:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution 正在离线过程中。"
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr "Ximian Evolution 目前离线。点击该按钮则在线工作。"
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "无效参数"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "无法注册到 OAF"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "找不到配置数据库"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "通用错误"
 
@@ -14149,74 +15145,18 @@ msgstr "删除(_M)"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "从快捷方式栏上删除此快捷方式"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "保存快捷方式错误。"
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "收件箱"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "快捷方式"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "无错误"
-
-#: shell/e-storage.c:573
-msgid "A folder with the same name already exists"
-msgstr "已经有一个同名文件夹存在"
-
-#: shell/e-storage.c:575
-msgid "The specified folder type is not valid"
-msgstr "指定的文件夹类型无效"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "输入输出错误"
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr "没有足够的空间创建文件夹"
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr "文件夹不为空"
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "找不到指定的文件夹"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "在该存储中没有实现该功能"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "不支持的操作"
-
-#: shell/e-storage.c:591
-msgid "The specified type is not supported in this storage"
-msgstr "在该存储中不支持指定的类型"
-
-#: shell/e-storage.c:593
-msgid "The specified folder cannot be modified or removed"
-msgstr "无法修改或删除指定的文件夹"
-
-#: shell/e-storage.c:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "无法使文件夹成为它的子目录的子目录"
-
-#: shell/e-storage.c:597
-msgid "Cannot create a folder with that name"
-msgstr "无法以那个名字创建文件夹"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr "本操作不能在离线模式下执行"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "复选框"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14227,6 +15167,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "新建"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "“%2$s”中的“%1$s”"
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14264,74 +15215,6 @@ msgstr ""
 "来自激活系统的错误是：\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "CORBA 错误"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "被中断"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "无效参数"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "已经有所有者了"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "无所有者"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "没找到"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "不支持的类型"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "不支持的方案"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "不支持的操作"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "内部错误"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "存在"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "无效 URI"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "含有子文件夹"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "没有剩余空间"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "原所有者已死"
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "测试类型"
-
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr "Evolution 测试组件"
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr "当前连接"
@@ -14360,10 +15243,6 @@ msgstr "邮件(_M)："
 msgid "_Tasks:"
 msgstr "任务(_T)："
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr "文件夹名称(_N)："
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder _type:"
 msgstr "文件夹类型(_T)："
@@ -14424,22 +15303,6 @@ msgstr ""
 "\n"
 "单击“应用”按钮可保存您的设置。"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "在此配置特殊文件夹和脱机文件夹的行为"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Evolution 外壳"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution 文件夹配置控件"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "文件夹设置"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "点击“导入”以便开始将文件导入到 Evolution。"
@@ -14477,7 +15340,7 @@ msgstr ""
 msgid "Importers"
 msgstr "导入器"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "导入"
 
@@ -14493,16 +15356,16 @@ msgstr "不要再问我"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution 可以从下列文件中导入数据："
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Evolution 正在退出 ..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14534,7 +15397,7 @@ msgstr ""
 "\n"
 "我们希望您尽情享受我们努力工作的成果，我们也热切盼望着您的意见！\n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -14542,36 +15405,48 @@ msgstr ""
 "感谢\n"
 "Ximian Evolution 团队\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr "不要再问我"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "无法访问 Ximian Evolution shell。"
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "无法初始化 Ximian Evolution shell：%s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "以离线模式启动"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "以在线模式启动"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr "强制关闭所有 Evolution 组件"
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "把所有成员的调试输出发送到一个文件中。"
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14580,31 +15455,60 @@ msgstr ""
 "%s：不能同时使用 --online 和 --offline。\n"
 "  详情请使用 %s --help。\n"
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "选择导入器"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "证书 ID(_C)："
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "进度"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "表达式"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "合并电子邮件地址"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"证书过期：%s\n"
+"发行者：%s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14662,91 +15566,376 @@ msgid "Backup All"
 msgstr "黑泽"
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "证书 ID(_C)："
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "不信任的证书"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "证书 ID(_C)："
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "通用名"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "证书 ID(_C)："
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "编辑(_E)"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "验证证书失败。"
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "表达式"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "组织"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "组织单元"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "查看(_V)"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "证书 ID(_C)："
+
+#: smime/gui/smime-ui.glade.h:42
+#, fuzzy
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr "无效的证书颁发机构(CA)"
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "证书 ID(_C)："
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "导入"
+msgid "Certificate already exists"
+msgstr "卡片 ID 已经存在"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%Y年%m月%d日"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "佛蒙特州"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "北"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "确定"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "北"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "证书 ID(_C)："
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "证书 ID(_C)："
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "不信任的证书"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "ID"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "主题是 %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "无法处理脱机文件夹"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "无效的证书颁发机构(CA)"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "无效的证书颁发机构(CA)"
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "没有信息"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "附件"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "证书 ID(_C)："
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "库里提巴"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "北卡罗莱纳州"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "表达式"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "在 %2$s 时 %1$s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "证书签名失败"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "插入(_I)"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "主题是 %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "证书签名失败"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "为 %s 输入密码"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "证书 ID(_C)："
 
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
@@ -14797,7 +15986,7 @@ msgstr "复制选中内容"
 msgid "Copy to Folder..."
 msgstr "复制到文件夹..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "剪切选中内容"
 
@@ -14813,7 +16002,7 @@ msgstr "把选中的联系人移动到其它文件夹..."
 msgid "Move to Folder..."
 msgstr "移动到文件夹..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "粘贴剪贴板"
 
@@ -14821,8 +16010,8 @@ msgstr "粘贴剪贴板"
 msgid "Previews the contacts to be printed"
 msgstr "预览将要打印的联系人"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "打印预览(_V)"
@@ -14867,13 +16056,13 @@ msgstr "停止载入"
 msgid "View the current contact"
 msgstr "查看当前联系人"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "操作(_A)"
 
@@ -14903,142 +16092,110 @@ msgstr "给联系人发邮件(_S)..."
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "创建一个新的全天约会创建新约会"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "创建新约会"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "创建新文件夹"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "创建一条新任务请求"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "创建新任务"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "天"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "删除所有发生"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "删除约会"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "删除此次发生"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "删除此次发生"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "转到"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "后退"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "前进"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "转到日期(_D)"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "转到指定日期"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "转到今天"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "列表"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "月"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "新建约会(_A)"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "新喀里多尼亚"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "新会议"
-
-#: ui/evolution-calendar.xml.h:27
-#, fuzzy
-msgid "New _Task"
-msgstr "新建任务"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "预览将要打印的日历"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "打印此日历"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "为此日历发布忙闲信息"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "波治"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "含有约会和事件的公共文件夹"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "显示细节"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "显示一天"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "显示一个月"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "显示一周"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "显示工作周"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "周"
 
@@ -15102,7 +16259,7 @@ msgstr "把此项保存到磁盘"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "文件(_F)"
 
@@ -15318,7 +16475,7 @@ msgstr "全部标为已读(_R)"
 msgid "Mark all visible messages as read"
 msgstr "把所由可见的邮件标记为已读"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "从剪贴板粘贴邮件"
 
@@ -15374,16 +16531,6 @@ msgstr "反转选择(_I)"
 msgid "_Threaded Message List"
 msgstr "按线索编排的邮件列表(_T)"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "关闭此窗口"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "关闭(_C)"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "将发件人添加到地址簿(_D)"
@@ -15541,256 +16688,281 @@ msgstr "把选定的邮件作为附件转发给某人"
 msgid "Increase the text size"
 msgstr "增加文本大小"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "装入图像(_I)"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "标记为重要(_M)"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "标记为未读(_N)"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "标记为不重要(_O)"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "把选定的邮件标记为已读"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "把选定的邮件标记为重要邮件"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "把选定的邮件标记为不重要邮件"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "把选定的邮件标记为未读"
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "把选定的邮件标记为未读"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "把选定的邮件标记为不重要邮件"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "为选定的邮件做删除标记"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "移动"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "把选中的邮件移动到其它文件夹"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "下一封"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "下一封重要邮件(_I)"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "下一条线索(_T)"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "下一封未读邮件(_U)"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "没找到"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "在新窗口中打开选中的邮件"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "在邮件撰写器中打开选中的邮件以便重发"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "原大小(_Z)"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "上一封未读邮件(_R)"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "投递回复"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr "在公共文件夹中回复邮件"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "上一封重要邮件(_E)"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "预览要打印的邮件"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "上一封"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "打印该邮件"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "重定向(_D)"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "将选定的消息转发(退回)给某人"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "把文件重新设置为原来的大小"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 msgid "S_earch in Message..."
 msgstr "在邮件中搜索(_E)..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "较小(_M)"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "把邮件存为文本文件"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "在显示邮件的邮件体中搜索文本"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr "设定您当前打印机的页面设置"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "显示电子邮件源代码(_S)"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "显示完整的邮件头(_H)"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "在显示邮件的邮件体中搜索文本"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "以普通样式显示邮件"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "显示邮件时显示所有邮件头"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "显示邮件的原始邮件源代码"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "文字大小(_Z)"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "取消选中邮件的删除"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "基于邮件列表的虚拟文件夹(_L)..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "基于发件人的虚拟文件夹(_N)..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "基于收件人的虚拟文件夹(_R)..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "基于主题的虚拟文件夹(_S)..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "附加(_A)"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "复制到文件夹(_C)"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "根据邮件创建过滤规则(_C)"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "转发邮件(_F)"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "转到(_G)"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "嵌入(_I)"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "较大(_L)"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "邮件显示(_M)"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "移动到文件夹(_M)"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "下一封邮件(_N)"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "普通显示(_N)"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "打开邮件(_O)"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "上一封邮件(_P)"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "引用(_Q)"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "重发(_R)..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "工具(_T)"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "取消删除(_U)"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "关闭此窗口"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "关闭(_C)"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "附件"
@@ -16068,12 +17240,13 @@ msgid "Change Evolution's settings"
 msgstr "更改 Evolution 的设置"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "退出(_X)"
+#, fuzzy
+msgid "Create a new window"
+msgstr "创建一条新任务请求"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "Evolution 窗口(_W)"
+msgid "E_xit"
+msgstr "退出(_X)"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16085,61 +17258,74 @@ msgstr "从其它程序导入数据"
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "Evolution 窗口(_W)"
+msgid "Open a new window"
+msgstr "在新窗口中打开"
 
 #: ui/evolution.xml.h:11
 msgid "Pi_lot Settings..."
 msgstr "Pilot 设置(_L)..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "发送/接收"
+
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr "发送队列中的的邮件并收取新邮件"
+
+#: ui/evolution.xml.h:14
 msgid "Set up Pilot configuration"
 msgstr "配置 Pilot"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "显示关于 Ximian Evolution 的信息"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "提交错误报告"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "提交错误报告(_B)"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "用 Bug Buddy 提交错误报告"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "反转"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "切换是否脱机工作。"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution 常见问题(_F)"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "关于 Ximian Evolution(_A)..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "导入(_I)..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "新建(_N)"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "发送/接收(_S)"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "立即查找(_F)"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "打印概要"
@@ -16267,12 +17453,12 @@ msgstr "定义视图..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "一二三四五六日"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%Y年%B"
 
@@ -16405,7 +17591,7 @@ msgstr "搜索(_S)"
 msgid "_Find Now"
 msgstr "立即查找(_F)"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "清除(_C)"
 
@@ -16421,24 +17607,261 @@ msgstr "子项目 ID"
 msgid "Text"
 msgstr "文字"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "清除"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "立即查找"
 
+#~ msgid "Account Name"
+#~ msgstr "帐号名"
+
+#~ msgid "Server Name"
+#~ msgstr "服务器名"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "在本次 Evolution 创建中未打开 LDAP 支持"
+
+#~ msgid "Other Contacts"
+#~ msgstr "其他联系人"
+
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "在此配置对 LDAP 目录服务器的访问"
+
+#~ msgid "Directory Servers"
+#~ msgstr "目录服务器"
+
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Evolution 的地址簿 LDAP 配置控件"
+
+#~ msgid "Add LDAP Server"
+#~ msgstr "添加 LDAP 服务器"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "第四步：显示姓名"
+
+#~ msgid "Find contact in"
+#~ msgstr "在其中查找联系人"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* 点击此处以便添加联系人 *"
+
+#~ msgid "Business Address"
+#~ msgstr "商务地址"
+
+#~ msgid "Department"
+#~ msgstr "部门"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "忙闲 URL"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "职业"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "在 %s 打开任务"
+
+#~ msgid "Send anyway?"
+#~ msgstr "仍然发送？"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "取消当前邮件操作"
+#~ msgid "Folder _name"
+#~ msgstr "文件夹名称(_N)："
+
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr "该邮件有数字签名。单击锁图标以获得更多信息。"
+
+#~ msgid "Connecting..."
+#~ msgstr "正在连接..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "该文件夹不能含有邮件。"
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "无法打开共享文件夹：%s。"
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "为导入的数据选择目标文件夹"
+
+#, fuzzy
+#~ msgid "A folder named \"%s\" already exists.  Please use a different name."
+#~ msgstr "已经存在名为“%s”的文件夹。请使用不同的名称。"
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "无法转移文件夹：\n"
+#~ "%s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "添加文件夹"
+
+#~ msgid "Drafts"
+#~ msgstr "草稿"
+
+#~ msgid "Outbox"
+#~ msgstr "发件箱"
+
+#~ msgid "Sent"
+#~ msgstr "已发送"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "同步“%s”时出错：\n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "正在同步文件夹"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "正在同步“%s” (%d / %d) ..."
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(未显示文件夹)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(无)"
+
+#~ msgid "No error"
+#~ msgstr "无错误"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "已经有一个同名文件夹存在"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "指定的文件夹类型无效"
+
+#~ msgid "I/O error"
+#~ msgstr "输入输出错误"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "没有足够的空间创建文件夹"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "文件夹不为空"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "找不到指定的文件夹"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "在该存储中没有实现该功能"
+
+#~ msgid "Operation not supported"
+#~ msgstr "不支持的操作"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "在该存储中不支持指定的类型"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "无法修改或删除指定的文件夹"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "无法使文件夹成为它的子目录的子目录"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "无法以那个名字创建文件夹"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "本操作不能在离线模式下执行"
+
+#~ msgid "Checkbox"
+#~ msgstr "复选框"
+
+#~ msgid "CORBA error"
+#~ msgstr "CORBA 错误"
+
+#~ msgid "Invalid argument"
+#~ msgstr "无效参数"
+
+#~ msgid "Already has an owner"
+#~ msgstr "已经有所有者了"
+
+#~ msgid "No owner"
+#~ msgstr "无所有者"
+
+#~ msgid "Unsupported type"
+#~ msgstr "不支持的类型"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "不支持的方案"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "不支持的操作"
+
+#~ msgid "Internal error"
+#~ msgstr "内部错误"
+
+#~ msgid "Exists"
+#~ msgstr "存在"
+
+#~ msgid "Invalid URI"
+#~ msgstr "无效 URI"
+
+#~ msgid "Has subfolders"
+#~ msgstr "含有子文件夹"
+
+#~ msgid "No space left"
+#~ msgstr "没有剩余空间"
+
+#~ msgid "Old owner has died"
+#~ msgstr "原所有者已死"
+
+#~ msgid "Test type"
+#~ msgstr "测试类型"
+
+#~ msgid "Evolution Test Component"
+#~ msgstr "Evolution 测试组件"
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "导入"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "创建一个新的全天约会创建新约会"
+
+#~ msgid "New _Appointment"
+#~ msgstr "新建约会(_A)"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "新会议"
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "域名"
+#~ msgid "New _Task"
+#~ msgstr "新建任务"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "Evolution 窗口(_W)"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "Evolution 窗口(_W)"
+
+#~ msgid "Toggle"
+#~ msgstr "反转"
 
-#~ msgid "Family Name"
-#~ msgstr "姓"
+#~ msgid "Clear"
+#~ msgstr "清除"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "取消当前邮件操作"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -16531,9 +17954,6 @@ msgstr "立即查找"
 #~ msgid "VCard (.vcf, .gcrd)"
 #~ msgstr "VCard (.vcf, .gcrd)"
 
-#~ msgid "Loading..."
-#~ msgstr "装入..."
-
 #~ msgid "Searching..."
 #~ msgstr "搜索..."
 
@@ -16585,10 +18005,6 @@ msgstr "立即查找"
 #~ msgstr "没有装入 EBook\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "卡片 ID 已经存在"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "操作已取消"
 
@@ -16730,9 +18146,6 @@ msgstr "立即查找"
 #~ msgid "Callback"
 #~ msgstr "反馈"
 
-#~ msgid "Company"
-#~ msgstr "公司"
-
 #~ msgid "Comp"
 #~ msgstr "公司"
 
@@ -16799,9 +18212,6 @@ msgstr "立即查找"
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#~ msgid "Phone"
-#~ msgstr "电话"
-
 #~ msgid "Birth date"
 #~ msgstr "生日"
 
@@ -16814,9 +18224,6 @@ msgstr "立即查找"
 #~ msgid "Arbitrary"
 #~ msgstr "武断"
 
-#~ msgid "ID"
-#~ msgstr "ID"
-
 #~ msgid "Last Use"
 #~ msgstr "上次使用"
 
@@ -16829,9 +18236,6 @@ msgstr "立即查找"
 #~ msgid "Folder containing contact information"
 #~ msgstr "含有联系人信息的文件夹"
 
-#~ msgid "LDAP Server"
-#~ msgstr "LDAP 服务器"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "含有联系人信息的 LDAP 服务器"
 
@@ -16841,18 +18245,6 @@ msgstr "立即查找"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "含有联系人信息的公共文件夹"
 
-#~ msgid "_Contact"
-#~ msgstr "联系人(_C)"
-
-#~ msgid "Create a new contact"
-#~ msgstr "创建一个新联系人"
-
-#~ msgid "New Contact List"
-#~ msgstr "新建联系人列表"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "创建一个新的联系人列表"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "文件夹浏览器将显示的 URI"
 
@@ -16868,9 +18260,6 @@ msgstr "立即查找"
 #~ msgid "Is New Card"
 #~ msgstr "为新卡片"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "没有卡片"
 
@@ -16929,30 +18318,6 @@ msgstr "立即查找"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "含有待办项目的公共文件夹"
 
-#~ msgid "New appointment"
-#~ msgstr "新建约会"
-
-#~ msgid "_Appointment"
-#~ msgstr "约会(_A)"
-
-#~ msgid "New meeting"
-#~ msgstr "新闻会议"
-
-#~ msgid "M_eeting"
-#~ msgstr "会议(_E)"
-
-#~ msgid "New task"
-#~ msgstr "新建任务"
-
-#~ msgid "_Task"
-#~ msgstr "任务(_T)"
-
-#~ msgid "New All Day Appointment"
-#~ msgstr "新建全天约会"
-
-#~ msgid "All _Day Appointment"
-#~ msgstr "全天约会(_D)"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "无法更新无效对象"
 
@@ -16998,9 +18363,6 @@ msgstr "立即查找"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "从 %s 打开日历"
 
-#~ msgid "Opening default tasks folder"
-#~ msgstr "正在打开默认任务文件夹"
-
 #~ msgid "Evaluation of the search expression did not yield a boolean value"
 #~ msgstr "计算搜索表达式没有得到布尔值"
 
@@ -17038,9 +18400,6 @@ msgstr "立即查找"
 #~ "Evolution 找到了 GnomeCard 文件。\n"
 #~ "您是否希望把它们导入 Evolution？"
 
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Evolution Mail 配置界面"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "含有邮件的文件夹"
 
@@ -17056,9 +18415,6 @@ msgstr "立即查找"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "虚拟已删除邮件文件夹"
 
-#~ msgid "Properties..."
-#~ msgstr "属性..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "改变该文件夹的属性"
 
@@ -17068,15 +18424,6 @@ msgstr "立即查找"
 #~ msgid "You have unsent messages, do you wish to quit anyway?"
 #~ msgstr "您已取消邮件的发送，您仍希望退出吗？"
 
-#~ msgid "New Mail Message"
-#~ msgstr "新建邮件"
-
-#~ msgid "_Mail Message"
-#~ msgstr "邮件(_M)"
-
-#~ msgid "Compose a new mail message"
-#~ msgstr "撰写一封新邮件"
-
 #~ msgid "New Message Post"
 #~ msgstr "新建邮件投递"
 
@@ -18887,9 +20234,6 @@ msgstr "立即查找"
 #~ msgid "Cumberland"
 #~ msgstr "坎伯兰郡"
 
-#~ msgid "Curitiba"
-#~ msgstr "库里提巴"
-
 #~ msgid "Curitiba Apt"
 #~ msgstr "库里提巴 Apt"
 
@@ -21881,9 +23225,6 @@ msgstr "立即查找"
 #~ msgid "North Bend"
 #~ msgstr "North Bend"
 
-#~ msgid "North Carolina"
-#~ msgstr "北卡罗莱纳州"
-
 #~ msgid "North Conway"
 #~ msgstr "North Conway"
 
@@ -23495,9 +24836,6 @@ msgstr "立即查找"
 #~ msgid "State College"
 #~ msgstr "州立学院"
 
-#~ msgid "Stauning"
-#~ msgstr "Stauning"
-
 #~ msgid "Staunton"
 #~ msgstr "斯托顿"
 
@@ -24086,9 +25424,6 @@ msgstr "立即查找"
 #~ msgid "United Arab Emirates "
 #~ msgstr "阿拉伯联合酋长国 "
 
-#~ msgid "Unst"
-#~ msgstr "Unst"
-
 #~ msgid "Upington"
 #~ msgstr "Upington"
 
@@ -24197,12 +25532,6 @@ msgstr "立即查找"
 #~ msgid "Veracruz"
 #~ msgstr "韦拉克鲁斯"
 
-#~ msgid "Vermillion"
-#~ msgstr "Vermillion"
-
-#~ msgid "Vermont"
-#~ msgstr "佛蒙特州"
-
 #~ msgid "Vernal"
 #~ msgstr "Vernal"
 
@@ -24731,9 +26060,6 @@ msgstr "立即查找"
 #~ msgid " F"
 #~ msgstr " F"
 
-#~ msgid " C"
-#~ msgstr " C"
-
 #~ msgid "knots"
 #~ msgstr "节"
 
@@ -25352,9 +26678,6 @@ msgstr "立即查找"
 #~ msgid "Freezing haze"
 #~ msgstr "冻灰尘"
 
-#~ msgid "Spray"
-#~ msgstr "冰雾"
-
 #~ msgid "Spray in the vicinity"
 #~ msgstr "邻近有冰雾"
 
@@ -25719,18 +27042,6 @@ msgstr "立即查找"
 #~ msgid "Remove a folder added with \"Open Other User's Folder\""
 #~ msgstr "删除用“打开其它用户的文件夹”添加的文件夹"
 
-#~ msgid "Send / Receive"
-#~ msgstr "发送/接收"
-
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "发送队列中的的邮件并收取新邮件"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "是否显示文件夹栏"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "是否显示快捷方式栏"
-
 #~ msgid "View the selected folder"
 #~ msgstr "查看选中的文件夹"
 
@@ -25758,9 +27069,6 @@ msgstr "立即查找"
 #~ msgid "_Rename..."
 #~ msgstr "重命名(_R)..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "发送/接收(_S)"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "快捷方式栏(_S)"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 59f6261ca3..33648432d2 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.3.1.99\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-03-23 11:33+0800\n"
 "Last-Translator: Chao-Hsiung Liao <pesder.liao@msa.hinet.net>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -34,59 +34,230 @@ msgstr "無法載入 %s：%s"
 msgid "Could not read pilot's Address application block"
 msgstr "無法讀取 pilot 通訊錄程式區塊"
 
+# mail/mail-config.glade.h:76
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "自動補齊資料夾"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "憑證 ID(_C):"
+
+# ui/evolution-mail.xml.h:19
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "在此設定您的郵件帳號"
+
+# ui/evolution-addressbook.xml.h:17
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "連絡人"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Evolution 目錄服務迷你名片檢視"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution 目錄服務迷你名片檢視"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution 目錄服務迷你名片檢視"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution 目錄服務迷你名片檢視"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolution 測試元件。"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution 目錄服務迷你名片檢視"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution 郵件執行摘要元件。"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+# importers/pine-importer.c:661
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "目錄服務"
+
+# ui/evolution-event-editor.xml.h:70
+# ui/evolution-mail.xml.h:115
+# ui/evolution-task-editor-dialog.xml.h:83
+# ui/evolution.xml.h:60
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "屬性..."
+
+# addressbook/gui/component/addressbook-config.glade.h:3
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+# addressbook/gui/widgets/e-addressbook-view.c:616
+# calendar/gui/e-meeting-dialog.glade.h:8
+# calendar/gui/event-editor-dialog.glade.h:9
+# mail/mail-config.glade.h:23
+# mail/message-browser.c:202
+# ui/evolution-addressbook.xml.h:3
+# ui/evolution-event-editor.xml.h:17
+# ui/evolution-mail.xml.h:22
+# ui/evolution-task-editor-dialog.xml.h:18
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "刪除"
+
+# ui/evolution.xml.h:61
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "重新命名(_R)"
+
+# ui/evolution-addressbook.xml.h:7
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "新的連絡人:"
+
+# ui/evolution-addressbook.xml.h:17
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "連絡人(_C)"
+
+# ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "建立新的連絡人"
+
+# ui/evolution-addressbook.xml.h:17
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "新增連絡人清單"
+
+# ui/evolution-addressbook.xml.h:17
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "新增連絡人清單"
+
+# ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "建立新的連絡人清單"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "個人"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "工作"
+
+# addressbook/gui/component/addressbook-config.c:148
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "LDAP 伺服器"
+
+# camel/providers/imap/camel-imap-folder.c:172
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "無法建立目錄 %s： %s"
+
 # camel/providers/imap/camel-imap-store.c:531
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "無法連線至 LDAP 伺服器"
 
 # camel/providers/imap/camel-imap-store.c:531
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "無法驗證進入 LDAP 伺服器"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "無法在 Root DSE 上執行查詢"
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "伺服器回報了不支援的搜尋起點"
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "這個伺服器不支援 LDAPv3 模式的資訊"
 
 # mail/mail-callbacks.c:1349
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "接收模式資訊時發生錯誤"
 
 # camel/providers/imap/camel-imap-command.c:487
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr "伺服器沒有回應有效的模式資訊"
 
-# mail/mail-config.glade.h:3
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "帳號名稱"
-
-# addressbook/gui/component/select-names/select-names.glade.h:3
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "伺服器名稱"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "此一版本的 Evolution 並未啟用 LDAP"
-
-# ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "其他連絡人"
-
 # addressbook/gui/component/addressbook.c:458
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -95,7 +266,7 @@ msgstr ""
 "您是否擁有存取權限。"
 
 # addressbook/gui/component/addressbook.c:445
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -106,7 +277,7 @@ msgstr ""
 "或者 LDAP 伺服器沒有啟動。"
 
 # addressbook/gui/component/addressbook.c:450
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -118,7 +289,7 @@ msgstr ""
 "及安裝 OpenLDAP，然後再重新編譯 Evolution。\n"
 
 # addressbook/gui/component/addressbook.c:445
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -133,50 +304,49 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "無法開啟目錄服務"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "正以匿名方式存取 LDAP 伺服器"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "驗證憑證失敗。\n"
 
 # camel/camel-smime-context.c:194
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s請輸入 %s 所需的密碼(使用者 %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "名稱開始於"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "電子郵件開始於"
 
 # calendar/gui/e-calendar-table.c:150
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "類別為"
 
 # addressbook/gui/component/addressbook.c:618
 # calendar/gui/gnome-cal.c:233
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "任何欄位包含"
 
 # widgets/misc/e-filter-bar.h:97
 # widgets/misc/e-filter-bar.h:104
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "進階..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -188,7 +358,7 @@ msgstr ""
 "請使用更加明確的查詢或是提高此目錄服務的目錄\n"
 "伺服器偏好設定中的結果上限。"
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -200,106 +370,43 @@ msgstr ""
 "或是提高此目錄服務的目錄伺服器偏好設定中的\n"
 "結果上限。"
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "此目錄服務的後端程式無法解析這次的查詢。"
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "此目錄服務的後端程式拒絕執行這次的查詢。"
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "這次的查詢並未完全成功。"
 
 # calendar/gui/e-tasks.c:155
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "任何類別"
 
 # calendar/gui/control-factory.c:126
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "行事曆將顯示的 URI "
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "憑證 ID(_C):"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "在這裡設定對 LDAP 目錄的存取"
-
-# ui/evolution-addressbook.xml.h:17
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "連絡人"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "目錄伺服器"
-
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Evolution 目錄服務迷你名片檢視"
-
-# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Evolution 目錄服務名稱選擇界面。"
-
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution 目錄服務迷你名片檢視"
-
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution 目錄服務迷你名片檢視"
-
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution 目錄服務迷你名片檢視"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Evolution 測試元件。"
-
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution 目錄服務迷你名片檢視"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:3
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution 郵件執行摘要元件。"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -323,6 +430,7 @@ msgstr " 顯示支援的起點(_S) "
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -356,11 +464,11 @@ msgstr "5:00"
 msgid "636"
 msgstr "636"
 
-# addressbook/gui/component/addressbook-config.c:148
+# mail/mail-config.glade.h:40
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Add LDAP Server"
-msgstr "LDAP 伺服器"
+msgid "Addressbook Creation Assistant"
+msgstr "LDAP 組態助理"
 
 # addressbook/gui/component/addressbook-config.glade.h:2
 #: addressbook/gui/component/ldap-config.glade.h:12
@@ -378,9 +486,9 @@ msgid "Anonymously"
 msgstr "匿名"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -391,56 +499,57 @@ msgstr ""
 "請按“完成”按鈕以儲存您在這裡輸入的設定值。"
 
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "連線中"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "'辨別的名稱(_N):"
 
 # addressbook/gui/component/addressbook-config.c:148
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Edit LDAP Server"
 msgstr "LDAP 伺服器"
 
 # mail/mail-config.glade.h:29
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address:"
 msgstr "電子郵件位址(_A):"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution 會使用這個 DN 透過伺服器來驗證您"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr "Evolution 會使用電子郵件位址透過伺服器來驗證您"
 
 # mail/mail-search.c:316
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "已完成"
 
 # addressbook/contact-editor/contact-editor.glade.h:10
 # executive-summary/component/executive-summary-config.glade.h:3
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "一般"
 
-# mail/mail-config.glade.h:40
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "LDAP 組態助理"
+# shell/e-shortcuts-view.c:137
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "組別"
 
 # calendar/gui/event-editor-dialog.glade.h:10
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "永不"
 
@@ -470,8 +579,8 @@ msgstr "搜尋範圍(_E):"
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "搜尋中"
 
@@ -526,29 +635,33 @@ msgstr ""
 "和編輯連絡人的預設設定。"
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr "指定顯示名稱是在設定 LDAP 伺服器時最後需要的步驟。"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:395
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:395
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "Step 2: Server Information"
 msgstr "步驟一：伺服器資訊"
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "步驟二：連線至伺服器"
-
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "步驟三：搜尋目錄"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "步驟二：連線至伺服器"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "步驟四：顯示名稱"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "步驟三：搜尋目錄"
 
 # calendar/gui/print.c:362
 #: addressbook/gui/component/ldap-config.glade.h:52
@@ -561,16 +674,6 @@ msgstr "支援的搜尋起點"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"設定 LDAP 伺服器的第一個步驟是提供伺服器的名稱，和您的登入\n"
-"資訊。如果您不確定這個資訊，請向您的系統管理者詢問。"
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -581,7 +684,7 @@ msgstr ""
 "還有一次搜尋應該花多久的時間。如果您需要改變這些選項，\n"
 "請詢問您的系統管理者。"
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -591,7 +694,7 @@ msgstr ""
 "搜尋起點是您的搜尋起始處的辨認的名稱 (DN)。\n"
 "如果您讓它保持空白，搜尋會從樹狀目錄的根目錄開始。"
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -604,15 +707,14 @@ msgstr ""
 "“子目錄”的搜尋範圍會包括在您的搜尋起點之下的所有項目。\n"
 "“一層”的搜尋範圍只會包括在您的起點下一層的項目。\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
 #, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "這個助理會幫助您使用 LDAP （輕量目錄存取通訊\n"
 "協定）伺服器來存取線上目錄服務。\n"
@@ -621,13 +723,13 @@ msgstr ""
 "的特殊資訊。如果您需要找尋這個資訊，請連絡\n"
 "您的系統管理者。"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "這是您的 ldap 伺服器的完整名稱。例如：“ldap.mycompany.com”。"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -636,7 +738,7 @@ msgstr ""
 "這是要下載的項目的最大數量。把這個數量設得\n"
 "太大會減慢您的目錄服務的速度。"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -645,7 +747,7 @@ msgstr ""
 "這是 Evolution 將要用驗證您的方法。注意要設定此項至“電子郵件位址”需要您的 "
 "LDAP 伺服器的匿名存取。"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -654,6 +756,15 @@ msgstr ""
 "這是此伺服器出現於您的 Evolution 資料夾清單中的名稱。\n"
 "它僅做為顯示之用。"
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"這是此伺服器出現於您的 Evolution 資料夾清單中的名稱。\n"
+"它僅做為顯示之用。"
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -683,17 +794,28 @@ msgid "Using email address"
 msgstr "使用電子郵件位址"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "每次可能的時候"
 
+#: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+"設定 LDAP 伺服器的第一個步驟是提供伺服器的名稱，和您的登入\n"
+"資訊。如果您不確定這個資訊，請向您的系統管理者詢問。"
+
 # calendar/gui/calendar-summary.c:622
 # mail/mail-config.glade.h:24
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "顯示名稱(_D):"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "下載限制(_D):"
 
@@ -703,9 +825,9 @@ msgstr "下載限制(_D):"
 # ui/evolution-subscribe.xml.h:10
 # ui/evolution-task-editor-dialog.xml.h:70
 # ui/evolution.xml.h:48
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -713,27 +835,27 @@ msgstr "下載限制(_D):"
 msgid "_Edit"
 msgstr "編輯 (_E)"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "登入方法(_L):"
 
 # addressbook/gui/component/addressbook-config.c:409
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "連接埠號碼(_P):"
 
 # addressbook/gui/component/addressbook-config.c:430
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "搜尋起點(_S):"
 
 # calendar/gui/e-itip-control.glade.h:10
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "伺服器名稱(_S):"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:4
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "逾時時間（分鐘）(_T):"
 
@@ -741,33 +863,32 @@ msgstr "逾時時間（分鐘）(_T):"
 # 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:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "名片"
 
 # mail/mail-ops.c:1939
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
 # addressbook/contact-editor/contact-editor.glade.h:10
 # executive-summary/component/executive-summary-config.glade.h:3
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr "general-tab"
 
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr "searching-tab"
 
-# addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "名稱"
+# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution 目錄服務名稱選擇界面。"
 
 # addressbook/gui/component/select-names/e-select-names-popup.c:176
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
@@ -779,7 +900,7 @@ msgstr "全部移除"
 # shell/e-shortcuts-view.c:265
 # shell/e-shortcuts-view.c:388
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "移除"
@@ -815,27 +936,23 @@ msgstr "新增到連絡人"
 msgid "Unnamed Contact"
 msgstr "未命名的連絡人"
 
+# addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "名稱"
+
 # addressbook/gui/widgets/e-addressbook-view.c:735
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "來源"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "從目錄服務選擇連絡人"
 
-# addressbook/gui/component/addressbook.c:619
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "尋找連絡人於"
-
-# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution 目錄服務名稱選擇界面。"
-
 # mail/mail-search.c:316
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
@@ -935,7 +1052,8 @@ msgstr "部門(_E):"
 # addressbook/contact-editor/contact-editor.glade.h:8
 # calendar/gui/dialogs/task-editor-dialog.glade.h:9
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "詳細資料"
 
@@ -1030,12 +1148,12 @@ msgstr "類別(_T)..."
 # ui/evolution-task-editor-dialog.xml.h:69
 # ui/evolution.xml.h:46
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "刪除(_D)"
@@ -2318,7 +2436,7 @@ msgstr "Esq."
 # addressbook/contact-editor/e-contact-quick-add.c:276
 # addressbook/gui/widgets/e-addressbook-view.c:700
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "全名"
 
@@ -2436,11 +2554,28 @@ msgstr "連絡人清單編輯器"
 msgid "Save List as VCard"
 msgstr "儲存清單為 VCard 檔案格式"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+# addressbook/gui/component/addressbook-storage.c:99
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "變更後的連絡人:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "衝突的連絡人:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "偵測到重複的連絡人"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"此連絡人中改變後的電子郵件或名稱已經\n"
+"存在於此資料夾。您無論如何都要新增它嗎？"
+
 # ui/evolution-addressbook.xml.h:7
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
@@ -2459,23 +2594,6 @@ msgstr ""
 "此連絡人的名稱或電子郵件地址已經存在\n"
 "於此資料夾。您無論如何都要新增它嗎？"
 
-# addressbook/gui/component/addressbook-storage.c:99
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "變更後的連絡人:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "衝突的連絡人:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"此連絡人中改變後的電子郵件或名稱已經\n"
-"存在於此資料夾。您無論如何都要新增它嗎？"
-
 # widgets/misc/e-filter-bar.c:239
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
@@ -2604,9 +2722,9 @@ msgstr "傳送郵件給連絡人"
 # 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:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "列印"
@@ -2637,9 +2755,12 @@ msgstr "剪下"
 # ui/evolution-event-editor.xml.h:13
 # ui/evolution-mail.xml.h:8
 # ui/evolution-task-editor-dialog.xml.h:14
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "複製"
 
@@ -2650,28 +2771,9 @@ msgstr "複製"
 msgid "Paste"
 msgstr "貼上"
 
-# addressbook/gui/component/addressbook-config.glade.h:3
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-# addressbook/gui/widgets/e-addressbook-view.c:616
-# calendar/gui/e-meeting-dialog.glade.h:8
-# calendar/gui/event-editor-dialog.glade.h:9
-# mail/mail-config.glade.h:23
-# mail/message-browser.c:202
-# ui/evolution-addressbook.xml.h:3
-# 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:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "刪除"
-
 # widgets/menus/gal-view-menus.c:176
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "目前檢視"
 
@@ -2686,216 +2788,218 @@ msgstr ""
 "的目錄服務後端程式\n"
 "已經當機。您將需要重新啟動 Evolution 才能再度使用它"
 
-# 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 "* 按這裡新增連絡人 *"
-
 # addressbook/contact-editor/e-contact-editor.c:1242
 # addressbook/gui/widgets/e-addressbook-view.c:733
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 msgid "Assistant"
 msgstr "助理"
 
 # addressbook/gui/widgets/e-addressbook-view.c:703
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant Phone"
 msgstr "助理電話"
 
-# addressbook/gui/widgets/e-addressbook-view.c:709
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Address"
-msgstr "商務地址"
-
 # addressbook/contact-editor/e-contact-editor.c:1245
 # addressbook/gui/widgets/e-addressbook-view.c:713
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "商務傅真"
 
 # addressbook/gui/widgets/e-addressbook-view.c:704
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "商務電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:715
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "商務電話 2"
 
 # addressbook/gui/widgets/e-addressbook-view.c:705
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "回撥電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:712
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "汽車電話"
 
+# calendar/gui/e-calendar-table.c:150
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "類別"
+
 # addressbook/gui/widgets/e-addressbook-view.c:706
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "公司電話"
 
-# addressbook/gui/widgets/e-addressbook-view.c:728
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "部門"
-
 # addressbook/gui/widgets/e-addressbook-view.c:701
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "電子郵件"
 
 # addressbook/contact-editor/e-contact-editor.c:1285
 # addressbook/gui/widgets/e-addressbook-view.c:725
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "電子郵件 2"
 
 # addressbook/contact-editor/e-contact-editor.c:1286
 # addressbook/gui/widgets/e-addressbook-view.c:726
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "電子郵件 3"
 
+# addressbook/contact-editor/e-contact-quick-add.c:276
+# addressbook/gui/widgets/e-addressbook-view.c:700
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "姓"
+
 # addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "歸檔為"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
+# addressbook/contact-editor/e-contact-quick-add.c:276
+# addressbook/gui/widgets/e-addressbook-view.c:700
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "空閒-忙碌 URL"
-
-# addressbook/gui/widgets/e-addressbook-view.c:710
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "住家地址"
+#, fuzzy
+msgid "Given Name"
+msgstr "欄位名稱"
 
 # addressbook/contact-editor/e-contact-editor.c:1251
 # addressbook/gui/widgets/e-addressbook-view.c:714
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "住家傳真"
 
 # addressbook/gui/widgets/e-addressbook-view.c:707
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "住家電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:716
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "住家電話 2"
 
-# addressbook/contact-editor/e-contact-editor.c:1252
-# addressbook/gui/widgets/e-addressbook-view.c:717
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+# mail/mail-config.glade.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "電話"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "約旦"
 
 # addressbook/gui/widgets/e-addressbook-view.c:732
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "主管"
 
 # addressbook/gui/widgets/e-addressbook-view.c:711
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "行動電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:734
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "暱稱"
 
 # addressbook/gui/widgets/e-addressbook-view.c:736
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "備註"
 
 # addressbook/gui/widgets/e-addressbook-view.c:729
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "辦公室"
 
 # addressbook/gui/widgets/e-addressbook-view.c:708
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "團體"
 
-# addressbook/gui/widgets/e-addressbook-view.c:724
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "其它地址"
-
 # addressbook/contact-editor/e-contact-editor.c:1255
 # addressbook/gui/widgets/e-addressbook-view.c:719
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "其它傳真"
 
 # addressbook/gui/widgets/e-addressbook-view.c:718
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "其它電話"
 
 # addressbook/contact-editor/e-contact-editor.c:1256
 # addressbook/gui/widgets/e-addressbook-view.c:720
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "呼叫器"
 
 # addressbook/gui/widgets/e-addressbook-view.c:702
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "主要電話"
 
-# addressbook/gui/widgets/e-addressbook-view.c:731
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "專業"
-
 # addressbook/contact-editor/e-contact-editor.c:1258
 # addressbook/gui/widgets/e-addressbook-view.c:721
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "無線電電話"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "角色"
+
 # addressbook/gui/widgets/e-addressbook-view.c:735
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "配偶"
 
-# addressbook/gui/widgets/e-addressbook-view.c:723
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+# addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
 # addressbook/contact-editor/e-contact-editor.c:1259
 # addressbook/gui/widgets/e-addressbook-view.c:722
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "電報"
 
 # addressbook/gui/widgets/e-addressbook-view.c:730
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "頭銜"
 
+# mail/message-list.c:677
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "恩斯特"
+
 # addressbook/gui/widgets/e-addressbook-view.c:727
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "網址"
 
@@ -3002,11 +3106,21 @@ msgid "Job Title"
 msgstr "職稱(_J):"
 
 # addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "住家地址"
+
+# addressbook/gui/widgets/e-addressbook-view.c:710
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "住家地址"
 
+# addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "其它地址"
+
 # addressbook/contact-editor/e-contact-editor.c:1251
 # addressbook/gui/widgets/e-addressbook-view.c:714
 #: addressbook/gui/widgets/eab-contact-display.c:227
@@ -3021,47 +3135,44 @@ msgstr "住家傳真"
 msgid "Blog"
 msgstr "波隆納"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "成功"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
 # shell/e-shell-view-menu.c:602
 # shell/e-shell-view-menu.c:614
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "資料庫離線"
 
 # shell/e-storage.c:475
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "權限不足"
 
 # calendar/gui/calendar-commands.c:266
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "找不到名片"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "名片 ID 已經存在"
 
 # shell/e-storage.c:477
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "通訊協定不支援"
 
@@ -3071,11 +3182,11 @@ msgstr "通訊協定不支援"
 # calendar/gui/e-calendar-table.c:422
 # camel/camel-service.c:544
 # camel/camel-service.c:580
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
@@ -3084,77 +3195,77 @@ msgstr "已取消"
 
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "驗証失敗"
 
 # camel/providers/smtp/camel-smtp-transport.c:218
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "要求驗證"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS 無法使用"
 
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "目錄服務不存在"
 
 # shell/e-storage.c:467
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "其他錯誤"
 
 # calendar/gui/dialogs/save-comp.c:51
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "您是否須要儲存變更？"
 
 # ui/evolution-calendar.xml.h:25
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr "放棄(_D)"
 
 # shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "新增清單時發生錯誤"
 
 # shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "新增名片時發生錯誤"
 
 # shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "編輯清單時發生錯誤"
 
 # shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "編輯名片時發生錯誤"
 
 # executive-summary/component/e-summary.c:940
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "移除清單時發生錯誤"
 
 # executive-summary/component/e-summary.c:940
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "移除名片時發生錯誤"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -3163,7 +3274,7 @@ msgstr ""
 "開啟 %d 張名片也會同時開啟 %d 個新視窗。\n"
 "您真的要顯示所有這些名片嗎？"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3174,33 +3285,33 @@ msgstr ""
 
 # mail/mail-callbacks.c:1140
 # mail/mail-display.c:92
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "覆寫"
 
 # composer/e-msg-composer.c:785
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "儲存 %s 時發生錯誤：%s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "card.vcf"
 
 # addressbook/contact-editor/fullname.glade.h:8
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "清單"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "移動名片到"
 
 # calendar/gui/e-calendar-table.c:714
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "複製名片到"
@@ -3209,7 +3320,7 @@ msgstr "複製名片到"
 # 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/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "移動名片到"
@@ -3218,18 +3329,18 @@ msgstr "移動名片到"
 # 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/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "複製名片到"
 
 # addressbook/backend/ebook/e-card.c:3745
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "多重 VCard"
 
 # addressbook/backend/ebook/e-card.c:3753
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "給 %s 的 VCard"
@@ -3471,7 +3582,7 @@ msgid "Number of columns:"
 msgstr "欄數:"
 
 # addressbook/printing/e-contact-print.glade.h:23
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "選項"
 
@@ -3693,23 +3804,23 @@ msgstr "分割多日事件:"
 # addressbook/conduit/address-conduit.c:654
 # calendar/conduits/calendar/calendar-conduit.c:731
 # calendar/conduits/todo/todo-conduit.c:545
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "無法啟動 wombat 服務"
 
 # addressbook/conduit/address-conduit.c:655
 # calendar/conduits/calendar/calendar-conduit.c:732
 # calendar/conduits/todo/todo-conduit.c:546
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "無法啟動 wombat"
 
 # calendar/conduits/calendar/calendar-conduit.c:786
 # calendar/conduits/calendar/calendar-conduit.c:789
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "無法讀取 pilot 行事曆程式區塊"
 
@@ -3720,30 +3831,113 @@ msgstr "預設優先順序:"
 
 # calendar/conduits/todo/todo-conduit.c:600
 # calendar/conduits/todo/todo-conduit.c:603
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "無法讀取 pilot 待辦事項程式區塊"
 
+# ui/evolution-mail.xml.h:110
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "行事曆與工作"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "行事曆"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "在這裡設定您的時區、行事曆與工作清單"
+
+# ui/evolution-mail.xml.h:110
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "行事曆與工作"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution 郵件資料夾元件工廠。"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution 行事曆 iTip/iMip 檢視器"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution 行事曆 iTip/iMip 檢視器"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution 行事曆 iTip/iMip 檢視器"
+
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution 提醒"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolution 郵件資料夾顯示元件。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolution 測試元件。"
+
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "工作"
+
+# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "聲音提醒服務的元件工廠"
+
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "開始:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "結束:"
 
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Evolution 提醒"
 
 # calendar/gui/e-calendar-table.c:162
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "提醒於 %s"
@@ -3834,12 +4028,6 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "不要再詢問我關於這個程式。"
 
-# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "聲音提醒服務的元件工廠"
-
 # addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 # addressbook/backend/ebook/load-pine-addressbook.c:22
 # addressbook/backend/ebook/test-client-list.c:23
@@ -3850,7 +4038,7 @@ msgstr "聲音提醒服務的元件工廠"
 # calendar/conduits/todo/todo-conduit.c:965
 # calendar/gui/alarm-notify/notify-main.c:98
 # calendar/gui/main.c:57
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "無法初始化 Bonobo"
 
@@ -3864,40 +4052,179 @@ msgstr "無法初始化 Bonobo"
 # calendar/conduits/todo/todo-conduit.c:965
 # calendar/gui/alarm-notify/notify-main.c:98
 # calendar/gui/main.c:57
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "無法始初化 gnome-vfs"
 
 # calendar/gui/alarm-notify/notify-main.c:108
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "無法建立聲音提醒服務元件工廠"
 
 # calendar/gui/event-editor-dialog.glade.h:30
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "失效時間"
 
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "iCalendar 錯誤"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "今天到期的工作色彩"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "今天到期的工作色彩"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "在週及月的檢視內顯示約會的結束時間(_S)"
+
+# ui/evolution-calendar.xml.h:22
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "預覽將要列印的行事曆內容"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "當刪除項目時先確認(_A)"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "當刪除項目時先確認(_A)"
+
+# calendar/gui/e-calendar-table.c:714
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "刪除已完成的工作"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "在日期導覽顯示週數(_N)"
+
 # calendar/gui/gnome-cal.c:234
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "主旨包含"
 
 # calendar/gui/gnome-cal.c:235
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "描述包含"
 
 # calendar/gui/gnome-cal.c:236
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "備註包含"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "沒有相符資料"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3909,12 +4236,12 @@ msgstr ""
 "\n"
 "確定清除這些工作？"
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid "Purge events older than"
 msgstr "傳回小於"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "天"
@@ -3922,7 +4249,7 @@ msgstr "天"
 # 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
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
@@ -3931,22 +4258,22 @@ msgstr "%A %d %B %Y"
 # calendar/gui/e-week-view-main-item.c:334
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 # calendar/gui/print.c:1093
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
 # 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
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
@@ -3954,49 +4281,93 @@ msgstr "%d %B %Y"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
+# ui/evolution-calendar.xml.h:26
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "列印這個行事曆"
+
 # ui/evolution-addressbook.xml.h:7
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "新喀里多尼亞島"
 
-# ui/evolution.xml.h:61
-#: calendar/gui/calendar-component.c:207
+# calendar/gui/e-day-view.c:3146
+# ui/evolution-calendar.xml.h:16
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "新增約會"
+
+# calendar/gui/event-editor-dialog.glade.h:3
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "約會(_A)"
+
+# ui/evolution-calendar.xml.h:5
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "建立一個新的約會"
+
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "新增會議"
+
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#: calendar/gui/calendar-component.c:640
 #, fuzzy
-msgid "Rename"
-msgstr "重新命名(_R)"
+msgid "M_eeting"
+msgstr "會議"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+# ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:641
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "建立一個新的會議要求"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "個人"
+# calendar/gui/e-day-view.c:3146
+# ui/evolution-calendar.xml.h:16
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "新增全天約會"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "工作"
+# calendar/gui/e-day-view.c:3146
+# ui/evolution-calendar.xml.h:16
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr "全天約會(_D)"
+
+# ui/evolution-calendar.xml.h:5
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "建立一個新的約會"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -4139,7 +4510,7 @@ msgstr "傳送"
 msgid "With these arguments:"
 msgstr "具有這些參數:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr ""
 
@@ -4156,6 +4527,10 @@ msgstr "時"
 msgid "minutes"
 msgstr "分"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -4201,8 +4576,8 @@ msgstr "傳送電子郵件"
 # calendar/gui/e-itip-control.glade.h:11
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "摘要:"
 
@@ -4239,7 +4614,7 @@ msgstr "時"
 
 # calendar/gui/event-editor-dialog.glade.h:42
 # mail/mail-config.glade.h:87
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "分"
 
@@ -4303,7 +4678,7 @@ msgstr "天"
 # calendar/gui/event-editor.c:479
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "星期五"
 
@@ -4320,7 +4695,7 @@ msgstr "分"
 # calendar/gui/event-editor.c:475
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "星期一"
 
@@ -4333,7 +4708,7 @@ msgstr "週日(_U)"
 # calendar/gui/event-editor.c:480
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "星期六"
 
@@ -4350,7 +4725,7 @@ msgstr "在日期導覽顯示週數(_N)"
 # calendar/gui/event-editor.c:481
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "星期日"
 
@@ -4375,7 +4750,7 @@ msgstr "工作清單"
 # calendar/gui/event-editor.c:478
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "星期四"
 
@@ -4398,7 +4773,7 @@ msgstr "時間格式:"
 # calendar/gui/event-editor.c:476
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "星期二"
 
@@ -4410,13 +4785,13 @@ msgstr "一週開始於(_E):"
 # calendar/gui/event-editor.c:477
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "星期三"
 
 # ui/evolution-calendar.xml.h:35
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "工作週"
 
@@ -4461,7 +4836,7 @@ msgstr "週五(_F)"
 # addressbook/contact-editor/contact-editor.glade.h:10
 # executive-summary/component/executive-summary-config.glade.h:3
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "一般(_G)"
 
@@ -4510,7 +4885,7 @@ msgstr "週三(_W)"
 msgid "before every appointment"
 msgstr "在每個約會前"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
@@ -4518,73 +4893,73 @@ msgstr "要刪除的事件是一個會議，您想要送出取消通知嗎？"
 
 # mail/mail-accounts.c:280
 # mail/mail-accounts.c:284
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "您確定要取消並刪除這個會議？"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr "要刪除的工作已經被指派了，您想要送出取消通知嗎？"
 
 # calendar/gui/dialogs/delete-comp.c:125
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "您確定要取消並刪除這個工作？"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr "要刪除的日誌項目已經公佈了，您想要送出取消通知嗎？"
 
 # calendar/gui/dialogs/delete-comp.c:102
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "您確定要取消並刪除這個日誌項目？"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "這個事件已刪除。"
 
 # addressbook/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "這個工作已刪除。"
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "這個日誌項目已刪除。"
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  您已經做了些變更。放棄這些變更並且關閉這個編輯器？"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  您沒有做任何變更，關閉這個編輯器？"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "這個事件已變更。"
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "這個工作已變更。"
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "這個日誌項目已變更。"
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  您已經做了些變更。放棄這些變更並且更新這個編輯器？"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  您沒有做任何變更，更新這個編輯器？"
@@ -4595,7 +4970,7 @@ msgstr "%s  您沒有做任何變更，更新這個編輯器？"
 msgid "Validation error: %s"
 msgstr "確認上的錯誤： %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " 到 "
 
@@ -4603,7 +4978,7 @@ msgstr " 到 "
 # calendar/gui/calendar-model.c:1180
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (已完成) "
 
@@ -4611,34 +4986,34 @@ 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/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "已完成 "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr "(期限)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 # calendar/gui/e-calendar-table.c:155
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "期限 "
 
 # shell/e-setup.c:163
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "無法更新物件"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:2
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "編輯約會"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "約會 - %s"
@@ -4646,143 +5021,149 @@ 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:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "工作 - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "日誌項目 - %s"
 
 # calendar/gui/e-calendar-table.c:159
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "沒有摘要"
 
 # composer/e-msg-composer.c:774
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "另存新檔..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 #, fuzzy
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "如果有更新透過電子郵件到達，對此項目所做的變更可能被放棄"
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "無法取得目前的版本！"
 
+# shell/e-shell-importer.c:602
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "選擇用來匯入這些資料的目的資料夾"
+
 # calendar/gui/dialogs/delete-comp.c:84
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "您確定要刪除約會 “%s”？"
 
 # calendar/gui/dialogs/delete-comp.c:87
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "您確定要刪除這個未命名的約會？"
 
 # calendar/gui/dialogs/delete-comp.c:93
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "您確定要刪除工作“%s”？"
 
 # calendar/gui/dialogs/delete-comp.c:96
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "您確定要刪除這個未命名的工作？"
 
 # calendar/gui/dialogs/delete-comp.c:102
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "您確定要刪除日誌項目 “%s”？"
 
 # calendar/gui/dialogs/delete-comp.c:105
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "您確定要刪除這個未命名的日誌？"
 
 # calendar/gui/dialogs/delete-comp.c:120
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "您確定要刪除 %d 個約會？"
 
 # calendar/gui/dialogs/delete-comp.c:125
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "您確定要刪除 %d 個工作？"
 
 # calendar/gui/dialogs/delete-comp.c:130
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "您確定要刪除 %d 個日誌項目？"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 #, fuzzy
 msgid "The item could not be deleted due to a corba error"
 msgstr "無法傳送這個項目！\n"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 #, fuzzy
 msgid "The task could not be deleted because permission was denied"
 msgstr "由於不合法的狀態使得到會者狀態無法更新！\n"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "無法傳送這個項目！\n"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "無法傳送這個項目！\n"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "由於不合法的狀態使得到會者狀態無法更新！\n"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "無法傳送這個項目！\n"
@@ -4803,50 +5184,50 @@ msgid "Enter Delegate"
 msgstr "輸入代表"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "約會"
 
 # calendar/gui/event-editor-dialog.glade.h:20
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "提醒"
 
 # calendar/gui/event-editor-dialog.glade.h:18
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "週期性"
 
 # ui/evolution-event-editor.xml.h:46
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "會議排程"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "會議"
 
 # calendar/gui/e-calendar-table.c:154
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "開始日期錯誤"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "結束日期錯誤"
 
 # calendar/gui/event-editor-dialog.glade.h:31
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "開始時間錯誤"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "結束時間錯誤"
 
@@ -4954,33 +5335,33 @@ msgstr "開始時間(_S):"
 # widgets/misc/e-dateedit.c:1341
 # widgets/misc/e-dateedit.c:1456
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "無"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "需要一個召集人。"
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "最少需要一個到會者。"
 
 # calendar/gui/e-calendar-table.c:708
 # ui/evolution-task-editor-dialog.xml.h:19
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "委派給(_D)..."
 
@@ -5030,23 +5411,17 @@ msgid "Member"
 msgstr "會員"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "角色"
-
 # calendar/gui/e-meeting-dialog.glade.h:23
 # mail/message-list.c:1081
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "狀況"
@@ -5069,6 +5444,7 @@ msgid "_Invite Others..."
 msgstr "邀請其他人(_I)..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -5104,6 +5480,7 @@ msgid "Could not create directory for new calendar"
 msgstr "無法建立目錄 %s： %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "必須指定一個召集人。"
@@ -5140,36 +5517,72 @@ msgstr "行事曆資訊"
 msgid "Calendar Name"
 msgstr "行事曆"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+# camel/providers/imap/camel-imap-folder.c:172
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "無法建立目錄 %s： %s"
+
+# data/evolution.keys.in.h:2
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "行事曆資訊"
+
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "工作清單"
+
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "工作清單"
+
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "工作清單"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "沃里斯與伏塔那島"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 #, fuzzy
 msgid "This and Future Instances"
 msgstr "沃里斯與伏塔那島"
 
 # widgets/misc/e-filter-bar.h:97
 # widgets/misc/e-filter-bar.h:104
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 #, fuzzy
 msgid "All Instances"
 msgstr "艾來安斯"
@@ -5231,10 +5644,17 @@ msgid "on the"
 msgstr "在第"
 
 # calendar/gui/event-editor.c:754
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "出現"
 
+# calendar/gui/dialogs/task-editor-dialog.glade.h:7
+# calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "日期/時間:"
+
 # addressbook/contact-editor/contact-editor.glade.h:1
 # addressbook/gui/component/addressbook-config.glade.h:1
 # calendar/gui/e-meeting-dialog.glade.h:1
@@ -5323,7 +5743,7 @@ msgid "year(s)"
 msgstr "年"
 
 # composer/e-msg-composer.c:941
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 #, fuzzy
 msgid ""
 "This event has been changed, but has not been saved.\n"
@@ -5334,29 +5754,29 @@ msgstr ""
 "\n"
 "您是否要儲存變更？"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "放棄變更(_D)"
 
 # calendar/gui/e-itip-control.glade.h:4
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 #, fuzzy
 msgid "Save Event"
 msgstr "行事曆事件"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "會議資訊已建立。是否傳送它？"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "會議資訊已變更。是否傳送更新後的資訊？"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "工作指派資訊已建立。是否傳送它？"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "工作資訊已變更。是否傳送更新後的資訊？"
 
@@ -5364,7 +5784,7 @@ msgstr "工作資訊已變更。是否傳送更新後的資訊？"
 # calendar/gui/calendar-model.c:1180
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "完成日期錯誤 "
 
@@ -5379,11 +5799,11 @@ msgstr "% 完成"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "已完成"
 
@@ -5393,8 +5813,8 @@ msgstr "已完成"
 # calendar/gui/e-calendar-table.c:345
 # mail/message-list.c:689
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "高"
 
@@ -5403,9 +5823,9 @@ msgstr "高"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:11
 # calendar/gui/e-calendar-table.c:420
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "進行中"
 
@@ -5415,8 +5835,8 @@ msgstr "進行中"
 # calendar/gui/e-calendar-table.c:347
 # mail/message-list.c:687
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "低"
 
@@ -5427,8 +5847,8 @@ msgstr "低"
 # calendar/gui/e-calendar-table.c:346
 # mail/message-list.c:688
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "普通"
 
@@ -5437,9 +5857,9 @@ msgstr "普通"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:14
 # calendar/gui/e-calendar-table.c:419
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "未開始"
 
@@ -5452,7 +5872,7 @@ msgstr "進度"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:22
 # calendar/gui/e-calendar-table.c:348
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "未指定"
 
@@ -5478,22 +5898,22 @@ msgstr "狀態(_S):"
 msgid "_Web Page:"
 msgstr "Web 網址(_W):"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "基本"
 
 # calendar/gui/calendar-model.c:1578
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "指派工作"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "到期日錯誤"
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -5507,9 +5927,9 @@ msgstr "機密(_F)"
 # 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:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "描述:"
 
@@ -5637,33 +6057,27 @@ msgstr "%s 為未知的觸發類型"
 # calendar/gui/calendar-model.c:360
 # calendar/gui/calendar-model.c:898
 # calendar/gui/e-calendar-table.c:323
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "公開"
 
 # calendar/gui/calendar-model.c:363
 # calendar/gui/calendar-model.c:900
 # calendar/gui/e-calendar-table.c:324
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "私人"
 
 # calendar/gui/calendar-model.c:366
 # calendar/gui/calendar-model.c:902
 # calendar/gui/e-calendar-table.c:325
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "機密"
 
-# calendar/gui/e-calendar-table.c:150
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "類別"
-
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
@@ -5681,32 +6095,30 @@ msgstr "開始日期"
 
 # calendar/gui/e-calendar-table.c:159
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "摘要"
 
 # mail/mail-config.glade.h:2
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "顏色"
 
 # calendar/gui/event-editor-dialog.glade.h:3
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "約會"
 
 # ui/evolution-calendar.xml.h:36
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "空閒"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:393
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "忙碌"
 
@@ -5721,7 +6133,7 @@ msgid "S"
 msgstr "S"
 
 # calendar/gui/calendar-model.c:459
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "E"
 
@@ -5731,7 +6143,7 @@ msgid "W"
 msgstr "W"
 
 # calendar/gui/calendar-model.c:970
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -5742,7 +6154,7 @@ msgstr ""
 "45.436845,125.862501"
 
 # calendar/gui/calendar-model.c:1584
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -5751,7 +6163,7 @@ msgid "Yes"
 msgstr "是"
 
 # calendar/gui/calendar-model.c:1584
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -5763,17 +6175,17 @@ msgstr "否"
 # camel/providers/smtp/camel-smtp-transport.c:221
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "不明"
 
@@ -5787,88 +6199,81 @@ msgstr "循環模式"
 msgid "Assigned"
 msgstr "已指定"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "更新物件"
-
 # calendar/gui/e-calendar-table.c:714
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "刪除選定的物件"
 
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "更新物件"
+
 # calendar/gui/e-week-view.c:3277
 # calendar/gui/e-week-view.c:3300
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "新增約會(_A)..."
 
 # calendar/gui/e-day-view.c:3148
 # calendar/gui/e-week-view.c:3279
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "新增全天事件(_E)"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "新增會議"
 
 # ui/evolution-tasks.xml.h:3
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "新增工作"
 
 # ui/evolution-addressbook.xml.h:18
 # ui/evolution-calendar.xml.h:42
 # ui/evolution-contact-editor.xml.h:15
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "列印(_P)..."
 
 # ui/evolution-event-editor.xml.h:68
 # ui/evolution-task-editor-dialog.xml.h:81
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "貼上(_P)"
 
 # ui/evolution-calendar.xml.h:12
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "移至今日(_T)"
 
 # calendar/gui/e-day-view.c:3155
 # calendar/gui/e-week-view.c:3286
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "到指定日期(_G)..."
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "發佈空閒/忙碌資訊(_P)"
 
-# ui/evolution-mail.xml.h:110
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "設定值(_S)..."
-
 # mail/folder-browser.c:686
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "開啟(_O)"
@@ -5877,17 +6282,17 @@ msgstr "開啟(_O)"
 # ui/evolution-calendar.xml.h:43
 # ui/evolution-mail.xml.h:118
 # ui/evolution-tasks.xml.h:8
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "另存新檔(_S)..."
 
 # ui/evolution-event-editor.xml.h:6
 # ui/evolution-task-editor-dialog.xml.h:7
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
@@ -5895,125 +6300,130 @@ msgstr "剪下(_U)"
 
 # ui/evolution-event-editor.xml.h:55
 # ui/evolution-task-editor-dialog.xml.h:67
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "複製(_C)"
 
 # ui/evolution-event-editor.xml.h:46
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "會議排程(_S)..."
 
 # calendar/gui/calendar-summary.c:721
 # calendar/gui/e-itip-control.glade.h:7
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "以 iCalendar 轉寄(_F)..."
 
 # calendar/gui/e-day-view.c:3177
 # calendar/gui/e-week-view.c:3311
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "刪除這個事件(_O)"
 
 # calendar/gui/e-week-view.c:3313
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "刪除全部事件(_A)"
 
+# ui/evolution-mail.xml.h:110
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "設定值(_S)..."
+
 # calendar/gui/e-calendar-table.c:367
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
 # calendar/gui/e-calendar-table.c:368
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
 # calendar/gui/e-calendar-table.c:369
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
 # calendar/gui/e-calendar-table.c:370
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
 # calendar/gui/e-calendar-table.c:371
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
 # calendar/gui/e-calendar-table.c:372
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
 # calendar/gui/e-calendar-table.c:373
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
 # calendar/gui/e-calendar-table.c:374
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
 # calendar/gui/e-calendar-table.c:375
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
 # calendar/gui/e-calendar-table.c:376
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
 # calendar/gui/e-calendar-table.c:377
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
 # ui/evolution-mail.xml.h:114
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "開啟郵件(_O)"
 
 # calendar/gui/calendar-model.c:1578
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "指派工作(_A)"
 
 # calendar/gui/calendar-summary.c:721
 # calendar/gui/e-itip-control.glade.h:7
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "以 iCalendar 轉寄(_F)"
 
 # calendar/gui/e-calendar-table.c:707
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "標示為完成(_M)"
 
 # calendar/gui/e-calendar-table.c:713
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "標示選定的工作為已完成(_M)"
 
 # calendar/gui/e-calendar-table.c:714
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "刪除選定的工作(_D)"
 
 # calendar/gui/e-calendar-table.c:163
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "請按這裡增加新的工作"
@@ -6031,8 +6441,8 @@ msgstr "提醒"
 
 # camel/camel-filter-driver.c:694
 # camel/camel-filter-driver.c:793
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "完成"
 
@@ -6073,7 +6483,7 @@ msgstr "網址 URL"
 # calendar/gui/calendar-model.c:794
 # e-util/e-time-utils.c:278
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
@@ -6081,13 +6491,13 @@ msgstr "%a %m/%d/%Y %H:%M:%S"
 # calendar/gui/calendar-model.c:797
 # e-util/e-time-utils.c:287
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
 # calendar/gui/calendar-model.c:802
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -6110,7 +6520,7 @@ 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:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -6129,7 +6539,7 @@ msgstr "%d %b"
 # calendar/gui/print.c:617
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "上午"
 
@@ -6138,107 +6548,107 @@ msgstr "上午"
 # calendar/gui/print.c:616
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "下午"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
 # calendar/gui/event-editor-dialog.glade.h:26
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "簡單循環(_S)"
 
 # calendar/gui/event-editor-dialog.glade.h:10
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
 msgid "Every day"
 msgstr "每"
 
 # calendar/gui/event-editor.c:1543
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, fuzzy, c-format
 msgid "Every %d days"
 msgstr "%d 日"
 
 # calendar/gui/event-editor-dialog.glade.h:10
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 #, fuzzy
 msgid "Every week"
 msgstr "每"
 
 # calendar/gui/event-editor.c:1548
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, fuzzy, c-format
 msgid "Every %d weeks"
 msgstr "%d 週"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 #, fuzzy
 msgid "Every week on "
 msgstr "艾弗格林"
 
 # calendar/gui/event-editor.c:1548
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, fuzzy, c-format
 msgid "Every %d weeks on "
 msgstr "%d 週"
 
 # ui/evolution-message-composer.xml.h:26
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 #, fuzzy
 msgid " and "
 msgstr "沙塵"
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 #, fuzzy
 msgid "every month"
 msgstr "一個月(_H)"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr ""
 
 # calendar/gui/event-editor-dialog.glade.h:10
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 #, fuzzy
 msgid "Every year"
 msgstr "每"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>開始:</b>"
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>結束:</b>"
 
@@ -6246,382 +6656,381 @@ msgstr "<b>結束:</b>"
 # 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:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>已完成:</b>"
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>逾期:</b>"
 
 # data/evolution.keys.in.h:2
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "iCalendar 資訊"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "iCalendar 錯誤"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "不明人士"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr "<br> 請查閱下列資訊，然後在下面的選單中選擇一個動作。"
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>無</i>"
 
 # addressbook/backend/ebook/e-card.c:3442
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "位置:"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:27
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "狀態:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "接受"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "暫時接受"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "婉拒"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "選擇一個動作:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "更新"
 
 # widgets/misc/e-cell-date-edit.c:245
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "確認"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "接受"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "暫時接受"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "婉拒"
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "送出空閒/忙碌資訊"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "更新回應狀態"
 
 # widgets/misc/e-messagebox.c:152
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "送出最新資訊"
 
 # ui/evolution-mail.xml.h:2
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "取消"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> 已經發佈會議資訊。"
 
 # data/evolution.keys.in.h:2
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "會議資訊"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> 邀請 %s 出席此次會議。"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> 邀請您出席此次會議。"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "會議提案"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> 希望加入一個既存的會議。"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:631
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "會議更新"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> 希望收到最新的會議資訊。"
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "會議更新請求"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> 已經答覆了會議請求。"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "會議答覆"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> 已經消取會議。"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "會議取消"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> 傳送了一個難以理解的訊息。"
 
 # mail/mail-search.c:268
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "不正確的會議訊息"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> 已經發佈了工作資訊。"
 
 # widgets/misc/e-messagebox.c:152
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "工作資訊"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> 要求 %s 進行工作。"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> 要求您進行工作。"
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "工作計畫"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> 希望加入一項既存的工作。"
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "工作更新"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> 希望收到最新的工作資訊。"
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "工作更新請求"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> 已經回覆指派的工作。"
 
 # mail/message-browser.c:188
 # ui/evolution-mail.xml.h:70
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "工作回覆"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> 已經取消工作。"
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "工作取消"
 
 # calendar/gui/e-itip-control.glade.h:4
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "不正確的工作訊息"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> 已經發佈空閒/忙碌資訊。"
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "空閒/忙碌資訊"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> 請求您的空閒/忙碌資訊。"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "空閒/忙碌請求"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> 已經答覆空閒/忙碌請求。"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "空閒/忙碌回覆"
 
 # mail/mail-callbacks.c:1407
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "不正確的空閒/忙碌訊息"
 
 # camel/providers/local/camel-mbox-folder.c:368
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr "訊息似乎沒有被適當地組成"
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "這個郵件只包含不支援的請求。"
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr "附件並未包含合法的行事曆訊息"
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr "附件沒有可檢視的行事曆項目"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "無法更新行事曆檔案！\n"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:8
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "更新完成\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "到會者狀態不能更新，因為項目已經不存在"
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "物件是無效的而且不能更新\n"
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "這個回覆並非來自目前的到會者。將他加入為到會者？"
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "由於不合法的狀態使得到會者狀態無法更新！\n"
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr "CORBA 系統發生錯誤\n"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr "找不到物件\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "您沒有正確的權限可以更新行事曆\n"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "到會者狀態已更新\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "無法更新到會者狀態！\n"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "移除完成"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "項目傳送！\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "無法傳送這個項目！\n"
 
@@ -6817,7 +7226,7 @@ msgstr "%a %m/%d/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
@@ -6897,57 +7306,51 @@ msgid "Meeting _end time:"
 msgstr "會議結束時間(_E):"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:18
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr "開始日期(_R):"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:25
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "到期日(_D):"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "優先順序(_P):"
 
 # addressbook/printing/e-contact-print.glade.h:25
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "頁"
 
-# mail/mail-ops.c:1262
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "開啟在 %s 的工作"
-
 # calendar/gui/e-tasks.c:298
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "無法載入“%s”裡的工作"
 
 # calendar/gui/e-tasks.c:310
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "不支援載入“%s”必須的方法"
 
 # calendar/gui/gnome-cal.c:840
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "您沒有權限可以開啟“%s”內的資料夾"
 
 # mail/mail-mt.c:190
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6957,58 +7360,46 @@ msgstr ""
 " %s"
 
 # calendar/gui/e-calendar-table.c:152
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "正在完成工作..."
 
 # calendar/gui/e-calendar-table.c:714
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "正在刪除選定的物件..."
 
 # mail/mail-ops.c:1449
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "除去中"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
-#: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "工作"
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
+#: shell/e-shortcuts.c:1086
 msgid "Calendar"
 msgstr "行事曆"
 
 # calendar/gui/gnome-cal.c:840
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "無法開啟“%s”內的資料夾"
 
 # calendar/gui/gnome-cal.c:851
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "不支援開啟“%s”必須的方法"
 
 # calendar/gui/e-calendar-table.c:162
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "增加 %s 的提醒"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -7019,7 +7410,7 @@ msgstr ""
 "的工作後端程式\n"
 "已經當機。您將需要重新啟動 Evolution 才能再度使用它"
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -7035,77 +7426,11 @@ msgstr ""
 # mail/mail-ops.c:1014
 # mail/mail-ops.c:1032
 # mail/mail-ops.c:1033
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "杜林"
 
-# ui/evolution-mail.xml.h:110
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "行事曆與工作"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "行事曆"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "在這裡設定您的時區、行事曆與工作清單"
-
-# ui/evolution-mail.xml.h:110
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "行事曆與工作"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:5
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution 郵件資料夾元件工廠。"
-
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution 行事曆 iTip/iMip 檢視器"
-
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Evolution 行事曆 iTip/iMip 檢視器"
-
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution 行事曆 iTip/iMip 檢視器"
-
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Evolution 提醒"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:4
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolution 郵件資料夾顯示元件。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolution 測試元件。"
-
 # calendar/gui/goto-dialog.glade.h:1
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
@@ -7176,272 +7501,272 @@ msgstr "10月"
 msgid "September"
 msgstr "9月"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "必須指定一個召集人。"
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "至少需要一個到會者"
 
 # data/evolution.keys.in.h:2
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "事件資訊"
 
 # widgets/misc/e-messagebox.c:152
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "工作資訊"
 
 # mail/mail-config.glade.h:47
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "日誌資訊"
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "空閒/忙碌資訊"
 
 # data/evolution.keys.in.h:2
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "行事曆資訊"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "已更新"
 
 # ui/evolution-subscribe.xml.h:4
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "重整清單"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "計算計劃"
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "空閒/忙碌資訊 (%s 到 %s)"
 
 # data/evolution.keys.in.h:2
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "iCalendar 資訊"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "您必須是此事件的到會者。"
 
 # calendar/gui/print.c:300
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1日"
 
 # calendar/gui/print.c:300
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2日"
 
 # calendar/gui/print.c:300
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3日"
 
 # calendar/gui/print.c:300
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4日"
 
 # calendar/gui/print.c:300
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5日"
 
 # calendar/gui/print.c:301
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6日"
 
 # calendar/gui/print.c:301
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7日"
 
 # calendar/gui/print.c:301
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8日"
 
 # calendar/gui/print.c:301
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9日"
 
 # calendar/gui/print.c:301
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10日"
 
 # calendar/gui/print.c:302
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11日"
 
 # calendar/gui/print.c:302
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12日"
 
 # calendar/gui/print.c:302
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13日"
 
 # calendar/gui/print.c:302
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14日"
 
 # calendar/gui/print.c:302
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15日"
 
 # calendar/gui/print.c:303
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16日"
 
 # calendar/gui/print.c:303
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17日"
 
 # calendar/gui/print.c:303
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18日"
 
 # calendar/gui/print.c:303
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19日"
 
 # calendar/gui/print.c:303
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20日"
 
 # calendar/gui/print.c:304
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21日"
 
 # calendar/gui/print.c:304
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22日"
 
 # calendar/gui/print.c:304
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23日"
 
 # calendar/gui/print.c:304
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24日"
 
 # calendar/gui/print.c:304
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25日"
 
 # calendar/gui/print.c:305
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26日"
 
 # calendar/gui/print.c:305
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27日"
 
 # calendar/gui/print.c:305
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28日"
 
 # calendar/gui/print.c:305
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29日"
 
 # calendar/gui/print.c:305
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30日"
 
 # calendar/gui/print.c:306
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31日"
 
 # calendar/gui/print.c:362
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "日"
 
 # calendar/gui/print.c:362
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "一"
 
 # calendar/gui/print.c:362
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "二"
 
 # calendar/gui/print.c:362
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "三"
 
 # calendar/gui/print.c:362
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "四"
 
 # calendar/gui/print.c:362
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "五"
 
 # calendar/gui/print.c:362
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "六"
 
 # calendar/gui/print.c:1078
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "選擇的日期(%a %b %d %Y)"
 
 # calendar/gui/print.c:1092
 # calendar/gui/print.c:1096
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
 # calendar/gui/print.c:1093
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
@@ -7449,68 +7774,68 @@ msgstr "%a %d %Y"
 # calendar/gui/print.c:1097
 # calendar/gui/print.c:1099
 # calendar/gui/print.c:1100
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
 # calendar/gui/print.c:1104
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "選擇的週(%s - %s)"
 
 # calendar/gui/print.c:1112
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "選擇的月(%b %Y)"
 
 # calendar/gui/print.c:1119
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "選擇的年(%Y)"
 
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "工作"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:27
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "狀態(_S): %s"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "優先順序(_P): %s"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:8
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完成百分比: %i"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:21
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "網址: %s"
 
 # addressbook/backend/ebook/e-card.c:3467
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "類別: %s"
 
 # ui/evolution-addressbook.xml.h:17
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "連絡人: "
 
@@ -7518,30 +7843,73 @@ msgstr "連絡人: "
 # mail/mail-callbacks.c:1447
 # ui/evolution-addressbook.xml.h:10
 # ui/evolution-calendar.xml.h:24
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "預覽列印"
 
 # ui/evolution-contact-editor.xml.h:6
 # ui/evolution-event-editor.xml.h:37
 # ui/evolution-task-editor-dialog.xml.h:40
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "列印項目"
 
 # ui/evolution-event-editor.xml.h:36
 # ui/evolution-task-editor-dialog.xml.h:39
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "列印設定"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+# shell/e-shortcuts-view.c:295
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "更改這個功能的名稱"
+
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "工作清單"
+
+# ui/evolution-tasks.xml.h:3
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "新增工作"
+
+# ui/evolution-tasks.xml.h:9
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "工作(_T)"
+
+# ui/evolution-tasks.xml.h:2
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "建立一個新的工作"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 # calendar/gui/tasks-control.c:108
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "工作資料夾顯示的 URI"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -7556,12 +7924,12 @@ msgstr ""
 # importers/elm-importer.c:528
 # importers/netscape-importer.c:807
 # importers/pine-importer.c:668
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "不要再顯示這個訊息。"
 
 # ui/evolution-calendar.xml.h:25
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "列印工作"
 
@@ -7600,17 +7968,17 @@ msgid "vCalendar files (.vcf)"
 msgstr ""
 
 # calendar/gui/event-editor-dialog.glade.h:20
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "提醒！！"
 
 # calendar/gui/e-itip-control.glade.h:4
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "行事曆事件"
 
 # importers/pine-importer.c:705
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -7620,7 +7988,7 @@ msgstr ""
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Gnome 行事曆"
 
@@ -9186,32 +9554,32 @@ msgid "Pacific/Yap"
 msgstr "太平洋/雅浦島"
 
 # camel/camel-cipher-context.c:171
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "此加密器不支援加簽"
 
 # camel/camel-cipher-context.c:251
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "此加密器不支援驗證加簽"
 
 # camel/camel-cipher-context.c:294
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "此加密器不支援加密"
 
 # camel/camel-cipher-context.c:336
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "此加密器不支援解密"
 
 # camel/camel-cipher-context.c:336
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr "您不能匯入此加密器的金鑰"
 
 # camel/camel-cipher-context.c:336
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr "您不能匯出此加密器的金鑰"
 
@@ -9270,7 +9638,7 @@ msgstr "您必須於線上工作才能完成此操作"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
@@ -9278,104 +9646,104 @@ msgstr "建立到“%s”的導管失敗： %s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "建立子程序“%s”失敗： %s"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "無法讀取 %s 的歡迎辭： %s"
 
 # camel/camel-filter-driver.c:534
 # camel/camel-filter-driver.c:543
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "同步處理資料夾"
 
 # camel/camel-filter-driver.c:866
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "分析過濾器發生錯誤： %s: %s"
 
 # camel/camel-filter-driver.c:871
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "執行過濾器發生錯誤： %s: %s"
 
 # camel/camel-filter-driver.c:643
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "無法開啟 spool 資料夾"
 
 # camel/camel-filter-driver.c:652
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "無法處理 spool 資料夾"
 
 # camel/camel-filter-driver.c:666
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "接收郵件 %d (%d%%)"
 
 # camel/camel-filter-driver.c:671
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "不能開啟郵件"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "在第 %d 封郵件發生錯誤"
 
 # camel/camel-filter-driver.c:690
 # camel/camel-filter-driver.c:788
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "同步處理資料夾"
 
 # camel/camel-filter-driver.c:748
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "正在接收第 %d / %d 封郵件"
 
 # camel/camel-filter-driver.c:753
 # camel/camel-filter-driver.c:771
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "在第 %d / %d 封郵件失敗"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "取回郵件失敗。"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr "無效的參數給 (system-flag)"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr "無效的參數給 (user-tag)"
 
 # camel/camel-filter-search.c:439
 # camel/camel-filter-search.c:445
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "執行過濾器搜尋發生錯誤： %s: %s"
@@ -9412,39 +9780,39 @@ msgstr "(符合-全部) 需要單一布林值結果"
 msgid "Performing query on unknown header: %s"
 msgstr "在不明的檔頭內執行查詢：%s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "不支援的操作：添加郵件： %s"
 
 # camel/camel-folder-search.c:338
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "不支援的操作：以詞句搜尋： %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "不支援的操作：以 uids 搜尋： %s"
 
 # mail/mail-ops.c:898
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "移動郵件"
 
 # mail/mail-ops.c:898
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr "複製郵件"
 
 # mail/mail-ops.c:1565
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "取回 %d 封郵件"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -9455,15 +9823,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr "解析 gpg userid 提示時失敗。"
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr "解析 gpg passphrase 要求時失敗。"
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -9473,35 +9841,35 @@ msgstr ""
 "“%s”"
 
 # mail/mail-send-recv.c:471
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "已取消。"
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "解鎖私密金鑰時失敗：輸入了 3 次錯誤的 passhprase 。"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "從 GnuPG 傳回意外的回應： %s"
 
 # camel/camel-pgp-context.c:1073
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr "沒有提供資料"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "不能加密郵件：沒有提供有效的收件者。"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9514,57 +9882,70 @@ msgstr ""
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "無法 GPG %s： %s\n"
 
 # mail/mail-ops.c:1872
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "無法寫入資料：%s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "執行 gpg 失敗： %s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr "執行 gpg 失敗。"
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "這是數位加簽的郵件"
 
 # camel/camel-pgp-context.c:890
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr "不能驗證此郵件的簽章：無法建立暫存檔案：%s"
+
+# camel/camel-pgp-context.c:890
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "不能驗證此郵件的簽章：無法建立暫存檔案：%s"
 
 # mail/mail-ops.c:1872
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "無法寫入資料：%s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "這是數位加簽的郵件"
 
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "索引內文包含"
+
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "無法從編輯器取得郵件"
@@ -9684,16 +10065,16 @@ msgstr "寫入郵件暫存檔案時發生錯誤：%s"
 msgid "Error copying mail temp file: %s"
 msgstr "複製郵件暫存檔案時發生錯誤：%s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "解密 MIME 組件時失敗：通訊協定錯誤"
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "解密 MIME 組件時失敗：無效的結構"
 
 # shell/e-storage.c:467
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "解析錯誤"
 
@@ -10054,13 +10435,13 @@ msgstr "使讀取郵件如同查詢其他資料夾"
 
 # camel/camel-session.c:295
 # camel/camel-session.c:364
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "沒有通訊協定“%s”的提供者"
 
 # camel/camel-session.c:479
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -10070,7 +10451,7 @@ msgstr ""
 "%s"
 
 # camel/camel-smime-context.c:194
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "請輸入 %s 所需的密碼"
@@ -10078,73 +10459,90 @@ msgstr "請輸入 %s 所需的密碼"
 # calendar/gui/calendar-model.c:1064
 # calendar/gui/dialogs/task-editor-dialog.glade.h:22
 # calendar/gui/e-calendar-table.c:348
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "未指定"
 
 # mail/mail-config.glade.h:74
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "儲存簽名檔"
 
 # mail/mail-config.glade.h:74
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "儲存簽名檔"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "在憑證鏈中的自我加簽憑證"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "憑證不被信任"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
 # mail/mail-config.glade.h:74
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "儲存簽名檔"
 
 # shell/e-storage.c:467
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "解析錯誤"
 
 # mail/mail-config.glade.h:72
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "伺服器： %s，類型： %s"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "不能取得資料夾：在此儲存空間上無效的操作"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "不能建立資料夾：在此儲存空間上無效的操作"
 
+# camel/camel-store.c:378
+# mail/mail-ops.c:1007
+# mail/mail-ops.c:1014
+# mail/mail-ops.c:1032
+# mail/mail-ops.c:1033
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "垃圾桶"
+
+# calendar/gui/goto-dialog.glade.h:9
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "6月"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "無法取得發照者的憑證。"
@@ -10361,7 +10759,7 @@ msgstr ""
 "發照者： %s"
 
 # camel/camel-url.c:289
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "無法分析 URL“%s”"
@@ -10385,26 +10783,26 @@ msgstr "不能複製或移動郵件到虛擬資料夾中"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "不能刪除資料夾： %s ：無效的操作"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "不能刪除資料夾： %s ：沒有這個資料夾"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "不能重新命名資料夾： %s ：無效的操作"
 
 # camel/providers/local/camel-local-store.c:237
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "不能重新命名資料夾： %s ：沒有這個資料夾"
@@ -10506,7 +10904,7 @@ msgstr "無法從取回郵件： %s"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -10523,7 +10921,7 @@ msgstr ""
 # camel/providers/local/camel-mh-folder.c:185
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "沒有這封郵件"
@@ -10569,56 +10967,75 @@ msgstr "快取郵件 %s 失敗： %s"
 msgid "Failed to cache %s: %s"
 msgstr "快取 %s 失敗： %s"
 
+# mail/mail-config.c:1213
+# mail/mail-config.c:1216
+#: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "正在連線至伺服器..."
+
+# camel/providers/imap/camel-imap-store.c:531
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "無法連線至 LDAP 伺服器"
+
+# addressbook/contact-editor/e-contact-editor.c:1248
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "公司電話"
+
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
-#: camel/providers/imap/camel-imap-provider.c:43
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "檢查新郵件"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Check for new messages in all folders"
 msgstr "檢查所有資料夾裡的新郵件"
 
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "資料夾"
 
 # camel/providers/imap/camel-imap-provider.c:50
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "只顯示已訂閱的資料夾"
 
 # camel/providers/imap/camel-imap-provider.c:52
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "覆蓋伺服器提供之資料夾的命名空間"
 
 # camel/providers/imap/camel-imap-provider.c:54
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "命名空間"
 
 # camel/providers/imap/camel-imap-provider.c:57
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "將過濾器套用於此伺服器上 INBOX 裡的新郵件"
 
 # mail/mail-config.glade.h:12
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "自動檢查新郵件(_A)"
 
 # camel/providers/imap/camel-imap-provider.c:63
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
 # camel/providers/imap/camel-imap-provider.c:65
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "用作讀取及儲存郵件於 IMAP 伺服器。"
 
@@ -10628,15 +11045,15 @@ msgstr "用作讀取及儲存郵件於 IMAP 伺服器。"
 # camel/providers/nntp/camel-nntp-store.c:291
 # camel/providers/pop3/camel-pop3-provider.c:67
 # mail/mail-config.glade.h:52
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "密碼"
 
 # camel/providers/imap/camel-imap-provider.c:82
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "這個選項將會使用簡易的密碼連線至 IMAP 伺服器。"
@@ -10927,7 +11344,7 @@ msgstr "無法將資料夾 %s 重新命名為 %s： %s"
 
 # camel/providers/local/camel-mbox-summary.c:655
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "無法重新命名“%s”：%s "
@@ -11075,14 +11492,14 @@ msgid "Storing folder"
 msgstr "儲存資料夾"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "不能建立資料夾鎖定 %s ： %s"
 
 # camel/providers/local/camel-mbox-folder.c:203
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "不能開啟 mailbox：%s： %s\n"
@@ -11091,12 +11508,12 @@ msgstr "不能開啟 mailbox：%s： %s\n"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "郵件增添已取消"
 
 # camel/providers/local/camel-mbox-folder.c:259
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "不能將郵件儲存到 mbox 檔案： %s： %s"
@@ -11104,9 +11521,9 @@ msgstr "不能將郵件儲存到 mbox 檔案： %s： %s"
 # camel/providers/local/camel-mbox-folder.c:335
 # camel/providers/local/camel-mbox-folder.c:367
 # camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -11116,12 +11533,12 @@ msgstr ""
 "  %s"
 
 # camel/providers/local/camel-mbox-folder.c:368
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "資料夾好像已經損毀並且不能復原。"
 
 # camel/providers/local/camel-mbox-folder.c:381
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "郵件結構錯誤：損毀的 mailbox ？"
 
@@ -11201,14 +11618,19 @@ msgstr "無法建立目錄 %s： %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "不能取得資料夾：%s：%s"
 
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "名片 ID 已經存在"
+
 # camel/providers/local/camel-local-store.c:237
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "無法將資料夾 %s 重新命名為 %s： %s"
 
 # shell/e-shell-folder-creation-dialog.c:156
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "指定的資料夾名稱不合法： %s"
@@ -11263,7 +11685,7 @@ msgid "Could not close temp folder: %s"
 msgstr "無法關閉暫存資料夾： %s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "無法重新命名資料夾：%s "
@@ -11613,7 +12035,7 @@ msgstr ""
 
 # camel/providers/pop3/camel-pop3-provider.c:48
 # mail/mail-config.glade.h:51
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -11713,7 +12135,7 @@ msgstr "沒有這個資料夾“%s”。"
 # 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:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11777,7 +12199,7 @@ msgstr "經由 sendmail 程式傳送郵件"
 
 # camel/providers/smtp/camel-smtp-provider.c:38
 # mail/mail-config.glade.h:62
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11981,7 +12403,7 @@ msgid "Cannot send message: sender address not valid."
 msgstr "不能傳送郵件：寄件者的地址無效。"
 
 # mail/mail-ops.c:603
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "傳送郵件"
 
@@ -12133,7 +12555,7 @@ msgstr "%.0fG"
 
 # composer/e-msg-composer-attachment-bar.c:332
 # mail/mail-display.c:122
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "附件"
 
@@ -12189,7 +12611,7 @@ msgid "Suggest automatic display of attachment"
 msgstr "建議自動顯示附件"
 
 # mail/mail-callbacks.c:146
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
@@ -12197,7 +12619,7 @@ msgstr ""
 "才可以開始撰寫郵件。"
 
 # composer/e-msg-composer-hdrs.c:324
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "按這裡新增目錄服務"
 
@@ -12209,7 +12631,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:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "回覆地址:"
 
@@ -12217,7 +12639,7 @@ msgstr "回覆地址:"
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "寄件者:"
 
@@ -12225,37 +12647,37 @@ msgstr "寄件者:"
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "主旨:"
 
 # composer/e-msg-composer-hdrs.c:386
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "收件者:"
 
 # composer/e-msg-composer-hdrs.c:387
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "輸入郵件的收件者"
 
 # composer/e-msg-composer-hdrs.c:390
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "副本:"
 
 # composer/e-msg-composer-hdrs.c:391
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "輸入郵件副本的收件者"
 
 # composer/e-msg-composer-hdrs.c:394
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "密件副本:"
 
 # composer/e-msg-composer-hdrs.c:395
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -12265,17 +12687,23 @@ msgstr "輸入郵件密件副本的收件者"
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "張貼到:"
 
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr "張貼的目的端"
 
+# composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "附加檔案至郵件"
+
 # composer/e-msg-composer-attachment-bar.c:421
 # ui/evolution-message-composer.xml.h:2
 #: composer/e-msg-composer-select-file.c:119
@@ -12315,24 +12743,24 @@ msgid "Error saving file: %s"
 msgstr "儲存檔案時發生錯誤：%s"
 
 # composer/e-msg-composer.c:805
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "載入檔案時發生錯誤：%s"
 
 # composer/e-msg-composer.c:785
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "存取檔案時發生錯誤：%s"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "無法從編輯器取得郵件"
 
 # mail/mail-ops.c:1728
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -12342,7 +12770,7 @@ msgstr ""
 "%s"
 
 # mail/mail-ops.c:1728
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -12352,7 +12780,7 @@ msgstr ""
 "%s"
 
 # mail/mail-ops.c:1728
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -12362,7 +12790,7 @@ msgstr ""
 "%s"
 
 # mail/mail-ops.c:1755
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -12372,7 +12800,7 @@ msgstr ""
 " %s"
 
 # importers/pine-importer.c:705
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -12381,7 +12809,7 @@ msgstr ""
 "是否嘗試將它復原？"
 
 # composer/e-msg-composer.c:941
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -12393,32 +12821,32 @@ msgstr ""
 "您希望儲存您的變更嗎？"
 
 # mail/mail-ops.c:1154
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "警告：編輯過的郵件"
 
 # composer/e-msg-composer.c:966
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "開啟檔案"
 
 # mail/mail-config.glade.h:74
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "簽名檔:"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "自動產生的"
 
 # composer/e-msg-composer.c:1526
 # composer/e-msg-composer.c:1871
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "編輯郵件"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -12427,7 +12855,7 @@ msgstr ""
 "無法作用位址選擇器控制元。"
 
 # composer/evolution-composer.c:355
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -12440,7 +12868,7 @@ msgstr ""
 "的 gtkhtml 與 libgtkhtml 。\n"
 
 # composer/evolution-composer.c:355
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -12448,7 +12876,7 @@ msgstr ""
 "無法建立郵件編輯視窗：\n"
 "無法作用 HTML 編輯器元件。"
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -12456,14 +12884,16 @@ msgstr "<b>（郵件編輯器包含不能編輯的非文字的郵件內文。）
 
 # data/evolution.desktop.in.h:2
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Evolution 群組軟體套件"
 
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 # data/evolution.keys.in.h:1
@@ -12753,7 +13183,7 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -12763,7 +13193,7 @@ msgstr "%I:%M %p"
 # widgets/misc/e-dateedit.c:1497
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -12908,7 +13338,7 @@ msgid "You must specify a folder."
 msgstr "您必須指定一個資料夾。"
 
 # mail/mail-account-gui.c:682
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "選擇資料夾"
@@ -12922,27 +13352,27 @@ msgstr ""
 "正規表示式內有錯誤“%s”：\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "重要"
 
 # mail/mail-format.c:762
 # mail/message-list.c:1083
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "待辦"
 
 # calendar/gui/event-editor-dialog.glade.h:33
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "稍後"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "測試"
 
@@ -13043,7 +13473,7 @@ msgstr "前"
 msgid "months"
 msgstr "月"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "秒"
 
@@ -13143,7 +13573,7 @@ msgstr "跟隨"
 
 # addressbook/contact-editor/e-contact-editor.c:1256
 # addressbook/gui/widgets/e-addressbook-view.c:720
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "標籤"
 
@@ -13220,115 +13650,121 @@ msgid "Source Account"
 msgstr "來源帳號"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "飛沫"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "指定檔頭"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "停止處理"
 
 # mail/mail-format.c:767
 # mail/message-list.c:1082
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "主旨"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "取消設定狀態"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "包含"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "不包含"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "不是以此結束"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "不存在"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "does not return"
 msgstr "沒有傳回"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "不類似"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "不是以此開始"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "以此終結"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "存在"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr "有標幟的"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr "是之後的"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "is before"
 msgstr "是之前的"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "大於"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "小於"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr "沒有標幟的"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "不是"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "是"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr "傳回大於"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr "傳回小於"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:393
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr "傳回"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "類似"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "以此開始"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "規則名稱“%s”並不是唯一的，請選擇其他的。"
@@ -13354,18 +13790,98 @@ msgid "Score Rules"
 msgstr "目標規則"
 
 # ui/evolution.xml.h:3
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "您必須為這個虛擬資料夾命名。"
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr "您需要指定至少一個資料夾做為來源。"
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 msgid "VFolder source"
 msgstr "虛擬資料夾來源"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "郵件編輯器偏好設定"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "在此設定郵件的偏好設定，包含安全性與訊息的顯示"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "在此設定拼字檢查、簽名檔與郵件編輯器"
+
+# ui/evolution-mail.xml.h:19
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "在此設定您的郵件帳號"
+
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+# mail/mail-account-editor.c:173
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution 帳號編輯器"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Evolution 郵件編輯器。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Evolution 郵件編輯器。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution 郵件編輯器。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution 郵件資料夾顯示元件。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolution 郵件執行摘要元件。"
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "郵件"
+
+# mail/mail-config.glade.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "郵件帳號"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "郵件偏好設定"
+
 # mail/mail-accounts.c:280
 # mail/mail-accounts.c:284
 #: mail/em-account-prefs.c:233
@@ -13418,7 +13934,7 @@ msgstr "通訊協定"
 
 # addressbook/gui/component/addressbook-storage.c:99
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr "未命名的"
 
@@ -13447,23 +13963,18 @@ msgstr "新增命令稿簽名檔"
 msgid "Signature(s)"
 msgstr "簽名檔"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "您正要傳送一封 HTML 格式的郵件。請確定\n"
 "下列收件者願意並且能夠接收 HTML 郵件：\n"
 
-# calendar/gui/event-editor-dialog.glade.h:23
-# calendar/gui/event-editor.c:1594
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "無論如何都傳送？"
-
 # mail/mail-callbacks.c:235
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -13471,18 +13982,18 @@ msgstr ""
 "郵件上沒有主旨。\n"
 "是否仍然將郵件送出？"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 "因為您送信的連絡人清單設定為隱藏清單的地址，這個郵件只會包含密件副本收件者。"
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "這個郵件只包含密件副本收件者。"
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -13492,12 +14003,12 @@ msgstr ""
 "無論如何都要傳送嗎？"
 
 # mail/mail-callbacks.c:308
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "您必須指定收件者才可送出郵件。"
 
 # composer/e-msg-composer.c:877
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -13510,42 +14021,192 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "從搜尋建立虛擬資料夾(_V)..."
 
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "郵件"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<按這裏選擇資料夾>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "“%s”在“%s”"
+# ui/evolution.xml.h:8
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "建立新資料夾"
+
+# shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "指定建立資料夾的位置："
 
 # shell/glade/e-shell-folder-creation-dialog.glade.h:1
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
-msgid "Folder _name"
+msgid "Folder _name:"
 msgstr "資料夾名稱:"
 
+# mail/mail-display.c:236
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "無法建立暫存目錄： %s"
+
+# mail/mail-display.c:236
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "無法建立暫存目錄： %s"
+
+# mail/mail-display.c:236
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "無法建立暫存檔案“%s”： %s"
+
+# camel/providers/local/camel-mbox-summary.c:644
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "無法關閉暫存資料夾： %s"
+
+# mail/mail-send-recv.c:287
+# mail/mail-send-recv.c:333
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "載入中..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
 # shell/e-shell-importer.c:601
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "選擇資料夾"
 
+# ui/evolution.xml.h:10
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "新增一個資料夾"
+
+# camel/providers/local/camel-maildir-store.c:151
+# camel/providers/local/camel-maildir-store.c:188
+# camel/providers/local/camel-mh-store.c:127
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "無法刪除資料夾“%s”： %s"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "確定要刪除資料夾“%s”？"
+
+# addressbook/gui/component/addressbook-config.glade.h:3
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+# addressbook/gui/widgets/e-addressbook-view.c:616
+# calendar/gui/e-meeting-dialog.glade.h:8
+# calendar/gui/event-editor-dialog.glade.h:9
+# mail/mail-config.glade.h:23
+# mail/message-browser.c:202
+# ui/evolution-addressbook.xml.h:3
+# ui/evolution-event-editor.xml.h:17
+# ui/evolution-mail.xml.h:22
+# ui/evolution-task-editor-dialog.xml.h:18
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "刪除“%s”"
+
+# mail/mail-ops.c:1195
+# mail/mail-ops.c:1333
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "重新命名資料夾“%s”為："
+
+# mail/mail-ops.c:1195
+# mail/mail-ops.c:1333
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+#, fuzzy
+msgid "Rename Folder"
+msgstr "重新命名資料夾"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+# mail/folder-browser-factory.c:198
+# ui/evolution-event-editor.xml.h:39
+# ui/evolution-task-editor-dialog.xml.h:42
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "字型內容"
+
+# mail/folder-browser-factory.c:198
+# ui/evolution-event-editor.xml.h:39
+# ui/evolution-task-editor-dialog.xml.h:42
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "屬性"
+
+# shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "資料夾名稱(_F):"
+
+# ui/evolution-event-editor.xml.h:76
+# ui/evolution-message-composer.xml.h:55
+# ui/evolution-task-editor-dialog.xml.h:90
+# ui/evolution.xml.h:65
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "檢視(_V)"
+
+# ui/evolution.xml.h:24
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "在新視窗開啟"
+
+# ui/evolution-mail.xml.h:55
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "移動"
+
+# ui/evolution.xml.h:59
+#: mail/em-folder-tree.c:1500
+#, fuzzy
+msgid "_New Folder..."
+msgstr "新增資料夾(_N)"
+
+# ui/evolution.xml.h:61
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "重新命名(_R)"
+
+# ui/evolution-event-editor.xml.h:70
+# ui/evolution-mail.xml.h:115
+# ui/evolution-task-editor-dialog.xml.h:83
+# ui/evolution.xml.h:60
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "屬性(_P)..."
+
 # ui/evolution-mail.xml.h:66
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "編輯為新郵件(_E)..."
 
@@ -13553,36 +14214,36 @@ msgstr "編輯為新郵件(_E)..."
 # ui/evolution-event-editor.xml.h:69
 # ui/evolution-task-editor-dialog.xml.h:82
 # ui/evolution-tasks.xml.h:7
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "列印(_P)"
 
 # mail/folder-browser.c:697
 # ui/evolution-mail.xml.h:117
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "回覆寄件者(_R)"
 
 # mail/folder-browser.c:699
 # ui/evolution-mail.xml.h:72
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "回覆至清單(_L)"
 
 # mail/folder-browser.c:699
 # ui/evolution-mail.xml.h:72
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "回覆所有人(_A)"
 
 # mail/folder-browser.c:701
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "轉寄(_F)"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr "跟隨(_W)..."
 
@@ -13590,159 +14251,275 @@ msgstr "跟隨(_W)..."
 # calendar/gui/calendar-model.c:1180
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr "標幟已完成(_G)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "清除標幟(_E)"
 
 # mail/folder-browser.c:704
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "標示成已閱讀(_K)"
 
 # mail/folder-browser.c:706
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "標示成未閱讀(_U)"
 
 # mail/folder-browser.c:706
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "標示成重要(_I)"
 
 # mail/folder-browser.c:706
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "標示成不重要(_M)"
 
+# mail/folder-browser.c:706
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "標示成未閱讀(_U)"
+
+# mail/folder-browser.c:706
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "標示成重要(_I)"
+
 # mail/folder-browser.c:717
 # ui/evolution-mail.xml.h:121
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "復原(_N)"
 
 # mail/folder-browser.c:711
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "移至資料夾(_V)..."
 
 # mail/folder-browser.c:713
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "複製至資料夾(_C)..."
 
 # addressbook/gui/component/addressbook-config.c:662
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "新增寄件者到目錄服務(_B)"
 
 # mail/folder-browser.c:727
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "套用過濾器(_Y)"
 
 # mail/folder-browser.c:731
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "從郵件建立規則(_T)"
 
 # mail/folder-browser.c:653
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "從主旨建立虛擬資料夾(_S)"
 
 # mail/folder-browser.c:656
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "從寄件者建立虛擬資料夾(_N)"
 
 # mail/folder-browser.c:659
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "從收件者建立虛擬資料夾(_R)"
 
 # mail/folder-browser.c:662
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "從郵件清單建立虛擬資料夾(_L)"
 
 # mail/folder-browser.c:656
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "從寄件者建立虛擬資料夾(_N)"
 
 # mail/folder-browser.c:668
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "從主旨建立過濾器(_J)"
 
 # mail/folder-browser.c:671
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "從寄件者建立過濾器(_D)"
 
 # mail/folder-browser.c:674
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "收件者過濾器(_C)"
 
 # mail/folder-browser.c:677
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "從郵件清單建立過濾器(_M)"
 
 # mail/folder-browser.c:671
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "從寄件者建立過濾器(_D)"
 
 # mail/mail-config.glade.h:21
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "預設值"
 
 # mail/mail-callbacks.c:1407
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "列印郵件"
 
 # ui/evolution-event-editor.xml.h:14
 # ui/evolution-task-editor-dialog.xml.h:15
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "複製連結位址"
 
 # mail/mail-search.c:319
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "符合的資料:"
 
-# mail/mail-format.c:1153
-#: mail/em-format-html-display.c:638
+# calendar/gui/calendar-model.c:1578
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "已指定"
+
+# mail/mail-format.c:1161
+#: mail/em-format-html-display.c:597
+#, fuzzy
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr "這封是加入了數位簽名的郵件，但不能証實無訛"
+
+# mail/mail-config.glade.h:74
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "儲存簽名檔"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+# mail/mail-config.glade.h:74
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "儲存簽名檔"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "已中斷"
+
+#: mail/em-format-html-display.c:606
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr "這封是加入了數位簽名的郵件。單擊 鎖 圖示以獲得更多資訊。"
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+# ui/evolution-message-composer.xml.h:13
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "PGP 加密"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+# mail/mail-format.c:573
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "無法解析 MIME 格式的郵件。只好顯示原始檔。"
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "不支援的基模"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "驗證 leaf 憑證失敗。"
 
 # mail/mail-display.c:301
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "檢視行內"
 
 # mail/mail-display.c:363
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "隱藏"
@@ -13754,227 +14531,258 @@ msgid "Page %d of %d"
 msgstr "第 %d / %d 頁"
 
 # mail/mail-ops.c:1498
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "取回郵件 %s"
 
 # mail/mail-format.c:1842
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "格式不良的外加本文部分。"
 
 # mail/mail-format.c:1787
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP 站指示 (%s)"
 
 # mail/mail-format.c:1799
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "本地端檔案 (%s) 於 “%s”有效的指示"
 
 # mail/mail-format.c:1803
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "本地檔案指示 (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "遠端資料指示 (%s)"
 
 # mail/mail-format.c:1837
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "不明的外部檔案指示 (“%s”類型)"
 
-# mail/mail-format.c:1161
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "這封是加入了數位簽名的郵件，但不能証實無訛"
-
-# mail/mail-format.c:1153
-#: mail/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "這封是加入了數位簽名的郵件，已証實無訛"
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-msgid "No signature present"
-msgstr ""
-
-# addressbook/backend/ebook/load-gnomecard-addressbook.c:21
-# addressbook/backend/ebook/load-pine-addressbook.c:22
-# addressbook/backend/ebook/test-client-list.c:23
-# addressbook/backend/ebook/test-client.c:33
-# addressbook/conduit/address-conduit.c:1092
-# addressbook/gui/component/addressbook-factory.c:42
-# calendar/conduits/calendar/calendar-conduit.c:1151
-# calendar/conduits/todo/todo-conduit.c:965
-# calendar/gui/alarm-notify/notify-main.c:98
-# calendar/gui/main.c:57
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "無法初始化 Bonobo"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "不支援的基模"
-
 # mail/mail-format.c:573
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "無法解析 MIME 格式的郵件。只好顯示原始檔。"
 
 # mail/mail-ops.c:898
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "移動郵件"
 
 # mail/mail-format.c:756
 # mail/message-list.c:1082
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "寄件者"
 
 # mail/mail-format.c:759
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "回覆"
 
 # mail/mail-format.c:762
 # mail/message-list.c:1083
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "收件者"
 
 # mail/mail-format.c:765
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "副本"
 
 # composer/e-msg-composer-hdrs.c:394
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "密件副本"
 
 # addressbook/backend/ebook/e-card.c:3428
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "寄件者"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
 # mail/mail-format.c:640
 # mail/message-list.c:1082
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "日期"
 
 # mail/mail-format.c:527
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "%s 附加檔案"
 
-# mail/mail-format.c:573
-#: mail/em-format.c:1259
+# addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+# addressbook/backend/ebook/load-pine-addressbook.c:22
+# addressbook/backend/ebook/test-client-list.c:23
+# addressbook/backend/ebook/test-client.c:33
+# addressbook/conduit/address-conduit.c:1092
+# addressbook/gui/component/addressbook-factory.c:42
+# calendar/conduits/calendar/calendar-conduit.c:1151
+# calendar/conduits/todo/todo-conduit.c:965
+# calendar/gui/alarm-notify/notify-main.c:98
+# calendar/gui/main.c:57
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "無法解析 MIME 格式的郵件。只好顯示原始檔。"
+msgid "Session not initialised"
+msgstr "無法初始化 Bonobo"
+
+# mail/mail-format.c:1153
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "這封是加入了數位簽名的郵件，已証實無訛"
+
+# mail/mail-format.c:1161
+#: mail/em-format.c:1212
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr "這封是加入了數位簽名的郵件，但不能証實無訛"
+
+#: mail/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+# mail/mail-send-recv.c:287
+# mail/mail-send-recv.c:333
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "正在等待..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+# mail/mail-ops.c:599
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Pinging %s"
+
+# camel/camel-filter-driver.c:670
+# camel/camel-filter-driver.c:679
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "快取 %s 失敗： %s"
+
+# camel/camel-filter-driver.c:670
+# camel/camel-filter-driver.c:679
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "建立到“%s”的導管失敗： %s"
+
+# camel/camel-filter-driver.c:670
+# camel/camel-filter-driver.c:679
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "建立到“%s”的導管失敗： %s"
 
 # widgets/misc/e-filter-bar.h:94
 # widgets/misc/e-filter-bar.h:101
-#: mail/em-popup.c:593
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "另存新檔..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
 # mail/folder-browser.c:697
 # ui/evolution-mail.xml.h:117
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "回覆寄件者(_R)"
 
 # mail/mail-display.c:1256
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器內開啟連結"
 
 # ui/evolution-contact-editor.xml.h:13
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "傳送郵件給清單(_M)..."
 
 # addressbook/gui/component/addressbook-config.c:662
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "新增寄件者到目錄服務"
 
 # mail/mail-display.c:299
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "在 %s 內開啟..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "這個伺服器不支援 LDAPv3 模式的資訊"
 
 # ui/evolution-subscribe.xml.h:8
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "訂閱"
 
 # mail/subscribe-dialog.c:76
 # shell/e-storage-set-view.c:48
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "資料夾"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "請選擇一個伺服器。"
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "尚未選擇伺服器"
 
 # widgets/misc/e-messagebox.c:224
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "不要再顯示這個訊息。"
 
 # mail/mail-callbacks.c:1349
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -13985,25 +14793,25 @@ msgstr ""
 
 # importers/netscape-importer.c:795
 # mail/mail-callbacks.c:1359
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "過濾器"
 
 # mail/mail-ops.c:1154
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "轉寄的郵件"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "不明的寄件者"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "在 %a, %Y-%m-%d %H:%M, %%s 寫道："
@@ -14015,7 +14823,7 @@ msgstr "在 %a, %Y-%m-%d %H:%M, %%s 寫道："
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -14024,7 +14832,7 @@ msgstr ""
 "無法儲存到“%s”\n"
 " %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -14034,27 +14842,28 @@ msgstr ""
 "您是否要複蓋它？"
 
 # widgets/misc/e-messagebox.c:180
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "訊息"
 
 # mail/mail-callbacks.c:1188
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "另存郵件..."
 
-# mail/mail-display.c:236
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "無法建立暫存目錄： %s"
+# addressbook/backend/ebook/e-card.c:3346
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "地址"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -14063,76 +14872,456 @@ msgstr ""
 "\n"
 "確定清除這些郵件？"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "郵件編輯器偏好設定"
+#: mail/em-utils.c:2288
+#, fuzzy
+msgid ""
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"這個操作會永久地清除所有標示為刪除的郵件。\n"
+"如果您要繼續，您將不能復原這些郵件。\n"
+"\n"
+"確定清除這些郵件？"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+# mail/mail-config.glade.h:12
+#: mail/evolution-mail.schemas.in.in.h:1
+#, fuzzy
+msgid "Automatic link recognition"
+msgstr "自動偵測連結(_D)"
+
+# mail/mail-config.glade.h:12
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "自動偵測連結(_D)"
+
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:6
+msgid "Default charset in which to compose messages"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:7
+msgid "Default charset in which to compose messages."
+msgstr ""
+
+# ui/evolution-mail.xml.h:75
+#: mail/evolution-mail.schemas.in.in.h:8
+#, fuzzy
+msgid "Default charset in which to display messages"
+msgstr "搜尋顯示的郵件本文中的文字"
+
+# ui/evolution-mail.xml.h:75
+#: mail/evolution-mail.schemas.in.in.h:9
+#, fuzzy
+msgid "Default charset in which to display messages."
+msgstr "搜尋顯示的郵件本文中的文字"
+
+# ui/evolution-mail.xml.h:34
+#: mail/evolution-mail.schemas.in.in.h:10
+#, fuzzy
+msgid "Default forward style"
+msgstr "轉寄方式(_F):"
+
+# mail/message-browser.c:191
+# ui/evolution-mail.xml.h:71
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default reply style"
+msgstr "回覆方式(_R):"
+
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Empty Trash folders on exit"
+msgstr "離開時清空垃圾桶資料夾(_T)"
+
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "離開時清空垃圾桶資料夾(_T)"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "在此設定郵件的偏好設定，包含安全性與訊息的顯示"
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "在此設定拼字檢查、簽名檔與郵件編輯器"
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
 
-# ui/evolution-mail.xml.h:19
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "在此設定您的郵件帳號"
+# mail/mail-config.glade.h:6
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
+msgstr "郵件帳號"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
+msgid "Log filter actions"
+msgstr "執行動作"
 
-# mail/mail-account-editor.c:173
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+# mail/mail-config.glade.h:40
+#: mail/evolution-mail.schemas.in.in.h:36
 #, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution 帳號編輯器"
+msgid "New Mail Notify sound file"
+msgstr "新郵件通知"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+# mail/mail-config.glade.h:40
+#: mail/evolution-mail.schemas.in.in.h:37
 #, fuzzy
-msgid "Evolution Mail component"
-msgstr "Evolution 郵件編輯器。"
+msgid "New Mail Notify type"
+msgstr "新郵件通知"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+# ui/evolution-mail.xml.h:14
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr "當傳送 HTML 郵件給不想收到 HTML 郵件的連絡人時顯示提示(_P)"
+
+# ui/evolution-mail.xml.h:14
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "當傳送的郵件只有指定密件副本收件者時顯示提示(_O)"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+# addressbook/gui/component/select-names/e-select-names-popup.c:200
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "傳送 HTML 格式的電子郵件？"
+
+# addressbook/gui/component/select-names/e-select-names-popup.c:200
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "傳送 HTML 格式的電子郵件？"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "顯示動畫影像(_S)"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "顯示動畫影像(_S)"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+# ui/evolution-mail.xml.h:86
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "使用正常模式顯示郵件"
+
+# calendar/gui/event-editor-dialog.glade.h:15
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "預覽面板(_P)"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "當新郵件到達時播放聲音檔案(_P)"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "拼字檢查(_C)"
+
+# addressbook/gui/component/addressbook-storage.c:99
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "原本的連絡人:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "選擇用於列印的 HTML 可變寬度字型"
+
+# ui/evolution-mail.xml.h:93
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "相關郵件清單"
+
+# ui/evolution-mail.xml.h:93
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "相關郵件清單"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+# mail/mail-config.glade.h:41
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "設為我的預設帳號(_M)"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+# mail/mail-accounts.c:197
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "可變寬度(_A):"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 #, fuzzy
-msgid "Evolution Mail composer"
+msgid "Evolution Elm importer"
 msgstr "Evolution 郵件編輯器。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
 #, fuzzy
-msgid "Evolution Mail composer configuration control"
+msgid "Evolution mbox importer"
 msgstr "Evolution 郵件編輯器。"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:4
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution 郵件資料夾顯示元件。"
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
+msgstr ""
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:3
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Evolution 郵件執行摘要元件。"
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution 郵件編輯器。"
 
-# mail/mail-config.glade.h:6
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "郵件帳號"
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "郵件偏好設定"
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "Evolution 郵件編輯器。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:1
 #: mail/importers/elm-importer.c:105
@@ -14177,42 +15366,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Elm importer"
-msgstr "Evolution 郵件編輯器。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution mbox importer"
-msgstr "Evolution 郵件編輯器。"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr ""
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution 郵件編輯器。"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr ""
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Pine importer"
-msgstr "Evolution 郵件編輯器。"
-
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #: mail/importers/netscape-importer.c:75
 #, c-format
@@ -14275,17 +15428,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution 正在匯入您舊有的 Netscape 資料"
 
-# camel/camel-store.c:378
-# mail/mail-ops.c:1007
-# mail/mail-ops.c:1014
-# mail/mail-ops.c:1032
-# mail/mail-ops.c:1033
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "垃圾桶"
-
 # camel/providers/local/camel-local-store.c:183
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
@@ -14296,7 +15438,7 @@ msgstr "掃描郵件過濾器"
 msgid "Scanning directory"
 msgstr "掃描目錄"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "開始匯入"
 
@@ -14390,28 +15532,28 @@ msgstr "您沒有填入所有必須的資訊。"
 
 # mail/mail-account-editor.c:173
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution 帳號編輯器"
 
 # addressbook/gui/component/addressbook-config.c:401
 # mail/mail-config.glade.h:33
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "主機(_H):"
 
 # mail/mail-config.glade.h:80
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "使用者名稱(_N):"
 
 # addressbook/gui/component/addressbook-config.c:520
 # mail/mail-config.glade.h:53
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "路徑(_P):"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "您不能用相同的名稱建立兩個帳號。"
 
@@ -14422,39 +15564,39 @@ msgid "Mail to %s"
 msgstr "郵件送到 %s"
 
 # mail/mail-autofilter.c:213
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "主旨是 %s"
 
 # mail/mail-autofilter.c:229
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "郵件來自 %s "
 
 # mail/mail-autofilter.c:285
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s 郵件列表"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "回覆"
 
 # mail/mail-autofilter.c:335
 # mail/mail-autofilter.c:356
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "新增過濾器規則"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "下列的過濾器規則：\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -14465,196 +15607,35 @@ msgstr ""
 "    '%s'\n"
 "並已更新。"
 
-# mail/mail-config.c:1213
-# mail/mail-config.c:1216
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "正在連線..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "此資料夾不能包含郵件。"
-
-# camel/providers/local/camel-mbox-summary.c:655
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "無法開啟共用的資料夾：%s。"
-
-# mail/mail-display.c:236
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "無法建立暫存目錄： %s"
+# ui/evolution-mail.xml.h:109
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "新增郵件"
 
-# mail/mail-display.c:236
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "無法建立暫存檔案“%s”： %s"
+# ui/evolution-mail.xml.h:109
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "郵件訊息(_M)"
 
-# camel/providers/local/camel-mbox-summary.c:644
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "無法關閉暫存資料夾： %s"
+# composer/e-msg-composer.c:1526
+# composer/e-msg-composer.c:1871
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "編輯新的郵件訊息"
 
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-# shell/e-shell-importer.c:602
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "選擇用來匯入這些資料的目的資料夾"
-
-# shell/e-shell-importer.c:602
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "選擇用來匯入這些資料的目的資料夾"
-
-# ui/evolution.xml.h:10
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "新增一個資料夾"
-
-# shell/glade/e-shell-folder-creation-dialog.glade.h:3
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "指定建立資料夾的位置："
-
-# camel/providers/local/camel-maildir-store.c:151
-# camel/providers/local/camel-maildir-store.c:188
-# camel/providers/local/camel-mh-store.c:127
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "無法刪除資料夾“%s”： %s"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "確定要刪除資料夾“%s”？"
-
-# addressbook/gui/component/addressbook-config.glade.h:3
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-# addressbook/gui/widgets/e-addressbook-view.c:616
-# calendar/gui/e-meeting-dialog.glade.h:8
-# calendar/gui/event-editor-dialog.glade.h:9
-# mail/mail-config.glade.h:23
-# mail/message-browser.c:202
-# ui/evolution-addressbook.xml.h:3
-# ui/evolution-event-editor.xml.h:17
-# ui/evolution-mail.xml.h:22
-# ui/evolution-task-editor-dialog.xml.h:18
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "刪除“%s”"
-
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "重新命名資料夾“%s”為："
-
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-#, fuzzy
-msgid "Rename Folder"
-msgstr "重新命名資料夾"
-
-# shell/e-shell-folder-creation-dialog.c:156
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "指定的資料夾名稱不合法： %s"
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-# mail/folder-browser-factory.c:198
-# ui/evolution-event-editor.xml.h:39
-# ui/evolution-task-editor-dialog.xml.h:42
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "字型內容"
-
-# mail/folder-browser-factory.c:198
-# ui/evolution-event-editor.xml.h:39
-# ui/evolution-task-editor-dialog.xml.h:42
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "屬性"
-
-# shell/glade/e-shell-folder-creation-dialog.glade.h:1
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "資料夾名稱(_F):"
-
-# ui/evolution-event-editor.xml.h:76
-# ui/evolution-message-composer.xml.h:55
-# ui/evolution-task-editor-dialog.xml.h:90
-# ui/evolution.xml.h:65
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "檢視(_V)"
-
-# ui/evolution.xml.h:24
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "在新視窗開啟"
-
-# ui/evolution-mail.xml.h:55
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "移動"
-
-# ui/evolution.xml.h:59
-#: mail/mail-component.c:2087
-#, fuzzy
-msgid "_New Folder..."
-msgstr "新增資料夾(_N)"
-
-# ui/evolution.xml.h:61
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "重新命名(_R)"
-
-# ui/evolution-event-editor.xml.h:70
-# ui/evolution-mail.xml.h:115
-# ui/evolution-task-editor-dialog.xml.h:83
-# ui/evolution.xml.h:60
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "屬性(_P)..."
-
 # mail/mail-config.glade.h:35
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "身分"
 
@@ -14720,13 +15701,13 @@ msgstr ""
 "理為一個 Evolution 郵件帳號。現請在下面的空白處為這個帳號輸入一個名稱。這個名"
 "稱僅用作顯示用途。"
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "檢查服務"
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "正在連線至伺服器..."
 
@@ -14824,33 +15805,44 @@ msgstr "字集(_H):"
 msgid "C_olors"
 msgstr "顏色(_O)"
 
+# camel/providers/imap/camel-imap-provider.c:43
+# mail/mail-config.glade.h:13
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "檢查新郵件"
+
+#: mail/mail-config.glade.h:27
 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:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "檢查新郵件"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "拼錯字的顏色(_M):"
 
 # composer/e-msg-composer.c:1526
 # composer/e-msg-composer.c:1871
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "編輯郵件中"
 
 # mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "組態"
 
 # mail/mail-config.glade.h:15
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -14868,327 +15860,333 @@ msgstr ""
 "請按“完成”來儲存您的設定。"
 
 # mail/mail-config.glade.h:21
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "預設值(_F)"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "預設行為"
 
 # mail/mail-config.glade.h:22
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "預設字元編碼(_E):"
 
 # mail/mail-config.glade.h:58
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "刪除郵件中"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "當使用這個帳號時永遠在寄送的郵件上加簽(_A)"
 
 # camel/camel-filter-driver.c:671
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "不要引用原始訊息"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "不要加簽會議邀請(為了相容 Outlook)(_M)"
 
 # mail/mail-config.glade.h:25
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "完成"
 
 # mail/mail-config.glade.h:27
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "草稿匣(_F):"
 
 # mail/mail-accounts.c:199
 # mail/mail-config.glade.h:30
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "啟用(_E)"
 
 # mail/mail-config.glade.h:6
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "電子郵件帳號"
 
 # mail/mail-config.glade.h:29
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "電子郵件位址(_A):"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "離開時清空垃圾桶資料夾(_T)"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "憑證 ID(_C):"
 
 # mail/mail-config-druid.c:445
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Evolution 帳號助理"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "執行指令..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "固定寬度(_X):"
 
+# addressbook/printing/e-contact-print.glade.h:23
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "<< 減少選項"
+
 # 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:56
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "字型內容"
 
 # mail/mail-ops.c:1154
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "將郵件格式化為 _HTML"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "強調引文為(_Q)"
 
 # mail/mail-config.glade.h:34
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 # mail/mail-config.glade.h:37
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "行內"
 
 # mail/mail-config.glade.h:38
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 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:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "標籤與顏色"
 
 # ui/evolution-mail.xml.h:46
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "載入影像"
 
 # mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "郵件組態"
 
 # mail/local-config.glade.h:2
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "信箱位置"
 
 # views/mail/galview.xml.h:4
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "郵件編輯器"
 
 # views/mail/galview.xml.h:4
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "郵件顯示"
 
 # addressbook/gui/component/addressbook.c:619
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Fonts"
 msgstr "郵件包含"
 
 # mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "新郵件通知"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "注意：在您首次連線之前將不會提示您輸入密碼"
 
 # mail/mail-config.glade.h:47
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "選用的資訊"
 
 # addressbook/gui/widgets/e-addressbook-view.c:708
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "團體(_G):"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG 鑰匙 ID(_K):"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 # mail/mail-config.glade.h:54
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "選取顏色"
 
 # ui/evolution-mail.xml.h:14
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "當傳送的郵件只有指定密件副本收件者時顯示提示(_O)"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "相當高的隱私 (PGP/GPG)"
 
 # ui/evolution-addressbook.xml.h:11
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "列印的字型"
 
 # mail/mail-config.glade.h:55
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
 # camel/camel-filter-driver.c:671
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "引用原始訊息"
 
 # mail/mail-config.glade.h:56
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "引用"
 
 # addressbook/gui/component/addressbook-config.c:352
 # mail/mail-config.glade.h:60
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "記住這個密碼(_M)"
 
 # composer/e-msg-composer-hdrs.c:361
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "回覆地址(_P):"
 
 # mail/mail-config.glade.h:57
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "接收電子郵件"
 
 # mail/mail-config.glade.h:59
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "接收郵件選項(_O)"
 
 # addressbook/gui/component/addressbook-config.c:352
 # mail/mail-config.glade.h:60
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "記住這個密碼(_P)"
 
 # mail/mail-config.glade.h:61
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "所需資訊"
 
 # mail/mail-config.glade.h:21
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "還原預設值"
 
 # ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "安全性(_E)"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "安全的 MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr "選擇 HTML 固定寬度字型"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr "選擇用於列印的 HTML 固定寬度字型"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr "選擇 HTML 可變寬度字型"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr "選擇用於列印的 HTML 可變寬度字型"
 
 # mail/mail-config.glade.h:65
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "傳送電子郵件"
 
 # mail/mail-config.glade.h:70
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "傳送郵件資料夾(_M)"
 
 # mail/mail-config.glade.h:69
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "傳送與草稿郵件"
 
 # mail/mail-config.glade.h:73
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "伺服器要求驗證(_V)"
 
 # mail/mail-config.glade.h:71
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "伺服器設定"
 
 # mail/mail-config.glade.h:72
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "伺服器類型(_T):"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "在憑證鏈中的自我加簽憑證"
 
 # addressbook/printing/e-contact-print.glade.h:38
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "指定檔案名稱(_F):"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "拼字檢查(_C)"
 
 # mail/mail-config.glade.h:77
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "標準 Unix mbox"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15198,7 +16196,7 @@ msgstr ""
 "簽名檔。您所指定的名稱將只做為\n"
 "顯示之用。"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 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 "
@@ -15207,7 +16205,7 @@ msgstr ""
 "這一頁允許您設定拼字檢查的行為和語言。這裡的語言清單只反映出您已經安裝字典的"
 "語言。"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15215,13 +16213,17 @@ msgstr ""
 "輸入您想要用來代表這個帳號的名稱。\n"
 "例如：“工作”或“個人”"
 
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
 # mail/mail-accounts.c:197
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "可變寬度(_A):"
 
 # mail/mail-config.glade.h:81
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -15233,206 +16235,216 @@ msgstr ""
 "按“下一步”開始。"
 
 # mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "加入簽名檔(_A)"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "永遠自網路下載影像(_A)"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr "當使用這個帳號時永遠在寄送的郵件上加簽(_A)"
 
 # mail/mail-config.glade.h:11
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "驗證類別(_A): "
 
 # mail/mail-config.glade.h:11
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "驗證類別(_A): "
 
 # mail/mail-config.glade.h:12
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "自動檢查新郵件(_A)"
 
 # mail/mail-config.glade.h:12
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "自動插入笑臉影像(_A)"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "當新郵件到達時發出嗶聲(_B)"
 
 # mail/mail-ops.c:1449
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "刪除資料夾時確認(_C)"
 
 # calendar/gui/e-day-view.c:3179
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "預設的簽名檔(_D):"
 
 # mail/mail-config.glade.h:21
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "預設值(_D)"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "當新郵件到達時不要通知我(_D)"
 
 # mail/mail-accounts.c:199
 # mail/mail-config.glade.h:30
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "啟用(_E)"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
 # ui/evolution-mail.xml.h:34
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "轉寄方式(_F):"
 
 # mail/mail-config.glade.h:31
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "全名(_F):"
 
 # mail/mail-config.glade.h:36
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "_HTML 格式郵件"
 
 # mail/mail-config.glade.h:35
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "身分(_I)"
 
-#: mail/mail-config.glade.h:151
+# calendar/gui/goto-dialog.glade.h:9
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "6月"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "如果寄件者在目錄服務中就載入影像(_L)"
 
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
 # mail/mail-config.glade.h:41
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "設為我的預設帳號(_M)"
 
 # ui/evolution-mail.xml.h:51
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "標示郵件為稍後閱讀(_M)"
 
 # addressbook/gui/component/addressbook-config.c:686
 # mail/mail-config.glade.h:43
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "名稱(_N):"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "永遠不自網路下載影像(_N)"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "當新郵件到達時播放聲音檔案(_P)"
 
 # ui/evolution-mail.xml.h:14
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "當傳送 HTML 郵件給不想收到 HTML 郵件的連絡人時顯示提示(_P)"
 
 # ui/evolution-mail.xml.h:14
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "當傳送沒有主旨的郵件時顯示提示(_P)"
 
 # mail/mail-config.glade.h:58
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "接收郵件(_R)"
 
 # mail/message-browser.c:191
 # ui/evolution-mail.xml.h:71
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "回覆方式(_R):"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "還原預設值(_R)"
 
 # ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "命令稿(_S):"
 
 # ui/evolution-contact-editor.xml.h:3
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "刪除..."
 
 # mail/mail-config.glade.h:66
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "傳送郵件(_S)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "顯示動畫影像(_S)"
 
 # mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "簽名檔(_S)"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Standard Font:"
 msgstr "桑波恩"
 
 # addressbook/gui/component/addressbook-storage.c:99
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Terminal Font:"
 msgstr "原本的連絡人:"
 
 # mail/mail-config.glade.h:79
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "使用安全連線 (SSL)(_U):"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "描述"
 
 # mail/mail-ops.c:599
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
 # mail/mail-mt.c:190
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -15442,7 +16454,7 @@ msgstr ""
 "%s"
 
 # mail/mail-mt.c:193
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -15454,7 +16466,7 @@ msgstr ""
 # mail/mail-mt.c:516
 # mail/mail-mt.c:545
 # mail/mail-mt.c:880
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "正在工作"
 
@@ -15469,12 +16481,12 @@ msgid "Fetching Mail"
 msgstr "接收郵件"
 
 # camel/camel-movemail.c:274
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "儲存郵件至暫存檔案時失敗 %s：%s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15482,131 +16494,131 @@ msgid ""
 msgstr ""
 
 # camel/camel-movemail.c:274
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "儲存郵件至暫存檔案時失敗 %s：%s"
 
 # mail/mail-ops.c:599
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "傳送“%s”"
 
 # mail/mail-ops.c:718
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "正在傳送郵件 %d / %d"
 
 # mail/mail-ops.c:737
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "在處理郵件 %d / %d 時失敗"
 
 # mail/mail-ops.c:739
 # mail/mail-send-recv.c:475
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "完成。"
 
 # mail/mail-ops.c:825
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "儲存郵件到資料夾"
 
 # mail/mail-ops.c:898
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "將郵件移到 %s"
 
 # mail/mail-ops.c:898
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "將郵件複製到 %s"
 
 # mail/mail-ops.c:992
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "掃描“%s”內的資料夾"
 
 # mail/mail-ops.c:1154
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "已轉寄的郵件"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "開啟資料夾 %s"
 
 # mail/mail-ops.c:1262
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "開啟貯藏 %s"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "移除資料夾 %s"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "貯藏資料夾“%s”"
 
 # mail/mail-local.c:812
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "重新載入資料夾"
 
 # mail/mail-ops.c:1449
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "刪除資料夾"
 
 # shell/e-shell-importer.c:371
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "匯入 %s 為 %s"
 
 # mail/mail-config.glade.h:76
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "本機資料夾"
 
 # mail/mail-ops.c:1498
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "取回郵件 %s"
 
 # mail/mail-ops.c:1565
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "取回 %d 封郵件"
 
 # mail/mail-ops.c:1649
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "儲存 %d 封郵件"
 
 # mail/mail-ops.c:1728
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15616,7 +16628,7 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1755
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15626,12 +16638,12 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1829
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "儲存附件"
 
 # mail/mail-ops.c:1844
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15641,23 +16653,27 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1872
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "無法寫入資料：%s"
 
 # mail/mail-ops.c:1939
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "中斷與 %s 的連線"
 
 # mail/mail-ops.c:1939
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "重新連線到 %s"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 # mail/mail-search.c:298
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
@@ -15679,57 +16695,75 @@ msgstr "尋找:"
 msgid "Search"
 msgstr "搜尋"
 
+# mail/mail-config.glade.h:74
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "儲存簽名檔"
+
+# calendar/gui/event-editor-dialog.glade.h:11
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "例外"
+
+# mail/mail-config.glade.h:4
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "帳號資訊"
+
 # mail/mail-send-recv.c:138
-#: mail/mail-send-recv.c:148
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "正在取消..."
 
 # mail/mail-config.glade.h:72
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "伺服器： %s，類型： %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "路徑： %s，類型： %s"
 
 # addressbook/printing/e-contact-print.glade.h:40
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "類型： %s"
 
 # mail/mail-send-recv.c:233
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "傳送與接收郵件"
 
 # ui/evolution-mail.xml.h:2
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 #, fuzzy
 msgid "Cancel _All"
 msgstr "全部取消"
 
 # mail/mail-send-recv.c:285
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "正在更新..."
 
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "正在等待..."
 
 # mail/mail-session.c:161
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "使用者取消動作。"
 
 # camel/camel-smime-context.c:194
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "請輸入 %s 所需的密碼"
@@ -15740,17 +16774,17 @@ msgstr "請輸入 %s 所需的密碼"
 # camel/providers/nntp/camel-nntp-store.c:291
 # camel/providers/pop3/camel-pop3-provider.c:67
 # mail/mail-config.glade.h:52
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "輸入密碼"
 
 # addressbook/gui/component/addressbook-config.c:352
 # mail/mail-config.glade.h:60
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "記住這個密碼(_R)"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr "記住這個用於剩餘的工作階段的密碼(_R)"
 
@@ -15796,30 +16830,37 @@ msgid "Name:"
 msgstr "名稱:"
 
 # mail/mail-tools.c:219
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "轉寄的郵件 - %s"
 
 # mail/mail-ops.c:1154
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "轉寄的郵件"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "開啟資料夾 %s"
+
+# mail/mail-ops.c:1195
+# mail/mail-ops.c:1333
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "設定虛擬資料夾： %s"
 
 # mail/mail-ops.c:992
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "更新用於 URI： %s 的虛擬資料夾"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -15834,107 +16875,107 @@ msgstr ""
 
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "虛擬資料夾"
 
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "虛擬資料夾"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "編輯虛擬資料夾"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "嘗試編輯不存在的虛擬資料夾“%s”。"
 
 # mail/mail-vfolder.c:438
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "新增虛擬資料夾"
 
 # mail/message-list.c:677
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "未閱讀"
 
 # mail/message-list.c:678
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "已閱讀"
 
 # mail/message-list.c:679
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "已回覆"
 
 # mail/message-list.c:680
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "多個未閱讀的郵件"
 
 # mail/message-list.c:681
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "多個郵件"
 
 # mail/message-list.c:685
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "最低"
 
 # mail/message-list.c:686
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "低"
 
 # mail/message-list.c:690
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "高"
 
 # mail/message-list.c:691
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "最高"
 
 # mail/message-list.c:941
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "？"
 
 # mail/message-list.c:948
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "今天 %l:%M %p"
 
 # mail/message-list.c:957
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "昨天 %l:%M %p"
 
 # mail/message-list.c:969
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
 # mail/message-list.c:977
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
 # mail/message-list.c:979
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
 # mail/mail-local.c:905
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "產生郵件清單"
 
@@ -16007,13 +17048,13 @@ msgstr "不需要回應"
 
 # mail/message-browser.c:188
 # ui/evolution-mail.xml.h:70
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "回覆"
 
 # mail/message-browser.c:191
 # ui/evolution-mail.xml.h:71
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "全部回覆"
 
@@ -16078,50 +17119,161 @@ msgstr "訂閱(_S)"
 msgid "_Unsubscribe"
 msgstr "取消訂閱(_U)"
 
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr "在此設定特殊資料夾與離線資料夾的行為"
+
+# shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Evolution shell。"
+
+# ui/evolution-mail.xml.h:110
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "資料夾設定"
+
+# calendar/gui/e-calendar-table.c:375
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "380"
+
+# shell/e-shortcuts-view.c:295
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "更改這個功能群組的名稱"
+
+# ui/evolution.xml.h:32
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "切換資料夾清單的顯示狀態"
+
+# shell/e-shortcuts-view.c:301
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "隱藏功能列"
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:26
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "預設優先順序:"
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:26
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "預設優先順序:"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "郵件組態界面"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
 msgstr ""
-"不能傳送資料夾：\n"
-"%s"
 
-# mail/subscribe-dialog.c:76
-# shell/e-storage-set-view.c:48
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "新增資料夾"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
 
-# mail/mail-config.glade.h:26
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "草稿"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
 
-# mail/local-config.glade.h:8
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "收件匣"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "寄件匣"
+# mail/mail-ops.c:1195
+# mail/mail-ops.c:1333
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "開啟預設工作資料夾"
 
-# mail/mail-config.glade.h:68
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "傳送"
+# mail/mail-ops.c:1195
+# mail/mail-ops.c:1333
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "開啟預設工作資料夾"
+
+# mail/mail-ops.c:1195
+# mail/mail-ops.c:1333
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "開啟預設工作資料夾"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+# mail/mail-ops.c:1195
+# mail/mail-ops.c:1333
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "開啟預設工作資料夾"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+# ui/evolution.xml.h:32
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "切換資料夾清單的顯示狀態"
+
+# ui/evolution.xml.h:33
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "切換資料功能列的顯示狀態"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+# addressbook/gui/widgets/e-addressbook-view.c:701
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "電子郵件"
 
 # shell/e-setup.c:163
-#: shell/e-setup.c:145
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "無法正確地更新檔案"
 
 # shell/e-setup.c:215
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -16133,7 +17285,7 @@ msgstr ""
 "錯誤：%s"
 
 # composer/e-msg-composer.c:1165
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -16143,7 +17295,7 @@ msgstr ""
 "發生錯誤。"
 
 # shell/e-setup.c:255
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -16155,7 +17307,7 @@ msgstr ""
 "以便 Evolution 能夠安裝使用者檔案。"
 
 # shell/e-setup.c:267
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -16274,10 +17426,12 @@ msgstr ""
 "不能重新命名資料夾：\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+# shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+msgid "The specified folder name is not valid: %s"
+msgstr "指定的資料夾名稱不合法： %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -16304,23 +17458,18 @@ msgstr ""
 "不能建立指定的資料夾：\n"
 "%s"
 
-# ui/evolution.xml.h:8
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "建立新資料夾"
-
 # shell/e-shell-folder-title-bar.c:459
 # shell/e-shell-folder-title-bar.c:460
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(未命名)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "選擇匯入服務要執行的類型："
 
 # shell/e-shell-importer.c:97
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -16332,11 +17481,11 @@ msgstr ""
 "\n"
 "若您不清楚檔案類別，請選擇“自動”。Evolution 會嘗試找出適當的處理方法。"
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "請選擇您想要匯入的資訊："
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -16346,7 +17495,7 @@ msgstr ""
 
 # shell/e-shell-importer.c:212
 # shell/e-shell-importer.c:243
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -16356,14 +17505,14 @@ msgstr ""
 "匯入項目 %d。"
 
 # mail/mail-account-gui.c:682
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "選擇匯入服務"
 
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "檔案 %s 不存在"
@@ -16371,13 +17520,13 @@ msgstr "檔案 %s 不存在"
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Evolution 錯誤"
 
 # shell/e-shell-importer.c:353
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -16387,12 +17536,12 @@ msgstr ""
 "%s"
 
 # shell/e-shell-importer.c:363
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "匯入中"
 
 # shell/e-shell-importer.c:371
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -16402,19 +17551,19 @@ msgstr ""
 "正在啟動 %s"
 
 # shell/e-shell-importer.c:384
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "啟動 %s 時發生錯誤"
 
 # shell/e-shell-importer.c:404
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "載入 %s 時發生錯誤"
 
 # shell/e-shell-importer.c:419
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -16424,40 +17573,40 @@ msgstr ""
 "正在匯入項目 1。"
 
 # shell/e-shell-importer.c:490
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "自動"
 
 # shell/e-shell-importer.c:540
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "檔案名稱:"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "選擇一個檔案"
 
 # shell/e-shell-importer.c:555
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "檔案類型:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "從舊程式匯入資料與設定"
 
 # ui/evolution.xml.h:21
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a _single file"
 msgstr "匯入單一檔案"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16465,18 +17614,18 @@ msgstr ""
 "請稍候...\n"
 "正在掃描現存的設定"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "啟動智慧型匯入服務"
 
 # composer/e-msg-composer-hdrs.c:355
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "來自 %s："
 
 # shell/e-shell-importer.c:602
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "選擇用來匯入這些資料的目的資料夾"
 
@@ -16485,38 +17634,16 @@ msgstr "選擇用來匯入這些資料的目的資料夾"
 # importers/pine-importer.c:646
 # shell/e-shell-importer.c:653
 # shell/importer/import.glade.h:4
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "匯入"
 
 # shell/e-shell-offline-handler.c:554
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "關閉連線..."
 
-# mail/mail-mt.c:190
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"當同步“%s”時發生錯誤：\n"
-"%s"
-
-# camel/camel-filter-driver.c:690
-# camel/camel-filter-driver.c:788
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "同步處理資料夾"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "正在同步“%s” (%d / %d) ..."
-
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
@@ -16562,7 +17689,7 @@ msgstr "無法開啟共用的資料夾：%s。"
 msgid "Cannot find the specified shared folder."
 msgstr "找不到指定的共用資料夾。"
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -16573,21 +17700,11 @@ msgstr ""
 
 # addressbook/contact-editor/e-contact-editor.c:1242
 # addressbook/gui/widgets/e-addressbook-view.c:733
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "助理"
 
-# ui/evolution-calendar.xml.h:40
-# ui/evolution-event-editor.xml.h:66
-# ui/evolution-task-editor-dialog.xml.h:79
-# ui/evolution.xml.h:58
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "新增"
-
 # camel/camel-pgp-context.c:1073
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
@@ -16658,67 +17775,52 @@ msgid "Select the folder you want the shortcut to point to:"
 msgstr "選擇您想捷徑對應到的資料夾："
 
 # shell/e-shell-view-menu.c:590
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "線上工作(_W)"
 
 # ui/evolution.xml.h:66
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "離線工作(_W)"
 
 # ui/evolution.xml.h:39
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "離線工作"
 
-# shell/e-shell-view.c:149
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(沒有資料夾顯示)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-# shell/e-storage.c:178
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(沒有)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr "Ximian Evolution 目前為線上工作。按這裡改為離線工作。"
 
-#: shell/e-shell-view.c:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution 現正離線中。"
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr "Ximian Evolution 目前是離線工作。按這裡改為線上工作。"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "無效的參數"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "不能於 OAF 註冊"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "找不到組態資料庫"
 
 # shell/e-storage.c:461
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "一般錯誤"
 
@@ -16867,87 +17969,20 @@ msgid "Remove this shortcut from the shortcut bar"
 msgstr "將功能項目從功能列移除"
 
 # shell/e-shortcuts.c:381
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "儲存功能項目時發生錯誤。"
 
+# mail/local-config.glade.h:8
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "收件匣"
+
 # ui/evolution.xml.h:62
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "功能"
 
-# shell/e-storage.c:459
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "沒有錯誤"
-
-# shell/e-storage.c:463
-#: shell/e-storage.c:573
-msgid "A folder with the same name already exists"
-msgstr "相同名稱的資料夾已經存在"
-
-# shell/e-storage.c:465
-#: shell/e-storage.c:575
-msgid "The specified folder type is not valid"
-msgstr "所指定的資料夾類型是無效的"
-
-# shell/e-storage.c:467
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "輸出/入錯誤"
-
-# shell/e-storage.c:469
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr "沒有足夠空間去建立資料夾"
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr "資料夾不是空的"
-
-# shell/e-storage.c:471
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "找不到指定的資料夾"
-
-# shell/e-storage.c:473
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "這個儲存空間的功能仍未實作"
-
-# shell/e-storage.c:477
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "操作不支援"
-
-# shell/e-storage.c:479
-#: shell/e-storage.c:591
-msgid "The specified type is not supported in this storage"
-msgstr "這個儲存空間不支援所指定的類型"
-
-# shell/e-storage.c:471
-#: shell/e-storage.c:593
-msgid "The specified folder cannot be modified or removed"
-msgstr "指定的資料夾不能編輯或移動"
-
-#: shell/e-storage.c:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "不能把資料夾置於其子資料夾之下"
-
-# camel/providers/local/camel-mbox-folder.c:152
-#: shell/e-storage.c:597
-msgid "Cannot create a folder with that name"
-msgstr "無法建立以此為名的資料夾"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr "這個操作不能在離線模式中進行"
-
-# addressbook/contact-editor/e-contact-editor.c:1247
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "核取方塊"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -16962,6 +17997,21 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
 
+# ui/evolution-calendar.xml.h:40
+# ui/evolution-event-editor.xml.h:66
+# ui/evolution-task-editor-dialog.xml.h:79
+# ui/evolution.xml.h:58
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "新增"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "“%s”在“%s”"
+
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
 #: shell/evolution-shell-component-utils.c:124
@@ -17001,101 +18051,6 @@ msgstr ""
 "來自活化系統的錯誤為：\n"
 "%s"
 
-# shell/e-storage.c:467
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "CORBA 錯誤"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "已中斷"
-
-# camel/providers/local/camel-maildir-folder.c:218
-# camel/providers/local/camel-mh-folder.c:203
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "無效的參數"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "已經有擁有者"
-
-# calendar/gui/calendar-model.c:896
-# calendar/gui/calendar-model.c:1120
-# calendar/gui/calendar-model.c:1174
-# calendar/gui/e-calendar-table.c:322
-# calendar/gui/e-calendar-table.c:397
-# mail/mail-account-gui.c:976
-# mail/mail-accounts.c:120
-# mail/mail-accounts.c:164
-# mail/mail-config.glade.h:46
-# shell/e-shell-view.c:1198
-# widgets/misc/e-cell-date-edit.c:237
-# widgets/misc/e-dateedit.c:432
-# widgets/misc/e-dateedit.c:1341
-# widgets/misc/e-dateedit.c:1456
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "沒有擁有者"
-
-# calendar/gui/calendar-commands.c:266
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "找不到"
-
-# mail/mail-config.glade.h:1
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "不支援的類型"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "不支援的基模"
-
-# mail/mail-session.c:161
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "不支援的操作"
-
-# shell/e-storage.c:467
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "內部錯誤"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "存在"
-
-# mail/mail-config.glade.h:37
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "無效的 URI"
-
-# camel/providers/imap/camel-imap-store.c:803
-# mail/mail-local.c:334
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "有子資料夾"
-
-# mail/mail-callbacks.c:1106
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "沒有剩餘空間"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "舊的擁有者已死亡"
-
-# shell/e-shell-importer.c:555
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "測試類型"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr "Evolution 測試元件。"
-
 # shell/e-shell-offline-handler.c:554
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
@@ -17135,12 +18090,6 @@ msgstr "郵件(_M):"
 msgid "_Tasks:"
 msgstr "工作(_T):"
 
-# shell/glade/e-shell-folder-creation-dialog.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-#, fuzzy
-msgid "Folder _name:"
-msgstr "資料夾名稱:"
-
 # shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 #, fuzzy
@@ -17213,25 +18162,6 @@ msgstr ""
 "\n"
 "單擊“完成”按鈕以儲存您的設定。"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "在此設定特殊資料夾與離線資料夾的行為"
-
-# shell/GNOME_Evolution_Shell.oaf.in.h:1
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Evolution shell。"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr ""
-
-# ui/evolution-mail.xml.h:110
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "資料夾設定"
-
 # shell/importer/import.glade.h:1
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -17283,7 +18213,7 @@ msgstr "匯入服務"
 # importers/pine-importer.c:646
 # shell/e-shell-importer.c:653
 # shell/importer/import.glade.h:4
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "匯入"
 
@@ -17306,17 +18236,17 @@ msgstr "Evolution 可以自下列檔案匯入資料："
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
 # ui/evolution.xml.h:17
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Evolution 正在關閉..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17354,7 +18284,7 @@ msgstr ""
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -17365,39 +18295,51 @@ msgstr ""
 # importers/elm-importer.c:528
 # importers/netscape-importer.c:807
 # importers/pine-importer.c:668
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr "不要再顯示這個訊息"
 
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
 # shell/main.c:138
-#: shell/main.c:389
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "不能存取 Ximian Evolution shell。"
 
 # shell/main.c:138
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "不能初始化 Ximian Evolution shell： %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "以離線模式啟動"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "以線上模式啟動"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
 # shell/main.c:185
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "將全部元件的除錯輸出資料傳送至一個檔案。"
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17406,33 +18348,63 @@ msgstr ""
 "%s： --online 和 --offline 不能一起使用。\n"
 "  使用 %s --help 取得進一步資訊。\n"
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+# mail/mail-account-gui.c:682
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "選擇匯入服務"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "憑證 ID(_C):"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:16
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "進度"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "詞句"
 
 # mail/mail-config.glade.h:29
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "電子郵件地址:"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"憑證已逾期： %s\n"
+"發照者： %s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -17492,110 +18464,413 @@ msgstr "黑潭"
 msgid "Backup All"
 msgstr "黑潭"
 
-# calendar/gui/e-calendar-table.c:152
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "憑證 ID(_C):"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "憑證不被信任"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "憑證 ID(_C):"
+
+# calendar/gui/e-calendar-table.c:152
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "普通名稱"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "憑證 ID(_C):"
 
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
 # mail/mail-config.glade.h:86
 # ui/evolution-event-editor.xml.h:58
 # ui/evolution-message-composer.xml.h:45
 # ui/evolution-subscribe.xml.h:10
 # ui/evolution-task-editor-dialog.xml.h:70
 # ui/evolution.xml.h:48
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "編輯 (_E)"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "驗證憑證失敗。"
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "詞句"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
 # addressbook/gui/widgets/e-addressbook-view.c:708
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "團體"
 
 # addressbook/gui/widgets/e-addressbook-view.c:708
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "團體單位"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
 # ui/evolution-event-editor.xml.h:76
 # ui/evolution-message-composer.xml.h:55
 # ui/evolution-task-editor-dialog.xml.h:90
 # ui/evolution.xml.h:65
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "檢視(_V)"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "憑證 ID(_C):"
+
+#: smime/gui/smime-ui.glade.h:42
+#, fuzzy
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr "無效的憑證機構 (CA)"
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "憑證 ID(_C):"
 
-# importers/elm-importer.c:512
-# importers/netscape-importer.c:780
-# importers/pine-importer.c:646
-# shell/e-shell-importer.c:653
-# shell/importer/import.glade.h:4
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "匯入"
+msgid "Certificate already exists"
+msgstr "名片 ID 已經存在"
+
+# e-util/e-time-utils.c:69
+# e-util/e-time-utils.c:117
+# widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+# widgets/misc/e-dateedit.c:1284
+# widgets/misc/e-dateedit.c:1465
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%m/%d/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "佛蒙特"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "佛密良"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "佛密良"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "佛密良"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
+
+# calendar/gui/calendar-model.c:457
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+# widgets/misc/e-cell-date-edit.c:245
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "確認"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+# calendar/gui/calendar-model.c:457
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+# camel/providers/smtp/camel-smtp-provider.c:38
+# mail/mail-config.glade.h:62
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "憑證 ID(_C):"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "憑證 ID(_C):"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "憑證不被信任"
+
+# addressbook/contact-editor/fullname.glade.h:4
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "ID"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+# mail/mail-autofilter.c:213
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "主旨是 %s"
+
+# camel/camel-filter-driver.c:652
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "無法處理 spool 資料夾"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "無效的憑證機構 (CA)"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "無效的憑證機構 (CA)"
+
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Stauning"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:395
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "沒有資訊"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+# composer/e-msg-composer-attachment-bar.c:332
+# mail/mail-display.c:122
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "附件"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "憑證 ID(_C):"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "古里提巴"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "北卡羅來納"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "詞句"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s 在 %s"
+
+# mail/mail-crypto.c:59
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "憑證簽章失敗"
+
+# ui/evolution-message-composer.xml.h:49
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "插入(_I)"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+# mail/mail-autofilter.c:213
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "主旨是 %s"
+
+# mail/mail-crypto.c:59
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "憑證簽章失敗"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+# camel/camel-smime-context.c:194
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "請輸入 %s 所需的密碼"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "憑證 ID(_C):"
 
 # composer/e-msg-composer-attachment-bar.c:500
 #: tools/evolution-launch-composer.c:324
@@ -17657,7 +18932,7 @@ msgstr "複製至資料夾..."
 
 # ui/evolution-event-editor.xml.h:16
 # ui/evolution-task-editor-dialog.xml.h:17
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "剪下選定範圍"
 
@@ -17678,7 +18953,7 @@ msgstr "移至資料夾..."
 
 # ui/evolution-event-editor.xml.h:31
 # ui/evolution-task-editor-dialog.xml.h:34
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "貼上剪貼簿"
 
@@ -17689,8 +18964,8 @@ msgstr "預覽將要列印的連絡人"
 
 # ui/evolution-event-editor.xml.h:34
 # ui/evolution-task-editor-dialog.xml.h:37
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "預覽列印(_V)"
@@ -17748,13 +19023,13 @@ msgid "View the current contact"
 msgstr "檢視目前的連絡人"
 
 # ui/evolution.xml.h:41
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "執行(_A)"
 
@@ -17793,184 +19068,143 @@ msgstr "全選(_S)"
 msgid "_Send Message to Contact..."
 msgstr "傳送郵件給連絡人(_S)..."
 
-# ui/evolution-calendar.xml.h:5
-#: ui/evolution-calendar.xml.h:3
-#, fuzzy
-msgid "Create a new all-day event"
-msgstr "建立一個新的全天約會"
-
-# ui/evolution-calendar.xml.h:5
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "建立一個新的約會"
-
 # ui/evolution.xml.h:10
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:3
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "新增一個資料夾"
 
-# ui/evolution-tasks.xml.h:2
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "建立一個新的會議要求"
-
-# ui/evolution-tasks.xml.h:2
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "建立一個新的工作"
-
 # ui/evolution-calendar.xml.h:7
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "天"
 
 # calendar/gui/e-week-view.c:3313
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 #, fuzzy
 msgid "Delete All Occurrences"
 msgstr "刪除全部事件(_A)"
 
 # ui/evolution-event-editor.xml.h:18
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "刪除這個約會"
 
 # calendar/gui/e-day-view.c:3177
 # calendar/gui/e-week-view.c:3311
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "刪除這個事件(_O)"
 
 # calendar/gui/e-day-view.c:3177
 # calendar/gui/e-week-view.c:3311
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "刪除這個事件(_O)"
 
 # ui/evolution-calendar.xml.h:8
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "移至"
 
 # ui/evolution-calendar.xml.h:9
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "向後"
 
 # ui/evolution-calendar.xml.h:10
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "向前"
 
 # ui/evolution-calendar.xml.h:11
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "移至日期(_D)"
 
 # ui/evolution-calendar.xml.h:13
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "移至指定日期"
 
 # calendar/gui/e-day-view.c:3153
 # calendar/gui/e-week-view.c:3284
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "移至今日"
 
 # addressbook/contact-editor/fullname.glade.h:8
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "清單"
 
 # ui/evolution-calendar.xml.h:15
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "月"
 
-# calendar/gui/e-day-view.c:3146
-# ui/evolution-calendar.xml.h:16
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "新增約會(_A)"
-
 # ui/evolution-addressbook.xml.h:7
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "新喀里多尼亞島"
 
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "新增會議"
-
-# ui/evolution-tasks.xml.h:3
-#: ui/evolution-calendar.xml.h:27
-#, fuzzy
-msgid "New _Task"
-msgstr "新增工作"
-
 # ui/evolution-calendar.xml.h:22
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "預覽將要列印的行事曆內容"
 
 # ui/evolution-calendar.xml.h:26
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "列印這個行事曆"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "發佈此行事曆的空閒/忙碌資訊"
 
 # mail/mail-config.glade.h:75
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Bourges"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "公開資料夾包含約會與事件"
 
 # addressbook/contact-editor/contact-editor.glade.h:8
 # calendar/gui/dialogs/task-editor-dialog.glade.h:9
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "顯示詳細資料"
 
 # ui/evolution-calendar.xml.h:30
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "顯示一天"
 
 # ui/evolution-calendar.xml.h:31
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "顯示一個月"
 
 # ui/evolution-calendar.xml.h:32
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "顯示一週"
 
 # ui/evolution-calendar.xml.h:33
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "顯示工作週"
 
 # ui/evolution-calendar.xml.h:36
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "週"
 
@@ -18067,7 +19301,7 @@ msgstr "儲存這個項目到磁碟"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "檔案(_F)"
 
@@ -18352,7 +19586,7 @@ msgstr "將全部可見的郵件標示成已閱讀"
 
 # ui/evolution-event-editor.xml.h:31
 # ui/evolution-task-editor-dialog.xml.h:34
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "自剪貼簿貼上郵件"
 
@@ -18423,21 +19657,6 @@ msgstr "反向選擇(_I)"
 msgid "_Threaded Message List"
 msgstr "相關郵件清單(_T)"
 
-# ui/evolution.xml.h:6
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "關閉這個視窗"
-
-# ui/evolution-event-editor.xml.h:53
-# ui/evolution-message-composer.xml.h:43
-# ui/evolution-task-editor-dialog.xml.h:65
-# ui/evolution.xml.h:43
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "關閉(_C)"
-
 # addressbook/gui/component/addressbook-config.c:662
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
@@ -18634,57 +19853,69 @@ msgid "Increase the text size"
 msgstr "增加文字大小"
 
 # ui/evolution-mail.xml.h:46
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "載入圖片(_I)"
 
 # ui/evolution-mail.xml.h:50
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "標示成重要(_M)"
 
 # mail/folder-browser.c:706
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "標示成未閱讀(_N)"
 
 # mail/folder-browser.c:706
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "標示成不重要(_O)"
 
 # ui/evolution-mail.xml.h:52
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "將選定的郵件標示成已經閱讀"
 
 # ui/evolution-mail.xml.h:54
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "將選定的郵件標示成重要"
 
+# ui/evolution-mail.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "將選定的郵件標示成不重要"
+
 # ui/evolution-mail.xml.h:53
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "將選定的郵件標示成未閱讀"
+
+# ui/evolution-mail.xml.h:53
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "將選定的郵件標示成未閱讀"
 
 # ui/evolution-mail.xml.h:54
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "將選定的郵件標示成不重要"
 
 # ui/evolution-mail.xml.h:54
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "將選定的郵件標示成要刪除"
 
 # ui/evolution-mail.xml.h:55
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "移動"
 
 # ui/evolution-mail.xml.h:56
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "將選定的郵件移至另一個資料夾"
 
@@ -18693,63 +19924,69 @@ msgstr "將選定的郵件移至另一個資料夾"
 # ui/evolution-event-editor.xml.h:29
 # ui/evolution-mail.xml.h:57
 # ui/evolution-task-editor-dialog.xml.h:32
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "下一步"
 
 # ui/evolution-mail.xml.h:23
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "下一封重要郵件(_I)"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "下一封相關郵件(_T)"
 
 # mail/mail-search.c:138
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "下一封未閱讀的郵件(_U)"
 
+# calendar/gui/calendar-commands.c:266
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "找不到"
+
 # ui/evolution-mail.xml.h:59
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "使用新視窗開啟選定的郵件"
 
 # ui/evolution-mail.xml.h:60
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "開啟選定的郵件然後重傳"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "原始大小(_Z)"
 
 # ui/evolution-mail.xml.h:24
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "上一封未閱讀的郵件(_R)"
 
 # mail/message-browser.c:188
 # ui/evolution-mail.xml.h:70
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "張貼回覆"
 
 # ui/evolution-message-composer.xml.h:25
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr "張貼訊息的回覆至公開資料夾"
 
 # ui/evolution-mail.xml.h:24
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "上一封重要郵件(_E)"
 
 # ui/evolution-addressbook.xml.h:8
 # ui/evolution-mail.xml.h:63
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "預覽需要列印的郵件"
 
@@ -18757,161 +19994,161 @@ msgstr "預覽需要列印的郵件"
 # ui/evolution-event-editor.xml.h:33
 # ui/evolution-mail.xml.h:64
 # ui/evolution-task-editor-dialog.xml.h:36
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "上一步"
 
 # mail/mail-callbacks.c:1407
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "列印郵件"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "重新導向(_D)"
 
 # ui/evolution-mail.xml.h:40
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "將選定的郵件重新導向給某人"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "重設文字為原始大小"
 
 # ui/evolution-mail.xml.h:73
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "尋找郵件(_E)..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "較小(_M)"
 
 # ui/evolution-mail.xml.h:74
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "另存郵件成文字檔案"
 
 # ui/evolution-mail.xml.h:75
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "搜尋顯示的郵件本文中的文字"
 
 # ui/evolution-event-editor.xml.h:50
 # ui/evolution-task-editor-dialog.xml.h:59
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr "設定您目前印表機的版面設定"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "顯示郵件原始檔(_S)"
 
 # addressbook/printing/e-contact-print.glade.h:11
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "顯示全部檔頭(_H)"
 
 # ui/evolution-mail.xml.h:75
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "搜尋顯示的郵件本文中的文字"
 
 # ui/evolution-mail.xml.h:86
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "使用正常模式顯示郵件"
 
 # ui/evolution-mail.xml.h:87
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "顯示郵件及詳細檔頭"
 
 # ui/evolution-mail.xml.h:89
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "顯示郵件原始檔"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "文字大小(_Z)"
 
 # ui/evolution-mail.xml.h:94
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "復原選定的郵件"
 
 # ui/evolution-mail.xml.h:95
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "郵件清單虛擬資料夾(_L)..."
 
 # ui/evolution-mail.xml.h:96
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "寄件者虛擬資料夾(_N)..."
 
 # ui/evolution-mail.xml.h:97
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "收件者虛擬資料夾(_R)..."
 
 # ui/evolution-mail.xml.h:98
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "主旨虛擬資料夾(_S)..."
 
 # ui/evolution-message-composer.xml.h:1
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "附加(_A)"
 
 # ui/evolution-mail.xml.h:101
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "複製至資料夾(_C)"
 
 # ui/evolution-mail.xml.h:102
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "建立郵件過濾器(_C)"
 
 # ui/evolution-mail.xml.h:107
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "轉寄郵件(_F)"
 
 # ui/evolution-calendar.xml.h:8
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "移至(_G)"
 
 # mail/mail-config.glade.h:37
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "行內(_I)"
 
 # addressbook/contact-editor/e-contact-editor.c:1256
 # addressbook/gui/widgets/e-addressbook-view.c:720
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "較大(_L)"
 
 # views/mail/galview.xml.h:4
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "檢視郵件(_M)"
 
 # ui/evolution-mail.xml.h:112
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "移至資料夾(_M)"
 
 # widgets/misc/e-messagebox.c:180
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "下一封郵件(_N)"
 
@@ -18921,27 +20158,27 @@ msgstr "下一封郵件(_N)"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:13
 # calendar/gui/e-calendar-table.c:346
 # mail/message-list.c:688
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "標準顯示(_N)"
 
 # ui/evolution-mail.xml.h:114
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "開啟郵件(_O)"
 
 # mail/mail-callbacks.c:1407
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "上一封郵件(_P)"
 
 # mail/mail-config.glade.h:56
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "引用(_Q)"
 
 # ui/evolution.xml.h:61
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "重新傳送(_R)..."
 
@@ -18950,16 +20187,31 @@ msgstr "重新傳送(_R)..."
 # ui/evolution-event-editor.xml.h:74
 # ui/evolution-task-editor-dialog.xml.h:88
 # ui/evolution.xml.h:64
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "工具(_T)"
 
 # mail/folder-browser.c:717
 # ui/evolution-mail.xml.h:121
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "復原(_U)"
 
+# ui/evolution.xml.h:6
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "關閉這個視窗"
+
+# ui/evolution-event-editor.xml.h:53
+# ui/evolution-message-composer.xml.h:43
+# ui/evolution-task-editor-dialog.xml.h:65
+# ui/evolution.xml.h:43
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "關閉(_C)"
+
 # ui/evolution-message-composer.xml.h:1
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
@@ -19323,15 +20575,16 @@ msgstr "關於 Ximian Evolution..."
 msgid "Change Evolution's settings"
 msgstr "改變 Evolution 的設定值"
 
-# ui/evolution.xml.h:15
+# ui/evolution-tasks.xml.h:2
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "離開(_X)"
+#, fuzzy
+msgid "Create a new window"
+msgstr "建立一個新的會議要求"
 
-# ui/evolution.xml.h:17
+# ui/evolution.xml.h:15
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "Evolution 視窗(_W)"
+msgid "E_xit"
+msgstr "離開(_X)"
 
 # ui/evolution.xml.h:19
 #: ui/evolution.xml.h:7
@@ -19342,59 +20595,64 @@ msgstr "離開這個程式"
 msgid "Import data from other programs"
 msgstr "匯入其他程式的資料"
 
-# ui/evolution.xml.h:17
+# ui/evolution.xml.h:24
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "Evolution 視窗(_W)"
+msgid "Open a new window"
+msgstr "在新視窗開啟"
 
 # ui/evolution-mail.xml.h:110
 #: ui/evolution.xml.h:11
 msgid "Pi_lot Settings..."
 msgstr "P_ilot 設定..."
 
-# mail/mail-config.glade.h:40
+# ui/evolution-mail.xml.h:81
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "傳送/接收"
+
+# ui/evolution-mail.xml.h:82
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr "傳送待送的項目並接收新的項目"
+
+# mail/mail-config.glade.h:40
+#: ui/evolution.xml.h:14
 msgid "Set up Pilot configuration"
 msgstr "設定 Pilot 組態"
 
 # ui/evolution.xml.h:27
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "顯示關於 Ximian Evolution 的資訊"
 
 # ui/evolution.xml.h:28
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "傳送錯誤報告"
 
 # ui/evolution.xml.h:29
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "傳送錯誤報告(_B)"
 
 # ui/evolution.xml.h:30
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "使用 Bug Buddy 送出錯誤報告。"
 
-# ui/evolution.xml.h:31
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "切換"
-
 # ui/evolution.xml.h:34
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "切換離線/在線工作的狀態。"
 
 # ui/evolution.xml.h:16
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
 # ui/evolution.xml.h:40
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "關於 Ximian Evolution(_A)..."
 
@@ -19402,12 +20660,12 @@ msgstr "關於 Ximian Evolution(_A)..."
 # ui/evolution-message-composer.xml.h:48
 # ui/evolution-task-editor-dialog.xml.h:72
 # ui/evolution.xml.h:53
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "說明(_H)"
 
 # shell/e-shell-importer.c:363
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "匯入(_I)..."
 
@@ -19415,10 +20673,21 @@ msgstr "匯入(_I)..."
 # ui/evolution-event-editor.xml.h:66
 # ui/evolution-task-editor-dialog.xml.h:79
 # ui/evolution.xml.h:58
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "新增(_N)"
 
+# ui/evolution-mail.xml.h:119
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "傳送/接收 (_S)"
+
+# addressbook/gui/component/addressbook-config.c:349
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "立即搜尋(_F)"
+
 # calendar/gui/e-calendar-table.c:159
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
@@ -19574,14 +20843,14 @@ msgstr "定義檢視"
 # widgets/misc/e-calendar-item.c:422
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "一二三四五六日"
 
 # widgets/misc/e-calendar-item.c:1061
 # widgets/misc/e-calendar-item.c:2756
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -19743,7 +21012,7 @@ msgstr "立即搜尋(_F)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "清除(_C)"
 
@@ -19759,32 +21028,349 @@ msgstr "子項目 ID"
 msgid "Text"
 msgstr "文字"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "清除"
-
 # addressbook/gui/component/addressbook-config.c:349
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "立即搜尋"
 
-# ui/evolution-mail.xml.h:3
+# mail/mail-config.glade.h:3
+#~ msgid "Account Name"
+#~ msgstr "帳號名稱"
+
+# addressbook/gui/component/select-names/select-names.glade.h:3
+#~ msgid "Server Name"
+#~ msgstr "伺服器名稱"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "此一版本的 Evolution 並未啟用 LDAP"
+
+# ui/evolution-addressbook.xml.h:17
+#~ msgid "Other Contacts"
+#~ msgstr "其他連絡人"
+
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "在這裡設定對 LDAP 目錄的存取"
+
+#~ msgid "Directory Servers"
+#~ msgstr "目錄伺服器"
+
+# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "取消目前郵件所作的行動"
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Evolution 目錄服務名稱選擇界面。"
 
-# addressbook/contact-editor/e-contact-quick-add.c:276
-# addressbook/gui/widgets/e-addressbook-view.c:700
+# addressbook/gui/component/addressbook-config.c:148
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "欄位名稱"
+#~ msgid "Add LDAP Server"
+#~ msgstr "LDAP 伺服器"
 
-# addressbook/contact-editor/e-contact-quick-add.c:276
-# addressbook/gui/widgets/e-addressbook-view.c:700
-#~ msgid "Family Name"
-#~ msgstr "姓"
+#~ msgid "Step 4: Display Name"
+#~ msgstr "步驟四：顯示名稱"
+
+# addressbook/gui/component/addressbook.c:619
+#~ msgid "Find contact in"
+#~ msgstr "尋找連絡人於"
+
+# addressbook/gui/widgets/e-addressbook-view.c:698
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* 按這裡新增連絡人 *"
+
+# addressbook/gui/widgets/e-addressbook-view.c:709
+#~ msgid "Business Address"
+#~ msgstr "商務地址"
+
+# addressbook/gui/widgets/e-addressbook-view.c:728
+#~ msgid "Department"
+#~ msgstr "部門"
+
+# addressbook/gui/widgets/e-addressbook-view.c:737
+#~ msgid "Free-busy URL"
+#~ msgstr "空閒-忙碌 URL"
+
+# addressbook/contact-editor/e-contact-editor.c:1252
+# addressbook/gui/widgets/e-addressbook-view.c:717
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+# addressbook/gui/widgets/e-addressbook-view.c:731
+#~ msgid "Profession"
+#~ msgstr "專業"
+
+# addressbook/gui/widgets/e-addressbook-view.c:723
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+# mail/mail-ops.c:1262
+#~ msgid "Opening tasks at %s"
+#~ msgstr "開啟在 %s 的工作"
+
+# calendar/gui/event-editor-dialog.glade.h:23
+# calendar/gui/event-editor.c:1594
+#~ msgid "Send anyway?"
+#~ msgstr "無論如何都傳送？"
+
+# shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#, fuzzy
+#~ msgid "Folder _name"
+#~ msgstr "資料夾名稱:"
+
+# mail/mail-format.c:1153
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr "這封是加入了數位簽名的郵件。單擊 鎖 圖示以獲得更多資訊。"
+
+# mail/mail-config.c:1213
+# mail/mail-config.c:1216
+#~ msgid "Connecting..."
+#~ msgstr "正在連線..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "此資料夾不能包含郵件。"
+
+# camel/providers/local/camel-mbox-summary.c:655
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "無法開啟共用的資料夾：%s。"
+
+# shell/e-shell-importer.c:602
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "選擇用來匯入這些資料的目的資料夾"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "不能傳送資料夾：\n"
+#~ "%s"
+
+# mail/subscribe-dialog.c:76
+# shell/e-storage-set-view.c:48
+#~ msgid "Add a Folder"
+#~ msgstr "新增資料夾"
+
+# mail/mail-config.glade.h:26
+#~ msgid "Drafts"
+#~ msgstr "草稿"
+
+#~ msgid "Outbox"
+#~ msgstr "寄件匣"
+
+# mail/mail-config.glade.h:68
+#~ msgid "Sent"
+#~ msgstr "傳送"
+
+# mail/mail-mt.c:190
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "當同步“%s”時發生錯誤：\n"
+#~ "%s"
+
+# camel/camel-filter-driver.c:690
+# camel/camel-filter-driver.c:788
+#~ msgid "Syncing Folder"
+#~ msgstr "同步處理資料夾"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "正在同步“%s” (%d / %d) ..."
+
+# shell/e-shell-view.c:149
+#~ msgid "(No folder displayed)"
+#~ msgstr "(沒有資料夾顯示)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+# shell/e-storage.c:178
+#~ msgid "(None)"
+#~ msgstr "(沒有)"
+
+# shell/e-storage.c:459
+#~ msgid "No error"
+#~ msgstr "沒有錯誤"
+
+# shell/e-storage.c:463
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "相同名稱的資料夾已經存在"
+
+# shell/e-storage.c:465
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "所指定的資料夾類型是無效的"
+
+# shell/e-storage.c:467
+#~ msgid "I/O error"
+#~ msgstr "輸出/入錯誤"
+
+# shell/e-storage.c:469
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "沒有足夠空間去建立資料夾"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "資料夾不是空的"
+
+# shell/e-storage.c:471
+#~ msgid "The specified folder was not found"
+#~ msgstr "找不到指定的資料夾"
+
+# shell/e-storage.c:473
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "這個儲存空間的功能仍未實作"
+
+# shell/e-storage.c:477
+#~ msgid "Operation not supported"
+#~ msgstr "操作不支援"
+
+# shell/e-storage.c:479
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "這個儲存空間不支援所指定的類型"
+
+# shell/e-storage.c:471
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "指定的資料夾不能編輯或移動"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "不能把資料夾置於其子資料夾之下"
+
+# camel/providers/local/camel-mbox-folder.c:152
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "無法建立以此為名的資料夾"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "這個操作不能在離線模式中進行"
+
+# addressbook/contact-editor/e-contact-editor.c:1247
+#~ msgid "Checkbox"
+#~ msgstr "核取方塊"
+
+# shell/e-storage.c:467
+#~ msgid "CORBA error"
+#~ msgstr "CORBA 錯誤"
+
+# camel/providers/local/camel-maildir-folder.c:218
+# camel/providers/local/camel-mh-folder.c:203
+#~ msgid "Invalid argument"
+#~ msgstr "無效的參數"
+
+#~ msgid "Already has an owner"
+#~ msgstr "已經有擁有者"
+
+# calendar/gui/calendar-model.c:896
+# calendar/gui/calendar-model.c:1120
+# calendar/gui/calendar-model.c:1174
+# calendar/gui/e-calendar-table.c:322
+# calendar/gui/e-calendar-table.c:397
+# mail/mail-account-gui.c:976
+# mail/mail-accounts.c:120
+# mail/mail-accounts.c:164
+# mail/mail-config.glade.h:46
+# shell/e-shell-view.c:1198
+# widgets/misc/e-cell-date-edit.c:237
+# widgets/misc/e-dateedit.c:432
+# widgets/misc/e-dateedit.c:1341
+# widgets/misc/e-dateedit.c:1456
+#~ msgid "No owner"
+#~ msgstr "沒有擁有者"
+
+# mail/mail-config.glade.h:1
+#~ msgid "Unsupported type"
+#~ msgstr "不支援的類型"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "不支援的基模"
+
+# mail/mail-session.c:161
+#~ msgid "Unsupported operation"
+#~ msgstr "不支援的操作"
+
+# shell/e-storage.c:467
+#~ msgid "Internal error"
+#~ msgstr "內部錯誤"
+
+#~ msgid "Exists"
+#~ msgstr "存在"
+
+# mail/mail-config.glade.h:37
+#~ msgid "Invalid URI"
+#~ msgstr "無效的 URI"
+
+# camel/providers/imap/camel-imap-store.c:803
+# mail/mail-local.c:334
+#~ msgid "Has subfolders"
+#~ msgstr "有子資料夾"
+
+# mail/mail-callbacks.c:1106
+#~ msgid "No space left"
+#~ msgstr "沒有剩餘空間"
+
+#~ msgid "Old owner has died"
+#~ msgstr "舊的擁有者已死亡"
+
+# shell/e-shell-importer.c:555
+#~ msgid "Test type"
+#~ msgstr "測試類型"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#~ msgid "Evolution Test Component"
+#~ msgstr "Evolution 測試元件。"
+
+# importers/elm-importer.c:512
+# importers/netscape-importer.c:780
+# importers/pine-importer.c:646
+# shell/e-shell-importer.c:653
+# shell/importer/import.glade.h:4
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "匯入"
+
+# ui/evolution-calendar.xml.h:5
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "建立一個新的全天約會"
+
+# calendar/gui/e-day-view.c:3146
+# ui/evolution-calendar.xml.h:16
+#~ msgid "New _Appointment"
+#~ msgstr "新增約會(_A)"
+
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "新增會議"
+
+# ui/evolution-tasks.xml.h:3
+#, fuzzy
+#~ msgid "New _Task"
+#~ msgstr "新增工作"
+
+# ui/evolution.xml.h:17
+#~ msgid "Evolution _Window"
+#~ msgstr "Evolution 視窗(_W)"
+
+# ui/evolution.xml.h:17
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "Evolution 視窗(_W)"
+
+# ui/evolution.xml.h:31
+#~ msgid "Toggle"
+#~ msgstr "切換"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#~ msgid "Clear"
+#~ msgstr "清除"
+
+# ui/evolution-mail.xml.h:3
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "取消目前郵件所作的行動"
 
 # addressbook/backend/ebook/e-card.c:3346
 #, fuzzy
@@ -19903,11 +21489,6 @@ msgstr "立即搜尋"
 #~ msgid "Evolution VCard importer"
 #~ msgstr "Evolution 郵件編輯器。"
 
-# mail/mail-send-recv.c:287
-# mail/mail-send-recv.c:333
-#~ msgid "Loading..."
-#~ msgstr "載入中..."
-
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
 #~ msgid "Searching..."
@@ -19975,10 +21556,6 @@ msgstr "立即搜尋"
 #~ msgid "URI not loaded"
 #~ msgstr "尚未載入 EBook\n"
 
-#, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "名片 ID 已經存在"
-
 # camel/camel-remote-store.c:337
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
@@ -20139,10 +21716,6 @@ msgstr "立即搜尋"
 #~ msgid "Callback"
 #~ msgstr "回撥電話"
 
-# addressbook/contact-editor/e-contact-editor.c:1248
-#~ msgid "Company"
-#~ msgstr "公司電話"
-
 # ui/evolution-event-editor.xml.h:13
 # ui/evolution-mail.xml.h:8
 # ui/evolution-task-editor-dialog.xml.h:14
@@ -20225,10 +21798,6 @@ msgstr "立即搜尋"
 #~ msgid "%x"
 #~ msgstr "%x"
 
-# mail/mail-config.glade.h:25
-#~ msgid "Phone"
-#~ msgstr "電話"
-
 # addressbook/backend/ebook/e-card.c:3335
 #~ msgid "Birth date"
 #~ msgstr "出生日期"
@@ -20243,10 +21812,6 @@ msgstr "立即搜尋"
 #~ msgid "Arbitrary"
 #~ msgstr "任意"
 
-# addressbook/contact-editor/fullname.glade.h:4
-#~ msgid "ID"
-#~ msgstr "ID"
-
 # ui/evolution-event-editor.xml.h:30
 # ui/evolution-task-editor-dialog.xml.h:33
 #~ msgid "Last Use"
@@ -20264,10 +21829,6 @@ msgstr "立即搜尋"
 #~ msgid "Folder containing contact information"
 #~ msgstr "資料夾包含連絡人資訊"
 
-# addressbook/gui/component/addressbook-config.c:148
-#~ msgid "LDAP Server"
-#~ msgstr "LDAP 伺服器"
-
 # mail/mail-callbacks.c:1349
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "LDAP 伺服器包含連絡人資訊"
@@ -20280,22 +21841,6 @@ msgstr "立即搜尋"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "公開資料夾包含連絡人資訊"
 
-# ui/evolution-addressbook.xml.h:17
-#~ msgid "_Contact"
-#~ msgstr "連絡人(_C)"
-
-# ui/evolution-addressbook.xml.h:2
-#~ msgid "Create a new contact"
-#~ msgstr "建立新的連絡人"
-
-# ui/evolution-addressbook.xml.h:17
-#~ msgid "New Contact List"
-#~ msgstr "新增連絡人清單"
-
-# ui/evolution-addressbook.xml.h:2
-#~ msgid "Create a new contact list"
-#~ msgstr "建立新的連絡人清單"
-
 # addressbook/gui/component/addressbook.c:763
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "資料夾瀏覽器顯示之URI"
@@ -20315,10 +21860,6 @@ msgstr "立即搜尋"
 #~ msgid "Is New Card"
 #~ msgstr "是新的名片"
 
-# addressbook/contact-editor/e-contact-editor.c:1260
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 # calendar/gui/calendar-model.c:638
 # calendar/gui/calendar-model.c:1176
 # calendar/gui/dialogs/task-editor-dialog.glade.h:14
@@ -20380,44 +21921,6 @@ msgstr "立即搜尋"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "公開資料夾包含待辦事項"
 
-# calendar/gui/e-day-view.c:3146
-# ui/evolution-calendar.xml.h:16
-#~ msgid "New appointment"
-#~ msgstr "新增約會"
-
-# calendar/gui/event-editor-dialog.glade.h:3
-#~ msgid "_Appointment"
-#~ msgstr "約會(_A)"
-
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
-#~ msgid "New meeting"
-#~ msgstr "新增會議"
-
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
-#, fuzzy
-#~ msgid "M_eeting"
-#~ msgstr "會議"
-
-# ui/evolution-tasks.xml.h:3
-#~ msgid "New task"
-#~ msgstr "新增工作"
-
-# ui/evolution-tasks.xml.h:9
-#~ msgid "_Task"
-#~ msgstr "工作(_T)"
-
-# calendar/gui/e-day-view.c:3146
-# ui/evolution-calendar.xml.h:16
-#~ msgid "New All Day Appointment"
-#~ msgstr "新增全天約會"
-
-# calendar/gui/e-day-view.c:3146
-# ui/evolution-calendar.xml.h:16
-#~ msgid "All _Day Appointment"
-#~ msgstr "全天約會(_D)"
-
 # shell/e-setup.c:163
 #~ msgid "Could not update invalid object"
 #~ msgstr "無法更新無效的物件"
@@ -20474,11 +21977,6 @@ msgstr "立即搜尋"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "開啟在 %s 的行事曆"
 
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
-#~ msgid "Opening default tasks folder"
-#~ msgstr "開啟預設工作資料夾"
-
 #~ msgid "Evaluation of the search expression did not yield a boolean value"
 #~ msgstr "搜尋表示出的值結果不能為布林值"
 
@@ -20524,11 +22022,6 @@ msgstr "立即搜尋"
 #~ "Evolution 找到 GnomeCard 檔案。\n"
 #~ "您是否要將它們匯入至 Evolution？"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:9
-#, fuzzy
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "郵件組態界面"
-
 # mail/folder-browser.c:871
 #~ msgid "Folder containing mail"
 #~ msgstr "資料夾包含郵件"
@@ -20549,13 +22042,6 @@ msgstr "立即搜尋"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "虛擬垃圾桶資料夾"
 
-# ui/evolution-event-editor.xml.h:70
-# ui/evolution-mail.xml.h:115
-# ui/evolution-task-editor-dialog.xml.h:83
-# ui/evolution.xml.h:60
-#~ msgid "Properties..."
-#~ msgstr "屬性..."
-
 # ui/evolution-mail.xml.h:4
 #~ msgid "Change this folder's properties"
 #~ msgstr "變更這個資料夾的屬性"
@@ -20567,19 +22053,6 @@ msgstr "立即搜尋"
 #~ msgid "You have unsent messages, do you wish to quit anyway?"
 #~ msgstr "您有未寄出的郵件，您無論如何都要離開嗎？"
 
-# ui/evolution-mail.xml.h:109
-#~ msgid "New Mail Message"
-#~ msgstr "新增郵件"
-
-# ui/evolution-mail.xml.h:109
-#~ msgid "_Mail Message"
-#~ msgstr "郵件訊息(_M)"
-
-# composer/e-msg-composer.c:1526
-# composer/e-msg-composer.c:1871
-#~ msgid "Compose a new mail message"
-#~ msgstr "編輯新的郵件訊息"
-
 # widgets/misc/e-messagebox.c:180
 #~ msgid "New Message Post"
 #~ msgstr "張貼新郵件"
@@ -22632,9 +24105,6 @@ msgstr "立即搜尋"
 #~ msgid "Cumberland"
 #~ msgstr "昆布蘭"
 
-#~ msgid "Curitiba"
-#~ msgstr "古里提巴"
-
 #~ msgid "Curitiba Apt"
 #~ msgstr "古里提巴 Apt"
 
@@ -26041,9 +27511,6 @@ msgstr "立即搜尋"
 #~ msgid "North Bend"
 #~ msgstr "北班德"
 
-#~ msgid "North Carolina"
-#~ msgstr "北卡羅來納"
-
 # widgets/misc/e-cell-date-edit.c:221
 # widgets/misc/e-dateedit.c:418
 #~ msgid "North Conway"
@@ -27904,11 +29371,6 @@ msgstr "立即搜尋"
 #~ msgid "State College"
 #~ msgstr "State College"
 
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
-#~ msgid "Stauning"
-#~ msgstr "Stauning"
-
 #~ msgid "Staunton"
 #~ msgstr "斯唐頓"
 
@@ -28589,10 +30051,6 @@ msgstr "立即搜尋"
 #~ msgid "United Arab Emirates "
 #~ msgstr "阿拉伯聯合大公國"
 
-# mail/message-list.c:677
-#~ msgid "Unst"
-#~ msgstr "恩斯特"
-
 #~ msgid "Upington"
 #~ msgstr "烏平通"
 
@@ -28713,12 +30171,6 @@ msgstr "立即搜尋"
 #~ msgid "Veracruz"
 #~ msgstr "維拉克路茲"
 
-#~ msgid "Vermillion"
-#~ msgstr "佛密良"
-
-#~ msgid "Vermont"
-#~ msgstr "佛蒙特"
-
 # addressbook/contact-editor/contact-editor.glade.h:10
 # executive-summary/component/executive-summary-config.glade.h:3
 #~ msgid "Vernal"
@@ -29331,9 +30783,6 @@ msgstr "立即搜尋"
 #~ msgid " F"
 #~ msgstr " F"
 
-#~ msgid " C"
-#~ msgstr " C"
-
 # addressbook/printing/e-contact-print.glade.h:8
 #~ msgid "knots"
 #~ msgstr "節"
@@ -29992,10 +31441,6 @@ msgstr "立即搜尋"
 #~ msgstr "凍霾"
 
 #, fuzzy
-#~ msgid "Spray"
-#~ msgstr "飛沫"
-
-#, fuzzy
 #~ msgid "Spray in the vicinity"
 #~ msgstr "附近地區有飛沫"
 
@@ -30407,22 +31852,6 @@ msgstr "立即搜尋"
 #~ msgid "Remove a folder added with \"Open Other User's Folder\""
 #~ msgstr "移除以“開啟其他使用者的資料夾”新增的資料夾"
 
-# ui/evolution-mail.xml.h:81
-#~ msgid "Send / Receive"
-#~ msgstr "傳送/接收"
-
-# ui/evolution-mail.xml.h:82
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "傳送待送的項目並接收新的項目"
-
-# ui/evolution.xml.h:32
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "切換資料夾清單的顯示狀態"
-
-# ui/evolution.xml.h:33
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "切換資料功能列的顯示狀態"
-
 # ui/evolution.xml.h:38
 #~ msgid "View the selected folder"
 #~ msgstr "檢視選定的資料夾"
@@ -30460,10 +31889,6 @@ msgstr "立即搜尋"
 #~ msgid "_Rename..."
 #~ msgstr "重新命名(_R)..."
 
-# ui/evolution-mail.xml.h:119
-#~ msgid "_Send / Receive"
-#~ msgstr "傳送/接收 (_S)"
-
 # ui/evolution.xml.h:62
 #~ msgid "_Shortcut Bar"
 #~ msgstr "功能列(_S)"
@@ -30534,10 +31959,6 @@ msgstr "立即搜尋"
 #~ msgid "Font Preferences"
 #~ msgstr "字型偏好設定"
 
-# mail/mail-config.glade.h:12
-#~ msgid "Automatically _detect links"
-#~ msgstr "自動偵測連結(_D)"
-
 #~ msgid "Emacs"
 #~ msgstr "Emacs"
 
@@ -30662,10 +32083,6 @@ msgstr "立即搜尋"
 #~ msgid "1234"
 #~ msgstr "1234"
 
-# calendar/gui/e-calendar-table.c:375
-#~ msgid "380"
-#~ msgstr "380"
-
 #~ msgid "666"
 #~ msgstr "666"
 
@@ -30676,10 +32093,6 @@ msgstr "立即搜尋"
 #~ msgid "<- _Remove"
 #~ msgstr "<- 移除(_R)"
 
-# addressbook/printing/e-contact-print.glade.h:23
-#~ msgid "<< Fewer Options"
-#~ msgstr "<< 減少選項"
-
 #~ msgid "Add (or Edit) Attribute Mappings"
 #~ msgstr "新增（或編輯）屬性對應"